@modelcontextprotocol/inspector 1.0.2 → 1.0.3

package/client/dist/assets/{index-DdyO6kfY.js → index-C2CDzlVy.js}

@@ -7161,32 +7161,32 @@ function useToast() {
   };
 }
 var reactDomExports = requireReactDom();
-var __defProp$v = Object.defineProperty;
-var __name$v = (target, value) => __defProp$v(target, "name", { value, configurable: true });
+var __defProp$u = Object.defineProperty;
+var __name$u = (target, value) => __defProp$u(target, "name", { value, configurable: true });
 var canUseDOM = !!(typeof window !== "undefined" && window.document && window.document.createElement);
 function composeEventHandlers(originalEventHandler, ourEventHandler, { checkForDefaultPrevented = true } = {}) {
-  return /* @__PURE__ */ __name$v(function handleEvent(event) {
+  return /* @__PURE__ */ __name$u(function handleEvent(event) {
     originalEventHandler?.(event);
     if (checkForDefaultPrevented === false || !event || !event.defaultPrevented) {
       return ourEventHandler?.(event);
     }
   }, "handleEvent");
 }
-__name$v(composeEventHandlers, "composeEventHandlers");
+__name$u(composeEventHandlers, "composeEventHandlers");
 function getOwnerWindow(element) {
   if (!canUseDOM) {
     throw new Error("Cannot access window outside of the DOM");
   }
   return element?.ownerDocument?.defaultView ?? window;
 }
-__name$v(getOwnerWindow, "getOwnerWindow");
+__name$u(getOwnerWindow, "getOwnerWindow");
 function getOwnerDocument(element) {
   if (!canUseDOM) {
     throw new Error("Cannot access document outside of the DOM");
   }
   return element?.ownerDocument ?? document;
 }
-__name$v(getOwnerDocument, "getOwnerDocument");
+__name$u(getOwnerDocument, "getOwnerDocument");
 function getActiveElement(node, activeDescendant = false) {
   const { activeElement } = getOwnerDocument(node);
   if (!activeElement?.nodeName) {
@@ -7206,13 +7206,13 @@ function getActiveElement(node, activeDescendant = false) {
   }
   return activeElement;
 }
-__name$v(getActiveElement, "getActiveElement");
+__name$u(getActiveElement, "getActiveElement");
 function isFrame(element) {
   return element.tagName === "IFRAME";
 }
-__name$v(isFrame, "isFrame");
-var __defProp$u = Object.defineProperty;
-var __name$u = (target, value) => __defProp$u(target, "name", { value, configurable: true });
+__name$u(isFrame, "isFrame");
+var __defProp$t = Object.defineProperty;
+var __name$t = (target, value) => __defProp$t(target, "name", { value, configurable: true });
 function setRef$1(ref2, value) {
   if (typeof ref2 === "function") {
     return ref2(value);
@@ -7220,7 +7220,7 @@ function setRef$1(ref2, value) {
     ref2.current = value;
   }
 }
-__name$u(setRef$1, "setRef");
+__name$t(setRef$1, "setRef");
 function composeRefs(...refs) {
   return (node) => {
     let hasCleanup = false;
@@ -7245,23 +7245,23 @@ function composeRefs(...refs) {
     }
   };
 }
-__name$u(composeRefs, "composeRefs");
+__name$t(composeRefs, "composeRefs");
 function useComposedRefs(...refs) {
   return reactExports.useCallback(composeRefs(...refs), refs);
 }
-__name$u(useComposedRefs, "useComposedRefs");
-var __defProp$t = Object.defineProperty;
-var __name$t = (target, value) => __defProp$t(target, "name", { value, configurable: true });
+__name$t(useComposedRefs, "useComposedRefs");
+var __defProp$s = Object.defineProperty;
+var __name$s = (target, value) => __defProp$s(target, "name", { value, configurable: true });
 // @__NO_SIDE_EFFECTS__
 function createContext2(rootComponentName, defaultContext) {
   const Context = reactExports.createContext(defaultContext);
   Context.displayName = rootComponentName + "Context";
-  const Provider2 = /* @__PURE__ */ __name$t((props) => {
+  const Provider = /* @__PURE__ */ __name$s((props) => {
     const { children, ...context } = props;
     const value = reactExports.useMemo(() => context, Object.values(context));
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Context.Provider, { value, children });
   }, "Provider");
-  Provider2.displayName = rootComponentName + "Provider";
+  Provider.displayName = rootComponentName + "Provider";
   function useContext2(consumerName, options2 = {}) {
     const { optional: optional2 = false } = options2;
     const context = reactExports.useContext(Context);
@@ -7270,10 +7270,10 @@ function createContext2(rootComponentName, defaultContext) {
     if (optional2) return void 0;
     throw new Error(`\`${consumerName}\` must be used within \`${rootComponentName}\``);
   }
-  __name$t(useContext2, "useContext");
-  return [Provider2, useContext2];
+  __name$s(useContext2, "useContext");
+  return [Provider, useContext2];
 }
-__name$t(createContext2, "createContext");
+__name$s(createContext2, "createContext");
 // @__NO_SIDE_EFFECTS__
 function createContextScope(scopeName, createContextScopeDeps = []) {
   let defaultContexts = [];
@@ -7282,13 +7282,13 @@ function createContextScope(scopeName, createContextScopeDeps = []) {
     BaseContext.displayName = rootComponentName + "Context";
     const index2 = defaultContexts.length;
     defaultContexts = [...defaultContexts, defaultContext];
-    const Provider2 = /* @__PURE__ */ __name$t((props) => {
+    const Provider = /* @__PURE__ */ __name$s((props) => {
       const { scope: scope2, children, ...context } = props;
       const Context = scope2?.[scopeName]?.[index2] || BaseContext;
       const value = reactExports.useMemo(() => context, Object.values(context));
       return /* @__PURE__ */ jsxRuntimeExports.jsx(Context.Provider, { value, children });
     }, "Provider");
-    Provider2.displayName = rootComponentName + "Provider";
+    Provider.displayName = rootComponentName + "Provider";
     function useContext2(consumerName, scope2, options2 = {}) {
       const { optional: optional2 = false } = options2;
       const Context = scope2?.[scopeName]?.[index2] || BaseContext;
@@ -7298,15 +7298,15 @@ function createContextScope(scopeName, createContextScopeDeps = []) {
       if (optional2) return void 0;
       throw new Error(`\`${consumerName}\` must be used within \`${rootComponentName}\``);
     }
-    __name$t(useContext2, "useContext");
-    return [Provider2, useContext2];
+    __name$s(useContext2, "useContext");
+    return [Provider, useContext2];
   }
-  __name$t(createContext3, "createContext");
-  const createScope = /* @__PURE__ */ __name$t(() => {
+  __name$s(createContext3, "createContext");
+  const createScope = /* @__PURE__ */ __name$s(() => {
     const scopeContexts = defaultContexts.map((defaultContext) => {
       return reactExports.createContext(defaultContext);
     });
-    return /* @__PURE__ */ __name$t(function useScope(scope2) {
+    return /* @__PURE__ */ __name$s(function useScope(scope2) {
       const contexts = scope2?.[scopeName] || scopeContexts;
       return reactExports.useMemo(
         () => ({ [`__scope${scopeName}`]: { ...scope2, [scopeName]: contexts } }),
@@ -7317,16 +7317,16 @@ function createContextScope(scopeName, createContextScopeDeps = []) {
   createScope.scopeName = scopeName;
   return [createContext3, composeContextScopes(createScope, ...createContextScopeDeps)];
 }
-__name$t(createContextScope, "createContextScope");
+__name$s(createContextScope, "createContextScope");
 function composeContextScopes(...scopes) {
   const baseScope = scopes[0];
   if (scopes.length === 1) return baseScope;
-  const createScope = /* @__PURE__ */ __name$t(() => {
+  const createScope = /* @__PURE__ */ __name$s(() => {
     const scopeHooks = scopes.map((createScope2) => ({
       useScope: createScope2(),
       scopeName: createScope2.scopeName
     }));
-    return /* @__PURE__ */ __name$t(function useComposedScopes(overrideScopes) {
+    return /* @__PURE__ */ __name$s(function useComposedScopes(overrideScopes) {
       const nextScopes = scopeHooks.reduce((nextScopes2, { useScope, scopeName }) => {
         const scopeProps = useScope(overrideScopes);
         const currentScope = scopeProps[`__scope${scopeName}`];
@@ -7338,9 +7338,9 @@ function composeContextScopes(...scopes) {
   createScope.scopeName = baseScope.scopeName;
   return createScope;
 }
-__name$t(composeContextScopes, "composeContextScopes");
-var __defProp$s = Object.defineProperty;
-var __name$s = (target, value) => __defProp$s(target, "name", { value, configurable: true });
+__name$s(composeContextScopes, "composeContextScopes");
+var __defProp$r = Object.defineProperty;
+var __name$r = (target, value) => __defProp$r(target, "name", { value, configurable: true });
 // @__NO_SIDE_EFFECTS__
 function createSlot(ownerName) {
   const Slot2 = reactExports.forwardRef((props, forwardedRef) => {
@@ -7348,15 +7348,13 @@ function createSlot(ownerName) {
     let slottableElement = null;
     let hasSlottable = false;
     const newChildren = [];
-    if (isLazyComponent(children) && typeof use === "function") {
-      children = use(children._payload);
-    }
+    children = useUnwrappedLazy(children);
     reactExports.Children.forEach(children, (maybeSlottable) => {
       if (isSlottable(maybeSlottable)) {
         hasSlottable = true;
         const slottable = maybeSlottable;
         let child = "child" in slottable.props ? slottable.props.child : slottable.props.children;
-        if (isLazyComponent(child) && typeof use === "function") {
+        while (isLazyComponent(child) && typeof use === "function") {
           child = use(child._payload);
         }
         slottableElement = getSlottableElementFromSlottable(slottable, child);
@@ -7395,22 +7393,21 @@ function createSlot(ownerName) {
   Slot2.displayName = `${ownerName}.Slot`;
   return Slot2;
 }
-__name$s(createSlot, "createSlot");
+__name$r(createSlot, "createSlot");
 var Slot$3 = /* @__PURE__ */ createSlot("Slot");
 var SLOTTABLE_IDENTIFIER = /* @__PURE__ */ Symbol.for("radix.slottable");
 // @__NO_SIDE_EFFECTS__
 function createSlottable(ownerName) {
-  const Slottable2 = /* @__PURE__ */ __name$s((props) => "child" in props ? props.children(props.child) : props.children, "Slottable");
+  const Slottable2 = /* @__PURE__ */ __name$r((props) => "child" in props ? props.children(props.child) : props.children, "Slottable");
   Slottable2.displayName = `${ownerName}.Slottable`;
   Slottable2.__radixId = SLOTTABLE_IDENTIFIER;
   return Slottable2;
 }
-__name$s(createSlottable, "createSlottable");
-var getSlottableElementFromSlottable = /* @__PURE__ */ __name$s((slottable, child) => {
+__name$r(createSlottable, "createSlottable");
+var getSlottableElementFromSlottable = /* @__PURE__ */ __name$r((slottable, child) => {
   if ("child" in slottable.props) {
-    const child2 = slottable.props.child;
-    if (!reactExports.isValidElement(child2)) return null;
-    return reactExports.cloneElement(child2, void 0, slottable.props.children(child2.props.children));
+    if (!reactExports.isValidElement(child)) return null;
+    return reactExports.cloneElement(child, void 0, slottable.props.children(child.props.children));
   }
   return reactExports.isValidElement(child) ? child : null;
 }, "getSlottableElementFromSlottable");
@@ -7434,11 +7431,13 @@ function mergeProps(slotProps, childProps) {
       overrideProps[propName] = { ...slotPropValue, ...childPropValue };
     } else if (propName === "className") {
       overrideProps[propName] = [slotPropValue, childPropValue].filter(Boolean).join(" ");
+    } else if (propName === "aria-describedby") {
+      overrideProps[propName] = concatAriaDescribedby$3(childPropValue, slotPropValue);
     }
   }
   return { ...slotProps, ...overrideProps };
 }
-__name$s(mergeProps, "mergeProps");
+__name$r(mergeProps, "mergeProps");
 function getElementRef$1(element) {
   let getter = Object.getOwnPropertyDescriptor(element.props, "ref")?.get;
   let mayWarn = getter && "isReactWarning" in getter && getter.isReactWarning;
@@ -7452,29 +7451,50 @@ function getElementRef$1(element) {
   }
   return element.props.ref || element.ref;
 }
-__name$s(getElementRef$1, "getElementRef");
+__name$r(getElementRef$1, "getElementRef");
 function isSlottable(child) {
   return reactExports.isValidElement(child) && typeof child.type === "function" && "__radixId" in child.type && child.type.__radixId === SLOTTABLE_IDENTIFIER;
 }
-__name$s(isSlottable, "isSlottable");
+__name$r(isSlottable, "isSlottable");
 var REACT_LAZY_TYPE = /* @__PURE__ */ Symbol.for("react.lazy");
 function isLazyComponent(element) {
   return element != null && typeof element === "object" && "$$typeof" in element && element.$$typeof === REACT_LAZY_TYPE && "_payload" in element && isPromiseLike(element._payload);
 }
-__name$s(isLazyComponent, "isLazyComponent");
+__name$r(isLazyComponent, "isLazyComponent");
 function isPromiseLike(value) {
   return typeof value === "object" && value !== null && "then" in value;
 }
-__name$s(isPromiseLike, "isPromiseLike");
-var createSlotError = /* @__PURE__ */ __name$s((ownerName) => {
+__name$r(isPromiseLike, "isPromiseLike");
+function useUnwrappedLazy(value) {
+  let unwrapped = value;
+  while (isLazyComponent(unwrapped) && typeof use === "function") {
+    unwrapped = use(unwrapped._payload);
+  }
+  return unwrapped;
+}
+__name$r(useUnwrappedLazy, "useUnwrappedLazy");
+function concatAriaDescribedby$3(...values) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const value of values) {
+    if (typeof value !== "string") continue;
+    for (const id2 of String(value).trim().split(/\s+/)) {
+      if (id2) ids.add(id2);
+    }
+  }
+  return ids.size > 0 ? Array.from(ids).join(" ") : void 0;
+}
+__name$r(concatAriaDescribedby$3, "concatAriaDescribedby");
+var createSlotError = /* @__PURE__ */ __name$r((ownerName) => {
   return `${ownerName} failed to slot onto its children. Expected a single React element child or \`Slottable\`.`;
 }, "createSlotError");
-var createSlottableError = /* @__PURE__ */ __name$s((ownerName) => {
+var createSlottableError = /* @__PURE__ */ __name$r((ownerName) => {
   return `${ownerName} failed to slot onto its \`Slottable\`. Expected \`Slottable\` to receive a single React element child.`;
 }, "createSlottableError");
 var use = React2[" use ".trim().toString()];
-var __defProp$r = Object.defineProperty;
-var __name$r = (target, value) => __defProp$r(target, "name", { value, configurable: true });
+var useLayoutEffect2 = globalThis?.document ? reactExports.useLayoutEffect : () => {
+};
+var __defProp$q = Object.defineProperty;
+var __name$q = (target, value) => __defProp$q(target, "name", { value, configurable: true });
 // @__NO_SIDE_EFFECTS__
 function createCollection(name2) {
   const PROVIDER_NAME2 = name2 + "CollectionProvider";
@@ -7483,7 +7503,7 @@ function createCollection(name2) {
     PROVIDER_NAME2,
     { collectionRef: { current: null }, itemMap: /* @__PURE__ */ new Map() }
   );
-  const CollectionProvider = /* @__PURE__ */ __name$r((props) => {
+  const CollectionProvider = /* @__PURE__ */ __name$q((props) => {
     const { scope: scope2, children } = props;
     const ref2 = reactExports.useRef(null);
     const itemMap = reactExports.useRef(/* @__PURE__ */ new Map()).current;
@@ -7532,14 +7552,14 @@ function createCollection(name2) {
     }, [context.collectionRef, context.itemMap]);
     return getItems;
   }
-  __name$r(useCollection2, "useCollection");
+  __name$q(useCollection2, "useCollection");
   return [
     { Provider: CollectionProvider, Slot: CollectionSlot, ItemSlot: CollectionItemSlot },
     useCollection2,
     createCollectionScope2
   ];
 }
-__name$r(createCollection, "createCollection");
+__name$q(createCollection, "createCollection");
 var __instanciated = /* @__PURE__ */ new WeakMap();
 var OrderedDict = (_a = class extends Map {
   constructor(entries) {
@@ -7549,54 +7569,37 @@ var OrderedDict = (_a = class extends Map {
     __instanciated.set(this, true);
   }
   set(key, value) {
-    if (__instanciated.get(this)) {
-      if (this.has(key)) {
-        __privateGet(this, _keys)[__privateGet(this, _keys).indexOf(key)] = key;
-      } else {
-        __privateGet(this, _keys).push(key);
-      }
+    if (__instanciated.get(this) && !this.has(key)) {
+      __privateGet(this, _keys).push(key);
     }
     super.set(key, value);
     return this;
   }
+  /**
+   * Sets a key-value pair so that it ends up at the given index.
+   * - Existing keys are moved
+   * - Negative indices count from the end of the resulting dictionary, so
+   *   inserting at -1 makes the item the last one, -2 the second to last, etc.
+   * - Out-of-range indices are clamped
+   */
   insert(index2, key, value) {
     const has = this.has(key);
-    const length = __privateGet(this, _keys).length;
+    const finalSize = has ? this.size : this.size + 1;
     const relativeIndex = toSafeInteger(index2);
-    let actualIndex = relativeIndex >= 0 ? relativeIndex : length + relativeIndex;
-    const safeIndex = actualIndex < 0 || actualIndex >= length ? -1 : actualIndex;
-    if (safeIndex === this.size || has && safeIndex === this.size - 1 || safeIndex === -1) {
+    const targetIndex = relativeIndex >= 0 ? Math.min(relativeIndex, finalSize - 1) : Math.max(finalSize + relativeIndex, 0);
+    if (has ? __privateGet(this, _keys).indexOf(key) === targetIndex : targetIndex === this.size) {
       this.set(key, value);
       return this;
     }
-    const size2 = this.size + (has ? 0 : 1);
-    if (relativeIndex < 0) {
-      actualIndex++;
-    }
-    const keys = [...__privateGet(this, _keys)];
-    let nextValue;
-    let shouldSkip = false;
-    for (let i2 = actualIndex; i2 < size2; i2++) {
-      if (actualIndex === i2) {
-        let nextKey = keys[i2];
-        if (keys[i2] === key) {
-          nextKey = keys[i2 + 1];
-        }
-        if (has) {
-          this.delete(key);
-        }
-        nextValue = this.get(nextKey);
-        this.set(key, value);
-      } else {
-        if (!shouldSkip && keys[i2 - 1] === key) {
-          shouldSkip = true;
-        }
-        const currentKey = keys[shouldSkip ? i2 : i2 - 1];
-        const currentValue = nextValue;
-        nextValue = this.get(currentKey);
-        this.delete(currentKey);
-        this.set(currentKey, currentValue);
-      }
+    const keys = __privateGet(this, _keys).filter((existingKey) => existingKey !== key);
+    keys.splice(targetIndex, 0, key);
+    const entries = keys.map((entryKey) => [
+      entryKey,
+      entryKey === key ? value : this.get(entryKey)
+    ]);
+    this.clear();
+    for (const [entryKey, entryValue] of entries) {
+      this.set(entryKey, entryValue);
     }
     return this;
   }
@@ -7620,7 +7623,9 @@ var OrderedDict = (_a = class extends Map {
     if (index2 === -1) {
       return this;
     }
-    return this.insert(index2, newKey, value);
+    const currentIndex = __privateGet(this, _keys).indexOf(newKey);
+    const targetIndex = currentIndex !== -1 && currentIndex < index2 ? index2 - 1 : index2;
+    return this.insert(targetIndex, newKey, value);
   }
   after(key) {
     let index2 = __privateGet(this, _keys).indexOf(key);
@@ -7638,7 +7643,9 @@ var OrderedDict = (_a = class extends Map {
     if (index2 === -1) {
       return this;
     }
-    return this.insert(index2 + 1, newKey, value);
+    const currentIndex = __privateGet(this, _keys).indexOf(newKey);
+    const targetIndex = currentIndex !== -1 && currentIndex <= index2 ? index2 : index2 + 1;
+    return this.insert(targetIndex, newKey, value);
   }
   first() {
     return this.entryAt(0);
@@ -7744,10 +7751,14 @@ var OrderedDict = (_a = class extends Map {
   }
   reduce(...args) {
     const [callbackfn, initialValue] = args;
+    const hasInitialValue = args.length > 1;
+    if (!hasInitialValue && this.size === 0) {
+      throw new TypeError("Reduce of empty OrderedDict with no initial value");
+    }
     let index2 = 0;
-    let accumulator = initialValue ?? this.at(0);
+    let accumulator = initialValue;
     for (const entry of this) {
-      if (index2 === 0 && args.length === 1) {
+      if (index2 === 0 && !hasInitialValue) {
         accumulator = entry;
       } else {
         accumulator = Reflect.apply(callbackfn, this, [accumulator, entry, index2, this]);
@@ -7758,10 +7769,14 @@ var OrderedDict = (_a = class extends Map {
   }
   reduceRight(...args) {
     const [callbackfn, initialValue] = args;
-    let accumulator = initialValue ?? this.at(-1);
+    const hasInitialValue = args.length > 1;
+    if (!hasInitialValue && this.size === 0) {
+      throw new TypeError("Reduce of empty OrderedDict with no initial value");
+    }
+    let accumulator = initialValue;
     for (let index2 = this.size - 1; index2 >= 0; index2--) {
-      const entry = this.at(index2);
-      if (index2 === this.size - 1 && args.length === 1) {
+      const entry = this.entryAt(index2);
+      if (index2 === this.size - 1 && !hasInitialValue) {
         accumulator = entry;
       } else {
         accumulator = Reflect.apply(callbackfn, this, [accumulator, entry, index2, this]);
@@ -7769,7 +7784,36 @@ var OrderedDict = (_a = class extends Map {
     }
     return accumulator;
   }
+  /**
+   * Sorts the dictionary in place. This method mutates the dictionary and
+   * returns a reference to the same object
+   *
+   * @param compareFn Function used to determine the order of the elements. It
+   * is expected to return a negative value if the first argument is less than
+   * the second argument, zero if they're equal, and a positive value otherwise.
+   */
+  sort(compareFn) {
+    if (typeof compareFn !== "function") {
+      throw new TypeError(`OrderedDict.sort requires a compare function`);
+    }
+    const entries = [...this.entries()].sort(compareFn);
+    this.clear();
+    for (const [key, value] of entries) {
+      this.set(key, value);
+    }
+    return this;
+  }
+  /**
+   * Returns a copy of the dictionary with its elements sorted.
+   *
+   * @param compareFn Function used to determine the order of the elements. It
+   * is expected to return a negative value if the first argument is less than
+   * the second argument, zero if they're equal, and a positive value otherwise.
+   */
   toSorted(compareFn) {
+    if (typeof compareFn !== "function") {
+      throw new TypeError(`OrderedDict.toSorted requires a compare function`);
+    }
     const entries = [...this.entries()].sort(compareFn);
     return new _a(entries);
   }
@@ -7789,20 +7833,8 @@ var OrderedDict = (_a = class extends Map {
   }
   slice(start, end) {
     const result = new _a();
-    let stop = this.size - 1;
-    if (start === void 0) {
-      return result;
-    }
-    if (start < 0) {
-      start = start + this.size;
-    }
-    if (end !== void 0 && end > 0) {
-      stop = end - 1;
-    }
-    for (let index2 = start; index2 <= stop; index2++) {
-      const key = this.keyAt(index2);
-      const element = this.get(key);
-      result.set(key, element);
+    for (const key of __privateGet(this, _keys).slice(start, end)) {
+      result.set(key, this.get(key));
     }
     return result;
   }
@@ -7826,7 +7858,7 @@ var OrderedDict = (_a = class extends Map {
     }
     return false;
   }
-}, _keys = new WeakMap(), __name$r(_a, "OrderedDict"), _a);
+}, _keys = new WeakMap(), __name$q(_a, "OrderedDict"), _a);
 function at$1(array2, index2) {
   if ("at" in Array.prototype) {
     return Array.prototype.at.call(array2, index2);
@@ -7834,52 +7866,63 @@ function at$1(array2, index2) {
   const actualIndex = toSafeIndex(array2, index2);
   return actualIndex === -1 ? void 0 : array2[actualIndex];
 }
-__name$r(at$1, "at");
+__name$q(at$1, "at");
 function toSafeIndex(array2, index2) {
   const length = array2.length;
   const relativeIndex = toSafeInteger(index2);
   const actualIndex = relativeIndex >= 0 ? relativeIndex : length + relativeIndex;
   return actualIndex < 0 || actualIndex >= length ? -1 : actualIndex;
 }
-__name$r(toSafeIndex, "toSafeIndex");
+__name$q(toSafeIndex, "toSafeIndex");
 function toSafeInteger(number2) {
   return number2 !== number2 || number2 === 0 ? 0 : Math.trunc(number2);
 }
-__name$r(toSafeInteger, "toSafeInteger");
+__name$q(toSafeInteger, "toSafeInteger");
 // @__NO_SIDE_EFFECTS__
 function createCollection2(name2) {
   const PROVIDER_NAME2 = name2 + "CollectionProvider";
   const [createCollectionContext, createCollectionScope2] = /* @__PURE__ */ createContextScope(PROVIDER_NAME2);
-  const [CollectionContextProvider, useCollectionContext] = createCollectionContext(
-    PROVIDER_NAME2,
-    {
-      collectionElement: null,
-      collectionRef: { current: null },
-      collectionRefObject: { current: null },
-      itemMap: new OrderedDict(),
-      setItemMap: /* @__PURE__ */ __name$r(() => void 0, "setItemMap")
-    }
-  );
-  const CollectionProvider = /* @__PURE__ */ __name$r(({ state, ...props }) => {
+  const [CollectionStableContextProvider, useStableCollectionContext] = createCollectionContext(PROVIDER_NAME2);
+  CollectionStableContextProvider.displayName = name2 + "CollectionStableContextProvider";
+  const [CollectionStatefulContextProvider, useStatefulCollectionContext] = createCollectionContext(PROVIDER_NAME2);
+  CollectionStatefulContextProvider.displayName = name2 + "CollectionStatefulContextProvider";
+  const CollectionProvider = /* @__PURE__ */ __name$q(({ state, ...props }) => {
     return state ? /* @__PURE__ */ jsxRuntimeExports.jsx(CollectionProviderImpl, { ...props, state }) : /* @__PURE__ */ jsxRuntimeExports.jsx(CollectionInit, { ...props });
   }, "CollectionProvider");
   CollectionProvider.displayName = PROVIDER_NAME2;
-  const CollectionInit = /* @__PURE__ */ __name$r((props) => {
+  const CollectionInit = /* @__PURE__ */ __name$q((props) => {
     const state = useInitCollection();
     return /* @__PURE__ */ jsxRuntimeExports.jsx(CollectionProviderImpl, { ...props, state });
   }, "CollectionInit");
-  CollectionInit.displayName = PROVIDER_NAME2 + "Init";
-  const CollectionProviderImpl = /* @__PURE__ */ __name$r((props) => {
+  CollectionInit.displayName = name2 + "CollectionInit";
+  const CollectionProviderImpl = /* @__PURE__ */ __name$q((props) => {
     const { scope: scope2, children, state } = props;
     const ref2 = reactExports.useRef(null);
     const [collectionElement, setCollectionElement] = reactExports.useState(
       null
     );
     const composeRefs2 = useComposedRefs(ref2, setCollectionElement);
-    const [itemMap, setItemMap] = state;
+    const [collection, setCollection] = state;
+    const registryRef = reactExports.useRef(
+      new OrderedDict()
+    );
+    const getCollection = reactExports.useCallback(() => {
+      const registry2 = registryRef.current;
+      if (!isInDocumentOrder(registry2)) {
+        registry2.sort(sortByDocumentPosition);
+      }
+      return registry2;
+    }, []);
     reactExports.useEffect(() => {
-      if (!collectionElement) return;
+      if (!collectionElement) {
+        return;
+      }
       const observer = getChildListObserver(() => {
+        setCollection((map) => {
+          const sorted = map.toSorted(sortByDocumentPosition);
+          const orderChanged = sorted.some(([key], index2) => map.keyAt(index2) !== key);
+          return orderChanged ? sorted : map;
+        });
       });
       observer.observe(collectionElement, {
         childList: true,
@@ -7888,28 +7931,36 @@ function createCollection2(name2) {
       return () => {
         observer.disconnect();
       };
-    }, [collectionElement]);
+    }, [collectionElement, setCollection]);
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
-      CollectionContextProvider,
+      CollectionStableContextProvider,
       {
         scope: scope2,
-        itemMap,
-        setItemMap,
-        collectionRef: composeRefs2,
-        collectionRefObject: ref2,
-        collectionElement,
-        children
+        collectionElementRef: composeRefs2,
+        collectionElementRefObject: ref2,
+        getCollection,
+        setCollection,
+        registryRef,
+        children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+          CollectionStatefulContextProvider,
+          {
+            scope: scope2,
+            collectionElement,
+            collection,
+            children
+          }
+        )
       }
     );
   }, "CollectionProviderImpl");
-  CollectionProviderImpl.displayName = PROVIDER_NAME2 + "Impl";
+  CollectionProviderImpl.displayName = name2 + "CollectionProviderImpl";
   const COLLECTION_SLOT_NAME = name2 + "CollectionSlot";
   const CollectionSlotImpl = /* @__PURE__ */ createSlot(COLLECTION_SLOT_NAME);
   const CollectionSlot = reactExports.forwardRef(
     (props, forwardedRef) => {
       const { scope: scope2, children } = props;
-      const context = useCollectionContext(COLLECTION_SLOT_NAME, scope2);
-      const composedRefs = useComposedRefs(forwardedRef, context.collectionRef);
+      const context = useStableCollectionContext(COLLECTION_SLOT_NAME, scope2);
+      const composedRefs = useComposedRefs(forwardedRef, context.collectionElementRef);
       return /* @__PURE__ */ jsxRuntimeExports.jsx(CollectionSlotImpl, { ref: composedRefs, children });
     }
   );
@@ -7921,37 +7972,71 @@ function createCollection2(name2) {
     (props, forwardedRef) => {
       const { scope: scope2, children, ...itemData } = props;
       const ref2 = reactExports.useRef(null);
-      const [element, setElement] = reactExports.useState(null);
-      const composedRefs = useComposedRefs(forwardedRef, ref2, setElement);
-      const context = useCollectionContext(ITEM_SLOT_NAME, scope2);
-      const { setItemMap } = context;
+      const context = useStableCollectionContext(ITEM_SLOT_NAME, scope2);
+      const { setCollection, registryRef } = context;
       const itemDataRef = reactExports.useRef(itemData);
       if (!shallowEqual(itemDataRef.current, itemData)) {
         itemDataRef.current = itemData;
       }
       const memoizedItemData = itemDataRef.current;
+      const registerElement = reactExports.useCallback(
+        (node) => {
+          const registry2 = registryRef.current;
+          if (node) {
+            registry2.set(node, {
+              ...itemDataRef.current,
+              element: node
+            });
+          } else if (ref2.current) {
+            registry2.delete(ref2.current);
+          }
+        },
+        [registryRef]
+      );
+      const composedRefs = useComposedRefs(forwardedRef, registerElement, ref2);
+      useLayoutEffect2(() => {
+        const node = ref2.current;
+        const registry2 = registryRef.current;
+        if (node && registry2.has(node)) {
+          registry2.set(node, { ...memoizedItemData, element: node });
+        }
+      }, [memoizedItemData, registryRef]);
+      const registeredRef = reactExports.useRef(null);
       reactExports.useEffect(() => {
-        const itemData2 = memoizedItemData;
-        setItemMap((map) => {
-          if (!element) {
-            return map;
+        const element = ref2.current;
+        const registered = registeredRef.current;
+        if ((registered?.element ?? null) === element && (!element || registered?.itemData === memoizedItemData)) {
+          return;
+        }
+        registeredRef.current = element ? { element, itemData: memoizedItemData } : null;
+        setCollection((map) => {
+          const next = new OrderedDict(map);
+          if (registered && registered.element !== element) {
+            next.delete(registered.element);
           }
-          if (!map.has(element)) {
-            map.set(element, { ...itemData2, element });
-            return map.toSorted(sortByDocumentPosition);
+          if (element) {
+            next.set(element, { ...memoizedItemData, element });
           }
-          return map.set(element, { ...itemData2, element }).toSorted(sortByDocumentPosition);
+          return next.sort(sortByDocumentPosition);
         });
+      });
+      reactExports.useEffect(() => {
         return () => {
-          setItemMap((map) => {
-            if (!element || !map.has(element)) {
+          const registered = registeredRef.current;
+          registeredRef.current = null;
+          if (!registered) {
+            return;
+          }
+          setCollection((map) => {
+            if (!map.has(registered.element)) {
               return map;
             }
-            map.delete(element);
-            return new OrderedDict(map);
+            const next = new OrderedDict(map);
+            next.delete(registered.element);
+            return next;
           });
         };
-      }, [element, memoizedItemData, setItemMap]);
+      }, [setCollection]);
       return /* @__PURE__ */ jsxRuntimeExports.jsx(CollectionItemSlotImpl, { ...{ [ITEM_DATA_ATTR]: "" }, ref: composedRefs, children });
     }
   );
@@ -7959,15 +8044,21 @@ function createCollection2(name2) {
   function useInitCollection() {
     return reactExports.useState(new OrderedDict());
   }
-  __name$r(useInitCollection, "useInitCollection");
+  __name$q(useInitCollection, "useInitCollection");
   function useCollection2(scope2) {
-    const { itemMap } = useCollectionContext(name2 + "CollectionConsumer", scope2);
-    return itemMap;
+    const { collection } = useStatefulCollectionContext(name2 + "CollectionConsumer", scope2);
+    return collection;
+  }
+  __name$q(useCollection2, "useCollection");
+  function useGetCollection(scope2) {
+    const { getCollection } = useStableCollectionContext(name2 + "CollectionConsumer", scope2);
+    return getCollection;
   }
-  __name$r(useCollection2, "useCollection");
+  __name$q(useGetCollection, "useGetCollection");
   const functions = {
     createCollectionScope: createCollectionScope2,
     useCollection: useCollection2,
+    useGetCollection,
     useInitCollection
   };
   return [
@@ -7975,7 +8066,7 @@ function createCollection2(name2) {
     functions
   ];
 }
-__name$r(createCollection2, "createCollection");
+__name$q(createCollection2, "createCollection");
 function shallowEqual(a2, b2) {
   if (a2 === b2) return true;
   if (typeof a2 !== "object" || typeof b2 !== "object") return false;
@@ -7989,15 +8080,29 @@ function shallowEqual(a2, b2) {
   }
   return true;
 }
-__name$r(shallowEqual, "shallowEqual");
+__name$q(shallowEqual, "shallowEqual");
 function isElementPreceding(a2, b2) {
   return !!(b2.compareDocumentPosition(a2) & Node.DOCUMENT_POSITION_PRECEDING);
 }
-__name$r(isElementPreceding, "isElementPreceding");
+__name$q(isElementPreceding, "isElementPreceding");
+function isInDocumentOrder(dict) {
+  let previous;
+  for (const element of dict.keys()) {
+    if (previous) {
+      const position = previous.compareDocumentPosition(element);
+      if (!(position & Node.DOCUMENT_POSITION_DISCONNECTED) && position & Node.DOCUMENT_POSITION_PRECEDING) {
+        return false;
+      }
+    }
+    previous = element;
+  }
+  return true;
+}
+__name$q(isInDocumentOrder, "isInDocumentOrder");
 function sortByDocumentPosition(a2, b2) {
   return !a2[1].element || !b2[1].element ? 0 : isElementPreceding(a2[1].element, b2[1].element) ? -1 : 1;
 }
-__name$r(sortByDocumentPosition, "sortByDocumentPosition");
+__name$q(sortByDocumentPosition, "sortByDocumentPosition");
 function getChildListObserver(callback) {
   const observer = new MutationObserver((mutationsList) => {
     for (const mutation of mutationsList) {
@@ -8009,9 +8114,9 @@ function getChildListObserver(callback) {
   });
   return observer;
 }
-__name$r(getChildListObserver, "getChildListObserver");
-var __defProp$q = Object.defineProperty;
-var __name$q = (target, value) => __defProp$q(target, "name", { value, configurable: true });
+__name$q(getChildListObserver, "getChildListObserver");
+var __defProp$p = Object.defineProperty;
+var __name$p = (target, value) => __defProp$p(target, "name", { value, configurable: true });
 var NODES = [
   "a",
   "button",
@@ -8047,19 +8152,26 @@ var Primitive = NODES.reduce((primitive, node) => {
 function dispatchDiscreteCustomEvent(target, event) {
   if (target) reactDomExports.flushSync(() => target.dispatchEvent(event));
 }
-__name$q(dispatchDiscreteCustomEvent, "dispatchDiscreteCustomEvent");
-var __defProp$p = Object.defineProperty;
-var __name$p = (target, value) => __defProp$p(target, "name", { value, configurable: true });
+__name$p(dispatchDiscreteCustomEvent, "dispatchDiscreteCustomEvent");
+var __defProp$o = Object.defineProperty;
+var __name$o = (target, value) => __defProp$o(target, "name", { value, configurable: true });
+var useReactInsertionEffect$1 = React2[" useInsertionEffect ".trim().toString()];
 function useCallbackRef$1(callback) {
   const callbackRef = reactExports.useRef(callback);
-  reactExports.useEffect(() => {
-    callbackRef.current = callback;
-  });
+  if (typeof useReactInsertionEffect$1 === "function") {
+    useReactInsertionEffect$1(() => {
+      callbackRef.current = callback;
+    });
+  } else {
+    useLayoutEffect2(() => {
+      callbackRef.current = callback;
+    });
+  }
   return reactExports.useMemo(() => ((...args) => callbackRef.current?.(...args)), []);
 }
-__name$p(useCallbackRef$1, "useCallbackRef");
-var __defProp$o = Object.defineProperty;
-var __name$o = (target, value) => __defProp$o(target, "name", { value, configurable: true });
+__name$o(useCallbackRef$1, "useCallbackRef");
+var __defProp$n = Object.defineProperty;
+var __name$n = (target, value) => __defProp$n(target, "name", { value, configurable: true });
 var CONTEXT_UPDATE = "dismissableLayer.update";
 var POINTER_DOWN_OUTSIDE = "dismissableLayer.pointerDownOutside";
 var FOCUS_OUTSIDE = "dismissableLayer.focusOutside";
@@ -8077,7 +8189,7 @@ var DismissableLayerContext = reactExports.createContext({
 });
 var DismissableLayer = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$o(function DismissableLayer2(props, forwardedRef) {
+  /* @__PURE__ */ __name$n(function DismissableLayer2(props, forwardedRef) {
     const {
       disableOutsidePointerEvents = false,
       deferPointerDownOutside = false,
@@ -8185,7 +8297,7 @@ var DismissableLayer = /* @__PURE__ */ reactExports.forwardRef(
       };
     }, [node, context]);
     reactExports.useEffect(() => {
-      const handleUpdate = /* @__PURE__ */ __name$o(() => force({}), "handleUpdate");
+      const handleUpdate = /* @__PURE__ */ __name$n(() => force({}), "handleUpdate");
       document.addEventListener(CONTEXT_UPDATE, handleUpdate);
       return () => document.removeEventListener(CONTEXT_UPDATE, handleUpdate);
     }, []);
@@ -8208,7 +8320,7 @@ var DismissableLayer = /* @__PURE__ */ reactExports.forwardRef(
     );
   }, "DismissableLayer")
 );
-var DismissableLayerBranch = /* @__PURE__ */ reactExports.forwardRef(/* @__PURE__ */ __name$o(function DismissableLayerBranch2(props, forwardedRef) {
+var DismissableLayerBranch = /* @__PURE__ */ reactExports.forwardRef(/* @__PURE__ */ __name$n(function DismissableLayerBranch2(props, forwardedRef) {
   const context = reactExports.useContext(DismissableLayerContext);
   const ref2 = reactExports.useRef(null);
   const composedRefs = useComposedRefs(forwardedRef, ref2);
@@ -8237,8 +8349,8 @@ function useDismissableLayerSurface() {
   }, [node, context.dismissableSurfaces]);
   return setNode;
 }
-__name$o(useDismissableLayerSurface, "useDismissableLayerSurface");
-var IS_TRUE = /* @__PURE__ */ __name$o(() => true, "IS_TRUE");
+__name$n(useDismissableLayerSurface, "useDismissableLayerSurface");
+var IS_TRUE = /* @__PURE__ */ __name$n(() => true, "IS_TRUE");
 function usePointerDownOutside(onPointerDownOutside, args) {
   const {
     ownerDocument = globalThis?.document,
@@ -8259,11 +8371,11 @@ function usePointerDownOutside(onPointerDownOutside, args) {
       isDeferredPointerDownOutsideRef.current = false;
       interceptedOutsideInteractionEventsRef.current.clear();
     }
-    __name$o(resetOutsideInteraction, "resetOutsideInteraction");
+    __name$n(resetOutsideInteraction, "resetOutsideInteraction");
     function isOutsideInteractionIntercepted() {
       return Array.from(interceptedOutsideInteractionEventsRef.current.values()).some(Boolean);
     }
-    __name$o(isOutsideInteractionIntercepted, "isOutsideInteractionIntercepted");
+    __name$n(isOutsideInteractionIntercepted, "isOutsideInteractionIntercepted");
     function handleInteractionCapture(event) {
       if (!isPointerDownOutsideRef.current) {
         return;
@@ -8281,14 +8393,14 @@ function usePointerDownOutside(onPointerDownOutside, args) {
         }, 0);
       }
     }
-    __name$o(handleInteractionCapture, "handleInteractionCapture");
+    __name$n(handleInteractionCapture, "handleInteractionCapture");
     function handleInteractionBubble(event) {
       if (isPointerDownOutsideRef.current) {
         interceptedOutsideInteractionEventsRef.current.set(event.type, false);
       }
     }
-    __name$o(handleInteractionBubble, "handleInteractionBubble");
-    const handlePointerDown = /* @__PURE__ */ __name$o((event) => {
+    __name$n(handleInteractionBubble, "handleInteractionBubble");
+    const handlePointerDown = /* @__PURE__ */ __name$n((event) => {
       if (event.target && !isPointerInsideReactTreeRef.current) {
         let handleAndDispatchPointerDownOutsideEvent2 = function() {
           ownerDocument.removeEventListener("click", handleClickRef.current);
@@ -8303,7 +8415,7 @@ function usePointerDownOutside(onPointerDownOutside, args) {
             );
           }
         };
-        __name$o(handleAndDispatchPointerDownOutsideEvent2, "handleAndDispatchPointerDownOutsideEvent");
+        __name$n(handleAndDispatchPointerDownOutsideEvent2, "handleAndDispatchPointerDownOutsideEvent");
         if (!shouldHandlePointerDownOutside(event.target)) {
           ownerDocument.removeEventListener("click", handleClickRef.current);
           resetOutsideInteraction();
@@ -8361,15 +8473,15 @@ function usePointerDownOutside(onPointerDownOutside, args) {
   ]);
   return {
     // ensures we check React component tree (not just DOM tree)
-    onPointerDownCapture: /* @__PURE__ */ __name$o(() => isPointerInsideReactTreeRef.current = true, "onPointerDownCapture")
+    onPointerDownCapture: /* @__PURE__ */ __name$n(() => isPointerInsideReactTreeRef.current = true, "onPointerDownCapture")
   };
 }
-__name$o(usePointerDownOutside, "usePointerDownOutside");
+__name$n(usePointerDownOutside, "usePointerDownOutside");
 function useFocusOutside(onFocusOutside, ownerDocument = globalThis?.document) {
   const handleFocusOutside = useCallbackRef$1(onFocusOutside);
   const isFocusInsideReactTreeRef = reactExports.useRef(false);
   reactExports.useEffect(() => {
-    const handleFocus = /* @__PURE__ */ __name$o((event) => {
+    const handleFocus = /* @__PURE__ */ __name$n((event) => {
       if (event.target && !isFocusInsideReactTreeRef.current) {
         const eventDetail = { originalEvent: event };
         handleAndDispatchCustomEvent$1(FOCUS_OUTSIDE, handleFocusOutside, eventDetail, {
@@ -8381,16 +8493,16 @@ function useFocusOutside(onFocusOutside, ownerDocument = globalThis?.document) {
     return () => ownerDocument.removeEventListener("focusin", handleFocus);
   }, [ownerDocument, handleFocusOutside]);
   return {
-    onFocusCapture: /* @__PURE__ */ __name$o(() => isFocusInsideReactTreeRef.current = true, "onFocusCapture"),
-    onBlurCapture: /* @__PURE__ */ __name$o(() => isFocusInsideReactTreeRef.current = false, "onBlurCapture")
+    onFocusCapture: /* @__PURE__ */ __name$n(() => isFocusInsideReactTreeRef.current = true, "onFocusCapture"),
+    onBlurCapture: /* @__PURE__ */ __name$n(() => isFocusInsideReactTreeRef.current = false, "onBlurCapture")
   };
 }
-__name$o(useFocusOutside, "useFocusOutside");
+__name$n(useFocusOutside, "useFocusOutside");
 function dispatchUpdate() {
   const event = new CustomEvent(CONTEXT_UPDATE);
   document.dispatchEvent(event);
 }
-__name$o(dispatchUpdate, "dispatchUpdate");
+__name$n(dispatchUpdate, "dispatchUpdate");
 function handleAndDispatchCustomEvent$1(name2, handler, detail, { discrete }) {
   const target = detail.originalEvent.target;
   const event = new CustomEvent(name2, { bubbles: false, cancelable: true, detail });
@@ -8401,15 +8513,11 @@ function handleAndDispatchCustomEvent$1(name2, handler, detail, { discrete }) {
     target.dispatchEvent(event);
   }
 }
-__name$o(handleAndDispatchCustomEvent$1, "handleAndDispatchCustomEvent");
-var Root$3 = DismissableLayer;
-var Branch = DismissableLayerBranch;
-var useLayoutEffect2 = globalThis?.document ? reactExports.useLayoutEffect : () => {
-};
-var __defProp$n = Object.defineProperty;
-var __name$n = (target, value) => __defProp$n(target, "name", { value, configurable: true });
-var Portal$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$n(function Portal2(props, forwardedRef) {
+__name$n(handleAndDispatchCustomEvent$1, "handleAndDispatchCustomEvent");
+var __defProp$m = Object.defineProperty;
+var __name$m = (target, value) => __defProp$m(target, "name", { value, configurable: true });
+var Portal = /* @__PURE__ */ reactExports.forwardRef(
+  /* @__PURE__ */ __name$m(function Portal2(props, forwardedRef) {
     const { container: containerProp, ...portalProps } = props;
     const [mounted, setMounted] = reactExports.useState(false);
     useLayoutEffect2(() => setMounted(true), []);
@@ -8417,16 +8525,16 @@ var Portal$1 = /* @__PURE__ */ reactExports.forwardRef(
     return container ? reactDomExports.createPortal(/* @__PURE__ */ jsxRuntimeExports.jsx(Primitive.div, { ...portalProps, ref: forwardedRef }), container) : null;
   }, "Portal")
 );
-var __defProp$m = Object.defineProperty;
-var __name$m = (target, value) => __defProp$m(target, "name", { value, configurable: true });
+var __defProp$l = Object.defineProperty;
+var __name$l = (target, value) => __defProp$l(target, "name", { value, configurable: true });
 function useStateMachine(initialState, machine) {
   return reactExports.useReducer((state, event) => {
     const nextState = machine[state][event];
     return nextState ?? state;
   }, initialState);
 }
-__name$m(useStateMachine, "useStateMachine");
-var Presence = /* @__PURE__ */ __name$m((props) => {
+__name$l(useStateMachine, "useStateMachine");
+var Presence = /* @__PURE__ */ __name$l((props) => {
   const { present, children } = props;
   const presence = usePresence(present);
   const child = typeof children === "function" ? children({ present: presence.isPresent }) : reactExports.Children.only(children);
@@ -8489,7 +8597,7 @@ function usePresence(present) {
     if (node) {
       let timeoutId;
       const ownerWindow = node.ownerDocument.defaultView ?? window;
-      const handleAnimationEnd = /* @__PURE__ */ __name$m((event) => {
+      const handleAnimationEnd = /* @__PURE__ */ __name$l((event) => {
         const currentAnimationName = getAnimationName(stylesRef.current);
         const isCurrentAnimation = currentAnimationName.includes(CSS.escape(event.animationName));
         if (event.target === node && isCurrentAnimation) {
@@ -8505,7 +8613,7 @@ function usePresence(present) {
           }
         }
       }, "handleAnimationEnd");
-      const handleAnimationStart = /* @__PURE__ */ __name$m((event) => {
+      const handleAnimationStart = /* @__PURE__ */ __name$l((event) => {
         if (event.target === node) {
           prevAnimationNameRef.current = getAnimationName(stylesRef.current);
         }
@@ -8537,7 +8645,7 @@ function usePresence(present) {
     }, [])
   };
 }
-__name$m(usePresence, "usePresence");
+__name$l(usePresence, "usePresence");
 function setRef(ref2, value) {
   if (typeof ref2 === "function") {
     return ref2(value);
@@ -8545,7 +8653,7 @@ function setRef(ref2, value) {
     ref2.current = value;
   }
 }
-__name$m(setRef, "setRef");
+__name$l(setRef, "setRef");
 function useStableComposedRefs(...refs) {
   const refsRef = reactExports.useRef(refs);
   refsRef.current = refs;
@@ -8573,11 +8681,11 @@ function useStableComposedRefs(...refs) {
     }
   }, []);
 }
-__name$m(useStableComposedRefs, "useStableComposedRefs");
+__name$l(useStableComposedRefs, "useStableComposedRefs");
 function getAnimationName(styles) {
   return styles?.animationName || "none";
 }
-__name$m(getAnimationName, "getAnimationName");
+__name$l(getAnimationName, "getAnimationName");
 function getElementRef(element) {
   let getter = Object.getOwnPropertyDescriptor(element.props, "ref")?.get;
   let mayWarn = getter && "isReactWarning" in getter && getter.isReactWarning;
@@ -8591,9 +8699,9 @@ function getElementRef(element) {
   }
   return element.props.ref || element.ref;
 }
-__name$m(getElementRef, "getElementRef");
-var __defProp$l = Object.defineProperty;
-var __name$l = (target, value) => __defProp$l(target, "name", { value, configurable: true });
+__name$l(getElementRef, "getElementRef");
+var __defProp$k = Object.defineProperty;
+var __name$k = (target, value) => __defProp$k(target, "name", { value, configurable: true });
 var useReactEffectEvent = React2[" useEffectEvent ".trim().toString()];
 var useReactInsertionEffect = React2[" useInsertionEffect ".trim().toString()];
 function useEffectEvent(callback) {
@@ -8614,14 +8722,14 @@ function useEffectEvent(callback) {
   }
   return reactExports.useMemo(() => ((...args) => ref2.current?.(...args)), []);
 }
-__name$l(useEffectEvent, "useEffectEvent");
-var __defProp$k = Object.defineProperty;
-var __name$k = (target, value) => __defProp$k(target, "name", { value, configurable: true });
+__name$k(useEffectEvent, "useEffectEvent");
+var __defProp$j = Object.defineProperty;
+var __name$j = (target, value) => __defProp$j(target, "name", { value, configurable: true });
 var useInsertionEffect = React2[" useInsertionEffect ".trim().toString()] || useLayoutEffect2;
 function useControllableState({
   prop,
   defaultProp,
-  onChange = /* @__PURE__ */ __name$k(() => {
+  onChange = /* @__PURE__ */ __name$j(() => {
   }, "onChange"),
   caller
 }) {
@@ -8646,7 +8754,7 @@ function useControllableState({
   );
   return [value, setValue];
 }
-__name$k(useControllableState, "useControllableState");
+__name$j(useControllableState, "useControllableState");
 function useUncontrolledState({
   defaultProp,
   onChange
@@ -8665,11 +8773,11 @@ function useUncontrolledState({
   }, [value, prevValueRef]);
   return [value, setValue, onChangeRef];
 }
-__name$k(useUncontrolledState, "useUncontrolledState");
+__name$j(useUncontrolledState, "useUncontrolledState");
 function isFunction$3(value) {
   return typeof value === "function";
 }
-__name$k(isFunction$3, "isFunction");
+__name$j(isFunction$3, "isFunction");
 var SYNC_STATE = /* @__PURE__ */ Symbol("RADIX:SYNC_STATE");
 function useControllableStateReducer(reducer2, userArgs, initialArg, init) {
   const { prop: controlledState, defaultProp, onChange: onChangeProp, caller } = userArgs;
@@ -8716,9 +8824,9 @@ function useControllableStateReducer(reducer2, userArgs, initialArg, init) {
   }, [controlledState, internalState.state, isControlled]);
   return [state, dispatch2];
 }
-__name$k(useControllableStateReducer, "useControllableStateReducer");
-var __defProp$j = Object.defineProperty;
-var __name$j = (target, value) => __defProp$j(target, "name", { value, configurable: true });
+__name$j(useControllableStateReducer, "useControllableStateReducer");
+var __defProp$i = Object.defineProperty;
+var __name$i = (target, value) => __defProp$i(target, "name", { value, configurable: true });
 var VISUALLY_HIDDEN_STYLES = Object.freeze({
   // See: https://github.com/twbs/bootstrap/blob/main/scss/mixins/_visually-hidden.scss
   position: "absolute",
@@ -8733,7 +8841,7 @@ var VISUALLY_HIDDEN_STYLES = Object.freeze({
   wordWrap: "normal"
 });
 var VisuallyHidden = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$j(function VisuallyHidden2(props, forwardedRef) {
+  /* @__PURE__ */ __name$i(function VisuallyHidden2(props, forwardedRef) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
       Primitive.span,
       {
@@ -8744,19 +8852,34 @@ var VisuallyHidden = /* @__PURE__ */ reactExports.forwardRef(
     );
   }, "VisuallyHidden")
 );
-var Root$2 = VisuallyHidden;
-var __defProp$i = Object.defineProperty;
-var __name$i = (target, value) => __defProp$i(target, "name", { value, configurable: true });
+var __defProp$h = Object.defineProperty;
+var __name$h = (target, value) => __defProp$h(target, "name", { value, configurable: true });
+var startTransition = React2[" startTransition ".trim().toString()] || (() => void 0);
 var PROVIDER_NAME$1 = "ToastProvider";
 var [Collection$2, useCollection$2, createCollectionScope$2] = /* @__PURE__ */ createCollection("Toast");
+var SwipeDirection = {
+  Left: "left",
+  Right: "right"
+};
+var ToastType = {
+  Foreground: "foreground"
+};
 var [createToastContext, createToastScope] = /* @__PURE__ */ createContextScope("Toast", [createCollectionScope$2]);
 var [ToastProviderProvider, useToastProviderContext] = createToastContext(PROVIDER_NAME$1);
-var ToastProvider$1 = /* @__PURE__ */ __name$i((props) => {
+function scheduleUpdate(update) {
+  if (typeof startTransition === "function") {
+    startTransition(update);
+  } else {
+    update();
+  }
+}
+__name$h(scheduleUpdate, "scheduleUpdate");
+var ToastProvider$1 = /* @__PURE__ */ __name$h((props) => {
   const {
     __scopeToast,
     label = "Notification",
     duration: duration2 = 5e3,
-    swipeDirection = "right",
+    swipeDirection = SwipeDirection.Right,
     swipeThreshold = 50,
     announcerContainer,
     children
@@ -8764,6 +8887,15 @@ var ToastProvider$1 = /* @__PURE__ */ __name$i((props) => {
   const [viewport, setViewport] = reactExports.useState(null);
   const [toastCount, setToastCount] = reactExports.useState(0);
   const isClosePausedRef = reactExports.useRef(false);
+  const onViewportChange = reactExports.useCallback((node) => {
+    scheduleUpdate(() => setViewport(node));
+  }, []);
+  const onToastAdd = reactExports.useCallback(() => {
+    scheduleUpdate(() => setToastCount((prevCount) => prevCount + 1));
+  }, []);
+  const onToastRemove = reactExports.useCallback(() => {
+    scheduleUpdate(() => setToastCount((prevCount) => prevCount - 1));
+  }, []);
   if (!label.trim()) {
     console.error(
       `Invalid prop \`label\` supplied to \`${PROVIDER_NAME$1}\`. Expected non-empty \`string\`.`
@@ -8779,9 +8911,9 @@ var ToastProvider$1 = /* @__PURE__ */ __name$i((props) => {
       swipeThreshold,
       toastCount,
       viewport,
-      onViewportChange: setViewport,
-      onToastAdd: reactExports.useCallback(() => setToastCount((prevCount) => prevCount + 1), []),
-      onToastRemove: reactExports.useCallback(() => setToastCount((prevCount) => prevCount - 1), []),
+      onViewportChange,
+      onToastAdd,
+      onToastRemove,
       isClosePausedRef,
       announcerContainer,
       children
@@ -8793,7 +8925,7 @@ var VIEWPORT_DEFAULT_HOTKEY = ["F8"];
 var VIEWPORT_PAUSE = "toast.viewportPause";
 var VIEWPORT_RESUME = "toast.viewportResume";
 var ToastViewport$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$i(function ToastViewport2(props, forwardedRef) {
+  /* @__PURE__ */ __name$h(function ToastViewport2(props, forwardedRef) {
     const {
       __scopeToast,
       hotkey = VIEWPORT_DEFAULT_HOTKEY,
@@ -8810,7 +8942,7 @@ var ToastViewport$1 = /* @__PURE__ */ reactExports.forwardRef(
     const hotkeyLabel = hotkey.join("+").replace(/Key/g, "").replace(/Digit/g, "");
     const hasToasts = context.toastCount > 0;
     reactExports.useEffect(() => {
-      const handleKeyDown = /* @__PURE__ */ __name$i((event) => {
+      const handleKeyDown = /* @__PURE__ */ __name$h((event) => {
         const isHotkeyPressed = hotkey.length !== 0 && hotkey.every((key) => event[key] || event.code === key);
         if (isHotkeyPressed) ref2.current?.focus();
       }, "handleKeyDown");
@@ -8821,25 +8953,25 @@ var ToastViewport$1 = /* @__PURE__ */ reactExports.forwardRef(
       const wrapper = wrapperRef.current;
       const viewport = ref2.current;
       if (hasToasts && wrapper && viewport) {
-        const handlePause = /* @__PURE__ */ __name$i(() => {
+        const handlePause = /* @__PURE__ */ __name$h(() => {
           if (!context.isClosePausedRef.current) {
             const pauseEvent = new CustomEvent(VIEWPORT_PAUSE);
             viewport.dispatchEvent(pauseEvent);
             context.isClosePausedRef.current = true;
           }
         }, "handlePause");
-        const handleResume = /* @__PURE__ */ __name$i(() => {
+        const handleResume = /* @__PURE__ */ __name$h(() => {
           if (context.isClosePausedRef.current) {
             const resumeEvent = new CustomEvent(VIEWPORT_RESUME);
             viewport.dispatchEvent(resumeEvent);
             context.isClosePausedRef.current = false;
           }
         }, "handleResume");
-        const handleFocusOutResume = /* @__PURE__ */ __name$i((event) => {
+        const handleFocusOutResume = /* @__PURE__ */ __name$h((event) => {
           const isFocusMovingOutside = !wrapper.contains(event.relatedTarget);
           if (isFocusMovingOutside) handleResume();
         }, "handleFocusOutResume");
-        const handlePointerLeaveResume = /* @__PURE__ */ __name$i(() => {
+        const handlePointerLeaveResume = /* @__PURE__ */ __name$h(() => {
           const isFocusInside = wrapper.contains(document.activeElement);
           if (!isFocusInside) handleResume();
         }, "handlePointerLeaveResume");
@@ -8874,7 +9006,7 @@ var ToastViewport$1 = /* @__PURE__ */ reactExports.forwardRef(
     reactExports.useEffect(() => {
       const viewport = ref2.current;
       if (viewport) {
-        const handleKeyDown = /* @__PURE__ */ __name$i((event) => {
+        const handleKeyDown = /* @__PURE__ */ __name$h((event) => {
           const isMetaKey = event.altKey || event.ctrlKey || event.metaKey;
           const isTabKey = event.key === "Tab" && !isMetaKey;
           if (isTabKey) {
@@ -8900,7 +9032,7 @@ var ToastViewport$1 = /* @__PURE__ */ reactExports.forwardRef(
       }
     }, [getItems, getSortedTabbableCandidates]);
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(
-      Branch,
+      DismissableLayerBranch,
       {
         ref: wrapperRef,
         role: "region",
@@ -8941,7 +9073,7 @@ var ToastViewport$1 = /* @__PURE__ */ reactExports.forwardRef(
 var FOCUS_PROXY_NAME = "ToastFocusProxy";
 var FocusProxy = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$i(function ToastFocusProxy(props, forwardedRef) {
+  /* @__PURE__ */ __name$h(function ToastFocusProxy(props, forwardedRef) {
     const { __scopeToast, onFocusFromOutsideViewport, ...proxyProps } = props;
     const context = useToastProviderContext(FOCUS_PROXY_NAME, __scopeToast);
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -8967,7 +9099,7 @@ var TOAST_SWIPE_CANCEL = "toast.swipeCancel";
 var TOAST_SWIPE_END = "toast.swipeEnd";
 var Toast$1 = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$i(function Toast2(props, forwardedRef) {
+  /* @__PURE__ */ __name$h(function Toast2(props, forwardedRef) {
     const { forceMount, open: openProp, defaultOpen, onOpenChange, ...toastProps } = props;
     const [open, setOpen] = useControllableState({
       prop: openProp,
@@ -9018,10 +9150,10 @@ var [ToastInteractiveProvider, useToastInteractiveContext] = createToastContext(
   }
 });
 var ToastImpl = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$i(function ToastImpl2(props, forwardedRef) {
+  /* @__PURE__ */ __name$h(function ToastImpl2(props, forwardedRef) {
     const {
       __scopeToast,
-      type: type2 = "foreground",
+      type: type2 = ToastType.Foreground,
       duration: durationProp,
       open,
       onClose,
@@ -9062,11 +9194,11 @@ var ToastImpl = /* @__PURE__ */ reactExports.forwardRef(
     reactExports.useEffect(() => {
       const viewport = context.viewport;
       if (viewport) {
-        const handleResume = /* @__PURE__ */ __name$i(() => {
+        const handleResume = /* @__PURE__ */ __name$h(() => {
           startTimer(closeTimerRemainingTimeRef.current);
           onResume?.();
         }, "handleResume");
-        const handlePause = /* @__PURE__ */ __name$i(() => {
+        const handlePause = /* @__PURE__ */ __name$h(() => {
           const elapsedTime = (/* @__PURE__ */ new Date()).getTime() - closeTimerStartTimeRef.current;
           closeTimerRemainingTimeRef.current = closeTimerRemainingTimeRef.current - elapsedTime;
           window.clearTimeout(closeTimerRef.current);
@@ -9081,7 +9213,10 @@ var ToastImpl = /* @__PURE__ */ reactExports.forwardRef(
       }
     }, [context.viewport, duration2, onPause, onResume, startTimer]);
     reactExports.useEffect(() => {
-      if (open && !context.isClosePausedRef.current) startTimer(duration2);
+      closeTimerRemainingTimeRef.current = duration2;
+      if (open && !context.isClosePausedRef.current) {
+        startTimer(duration2);
+      }
     }, [open, duration2, context.isClosePausedRef, startTimer]);
     reactExports.useEffect(() => {
       return () => {
@@ -9102,13 +9237,13 @@ var ToastImpl = /* @__PURE__ */ reactExports.forwardRef(
         {
           __scopeToast,
           role: "status",
-          "aria-live": type2 === "foreground" ? "assertive" : "polite",
+          "aria-live": type2 === ToastType.Foreground ? "assertive" : "polite",
           children: announceTextContent
         }
       ),
       /* @__PURE__ */ jsxRuntimeExports.jsx(ToastInteractiveProvider, { scope: __scopeToast, onClose: handleClose, children: reactDomExports.createPortal(
         /* @__PURE__ */ jsxRuntimeExports.jsx(Collection$2.ItemSlot, { scope: __scopeToast, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-          Root$3,
+          DismissableLayer,
           {
             asChild: true,
             onEscapeKeyDown: composeEventHandlers(onEscapeKeyDown, (event) => {
@@ -9205,7 +9340,7 @@ var ToastImpl = /* @__PURE__ */ reactExports.forwardRef(
     ] });
   }, "ToastImpl")
 );
-var ToastAnnounce = /* @__PURE__ */ __name$i((props) => {
+var ToastAnnounce = /* @__PURE__ */ __name$h((props) => {
   const { __scopeToast, children, ...announceProps } = props;
   const context = useToastProviderContext(TOAST_NAME, __scopeToast);
   const [renderAnnounceText, setRenderAnnounceText] = reactExports.useState(false);
@@ -9215,28 +9350,28 @@ var ToastAnnounce = /* @__PURE__ */ __name$i((props) => {
     const timer = window.setTimeout(() => setIsAnnounced(true), 1e3);
     return () => window.clearTimeout(timer);
   }, []);
-  return isAnnounced ? null : /* @__PURE__ */ jsxRuntimeExports.jsx(Portal$1, { asChild: true, container: context.announcerContainer || void 0, children: /* @__PURE__ */ jsxRuntimeExports.jsx(VisuallyHidden, { ...announceProps, children: renderAnnounceText && /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+  return isAnnounced ? null : /* @__PURE__ */ jsxRuntimeExports.jsx(Portal, { asChild: true, container: context.announcerContainer || void 0, children: /* @__PURE__ */ jsxRuntimeExports.jsx(VisuallyHidden, { ...announceProps, children: renderAnnounceText && /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
     context.label,
     " ",
     children
   ] }) }) });
 }, "ToastAnnounce");
 var ToastTitle$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$i(function ToastTitle2(props, forwardedRef) {
+  /* @__PURE__ */ __name$h(function ToastTitle2(props, forwardedRef) {
     const { __scopeToast, ...titleProps } = props;
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Primitive.div, { ...titleProps, ref: forwardedRef });
   }, "ToastTitle")
 );
 var ToastDescription$1 = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$i(function ToastDescription2(props, forwardedRef) {
+  /* @__PURE__ */ __name$h(function ToastDescription2(props, forwardedRef) {
     const { __scopeToast, ...descriptionProps } = props;
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Primitive.div, { ...descriptionProps, ref: forwardedRef });
   }, "ToastDescription")
 );
 var ACTION_NAME = "ToastAction";
 var ToastAction$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$i(function ToastAction2(props, forwardedRef) {
+  /* @__PURE__ */ __name$h(function ToastAction2(props, forwardedRef) {
     const { altText, ...actionProps } = props;
     if (!altText.trim()) {
       console.error(
@@ -9249,7 +9384,7 @@ var ToastAction$1 = /* @__PURE__ */ reactExports.forwardRef(
 );
 var CLOSE_NAME$1 = "ToastClose";
 var ToastClose$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$i(function ToastClose2(props, forwardedRef) {
+  /* @__PURE__ */ __name$h(function ToastClose2(props, forwardedRef) {
     const { __scopeToast, ...closeProps } = props;
     const interactiveContext = useToastInteractiveContext(CLOSE_NAME$1, __scopeToast);
     return /* @__PURE__ */ jsxRuntimeExports.jsx(ToastAnnounceExclude, { asChild: true, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -9263,7 +9398,7 @@ var ToastClose$1 = /* @__PURE__ */ reactExports.forwardRef(
     ) });
   }, "ToastClose")
 );
-var ToastAnnounceExclude = /* @__PURE__ */ reactExports.forwardRef(/* @__PURE__ */ __name$i(function ToastAnnounceExclude2(props, forwardedRef) {
+var ToastAnnounceExclude = /* @__PURE__ */ reactExports.forwardRef(/* @__PURE__ */ __name$h(function ToastAnnounceExclude2(props, forwardedRef) {
   const { __scopeToast, altText, ...announceExcludeProps } = props;
   return /* @__PURE__ */ jsxRuntimeExports.jsx(
     Primitive.div,
@@ -9295,7 +9430,7 @@ function getAnnounceTextContent(container) {
   });
   return textContent;
 }
-__name$i(getAnnounceTextContent, "getAnnounceTextContent");
+__name$h(getAnnounceTextContent, "getAnnounceTextContent");
 function handleAndDispatchCustomEvent(name2, handler, detail, { discrete }) {
   const currentTarget = detail.originalEvent.currentTarget;
   const event = new CustomEvent(name2, { bubbles: true, cancelable: true, detail });
@@ -9306,12 +9441,12 @@ function handleAndDispatchCustomEvent(name2, handler, detail, { discrete }) {
     currentTarget.dispatchEvent(event);
   }
 }
-__name$i(handleAndDispatchCustomEvent, "handleAndDispatchCustomEvent");
-var isDeltaInDirection = /* @__PURE__ */ __name$i((delta, direction, threshold = 0) => {
+__name$h(handleAndDispatchCustomEvent, "handleAndDispatchCustomEvent");
+var isDeltaInDirection = /* @__PURE__ */ __name$h((delta, direction, threshold = 0) => {
   const deltaX = Math.abs(delta.x);
   const deltaY = Math.abs(delta.y);
   const isDeltaX = deltaX > deltaY;
-  if (direction === "left" || direction === "right") {
+  if (direction === SwipeDirection.Left || direction === SwipeDirection.Right) {
     return isDeltaX && deltaX > threshold;
   } else {
     return !isDeltaX && deltaY > threshold;
@@ -9330,15 +9465,15 @@ function useNextFrame(callback = () => {
     };
   }, [fn2]);
 }
-__name$i(useNextFrame, "useNextFrame");
+__name$h(useNextFrame, "useNextFrame");
 function isHTMLElement$1(node) {
   return node.nodeType === node.ELEMENT_NODE;
 }
-__name$i(isHTMLElement$1, "isHTMLElement");
+__name$h(isHTMLElement$1, "isHTMLElement");
 function getTabbableCandidates$1(container) {
   const nodes = [];
   const walker = document.createTreeWalker(container, NodeFilter.SHOW_ELEMENT, {
-    acceptNode: /* @__PURE__ */ __name$i((node) => {
+    acceptNode: /* @__PURE__ */ __name$h((node) => {
       const isHiddenInput = node.tagName === "INPUT" && node.type === "hidden";
       if (node.disabled || node.hidden || isHiddenInput) return NodeFilter.FILTER_SKIP;
       return node.tabIndex >= 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP;
@@ -9347,7 +9482,7 @@ function getTabbableCandidates$1(container) {
   while (walker.nextNode()) nodes.push(walker.currentNode);
   return nodes;
 }
-__name$i(getTabbableCandidates$1, "getTabbableCandidates");
+__name$h(getTabbableCandidates$1, "getTabbableCandidates");
 function focusFirst$2(candidates) {
   const previouslyFocusedElement = document.activeElement;
   return candidates.some((candidate) => {
@@ -9356,14 +9491,7 @@ function focusFirst$2(candidates) {
     return document.activeElement !== previouslyFocusedElement;
   });
 }
-__name$i(focusFirst$2, "focusFirst");
-var Provider$1 = ToastProvider$1;
-var Viewport = ToastViewport$1;
-var Root2$3 = Toast$1;
-var Title = ToastTitle$1;
-var Description = ToastDescription$1;
-var Action = ToastAction$1;
-var Close = ToastClose$1;
+__name$h(focusFirst$2, "focusFirst");
 function r$1(e2) {
   var t2, f2, n = "";
   if ("string" == typeof e2 || "number" == typeof e2) n += e2;
@@ -11998,9 +12126,9 @@ var MagnifyingGlassIcon = /* @__PURE__ */ reactExports.forwardRef(function(_ref,
     clipRule: "evenodd"
   }));
 });
-const ToastProvider = Provider$1;
+const ToastProvider = ToastProvider$1;
 const ToastViewport = reactExports.forwardRef(({ className, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(
-  Viewport,
+  ToastViewport$1,
   {
     ref: ref2,
     className: cn$1(
@@ -12010,7 +12138,7 @@ const ToastViewport = reactExports.forwardRef(({ className, ...props }, ref2) =>
     ...props
   }
 ));
-ToastViewport.displayName = Viewport.displayName;
+ToastViewport.displayName = ToastViewport$1.displayName;
 const toastVariants = cva(
   "group pointer-events-auto relative flex w-full items-center justify-between space-x-2 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
   {
@@ -12027,7 +12155,7 @@ const toastVariants = cva(
 );
 const Toast = reactExports.forwardRef(({ className, variant, ...props }, ref2) => {
   return /* @__PURE__ */ jsxRuntimeExports.jsx(
-    Root2$3,
+    Toast$1,
     {
       ref: ref2,
       className: cn$1(toastVariants({ variant }), className),
@@ -12035,9 +12163,9 @@ const Toast = reactExports.forwardRef(({ className, variant, ...props }, ref2) =
     }
   );
 });
-Toast.displayName = Root2$3.displayName;
+Toast.displayName = Toast$1.displayName;
 const ToastAction = reactExports.forwardRef(({ className, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(
-  Action,
+  ToastAction$1,
   {
     ref: ref2,
     className: cn$1(
@@ -12047,9 +12175,9 @@ const ToastAction = reactExports.forwardRef(({ className, ...props }, ref2) => /
     ...props
   }
 ));
-ToastAction.displayName = Action.displayName;
+ToastAction.displayName = ToastAction$1.displayName;
 const ToastClose = reactExports.forwardRef(({ className, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(
-  Close,
+  ToastClose$1,
   {
     ref: ref2,
     className: cn$1(
@@ -12061,25 +12189,25 @@ const ToastClose = reactExports.forwardRef(({ className, ...props }, ref2) => /*
     children: /* @__PURE__ */ jsxRuntimeExports.jsx(Cross2Icon, { className: "h-4 w-4" })
   }
 ));
-ToastClose.displayName = Close.displayName;
+ToastClose.displayName = ToastClose$1.displayName;
 const ToastTitle = reactExports.forwardRef(({ className, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(
-  Title,
+  ToastTitle$1,
   {
     ref: ref2,
     className: cn$1("text-sm font-semibold [&+div]:text-xs", className),
     ...props
   }
 ));
-ToastTitle.displayName = Title.displayName;
+ToastTitle.displayName = ToastTitle$1.displayName;
 const ToastDescription = reactExports.forwardRef(({ className, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(
-  Description,
+  ToastDescription$1,
   {
     ref: ref2,
     className: cn$1("text-sm opacity-90", className),
     ...props
   }
 ));
-ToastDescription.displayName = Description.displayName;
+ToastDescription.displayName = ToastDescription$1.displayName;
 function Toaster() {
   const { toasts } = useToast();
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(ToastProvider, { children: [
@@ -17186,7 +17314,12 @@ const OAuthTokensSchema = object({
   token_type: string(),
   expires_in: number().optional(),
   scope: string().optional(),
-  refresh_token: string().optional()
+  refresh_token: string().optional(),
+  /**
+   * Not part of the wire format: the authorization server this value was obtained from, added by
+   * the client's `auth()` before it is stored and compared when it is read back.
+   */
+  issuer: string().optional().catch(void 0)
 }).strip();
 const OAuthErrorResponseSchema = object({
   error: string(),
@@ -17216,7 +17349,12 @@ const OAuthClientInformationSchema = object({
   client_id: string(),
   client_secret: string().optional(),
   client_id_issued_at: number$1().optional(),
-  client_secret_expires_at: number$1().optional()
+  client_secret_expires_at: number$1().optional(),
+  /**
+   * Not part of the wire format: the authorization server this value was obtained from, added by
+   * the client's `auth()` before it is stored and compared when it is read back.
+   */
+  issuer: string().optional().catch(void 0)
 }).strip();
 const OAuthClientInformationFullSchema = OAuthClientMetadataSchema.merge(OAuthClientInformationSchema);
 object({
@@ -17228,7 +17366,7 @@ object({
   token_type_hint: string().optional()
 }).strip();
 const name = "@modelcontextprotocol/inspector-client";
-const version$1 = "1.0.2";
+const version$1 = "1.0.3";
 const packageJson = {
   name,
   version: version$1
@@ -17293,6 +17431,47 @@ const DEFAULT_INSPECTOR_CONFIG = {
     is_session_item: false
   }
 };
+const OAUTH_CALLBACK_PATH = "/oauth/callback";
+const OAUTH_DEBUG_CALLBACK_PATH = "/oauth/callback/debug";
+const isOAuthCallbackPath = (pathname = window.location.pathname) => pathname === OAUTH_CALLBACK_PATH || pathname === OAUTH_DEBUG_CALLBACK_PATH;
+const STORAGE_KEY = "mcp_oauth_connection_snapshot";
+const TRANSPORT_TYPES = ["stdio", "sse", "streamable-http"];
+const CONNECTION_TYPES = ["direct", "proxy"];
+const isSnapshot = (value) => {
+  if (typeof value !== "object" || value === null) return false;
+  const v2 = value;
+  return typeof v2.serverUrl === "string" && typeof v2.transportType === "string" && TRANSPORT_TYPES.includes(v2.transportType) && typeof v2.connectionType === "string" && CONNECTION_TYPES.includes(v2.connectionType) && typeof v2.command === "string" && typeof v2.args === "string" && typeof v2.proxyAddress === "string";
+};
+const saveOAuthConnectionSnapshot = (snapshot) => {
+  sessionStorage.setItem(STORAGE_KEY, JSON.stringify(snapshot));
+};
+const readOAuthConnectionSnapshot = () => {
+  const raw = sessionStorage.getItem(STORAGE_KEY);
+  if (!raw) return null;
+  try {
+    const parsed = JSON.parse(raw);
+    return isSnapshot(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+};
+const clearOAuthConnectionSnapshot = () => {
+  sessionStorage.removeItem(STORAGE_KEY);
+};
+const getOAuthCallbackSnapshot = () => isOAuthCallbackPath() ? readOAuthConnectionSnapshot() : null;
+const getOAuthReconnectRefusal = (snapshot, live) => {
+  if (!snapshot) {
+    return "No saved connection for this authorization. Connect again from the sidebar.";
+  }
+  if (snapshot.transportType === "stdio" || live.transportType === "stdio") {
+    return "OAuth applies only to SSE and Streamable HTTP connections. Not reconnecting.";
+  }
+  const matches = live.authorizedServerUrl === snapshot.serverUrl && live.sseUrl === snapshot.serverUrl && live.transportType === snapshot.transportType && live.connectionType === snapshot.connectionType && live.proxyAddress === snapshot.proxyAddress;
+  if (!matches) {
+    return "Connection settings changed during authorization. Connect again from the sidebar.";
+  }
+  return void 0;
+};
 const META_PREFIX_LABEL_REGEX = /^[a-z](?:[a-z\d-]*[a-z\d])?$/i;
 const META_NAME_REGEX = /^[a-z\d](?:[a-z\d._-]*[a-z\d])?$/i;
 const RESERVED_NAMESPACE_LABELS = ["modelcontextprotocol", "mcp"];
@@ -21067,6 +21246,9 @@ class Protocol {
       this.setRequestHandler(GetTaskPayloadRequestSchema, async (request, extra) => {
         const handleTaskResult = async () => {
           const taskId = request.params.taskId;
+          if (!await this._taskStore.getTask(taskId, extra.sessionId)) {
+            throw new McpError(ErrorCode.InvalidParams, `Task not found: ${taskId}`);
+          }
           if (this._taskMessageQueue) {
             let queuedMessage;
             while (queuedMessage = await this._taskMessageQueue.dequeue(taskId, extra.sessionId)) {
@@ -21097,12 +21279,12 @@ class Protocol {
             throw new McpError(ErrorCode.InvalidParams, `Task not found: ${taskId}`);
           }
           if (!isTerminal(task.status)) {
-            await this._waitForTaskUpdate(taskId, extra.signal);
+            await this._waitForTaskUpdate(taskId, extra.signal, extra.sessionId);
             return await handleTaskResult();
           }
           if (isTerminal(task.status)) {
             const result = await this._taskStore.getTaskResult(taskId, extra.sessionId);
-            this._clearTaskQueue(taskId);
+            this._clearTaskQueue(taskId, extra.sessionId);
             return {
               ...result,
               _meta: {
@@ -21139,7 +21321,7 @@ class Protocol {
             throw new McpError(ErrorCode.InvalidParams, `Cannot cancel task in terminal status: ${task.status}`);
           }
           await this._taskStore.updateTaskStatus(request.params.taskId, "cancelled", "Client cancelled task execution.", extra.sessionId);
-          this._clearTaskQueue(request.params.taskId);
+          this._clearTaskQueue(request.params.taskId, extra.sessionId);
           const cancelledTask = await this._taskStore.getTask(request.params.taskId, extra.sessionId);
           if (!cancelledTask) {
             throw new McpError(ErrorCode.InvalidParams, `Task not found after cancellation: ${request.params.taskId}`);
@@ -21267,6 +21449,19 @@ class Protocol {
     const handler = this._requestHandlers.get(request.method) ?? this.fallbackRequestHandler;
     const capturedTransport = this._transport;
     const relatedTaskId = request.params?._meta?.[RELATED_TASK_META_KEY]?.taskId;
+    const sessionId = capturedTransport?.sessionId;
+    const store = this._taskStore;
+    let relatedTaskFound = true;
+    let relatedTaskLookup;
+    if (relatedTaskId && store && this._taskMessageQueue && sessionId !== void 0) {
+      relatedTaskFound = false;
+      relatedTaskLookup = (async () => {
+        if (!await store.getTask(relatedTaskId, sessionId)) {
+          throw new McpError(ErrorCode.InvalidParams, `Task not found: ${relatedTaskId}`);
+        }
+        relatedTaskFound = true;
+      })();
+    }
     if (handler === void 0) {
       const errorResponse = {
         jsonrpc: "2.0",
@@ -21276,7 +21471,10 @@ class Protocol {
           message: "Method not found"
         }
       };
-      if (relatedTaskId && this._taskMessageQueue) {
+      if (relatedTaskId && relatedTaskLookup) {
+        const queuedError = { type: "error", message: errorResponse, timestamp: Date.now() };
+        relatedTaskLookup.then(() => this._enqueueTaskMessage(relatedTaskId, queuedError, sessionId), () => capturedTransport?.send(errorResponse)).catch((error) => this._onerror(new Error(`Failed to send an error response: ${error}`)));
+      } else if (relatedTaskId && this._taskMessageQueue) {
         this._enqueueTaskMessage(relatedTaskId, {
           type: "error",
           message: errorResponse,
@@ -21327,7 +21525,10 @@ class Protocol {
       closeSSEStream: extra?.closeSSEStream,
       closeStandaloneSSEStream: extra?.closeStandaloneSSEStream
     };
-    Promise.resolve().then(() => {
+    (relatedTaskLookup ?? Promise.resolve()).then(() => {
+      if (relatedTaskLookup && abortController.signal.aborted) {
+        throw new McpError(ErrorCode.ConnectionClosed, "Request was cancelled");
+      }
       if (taskCreationParams) {
         this.assertTaskHandlerCapability(request.method);
       }
@@ -21362,7 +21563,7 @@ class Protocol {
           ...error["data"] !== void 0 && { data: error["data"] }
         }
       };
-      if (relatedTaskId && this._taskMessageQueue) {
+      if (relatedTaskId && this._taskMessageQueue && relatedTaskFound) {
         await this._enqueueTaskMessage(relatedTaskId, {
           type: "error",
           message: errorResponse,
@@ -21842,7 +22043,7 @@ class Protocol {
       throw new Error("Cannot enqueue task message: taskStore and taskMessageQueue are not configured");
     }
     const maxQueueSize = this._options?.maxTaskQueueSize;
-    await this._taskMessageQueue.enqueue(taskId, message, sessionId, maxQueueSize);
+    await this._taskMessageQueue.enqueue(taskId, message, sessionId ?? this._transport?.sessionId, maxQueueSize);
   }
   /**
    * Clears the message queue for a task and rejects any pending request resolvers.
@@ -21871,12 +22072,13 @@ class Protocol {
    * Uses polling to check for updates at the task's configured poll interval.
    * @param taskId The task ID to wait for
    * @param signal Abort signal to cancel the wait
+   * @param sessionId Session of the request that waits, passed to the task store
    * @returns Promise that resolves when an update occurs or rejects if aborted
    */
-  async _waitForTaskUpdate(taskId, signal) {
+  async _waitForTaskUpdate(taskId, signal, sessionId) {
     let interval = this._options?.defaultTaskPollInterval ?? 1e3;
     try {
-      const task = await this._taskStore?.getTask(taskId);
+      const task = await this._taskStore?.getTask(taskId, sessionId);
       if (task?.pollInterval) {
         interval = task.pollInterval;
       }
@@ -22228,6 +22430,93 @@ const OAUTH_ERRORS = {
   [InsufficientScopeError.errorCode]: InsufficientScopeError,
   [InvalidTargetError.errorCode]: InvalidTargetError
 };
+function normalizeHeaders(headers) {
+  if (!headers)
+    return {};
+  if (headers instanceof Headers) {
+    return Object.fromEntries(headers.entries());
+  }
+  if (Array.isArray(headers)) {
+    return Object.fromEntries(headers);
+  }
+  return { ...headers };
+}
+function createFetchWithInit(baseFetch = fetch, baseInit) {
+  if (!baseInit) {
+    return baseFetch;
+  }
+  return async (url2, init) => {
+    const mergedInit = {
+      ...baseInit,
+      ...init,
+      // Headers need special handling - merge instead of replace
+      headers: init?.headers ? { ...normalizeHeaders(baseInit.headers), ...normalizeHeaders(init.headers) } : baseInit.headers
+    };
+    return baseFetch(url2, mergedInit);
+  };
+}
+const MAX_REDIRECTS = 5;
+const REDIRECT_STATUSES = [301, 302, 303, 307, 308];
+function isWithinOrigin(from, to2) {
+  if (from.protocol === to2.protocol && from.hostname === to2.hostname && from.port === to2.port) {
+    return true;
+  }
+  return from.hostname === to2.hostname && from.protocol === "http:" && from.port === "" && to2.protocol === "https:" && to2.port === "";
+}
+function redirectTarget(response, requestUrl) {
+  const location = REDIRECT_STATUSES.includes(response.status) ? response.headers.get("location") : null;
+  try {
+    return location ? new URL(location, requestUrl) : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function followWithinOrigin(baseFetch, url2, init, response, followed = 0) {
+  const target = redirectTarget(response, url2);
+  const keepsMethod = response.status === 307 || response.status === 308 || (init?.method ?? "GET").toUpperCase() === "GET";
+  if (!target || followed === MAX_REDIRECTS || !keepsMethod) {
+    return void 0;
+  }
+  const from = new URL(url2);
+  const addsUserinfo = (target.username || target.password) && (target.username !== from.username || target.password !== from.password);
+  if (addsUserinfo || !isWithinOrigin(from, target)) {
+    return void 0;
+  }
+  return Promise.resolve(response.body?.cancel()).then(() => baseFetch(target, { ...init, redirect: "manual" })).then((next) => followWithinOrigin(baseFetch, target, init, next, followed + 1) ?? next);
+}
+const followingFetches = /* @__PURE__ */ new WeakSet();
+function fetchLeavingRedirects(baseFetch) {
+  const following = (url2, init) => (baseFetch ?? fetch)(url2, init);
+  followingFetches.add(following);
+  return following;
+}
+function fetchWithinOrigin(baseFetch = fetch) {
+  if (followingFetches.has(baseFetch)) {
+    return baseFetch;
+  }
+  return (url2, init) => {
+    if (init?.redirect === "error" || init?.redirect === "manual") {
+      return baseFetch(url2, init);
+    }
+    return Promise.resolve(baseFetch(url2, { ...init, redirect: "manual" })).then((response) => followWithinOrigin(baseFetch, url2, init, response) ?? response);
+  };
+}
+function unfollowedRedirect(response, requestUrl) {
+  if (response.type === "opaqueredirect") {
+    return "Redirect not followed: this runtime does not expose the redirect target";
+  }
+  const from = response.url || requestUrl;
+  const target = redirectTarget(response, from);
+  if (!target) {
+    return void 0;
+  }
+  target.username = target.password = target.search = target.hash = "";
+  if (target.protocol === "http:" && new URL(from).protocol === "https:") {
+    target.protocol = "https:";
+    return `Redirect to plain http not followed; try ${target.href} instead`;
+  }
+  return `Redirect to ${target.href} not followed`;
+}
 class UnauthorizedError extends Error {
   constructor(message) {
     super(message ?? "Unauthorized");
@@ -22298,10 +22587,31 @@ async function parseErrorResponse(input) {
     const errorClass = OAUTH_ERRORS[error] || ServerError;
     return new errorClass(error_description || "", error_uri);
   } catch (error) {
-    const errorMessage = `${statusCode ? `HTTP ${statusCode}: ` : ""}Invalid OAuth error response: ${error}. Raw body: ${body}`;
+    const redirect = input instanceof Response ? unfollowedRedirect(input, input.url) : void 0;
+    const errorMessage = `${statusCode ? `HTTP ${statusCode}: ` : ""}${redirect ?? `Invalid OAuth error response: ${error}. Raw body: ${body}`}`;
     return new ServerError(errorMessage);
   }
 }
+function issuersMatch(a2, b2) {
+  let [x2, y] = [a2, b2];
+  try {
+    [x2, y] = [new URL(a2).href, new URL(b2).href];
+  } catch {
+  }
+  return x2 === y || x2.endsWith("/") && x2.slice(0, -1) === y || y.endsWith("/") && y.slice(0, -1) === x2;
+}
+function discardIfIssuerMismatch(stored, issuer) {
+  if (!stored)
+    return void 0;
+  if (typeof stored.issuer !== "string")
+    return stored.issuer == null ? stored : { ...stored, issuer: void 0 };
+  return issuersMatch(stored.issuer, issuer) ? stored : void 0;
+}
+const TokenResponseSchema = OAuthTokensSchema.omit({ issuer: true });
+const RegistrationResponseSchema = OAuthClientInformationFullSchema.omit({ issuer: true });
+function boundElsewhereError(stored, issuer) {
+  return new Error(`OAuth client information is bound to authorization server ${stored.issuer} and is not presented to ${issuer}. Clear the stored client information, or correct \`expectedIssuer\`, if the authorization server has moved.`);
+}
 async function auth(provider, options2) {
   try {
     return await authInternal(provider, options2);
@@ -22355,9 +22665,24 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope: sco
       authorizationServerMetadata: metadata2
     });
   }
-  const resource = await selectResourceURL(serverUrl, provider, resourceMetadata);
+  const issuer = String(authorizationServerUrl);
+  const selectedResource = await selectResourceURL(serverUrl, provider, resourceMetadata);
+  const resource = selectedResource && resourceMetadata && !provider.validateResourceURL ? resourceMetadata.resource : selectedResource;
   const resolvedScope = scope2 || resourceMetadata?.scopes_supported?.join(" ") || provider.clientMetadata.scope;
-  let clientInformation = await Promise.resolve(provider.clientInformation());
+  const storedClientInformation = await Promise.resolve(provider.clientInformation());
+  let clientInformation = discardIfIssuerMismatch(storedClientInformation, issuer);
+  const canRegisterAgain = provider.saveClientInformation !== void 0 && !!provider.redirectUrl;
+  if (storedClientInformation && !clientInformation && !canRegisterAgain) {
+    throw boundElsewhereError(storedClientInformation, issuer);
+  }
+  const unstampedClientInformation = clientInformation?.issuer == null ? clientInformation : void 0;
+  const bindClientInformation = async () => {
+    try {
+      if (unstampedClientInformation)
+        await provider.saveClientInformation?.({ ...unstampedClientInformation, issuer });
+    } catch {
+    }
+  };
   if (!clientInformation) {
     if (authorizationCode !== void 0) {
       throw new Error("Existing OAuth client information is required when exchanging an authorization code");
@@ -22369,9 +22694,7 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope: sco
     }
     const shouldUseUrlBasedClientId = supportsUrlBasedClientId && clientMetadataUrl;
     if (shouldUseUrlBasedClientId) {
-      clientInformation = {
-        client_id: clientMetadataUrl
-      };
+      clientInformation = { client_id: clientMetadataUrl, issuer };
       await provider.saveClientInformation?.(clientInformation);
     } else {
       if (!provider.saveClientInformation) {
@@ -22383,8 +22706,8 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope: sco
         scope: resolvedScope,
         fetchFn
       });
-      await provider.saveClientInformation(fullInformation);
-      clientInformation = fullInformation;
+      clientInformation = { ...fullInformation, issuer };
+      await provider.saveClientInformation(clientInformation);
     }
   }
   const nonInteractiveFlow = !provider.redirectUrl;
@@ -22395,10 +22718,14 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope: sco
       authorizationCode,
       fetchFn
     });
-    await provider.saveTokens(tokens2);
+    await bindClientInformation();
+    await provider.saveTokens({ ...tokens2, issuer });
     return "AUTHORIZED";
   }
-  const tokens = await provider.tokens();
+  const tokens = discardIfIssuerMismatch(await provider.tokens(), issuer);
+  if (tokens?.refresh_token && tokens.issuer == null) {
+    console.warn("[mcp-sdk] stored OAuth tokens have no 'issuer' property (saved by an earlier version, or by a provider that does not keep it) and are used as-is; make sure your OAuthClientProvider stores what saveTokens() and saveClientInformation() receive unchanged.");
+  }
   if (tokens?.refresh_token) {
     try {
       const newTokens = await refreshAuthorization(authorizationServerUrl, {
@@ -22409,7 +22736,8 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope: sco
         addClientAuthentication: provider.addClientAuthentication,
         fetchFn
       });
-      await provider.saveTokens(newTokens);
+      await bindClientInformation();
+      await provider.saveTokens({ ...newTokens, issuer });
       return "AUTHORIZED";
     } catch (error) {
       if (!(error instanceof OAuthError) || error instanceof ServerError) ;
@@ -22508,7 +22836,7 @@ async function discoverOAuthProtectedResourceMetadata(serverUrl, opts, fetchFn =
 }
 async function fetchWithCorsRetry(url2, headers, fetchFn = fetch) {
   try {
-    return await fetchFn(url2, { headers });
+    return await fetchWithinOrigin(fetchFn)(url2, { headers });
   } catch (error) {
     if (error instanceof TypeError) {
       if (headers) {
@@ -22533,7 +22861,7 @@ async function tryMetadataDiscovery(url2, protocolVersion, fetchFn = fetch) {
   return await fetchWithCorsRetry(url2, headers, fetchFn);
 }
 function shouldAttemptFallback(response, pathname) {
-  return !response || response.status >= 400 && response.status < 500 && pathname !== "/";
+  return !response || !response.ok && response.status < 500 && pathname !== "/";
 }
 async function discoverMetadataWithFallback(serverUrl, wellKnownType, fetchFn, opts) {
   const issuer = new URL(serverUrl);
@@ -22599,7 +22927,7 @@ async function discoverAuthorizationServerMetadata(authorizationServerUrl, { fet
     }
     if (!response.ok) {
       await response.body?.cancel();
-      if (response.status >= 400 && response.status < 500) {
+      if (response.status < 500) {
         continue;
       }
       throw new Error(`HTTP ${response.status} trying to load ${type2 === "oauth" ? "OAuth" : "OpenID provider"} metadata from ${endpointUrl}`);
@@ -22632,6 +22960,9 @@ async function discoverOAuthServerInfo(serverUrl, opts) {
     resourceMetadata
   };
 }
+function resourceIndicatorToString(resource) {
+  return typeof resource === "string" ? resource : resource.href;
+}
 async function startAuthorization(authorizationServerUrl, { metadata: metadata2, clientInformation, redirectUrl, scope: scope2, state, resource }) {
   let authorizationUrl;
   if (metadata2) {
@@ -22663,7 +22994,7 @@ async function startAuthorization(authorizationServerUrl, { metadata: metadata2,
     authorizationUrl.searchParams.append("prompt", "consent");
   }
   if (resource) {
-    authorizationUrl.searchParams.set("resource", resource.href);
+    authorizationUrl.searchParams.set("resource", resourceIndicatorToString(resource));
   }
   return { authorizationUrl, codeVerifier };
 }
@@ -22682,7 +23013,7 @@ async function executeTokenRequest(authorizationServerUrl, { metadata: metadata2
     Accept: "application/json"
   });
   if (resource) {
-    tokenRequestParams.set("resource", resource.href);
+    tokenRequestParams.set("resource", resourceIndicatorToString(resource));
   }
   if (addClientAuthentication) {
     await addClientAuthentication(headers, tokenRequestParams, tokenUrl, metadata2);
@@ -22691,7 +23022,7 @@ async function executeTokenRequest(authorizationServerUrl, { metadata: metadata2
     const authMethod = selectClientAuthMethod(clientInformation, supportedMethods);
     applyClientAuthentication(authMethod, clientInformation, headers, tokenRequestParams);
   }
-  const response = await (fetchFn ?? fetch)(tokenUrl, {
+  const response = await fetchWithinOrigin(fetchFn ?? fetch)(tokenUrl, {
     method: "POST",
     headers,
     body: tokenRequestParams
@@ -22699,7 +23030,7 @@ async function executeTokenRequest(authorizationServerUrl, { metadata: metadata2
   if (!response.ok) {
     throw await parseErrorResponse(response);
   }
-  return OAuthTokensSchema.parse(await response.json());
+  return TokenResponseSchema.parse(await response.json());
 }
 async function exchangeAuthorization(authorizationServerUrl, { metadata: metadata2, clientInformation, authorizationCode, codeVerifier, redirectUri, resource, addClientAuthentication, fetchFn }) {
   const tokenRequestParams = prepareAuthorizationCodeRequest(authorizationCode, codeVerifier, redirectUri);
@@ -22728,6 +23059,15 @@ async function refreshAuthorization(authorizationServerUrl, { metadata: metadata
   return { refresh_token: refreshToken, ...tokens };
 }
 async function fetchToken(provider, authorizationServerUrl, { metadata: metadata2, resource, authorizationCode, fetchFn } = {}) {
+  const readClientInformation = async () => {
+    const storedClientInformation = await provider.clientInformation();
+    const checked = discardIfIssuerMismatch(storedClientInformation, String(authorizationServerUrl));
+    if (storedClientInformation && !checked) {
+      throw boundElsewhereError(storedClientInformation, String(authorizationServerUrl));
+    }
+    return checked;
+  };
+  let clientInformation = await readClientInformation();
   const scope2 = provider.clientMetadata.scope;
   let tokenRequestParams;
   if (provider.prepareTokenRequest) {
@@ -22743,11 +23083,11 @@ async function fetchToken(provider, authorizationServerUrl, { metadata: metadata
     const codeVerifier = await provider.codeVerifier();
     tokenRequestParams = prepareAuthorizationCodeRequest(authorizationCode, codeVerifier, provider.redirectUrl);
   }
-  const clientInformation = await provider.clientInformation();
+  clientInformation ?? (clientInformation = await readClientInformation());
   return executeTokenRequest(authorizationServerUrl, {
     metadata: metadata2,
     tokenRequestParams,
-    clientInformation: clientInformation ?? void 0,
+    clientInformation,
     addClientAuthentication: provider.addClientAuthentication,
     resource,
     fetchFn
@@ -22763,7 +23103,7 @@ async function registerClient(authorizationServerUrl, { metadata: metadata2, cli
   } else {
     registrationUrl = new URL("/register", authorizationServerUrl);
   }
-  const response = await (fetchFn ?? fetch)(registrationUrl, {
+  const response = await fetchWithinOrigin(fetchFn ?? fetch)(registrationUrl, {
     method: "POST",
     headers: {
       "Content-Type": "application/json"
@@ -22776,7 +23116,7 @@ async function registerClient(authorizationServerUrl, { metadata: metadata2, cli
   if (!response.ok) {
     throw await parseErrorResponse(response);
   }
-  return OAuthClientInformationFullSchema.parse(await response.json());
+  return RegistrationResponseSchema.parse(await response.json());
 }
 const parseOAuthCallbackParams = (location) => {
   const params = new URLSearchParams(location);
@@ -22839,6 +23179,18 @@ function validateRedirectUrl(url2) {
     throw new Error(`Invalid URL: ${url2}`);
   }
 }
+function parseHttpUrl(url2) {
+  let parsedUrl;
+  try {
+    parsedUrl = new URL(url2);
+  } catch {
+    return null;
+  }
+  if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") {
+    return null;
+  }
+  return parsedUrl.href;
+}
 const discoverScopes = async (serverUrl, resourceMetadata, fetchFn) => {
   try {
     const metadata2 = await discoverAuthorizationServerMetadata(
@@ -22907,11 +23259,18 @@ const clearScopeFromSessionStorage = (serverUrl) => {
   sessionStorage.removeItem(key);
 };
 class InspectorOAuthClientProvider {
-  constructor(serverUrl) {
+  /**
+   * @param connection The connection this authorization is for. It is saved
+   * per tab just before redirecting, and is the only thing the callback will
+   * reconnect with; omit it and the callback will not reconnect.
+   */
+  constructor(serverUrl, connection) {
     this.serverUrl = serverUrl;
+    this.connection = connection;
     sessionStorage.setItem(SESSION_KEYS.SERVER_URL, serverUrl);
   }
   serverUrl;
+  connection;
   get scope() {
     return getScopeFromSessionStorage(this.serverUrl);
   }
@@ -22974,6 +23333,14 @@ class InspectorOAuthClientProvider {
   }
   redirectToAuthorization(authorizationUrl) {
     validateRedirectUrl(authorizationUrl.href);
+    if (this.connection) {
+      saveOAuthConnectionSnapshot({
+        ...this.connection,
+        serverUrl: this.serverUrl
+      });
+    } else {
+      clearOAuthConnectionSnapshot();
+    }
     window.location.href = authorizationUrl.href;
   }
   saveCodeVerifier(codeVerifier) {
@@ -23212,6 +23579,7 @@ class OAuthStateMachine {
   }
 }
 const getSearchParam = (key) => {
+  if (isOAuthCallbackPath()) return null;
   try {
     const url2 = new URL(window.location.href);
     return url2.searchParams.get(key);
@@ -23225,7 +23593,8 @@ const getMCPProxyAddress = (config2) => {
     proxyFullAddress = proxyFullAddress.replace(/\/+$/, "");
     return proxyFullAddress;
   }
-  const proxyPort = getSearchParam("MCP_PROXY_PORT") || DEFAULT_MCP_PROXY_LISTEN_PORT;
+  const portParam = getSearchParam("MCP_PROXY_PORT");
+  const proxyPort = portParam && /^\d{1,5}$/.test(portParam) ? portParam : DEFAULT_MCP_PROXY_LISTEN_PORT;
   return `${window.location.protocol}//${window.location.hostname}:${proxyPort}`;
 };
 const getMCPServerRequestTimeout = (config2) => {
@@ -23269,8 +23638,9 @@ const getInitialArgs = () => {
   return localStorage.getItem("lastArgs") || "";
 };
 const getConfigOverridesFromQueryParams = (defaultConfig) => {
-  const url2 = new URL(window.location.href);
   const overrides = {};
+  if (isOAuthCallbackPath()) return overrides;
+  const url2 = new URL(window.location.href);
   for (const key of Object.keys(defaultConfig)) {
     const param = url2.searchParams.get(key);
     if (param !== null) {
@@ -23289,7 +23659,11 @@ const getConfigOverridesFromQueryParams = (defaultConfig) => {
   }
   return overrides;
 };
+const normalizeProxyAddress = (address) => typeof address === "string" ? address.trim().replace(/\/+$/, "") : "";
+let queryOnlyProxyAddress = null;
+const sessionProxyAddressKey = (localStorageKey) => `${localStorageKey}_session_proxy_address`;
 const initializeInspectorConfig = (localStorageKey) => {
+  queryOnlyProxyAddress = null;
   const savedPersistentConfig = localStorage.getItem(localStorageKey);
   const savedEphemeralConfig = sessionStorage.getItem(
     `${localStorageKey}_ephemeral`
@@ -23312,7 +23686,32 @@ const initializeInspectorConfig = (localStorageKey) => {
     };
   }
   const overrides = getConfigOverridesFromQueryParams(DEFAULT_INSPECTOR_CONFIG);
-  return { ...baseConfig, ...overrides };
+  const config2 = { ...baseConfig, ...overrides };
+  const queryAddressItem = overrides.MCP_PROXY_FULL_ADDRESS;
+  const queryAddress = normalizeProxyAddress(queryAddressItem?.value);
+  const savedAddress = normalizeProxyAddress(
+    baseConfig.MCP_PROXY_FULL_ADDRESS.value
+  );
+  if (queryAddressItem && queryAddress && queryAddress !== savedAddress) {
+    queryOnlyProxyAddress = queryAddressItem.value;
+    if (!overrides.MCP_PROXY_AUTH_TOKEN) {
+      config2.MCP_PROXY_AUTH_TOKEN = {
+        ...DEFAULT_INSPECTOR_CONFIG.MCP_PROXY_AUTH_TOKEN
+      };
+    }
+  } else if (!queryAddressItem && !overrides.MCP_PROXY_AUTH_TOKEN) {
+    const sessionAddress = sessionStorage.getItem(
+      sessionProxyAddressKey(localStorageKey)
+    );
+    if (sessionAddress && normalizeProxyAddress(sessionAddress) !== savedAddress) {
+      queryOnlyProxyAddress = sessionAddress;
+      config2.MCP_PROXY_FULL_ADDRESS = {
+        ...config2.MCP_PROXY_FULL_ADDRESS,
+        value: sessionAddress
+      };
+    }
+  }
+  return config2;
 };
 const saveInspectorConfig = (localStorageKey, config2) => {
   const persistentConfig = {};
@@ -23324,6 +23723,26 @@ const saveInspectorConfig = (localStorageKey, config2) => {
       persistentConfig[key] = value;
     }
   }
+  if (queryOnlyProxyAddress !== null && config2.MCP_PROXY_FULL_ADDRESS?.value === queryOnlyProxyAddress) {
+    sessionStorage.setItem(
+      sessionProxyAddressKey(localStorageKey),
+      queryOnlyProxyAddress
+    );
+    const saved = localStorage.getItem(localStorageKey);
+    let savedAddress;
+    try {
+      savedAddress = saved ? JSON.parse(saved).MCP_PROXY_FULL_ADDRESS : void 0;
+    } catch {
+      savedAddress = void 0;
+    }
+    if (savedAddress) {
+      persistentConfig.MCP_PROXY_FULL_ADDRESS = savedAddress;
+    } else {
+      delete persistentConfig.MCP_PROXY_FULL_ADDRESS;
+    }
+  } else {
+    sessionStorage.removeItem(sessionProxyAddressKey(localStorageKey));
+  }
   localStorage.setItem(localStorageKey, JSON.stringify(persistentConfig));
   sessionStorage.setItem(
     `${localStorageKey}_ephemeral`,
@@ -30216,7 +30635,7 @@ function requireCodegen$1() {
         return "{" + opts._n + super.render(opts) + "}" + opts._n;
       }
     }
-    class Root4 extends ParentNode {
+    class Root extends ParentNode {
     }
     class Else extends BlockNode {
     }
@@ -30405,7 +30824,7 @@ function requireCodegen$1() {
         this.opts = { ...opts, _n: opts.lines ? "\n" : "" };
         this._extScope = extScope;
         this._scope = new scope_1.Scope({ parent: extScope });
-        this._nodes = [new Root4()];
+        this._nodes = [new Root()];
       }
       toString() {
         return this._root.render(this.opts);
@@ -32740,6 +33159,7 @@ function requireUtils() {
   hasRequiredUtils = 1;
   const isUUID = RegExp.prototype.test.bind(/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu);
   const isIPv4 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u);
+  const isPort = RegExp.prototype.test.bind(/^\d*$/u);
   const isHexPair = RegExp.prototype.test.bind(/^[\da-f]{2}$/iu);
   const isUnreserved = RegExp.prototype.test.bind(/^[\da-z\-._~]$/iu);
   const isPathCharacter = RegExp.prototype.test.bind(/^[A-Za-z0-9\-._~!$&'()*+,;=:@/]$/u);
@@ -32967,6 +33387,37 @@ function requireUtils() {
     }
     return output.join("");
   }
+  function removeDotSegmentsRelative(path) {
+    if (path === "" || path[0] === "/") {
+      return removeDotSegments(path);
+    }
+    const segments = path.split("/");
+    const last = segments.length - 1;
+    const output = [];
+    let trailingDirectory = false;
+    for (let i2 = 0; i2 <= last; i2++) {
+      const segment = segments[i2];
+      if (segment === "." || segment === "..") {
+        if (segment === "..") {
+          if (output.length !== 0 && output[output.length - 1] !== "..") {
+            output.pop();
+          } else {
+            output.push("..");
+          }
+        }
+        trailingDirectory = i2 === last;
+      } else {
+        output.push(segment);
+      }
+    }
+    if (trailingDirectory && output[output.length - 1] !== "..") {
+      output.push("");
+    }
+    if (output.length === 0 || output[0] === "" || output[0].includes(":")) {
+      output.unshift(".");
+    }
+    return output.join("/");
+  }
   const HOST_DELIMS = { "@": "%40", "/": "%2F", "?": "%3F", "#": "%23", ":": "%3A" };
   const HOST_DELIM_RE = /[@/?#:]/g;
   const HOST_DELIM_NO_COLON_RE = /[@/?#]/g;
@@ -33205,8 +33656,12 @@ function requireUtils() {
       uriTokens.push(host);
     }
     if (typeof component.port === "number" || typeof component.port === "string") {
+      const port = String(component.port);
+      if (!isPort(port)) {
+        throw new TypeError("URI port is malformed.");
+      }
       uriTokens.push(":");
-      uriTokens.push(String(component.port));
+      uriTokens.push(port);
     }
     return uriTokens.length ? uriTokens.join("") : void 0;
   }
@@ -33223,6 +33678,7 @@ function requireUtils() {
     encodeFragment,
     escapePreservingEscapes,
     removeDotSegments,
+    removeDotSegmentsRelative,
     isIPv4,
     isUUID,
     normalizeIPv6,
@@ -33445,16 +33901,18 @@ var hasRequiredFastUri;
 function requireFastUri() {
   if (hasRequiredFastUri) return fastUri.exports;
   hasRequiredFastUri = 1;
-  const { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, serializePathEncoding, normalizeQueryFragmentEncoding, encodeQuery, encodeFragment, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = requireUtils();
+  const { normalizeIPv6, removeDotSegments, removeDotSegmentsRelative, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, serializePathEncoding, normalizeQueryFragmentEncoding, encodeQuery, encodeFragment, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = requireUtils();
   const { SCHEMES, getSchemeHandler } = requireSchemes();
   const VALID_SCHEME = /^[A-Za-z][A-Za-z0-9+.-]*$/u;
   const MALFORMED_SCHEME_ERROR = "URI scheme is malformed.";
-  function decodeValidScheme(scheme) {
-    const decodedScheme = unescape(String(scheme));
-    if (!VALID_SCHEME.test(decodedScheme)) {
+  const MALFORMED_HOST_ERROR = "URI host is malformed.";
+  const FORBIDDEN_DOMAIN_HOST_CHARACTER = /[\0-\x20"#/:<>?@[\\\]^`{|}\x7F]/u;
+  function validateScheme(scheme) {
+    const stringScheme = String(scheme);
+    if (!VALID_SCHEME.test(stringScheme)) {
       throw new TypeError(MALFORMED_SCHEME_ERROR);
     }
-    return decodedScheme;
+    return stringScheme;
   }
   function normalize(uri2, options2) {
     if (typeof uri2 === "string") {
@@ -33491,6 +33949,9 @@ function requireFastUri() {
     const resolvedSchemeHandler = getSchemeHandler(options2 && options2.scheme || resolved.scheme);
     const resolvedHost = resolved.host;
     const resolvedHostIsIP = resolvedHost !== void 0 && resolvedHost !== "" && (isIPv4(resolvedHost) || normalizeIPv6(resolvedHost).isIPV6);
+    if (hasForbiddenDomainHost(resolved, options2 || {}, resolvedSchemeHandler, resolvedHostIsIP)) {
+      throw new Error(MALFORMED_HOST_ERROR);
+    }
     canonicalizeHost(resolved, options2 || {}, resolvedSchemeHandler, resolvedHostIsIP);
     const encodedASCIIHost = resolvedHost && resolvedHost.indexOf("%") !== -1 && !new RegExp("\\P{ASCII}", "u").test(resolvedHost);
     if (resolved.error && !encodedASCIIHost) {
@@ -33532,14 +33993,15 @@ function requireFastUri() {
           if (relative.path[0] === "/") {
             target.path = removeDotSegments(relative.path);
           } else {
-            if ((base.userinfo !== void 0 || base.host !== void 0 || base.port !== void 0) && !base.path) {
+            const baseHasAuthority = base.userinfo !== void 0 || base.host !== void 0 || base.port !== void 0;
+            if (baseHasAuthority && !base.path) {
               target.path = "/" + relative.path;
             } else if (!base.path) {
               target.path = relative.path;
             } else {
               target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative.path;
             }
-            target.path = removeDotSegments(target.path);
+            target.path = base.scheme === void 0 && !baseHasAuthority && target.path[0] !== "/" ? removeDotSegmentsRelative(target.path) : removeDotSegments(target.path);
           }
           target.query = relative.query;
         }
@@ -33577,12 +34039,13 @@ function requireFastUri() {
     const options2 = Object.assign({}, opts);
     const uriTokens = [];
     if (component.scheme) {
-      component.scheme = decodeValidScheme(component.scheme);
+      component.scheme = validateScheme(component.scheme);
     }
     const schemeHandler = getSchemeHandler(options2.scheme || component.scheme);
     if (schemeHandler && schemeHandler.serialize) schemeHandler.serialize(component, options2);
     const hasAuthority = component.userinfo !== void 0 || component.host !== void 0 || component.port !== void 0;
-    const pathNoScheme = !options2.skipEscape && component.scheme === void 0 && !hasAuthority;
+    const schemelessReference = (component.scheme === void 0 || options2.reference === "suffix") && !hasAuthority;
+    const pathNoScheme = !options2.skipEscape && schemelessReference;
     if (component.path !== void 0) {
       if (!options2.skipEscape) {
         component.path = serializePathEncoding(component.path, pathNoScheme);
@@ -33591,7 +34054,7 @@ function requireFastUri() {
       }
     }
     if (options2.reference !== "suffix" && component.scheme) {
-      component.scheme = decodeValidScheme(component.scheme);
+      component.scheme = validateScheme(component.scheme);
       uriTokens.push(component.scheme, ":");
     }
     const authority = recomposeAuthority(component);
@@ -33607,9 +34070,9 @@ function requireFastUri() {
     if (component.path !== void 0) {
       let s2 = component.path;
       if (!options2.absolutePath && (!schemeHandler || !schemeHandler.absolutePath)) {
-        s2 = removeDotSegments(s2);
+        s2 = schemelessReference && s2[0] !== "/" ? removeDotSegmentsRelative(s2) : removeDotSegments(s2);
       }
-      if (pathNoScheme) {
+      if (schemelessReference) {
         s2 = serializePathEncoding(s2, true);
       }
       if (authority === void 0 && s2[0] === "/" && s2[1] === "/") {
@@ -33648,21 +34111,42 @@ function requireFastUri() {
     }
     return false;
   }
+  function isIPLiteral(host) {
+    return host[0] === "[" && host[host.length - 1] === "]";
+  }
   function hasMalformedComponentPercentEncoding(matches) {
     const host = matches[4];
-    return hasMalformedPercentEncoding(matches[3]) || host !== void 0 && !(host[0] === "[" && host[host.length - 1] === "]") && hasMalformedPercentEncoding(host) || hasMalformedPercentEncoding(matches[6]) || hasMalformedPercentEncoding(matches[7]) || hasMalformedPercentEncoding(matches[8]);
+    return hasMalformedPercentEncoding(matches[3]) || host !== void 0 && !isIPLiteral(host) && hasMalformedPercentEncoding(host) || hasMalformedPercentEncoding(matches[6]) || hasMalformedPercentEncoding(matches[7]) || hasMalformedPercentEncoding(matches[8]);
   }
   function canonicalizeHost(parsed, options2, schemeHandler, isIP) {
-    if (!options2.unicodeSupport && (!schemeHandler || !schemeHandler.unicodeSupport) && parsed.host && parsed.host[0] !== "[" && (options2.domainHost || schemeHandler && schemeHandler.domainHost) && isIP === false && nonSimpleDomain(parsed.host)) {
+    if (hasForbiddenDomainHost(parsed, options2, schemeHandler, isIP)) {
+      parsed.error = parsed.error || MALFORMED_HOST_ERROR;
+      return true;
+    }
+    if (!options2.unicodeSupport && (!schemeHandler || !schemeHandler.unicodeSupport) && parsed.host && !isIPLiteral(parsed.host) && (options2.domainHost || schemeHandler && schemeHandler.domainHost) && isIP === false && nonSimpleDomain(parsed.host)) {
+      let url2;
       try {
-        parsed.host = new URL("http://" + parsed.host).hostname;
+        url2 = new URL("http://" + parsed.host);
       } catch (e2) {
         parsed.error = parsed.error || "Host's domain name can not be converted to ASCII: " + e2;
         return true;
       }
+      if (!isHostOnlyURL(url2)) {
+        parsed.error = parsed.error || MALFORMED_HOST_ERROR;
+        return true;
+      }
+      parsed.host = url2.hostname;
     }
     return false;
   }
+  function hasForbiddenDomainHost(parsed, options2, schemeHandler, isIP) {
+    return Boolean(
+      parsed.host && isIP === false && !isIPLiteral(parsed.host) && (options2.domainHost || schemeHandler && schemeHandler.domainHost) && FORBIDDEN_DOMAIN_HOST_CHARACTER.test(parsed.host)
+    );
+  }
+  function isHostOnlyURL(url2) {
+    return url2.username === "" && url2.password === "" && url2.port === "" && url2.pathname === "/" && url2.search === "" && url2.hash === "" && url2.hostname !== "";
+  }
   function parseWithStatus(uri2, opts) {
     const options2 = Object.assign({}, opts);
     const parsed = {
@@ -33717,9 +34201,8 @@ function requireFastUri() {
       parsed.query = matches[7];
       parsed.fragment = matches[8];
       if (parsed.scheme !== void 0) {
-        const decodedScheme = unescape(parsed.scheme);
-        if (VALID_SCHEME.test(decodedScheme)) {
-          parsed.scheme = decodedScheme.toLowerCase();
+        if (VALID_SCHEME.test(parsed.scheme)) {
+          parsed.scheme = parsed.scheme.toLowerCase();
         } else {
           parsed.error = parsed.error || MALFORMED_SCHEME_ERROR;
           malformedScheme = true;
@@ -33740,13 +34223,14 @@ function requireFastUri() {
       if (parsed.host) {
         const ipv4result = isIPv4(parsed.host);
         if (ipv4result === false) {
-          const bracketedIPLiteral = parsed.host[0] === "[" && parsed.host[parsed.host.length - 1] === "]";
+          const bracketedIPLiteral = isIPLiteral(parsed.host);
+          const hasIPLiteralBracket = parsed.host.indexOf("[") !== -1 || parsed.host.indexOf("]") !== -1;
           const ipv6result = normalizeIPv6(parsed.host);
           isIP = ipv6result.isIPV6 || ipv6result.isIPVFuture === true;
-          malformedIPLiteral = bracketedIPLiteral && ipv6result.error === true;
+          malformedIPLiteral = hasIPLiteralBracket && (!bracketedIPLiteral || ipv6result.error === true);
           parsed.host = isIP ? ipv6result.host : ipv6result.host.toLowerCase();
           if (malformedIPLiteral) {
-            parsed.error = parsed.error || "URI host is malformed.";
+            parsed.error = parsed.error || MALFORMED_HOST_ERROR;
             malformedAuthorityOrPort = true;
           }
         } else {
@@ -33766,14 +34250,17 @@ function requireFastUri() {
         parsed.error = parsed.error || "URI is not a " + options2.reference + " reference.";
       }
       const schemeHandler = getSchemeHandler(options2.scheme || parsed.scheme);
-      malformedHost = canonicalizeHost(parsed, options2, schemeHandler, isIP);
-      if (!schemeHandler || schemeHandler && !schemeHandler.skipNormalize) {
-        if (uri2.indexOf("%") !== -1) {
-          if (parsed.host !== void 0 && !malformedIPLiteral) {
-            const host = isIP ? parsed.host : normalizePercentEncoding(parsed.host, true);
-            parsed.host = reescapeHostDelimiters(host, isIP);
-          }
+      if (!malformedIPLiteral) {
+        malformedHost = canonicalizeHost(parsed, options2, schemeHandler, isIP);
+      }
+      if (uri2.indexOf("%") !== -1 && parsed.host !== void 0 && !malformedIPLiteral) {
+        let host = isIP ? parsed.host : normalizePercentEncoding(parsed.host, true);
+        if (!isIP) {
+          host = normalizePercentEncoding(host.toLowerCase());
         }
+        parsed.host = isIP || options2.scheme !== "null" ? reescapeHostDelimiters(host, isIP) : host;
+      }
+      if (!schemeHandler || schemeHandler && !schemeHandler.skipNormalize) {
         if (parsed.path) {
           parsed.path = normalizePathEncoding(parsed.path);
         }
@@ -37093,7 +37580,7 @@ function requireCodegen() {
         return "{" + opts._n + super.render(opts) + "}" + opts._n;
       }
     }
-    class Root4 extends ParentNode {
+    class Root extends ParentNode {
     }
     class Else extends BlockNode {
     }
@@ -37282,7 +37769,7 @@ function requireCodegen() {
         this.opts = { ...opts, _n: opts.lines ? "\n" : "" };
         this._extScope = extScope;
         this._scope = new scope_1.Scope({ parent: extScope });
-        this._nodes = [new Root4()];
+        this._nodes = [new Root()];
       }
       toString() {
         return this._root.render(this.opts);
@@ -43429,31 +43916,6 @@ function getBaseURL() {
   const doc = "document" in globalThis ? globalThis.document : void 0;
   return doc && typeof doc == "object" && "baseURI" in doc && typeof doc.baseURI == "string" ? doc.baseURI : void 0;
 }
-function normalizeHeaders(headers) {
-  if (!headers)
-    return {};
-  if (headers instanceof Headers) {
-    return Object.fromEntries(headers.entries());
-  }
-  if (Array.isArray(headers)) {
-    return Object.fromEntries(headers);
-  }
-  return { ...headers };
-}
-function createFetchWithInit(baseFetch = fetch, baseInit) {
-  if (!baseInit) {
-    return baseFetch;
-  }
-  return async (url2, init) => {
-    const mergedInit = {
-      ...baseInit,
-      ...init,
-      // Headers need special handling - merge instead of replace
-      headers: init?.headers ? { ...normalizeHeaders(baseInit.headers), ...normalizeHeaders(init.headers) } : baseInit.headers
-    };
-    return baseFetch(url2, mergedInit);
-  };
-}
 class SseError extends Error {
   constructor(code2, message, event) {
     super(`SSE error: ${message}`);
@@ -43471,6 +43933,16 @@ class SSEClientTransport {
     this._authProvider = opts?.authProvider;
     this._fetch = opts?.fetch;
     this._fetchWithInit = createFetchWithInit(opts?.fetch, opts?.requestInit);
+    this._followRedirects = opts?.redirectPolicy === "follow";
+    if (this._followRedirects) {
+      this._fetch = fetchLeavingRedirects(this._fetch);
+      this._fetchWithInit = fetchLeavingRedirects(this._fetchWithInit);
+    }
+  }
+  /** Error text for a redirect `response` that was not followed, or `undefined` for any other response. */
+  _unfollowedRedirect(response, url2) {
+    const text = unfollowedRedirect(response, url2);
+    return text && !this._followRedirects ? `${text} (redirectPolicy: 'same-origin')` : text;
   }
   async _authThenStart() {
     if (!this._authProvider) {
@@ -43511,7 +43983,9 @@ class SSEClientTransport {
     });
   }
   _startOrAuth() {
-    const fetchImpl = this?._eventSourceInit?.fetch ?? this._fetch ?? fetch;
+    const baseFetch = this?._eventSourceInit?.fetch ?? this._fetch ?? fetch;
+    const fetchImpl = this._followRedirects ? baseFetch : fetchWithinOrigin(baseFetch);
+    let redirect;
     return new Promise((resolve2, reject) => {
       this._eventSource = new EventSource(this._url.href, {
         ...this._eventSourceInit,
@@ -43522,6 +43996,7 @@ class SSEClientTransport {
             ...init,
             headers
           });
+          redirect = this._unfollowedRedirect(response, url2);
           if (response.status === 401 && response.headers.has("www-authenticate")) {
             const { resourceMetadataUrl, scope: scope2 } = extractWWWAuthenticateParams(response);
             this._resourceMetadataUrl = resourceMetadataUrl;
@@ -43536,7 +44011,7 @@ class SSEClientTransport {
           this._authThenStart().then(resolve2, reject);
           return;
         }
-        const error = new SseError(event.code, event.message, event);
+        const error = new SseError(event.code, redirect ?? event.message, event);
         reject(error);
         this.onerror?.(error);
       };
@@ -43613,7 +44088,7 @@ class SSEClientTransport {
         body: JSON.stringify(message),
         signal: this._abortController?.signal
       };
-      const response = await (this._fetch ?? fetch)(this._endpoint, init);
+      const response = await fetchWithinOrigin(this._fetch ?? fetch)(this._endpoint, init);
       if (!response.ok) {
         const text = await response.text().catch(() => null);
         if (response.status === 401 && this._authProvider) {
@@ -43631,7 +44106,7 @@ class SSEClientTransport {
           }
           return this.send(message);
         }
-        throw new Error(`Error POSTing to endpoint (HTTP ${response.status}): ${text}`);
+        throw new Error(`Error POSTing to endpoint (HTTP ${response.status}): ${this._unfollowedRedirect(response, this._endpoint) ?? text}`);
       }
       await response.body?.cancel();
     } catch (error) {
@@ -43808,9 +44283,19 @@ class StreamableHTTPClientTransport {
     this._authProvider = opts?.authProvider;
     this._fetch = opts?.fetch;
     this._fetchWithInit = createFetchWithInit(opts?.fetch, opts?.requestInit);
+    this._followRedirects = opts?.redirectPolicy === "follow";
+    if (this._followRedirects) {
+      this._fetch = fetchLeavingRedirects(this._fetch);
+      this._fetchWithInit = fetchLeavingRedirects(this._fetchWithInit);
+    }
     this._sessionId = opts?.sessionId;
     this._reconnectionOptions = opts?.reconnectionOptions ?? DEFAULT_STREAMABLE_HTTP_RECONNECTION_OPTIONS;
   }
+  /** Error text for a redirect `response` that was not followed, or `undefined` for any other response. */
+  _unfollowedRedirect(response, url2) {
+    const text = unfollowedRedirect(response, url2);
+    return text && !this._followRedirects ? `${text} (redirectPolicy: 'same-origin')` : text;
+  }
   async _authThenStart() {
     if (!this._authProvider) {
       throw new UnauthorizedError("No auth provider");
@@ -43860,11 +44345,13 @@ class StreamableHTTPClientTransport {
       if (resumptionToken) {
         headers.set("last-event-id", resumptionToken);
       }
-      const response = await (this._fetch ?? fetch)(this._url, {
-        method: "GET",
-        headers,
-        signal: this._abortController?.signal
-      });
+      const fetchFn = this._fetch ?? fetch;
+      const init = { method: "GET", headers, signal: this._abortController?.signal };
+      let response = await fetchFn(this._url, this._followRedirects ? init : { ...init, redirect: "manual" });
+      const followed = this._followRedirects ? void 0 : followWithinOrigin(fetchFn, this._url, init, response);
+      if (followed) {
+        response = await followed;
+      }
       if (!response.ok) {
         await response.body?.cancel();
         if (response.status === 401 && this._authProvider) {
@@ -43873,7 +44360,7 @@ class StreamableHTTPClientTransport {
         if (response.status === 405) {
           return;
         }
-        throw new StreamableHTTPError(response.status, `Failed to open SSE stream: ${response.statusText}`);
+        throw new StreamableHTTPError(response.status, `Failed to open SSE stream: ${this._unfollowedRedirect(response, this._url) ?? response.statusText}`);
       }
       this._handleSseStream(response.body, options2, true);
     } catch (error) {
@@ -44036,7 +44523,7 @@ class StreamableHTTPClientTransport {
         body: JSON.stringify(message),
         signal: this._abortController?.signal
       };
-      const response = await (this._fetch ?? fetch)(this._url, init);
+      const response = await fetchWithinOrigin(this._fetch ?? fetch)(this._url, init);
       const sessionId = response.headers.get("mcp-session-id");
       if (sessionId) {
         this._sessionId = sessionId;
@@ -44088,7 +44575,7 @@ class StreamableHTTPClientTransport {
             return this.send(message);
           }
         }
-        throw new StreamableHTTPError(response.status, `Error POSTing to endpoint: ${text}`);
+        throw new StreamableHTTPError(response.status, `Error POSTing to endpoint: ${this._unfollowedRedirect(response, this._url) ?? text}`);
       }
       this._hasCompletedAuthFlow = false;
       this._lastUpscopingHeader = void 0;
@@ -44150,10 +44637,10 @@ class StreamableHTTPClientTransport {
         headers,
         signal: this._abortController?.signal
       };
-      const response = await (this._fetch ?? fetch)(this._url, init);
+      const response = await fetchWithinOrigin(this._fetch ?? fetch)(this._url, init);
       await response.body?.cancel();
       if (!response.ok && response.status !== 405) {
-        throw new StreamableHTTPError(response.status, `Failed to terminate session: ${response.statusText}`);
+        throw new StreamableHTTPError(response.status, `Failed to terminate session: ${this._unfollowedRedirect(response, this._url) ?? response.statusText}`);
       }
       this._sessionId = void 0;
     } catch (error) {
@@ -44411,6 +44898,13 @@ function useConnection({
   const isProxyAuthError = (error) => {
     return error instanceof Error && error.message.includes("Authentication required. Use the session token");
   };
+  const getOAuthConnection = () => ({
+    transportType,
+    connectionType,
+    command,
+    args,
+    proxyAddress: getMCPProxyAddress(config2)
+  });
   const handleAuthError = async (error) => {
     if (isConnectionAuthError(error)) {
       let scope2 = oauthScope?.trim();
@@ -44428,7 +44922,10 @@ function useConnection({
         scope2 = await discoverScopes(sseUrl, resourceMetadata, fetchFn);
       }
       saveScopeToSessionStorage(sseUrl, scope2);
-      const serverAuthProvider = new InspectorOAuthClientProvider(sseUrl);
+      const serverAuthProvider = new InspectorOAuthClientProvider(
+        sseUrl,
+        getOAuthConnection()
+      );
       try {
         const result = await auth(serverAuthProvider, {
           serverUrl: sseUrl,
@@ -44495,7 +44992,10 @@ function useConnection({
     let lastRequest = "";
     try {
       const headers = {};
-      const serverAuthProvider = new InspectorOAuthClientProvider(sseUrl);
+      const serverAuthProvider = new InspectorOAuthClientProvider(
+        sseUrl,
+        getOAuthConnection()
+      );
       let finalHeaders = customHeaders || [];
       const isEmptyAuthHeader = (header) => header.name.trim().toLowerCase() === "authorization" && header.value.trim().toLowerCase() === "bearer";
       const hasEmptyAuthHeader = finalHeaders.some(
@@ -45157,8 +45657,8 @@ function useDraggableSidebar(initialWidth) {
     handleDragStart
   };
 }
-var __defProp$h = Object.defineProperty;
-var __name$h = (target, value) => __defProp$h(target, "name", { value, configurable: true });
+var __defProp$g = Object.defineProperty;
+var __name$g = (target, value) => __defProp$g(target, "name", { value, configurable: true });
 var useReactId = React2[" useId ".trim().toString()] || (() => void 0);
 var count$1 = 0;
 function useId(deterministicId) {
@@ -45168,17 +45668,20 @@ function useId(deterministicId) {
   }, [deterministicId]);
   return deterministicId || (id2 ? `radix-${id2}` : "");
 }
-__name$h(useId, "useId");
-var __defProp$g = Object.defineProperty;
-var __name$g = (target, value) => __defProp$g(target, "name", { value, configurable: true });
+__name$g(useId, "useId");
+var __defProp$f = Object.defineProperty;
+var __name$f = (target, value) => __defProp$f(target, "name", { value, configurable: true });
+var Direction$2 = {
+  LTR: "ltr"
+};
 var DirectionContext = reactExports.createContext(void 0);
 function useDirection(localDir) {
   const globalDir = reactExports.useContext(DirectionContext);
-  return localDir || globalDir || "ltr";
+  return localDir || globalDir || Direction$2.LTR;
 }
-__name$g(useDirection, "useDirection");
-var __defProp$f = Object.defineProperty;
-var __name$f = (target, value) => __defProp$f(target, "name", { value, configurable: true });
+__name$f(useDirection, "useDirection");
+var __defProp$e = Object.defineProperty;
+var __name$e = (target, value) => __defProp$e(target, "name", { value, configurable: true });
 var _isHydrated = false;
 function useIsHydrated() {
   const [isHydrated, setIsHydrated] = reactExports.useState(_isHydrated);
@@ -45190,13 +45693,13 @@ function useIsHydrated() {
   }, []);
   return isHydrated;
 }
-__name$f(useIsHydrated, "useIsHydrated");
+__name$e(useIsHydrated, "useIsHydrated");
 var useReactSyncExternalStore = React2[" useSyncExternalStore ".trim().toString()];
 function subscribe() {
   return () => {
   };
 }
-__name$f(subscribe, "subscribe");
+__name$e(subscribe, "subscribe");
 function useIsHydratedModern() {
   return useReactSyncExternalStore(
     subscribe,
@@ -45204,10 +45707,10 @@ function useIsHydratedModern() {
     () => false
   );
 }
-__name$f(useIsHydratedModern, "useIsHydratedModern");
+__name$e(useIsHydratedModern, "useIsHydratedModern");
 var useIsHydrated2 = typeof useReactSyncExternalStore === "function" ? useIsHydratedModern : useIsHydrated;
-var __defProp$e = Object.defineProperty;
-var __name$e = (target, value) => __defProp$e(target, "name", { value, configurable: true });
+var __defProp$d = Object.defineProperty;
+var __name$d = (target, value) => __defProp$d(target, "name", { value, configurable: true });
 var ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus";
 var EVENT_OPTIONS$1 = { bubbles: false, cancelable: true };
 var GROUP_NAME$1 = "RovingFocusGroup";
@@ -45216,14 +45719,21 @@ var [createRovingFocusGroupContext, createRovingFocusGroupScope] = /* @__PURE__
   GROUP_NAME$1,
   [createCollectionScope$1]
 );
+var Orientation = {
+  Vertical: "vertical",
+  Horizontal: "horizontal"
+};
+var Direction$1 = {
+  RTL: "rtl"
+};
 var [RovingFocusProvider, useRovingFocusContext] = createRovingFocusGroupContext(GROUP_NAME$1);
 var RovingFocusGroup = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$e(function RovingFocusGroup2(props, forwardedRef) {
+  /* @__PURE__ */ __name$d(function RovingFocusGroup2(props, forwardedRef) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Collection$1.Provider, { scope: props.__scopeRovingFocusGroup, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Collection$1.Slot, { scope: props.__scopeRovingFocusGroup, children: /* @__PURE__ */ jsxRuntimeExports.jsx(RovingFocusGroupImpl, { ...props, ref: forwardedRef }) }) });
   }, "RovingFocusGroup")
 );
-var RovingFocusGroupImpl = /* @__PURE__ */ reactExports.forwardRef(/* @__PURE__ */ __name$e(function RovingFocusGroupImpl2(props, forwardedRef) {
+var RovingFocusGroupImpl = /* @__PURE__ */ reactExports.forwardRef(/* @__PURE__ */ __name$d(function RovingFocusGroupImpl2(props, forwardedRef) {
   const {
     __scopeRovingFocusGroup,
     orientation,
@@ -45316,7 +45826,7 @@ var RovingFocusGroupImpl = /* @__PURE__ */ reactExports.forwardRef(/* @__PURE__
 var ITEM_NAME$1 = "RovingFocusGroupItem";
 var RovingFocusGroupItem = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$e(function RovingFocusGroupItem2(props, forwardedRef) {
+  /* @__PURE__ */ __name$d(function RovingFocusGroupItem2(props, forwardedRef) {
     const {
       __scopeRovingFocusGroup,
       focusable = true,
@@ -45404,17 +45914,21 @@ var MAP_KEY_TO_FOCUS_INTENT = {
   End: "last"
 };
 function getDirectionAwareKey(key, dir) {
-  if (dir !== "rtl") return key;
+  if (dir !== Direction$1.RTL) return key;
   return key === "ArrowLeft" ? "ArrowRight" : key === "ArrowRight" ? "ArrowLeft" : key;
 }
-__name$e(getDirectionAwareKey, "getDirectionAwareKey");
+__name$d(getDirectionAwareKey, "getDirectionAwareKey");
 function getFocusIntent(event, orientation, dir) {
   const key = getDirectionAwareKey(event.key, dir);
-  if (orientation === "vertical" && ["ArrowLeft", "ArrowRight"].includes(key)) return void 0;
-  if (orientation === "horizontal" && ["ArrowUp", "ArrowDown"].includes(key)) return void 0;
+  if (orientation === Orientation.Vertical && ["ArrowLeft", "ArrowRight"].includes(key)) {
+    return void 0;
+  }
+  if (orientation === Orientation.Horizontal && ["ArrowUp", "ArrowDown"].includes(key)) {
+    return void 0;
+  }
   return MAP_KEY_TO_FOCUS_INTENT[key];
 }
-__name$e(getFocusIntent, "getFocusIntent");
+__name$d(getFocusIntent, "getFocusIntent");
 function focusFirst$1(candidates, preventScroll = false) {
   const PREVIOUSLY_FOCUSED_ELEMENT = document.activeElement;
   for (const candidate of candidates) {
@@ -45423,15 +45937,17 @@ function focusFirst$1(candidates, preventScroll = false) {
     if (document.activeElement !== PREVIOUSLY_FOCUSED_ELEMENT) return;
   }
 }
-__name$e(focusFirst$1, "focusFirst");
+__name$d(focusFirst$1, "focusFirst");
 function wrapArray$1(array2, startIndex) {
   return array2.map((_2, index2) => array2[(startIndex + index2) % array2.length]);
 }
-__name$e(wrapArray$1, "wrapArray");
-var Root$1 = RovingFocusGroup;
-var Item = RovingFocusGroupItem;
-var __defProp$d = Object.defineProperty;
-var __name$d = (target, value) => __defProp$d(target, "name", { value, configurable: true });
+__name$d(wrapArray$1, "wrapArray");
+var __defProp$c = Object.defineProperty;
+var __name$c = (target, value) => __defProp$c(target, "name", { value, configurable: true });
+var ActivationMode = {
+  Automatic: "automatic",
+  Manual: "manual"
+};
 var TABS_NAME = "Tabs";
 var [createTabsContext, createTabsScope] = /* @__PURE__ */ createContextScope(TABS_NAME, [
   createRovingFocusGroupScope
@@ -45440,7 +45956,7 @@ var useRovingFocusGroupScope = createRovingFocusGroupScope();
 var [TabsProvider, useTabsContext] = createTabsContext(TABS_NAME);
 var Tabs$1 = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$d(function Tabs2(props, forwardedRef) {
+  /* @__PURE__ */ __name$c(function Tabs2(props, forwardedRef) {
     const {
       __scopeTabs,
       value: valueProp,
@@ -45448,7 +45964,7 @@ var Tabs$1 = /* @__PURE__ */ reactExports.forwardRef(
       defaultValue,
       orientation = "horizontal",
       dir,
-      activationMode = "automatic",
+      activationMode = ActivationMode.Automatic,
       ...tabsProps
     } = props;
     const direction = useDirection(dir);
@@ -45484,12 +46000,12 @@ var Tabs$1 = /* @__PURE__ */ reactExports.forwardRef(
 var TAB_LIST_NAME = "TabsList";
 var TabsList$1 = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$d(function TabsList2(props, forwardedRef) {
+  /* @__PURE__ */ __name$c(function TabsList2(props, forwardedRef) {
     const { __scopeTabs, loop = true, ...listProps } = props;
     const context = useTabsContext(TAB_LIST_NAME, __scopeTabs);
     const rovingFocusGroupScope = useRovingFocusGroupScope(__scopeTabs);
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
-      Root$1,
+      RovingFocusGroup,
       {
         asChild: true,
         ...rovingFocusGroupScope,
@@ -45511,7 +46027,7 @@ var TabsList$1 = /* @__PURE__ */ reactExports.forwardRef(
 );
 var TRIGGER_NAME$5 = "TabsTrigger";
 var TabsTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$d(function TabsTrigger2(props, forwardedRef) {
+  /* @__PURE__ */ __name$c(function TabsTrigger2(props, forwardedRef) {
     const { __scopeTabs, value, disabled = false, ...triggerProps } = props;
     const context = useTabsContext(TRIGGER_NAME$5, __scopeTabs);
     const rovingFocusGroupScope = useRovingFocusGroupScope(__scopeTabs);
@@ -45519,7 +46035,7 @@ var TabsTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
     const contentId = makeContentId(context.baseId, value);
     const isSelected = value === context.value;
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
-      Item,
+      RovingFocusGroupItem,
       {
         asChild: true,
         ...rovingFocusGroupScope,
@@ -45540,6 +46056,7 @@ var TabsTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
             ref: forwardedRef,
             onMouseDown: composeEventHandlers(props.onMouseDown, (event) => {
               if (!disabled && event.button === 0 && event.ctrlKey === false) {
+                event.currentTarget.focus();
                 context.onValueChange(value);
               } else {
                 event.preventDefault();
@@ -45554,7 +46071,7 @@ var TabsTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
               }
             }),
             onFocus: composeEventHandlers(props.onFocus, () => {
-              const isAutomaticActivation = context.activationMode !== "manual";
+              const isAutomaticActivation = context.activationMode !== ActivationMode.Manual;
               if (!isSelected && !disabled && isAutomaticActivation) {
                 context.onValueChange(value);
               }
@@ -45567,7 +46084,7 @@ var TabsTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
 );
 var CONTENT_NAME$5 = "TabsContent";
 var TabsContent$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$d(function TabsContent2(props, forwardedRef) {
+  /* @__PURE__ */ __name$c(function TabsContent2(props, forwardedRef) {
     const { __scopeTabs, value, forceMount, children, ...contentProps } = props;
     const context = useTabsContext(CONTENT_NAME$5, __scopeTabs);
     const triggerId = makeTriggerId(context.baseId, value);
@@ -45602,18 +46119,14 @@ var TabsContent$1 = /* @__PURE__ */ reactExports.forwardRef(
 function makeTriggerId(baseId, value) {
   return `${baseId}-trigger-${value}`;
 }
-__name$d(makeTriggerId, "makeTriggerId");
+__name$c(makeTriggerId, "makeTriggerId");
 function makeContentId(baseId, value) {
   return `${baseId}-content-${value}`;
 }
-__name$d(makeContentId, "makeContentId");
-var Root2$2 = Tabs$1;
-var List = TabsList$1;
-var Trigger$2 = TabsTrigger$1;
-var Content$1 = TabsContent$1;
-const Tabs = Root2$2;
+__name$c(makeContentId, "makeContentId");
+const Tabs = Tabs$1;
 const TabsList = reactExports.forwardRef(({ className, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(
-  List,
+  TabsList$1,
   {
     ref: ref2,
     className: cn$1(
@@ -45623,9 +46136,9 @@ const TabsList = reactExports.forwardRef(({ className, ...props }, ref2) => /* @
     ...props
   }
 ));
-TabsList.displayName = List.displayName;
+TabsList.displayName = TabsList$1.displayName;
 const TabsTrigger = reactExports.forwardRef(({ className, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(
-  Trigger$2,
+  TabsTrigger$1,
   {
     ref: ref2,
     className: cn$1(
@@ -45635,9 +46148,9 @@ const TabsTrigger = reactExports.forwardRef(({ className, ...props }, ref2) => /
     ...props
   }
 ));
-TabsTrigger.displayName = Trigger$2.displayName;
+TabsTrigger.displayName = TabsTrigger$1.displayName;
 const TabsContent = reactExports.forwardRef(({ className, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(
-  Content$1,
+  TabsContent$1,
   {
     ref: ref2,
     className: cn$1(
@@ -45647,7 +46160,7 @@ const TabsContent = reactExports.forwardRef(({ className, ...props }, ref2) => /
     ...props
   }
 ));
-TabsContent.displayName = Content$1.displayName;
+TabsContent.displayName = TabsContent$1.displayName;
 const buttonVariants = cva(
   "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
   {
@@ -47269,16 +47782,17 @@ function D(_2) {
 function W(_2, C, h2) {
   return _2 = h2 && h2.length > 0 ? `${_2 + " " + h2.join(" ")}` : _2, G(_2, C, D(_2), D(C), 0, 0, {});
 }
-var __defProp$c = Object.defineProperty;
-var __name$c = (target, value) => __defProp$c(target, "name", { value, configurable: true });
+var __defProp$b = Object.defineProperty;
+var __name$b = (target, value) => __defProp$b(target, "name", { value, configurable: true });
 var AUTOFOCUS_ON_MOUNT = "focusScope.autoFocusOnMount";
 var AUTOFOCUS_ON_UNMOUNT = "focusScope.autoFocusOnUnmount";
 var EVENT_OPTIONS = { bubbles: false, cancelable: true };
 var FocusScope = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$c(function FocusScope2(props, forwardedRef) {
+  /* @__PURE__ */ __name$b(function FocusScope2(props, forwardedRef) {
     const {
       loop = false,
       trapped = false,
+      branches,
       onMountAutoFocus: onMountAutoFocusProp,
       onUnmountAutoFocus: onUnmountAutoFocusProp,
       ...scopeProps
@@ -47288,6 +47802,18 @@ var FocusScope = /* @__PURE__ */ reactExports.forwardRef(
     const onUnmountAutoFocus = useCallbackRef$1(onUnmountAutoFocusProp);
     const lastFocusedElementRef = reactExports.useRef(null);
     const composedRefs = useComposedRefs(forwardedRef, setContainer);
+    const branchesRef = reactExports.useRef(branches);
+    reactExports.useEffect(() => {
+      branchesRef.current = branches;
+    });
+    const isTargetInScope = reactExports.useCallback(
+      (target) => {
+        if (!target) return false;
+        if (container?.contains(target)) return true;
+        return Boolean(branchesRef.current?.some((branch) => branch.contains(target)));
+      },
+      [container]
+    );
     const focusScope = reactExports.useRef({
       paused: false,
       pause() {
@@ -47302,7 +47828,7 @@ var FocusScope = /* @__PURE__ */ reactExports.forwardRef(
         let handleFocusIn2 = function(event) {
           if (focusScope.paused || !container) return;
           const target = event.target;
-          if (container.contains(target)) {
+          if (isTargetInScope(target)) {
             lastFocusedElementRef.current = target;
           } else {
             focus(lastFocusedElementRef.current, { select: true });
@@ -47311,7 +47837,7 @@ var FocusScope = /* @__PURE__ */ reactExports.forwardRef(
           if (focusScope.paused || !container) return;
           const relatedTarget = event.relatedTarget;
           if (relatedTarget === null) return;
-          if (!container.contains(relatedTarget)) {
+          if (!isTargetInScope(relatedTarget)) {
             focus(lastFocusedElementRef.current, { select: true });
           }
         }, handleMutations2 = function(mutations) {
@@ -47321,9 +47847,9 @@ var FocusScope = /* @__PURE__ */ reactExports.forwardRef(
             if (mutation.removedNodes.length > 0) focus(container);
           }
         };
-        __name$c(handleFocusIn2, "handleFocusIn");
-        __name$c(handleFocusOut2, "handleFocusOut");
-        __name$c(handleMutations2, "handleMutations");
+        __name$b(handleFocusIn2, "handleFocusIn");
+        __name$b(handleFocusOut2, "handleFocusOut");
+        __name$b(handleMutations2, "handleMutations");
         document.addEventListener("focusin", handleFocusIn2);
         document.addEventListener("focusout", handleFocusOut2);
         const mutationObserver = new MutationObserver(handleMutations2);
@@ -47334,7 +47860,7 @@ var FocusScope = /* @__PURE__ */ reactExports.forwardRef(
           mutationObserver.disconnect();
         };
       }
-    }, [trapped, container, focusScope.paused]);
+    }, [trapped, container, focusScope.paused, isTargetInScope]);
     reactExports.useEffect(() => {
       if (container) {
         focusScopesStack.add(focusScope);
@@ -47353,12 +47879,14 @@ var FocusScope = /* @__PURE__ */ reactExports.forwardRef(
         }
         return () => {
           container.removeEventListener(AUTOFOCUS_ON_MOUNT, onMountAutoFocus);
+          const ownerDocument = container.ownerDocument;
+          const UnmountEvent = CustomEvent;
           setTimeout(() => {
-            const unmountEvent = new CustomEvent(AUTOFOCUS_ON_UNMOUNT, EVENT_OPTIONS);
+            const unmountEvent = new UnmountEvent(AUTOFOCUS_ON_UNMOUNT, EVENT_OPTIONS);
             container.addEventListener(AUTOFOCUS_ON_UNMOUNT, onUnmountAutoFocus);
             container.dispatchEvent(unmountEvent);
             if (!unmountEvent.defaultPrevented) {
-              focus(previouslyFocusedElement ?? document.body, { select: true });
+              focus(previouslyFocusedElement ?? ownerDocument.body, { select: true });
             }
             container.removeEventListener(AUTOFOCUS_ON_UNMOUNT, onUnmountAutoFocus);
             focusScopesStack.remove(focusScope);
@@ -47394,6 +47922,35 @@ var FocusScope = /* @__PURE__ */ reactExports.forwardRef(
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Primitive.div, { tabIndex: -1, ...scopeProps, ref: composedRefs, onKeyDown: handleKeyDown });
   }, "FocusScope")
 );
+var FocusScopeBranchContext = reactExports.createContext(null);
+function FocusScopeBranchProvider({ registry: registry2, children }) {
+  if (!registry2) {
+    return children;
+  }
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(FocusScopeBranchContext.Provider, { value: registry2, children });
+}
+__name$b(FocusScopeBranchProvider, "FocusScopeBranchProvider");
+function useFocusScopeBranchRegistry() {
+  const [nodes, setNodes] = reactExports.useState([]);
+  const registry2 = reactExports.useMemo(
+    () => ({
+      add: /* @__PURE__ */ __name$b((node) => setNodes((prev) => prev.includes(node) ? prev : [...prev, node]), "add"),
+      remove: /* @__PURE__ */ __name$b((node) => setNodes((prev) => prev.filter((current) => current !== node)), "remove")
+    }),
+    []
+  );
+  return { nodes, registry: registry2 };
+}
+__name$b(useFocusScopeBranchRegistry, "useFocusScopeBranchRegistry");
+function useFocusScopeBranch(node) {
+  const registry2 = reactExports.useContext(FocusScopeBranchContext);
+  reactExports.useEffect(() => {
+    if (!node || !registry2) return;
+    registry2.add(node);
+    return () => registry2.remove(node);
+  }, [node, registry2]);
+}
+__name$b(useFocusScopeBranch, "useFocusScopeBranch");
 function focusFirst(candidates, { select = false } = {}) {
   const previouslyFocusedElement = document.activeElement;
   for (const candidate of candidates) {
@@ -47401,27 +47958,32 @@ function focusFirst(candidates, { select = false } = {}) {
     if (document.activeElement !== previouslyFocusedElement) return;
   }
 }
-__name$c(focusFirst, "focusFirst");
+__name$b(focusFirst, "focusFirst");
 function getTabbableEdges(container) {
   const candidates = getTabbableCandidates(container);
   const first = findVisible(candidates, container);
   const last = findVisible(candidates.reverse(), container);
   return [first, last];
 }
-__name$c(getTabbableEdges, "getTabbableEdges");
+__name$b(getTabbableEdges, "getTabbableEdges");
 function getTabbableCandidates(container) {
   const nodes = [];
-  const walker = document.createTreeWalker(container, NodeFilter.SHOW_ELEMENT, {
-    acceptNode: /* @__PURE__ */ __name$c((node) => {
+  const document2 = container.ownerDocument;
+  const walker = document2.createTreeWalker(container, NodeFilter.SHOW_ELEMENT, {
+    acceptNode: /* @__PURE__ */ __name$b((node) => {
       const isHiddenInput = node.tagName === "INPUT" && node.type === "hidden";
-      if (node.disabled || node.hidden || isHiddenInput) return NodeFilter.FILTER_SKIP;
+      if (node.disabled || node.hidden || isHiddenInput) {
+        return NodeFilter.FILTER_SKIP;
+      }
       return node.tabIndex >= 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP;
     }, "acceptNode")
   });
-  while (walker.nextNode()) nodes.push(walker.currentNode);
+  while (walker.nextNode()) {
+    nodes.push(walker.currentNode);
+  }
   return nodes;
 }
-__name$c(getTabbableCandidates, "getTabbableCandidates");
+__name$b(getTabbableCandidates, "getTabbableCandidates");
 function findVisible(elements, container) {
   const canUseCheckVisibility = typeof container.checkVisibility === "function" && container.checkVisibility({ checkVisibilityCSS: true });
   for (const element of elements) {
@@ -47431,7 +47993,7 @@ function findVisible(elements, container) {
     }
   }
 }
-__name$c(findVisible, "findVisible");
+__name$b(findVisible, "findVisible");
 function isHidden(node, { upTo }) {
   if (getComputedStyle(node).visibility === "hidden") return true;
   while (node) {
@@ -47441,20 +48003,21 @@ function isHidden(node, { upTo }) {
   }
   return false;
 }
-__name$c(isHidden, "isHidden");
+__name$b(isHidden, "isHidden");
 function isSelectableInput(element) {
-  return element instanceof HTMLInputElement && "select" in element;
+  return element.tagName === "INPUT" && typeof element.select === "function";
 }
-__name$c(isSelectableInput, "isSelectableInput");
+__name$b(isSelectableInput, "isSelectableInput");
 function focus(element, { select = false } = {}) {
   if (element && element.focus) {
-    const previouslyFocusedElement = document.activeElement;
+    const ownerDocument = element.ownerDocument ?? document;
+    const previouslyFocusedElement = ownerDocument.activeElement;
     element.focus({ preventScroll: true });
     if (element !== previouslyFocusedElement && isSelectableInput(element) && select)
       element.select();
   }
 }
-__name$c(focus, "focus");
+__name$b(focus, "focus");
 var focusScopesStack = createFocusScopesStack();
 function createFocusScopesStack() {
   let stack = [];
@@ -47473,7 +48036,7 @@ function createFocusScopesStack() {
     }
   };
 }
-__name$c(createFocusScopesStack, "createFocusScopesStack");
+__name$b(createFocusScopesStack, "createFocusScopesStack");
 function arrayRemove(array2, item) {
   const updatedArray = [...array2];
   const index2 = updatedArray.indexOf(item);
@@ -47482,20 +48045,20 @@ function arrayRemove(array2, item) {
   }
   return updatedArray;
 }
-__name$c(arrayRemove, "arrayRemove");
+__name$b(arrayRemove, "arrayRemove");
 function removeLinks(items2) {
   return items2.filter((item) => item.tagName !== "A");
 }
-__name$c(removeLinks, "removeLinks");
-var __defProp$b = Object.defineProperty;
-var __name$b = (target, value) => __defProp$b(target, "name", { value, configurable: true });
+__name$b(removeLinks, "removeLinks");
+var __defProp$a = Object.defineProperty;
+var __name$a = (target, value) => __defProp$a(target, "name", { value, configurable: true });
 var count = 0;
 var guards = null;
 function FocusGuards(props) {
   useFocusGuards();
   return props.children;
 }
-__name$b(FocusGuards, "FocusGuards");
+__name$a(FocusGuards, "FocusGuards");
 function useFocusGuards() {
   reactExports.useEffect(() => {
     if (!guards) {
@@ -47519,7 +48082,7 @@ function useFocusGuards() {
     };
   }, []);
 }
-__name$b(useFocusGuards, "useFocusGuards");
+__name$a(useFocusGuards, "useFocusGuards");
 function createFocusGuard() {
   const element = document.createElement("span");
   element.setAttribute("data-radix-focus-guard", "");
@@ -47530,7 +48093,7 @@ function createFocusGuard() {
   element.style.pointerEvents = "none";
   return element;
 }
-__name$b(createFocusGuard, "createFocusGuard");
+__name$a(createFocusGuard, "createFocusGuard");
 var __assign = function() {
   __assign = Object.assign || function __assign2(t2) {
     for (var s2, i2 = 1, n = arguments.length; i2 < n; i2++) {
@@ -48310,12 +48873,12 @@ var hideOthers = function(originalTarget, parentNode, markerName) {
   targets.push.apply(targets, Array.from(activeParentNode.querySelectorAll("[aria-live], script")));
   return applyAttributeToOthers(targets, activeParentNode, markerName, "aria-hidden");
 };
-var __defProp$a = Object.defineProperty;
-var __name$a = (target, value) => __defProp$a(target, "name", { value, configurable: true });
+var __defProp$9 = Object.defineProperty;
+var __name$9 = (target, value) => __defProp$9(target, "name", { value, configurable: true });
 var DIALOG_NAME = "Dialog";
 var [createDialogContext, createDialogScope] = /* @__PURE__ */ createContextScope(DIALOG_NAME);
 var [DialogProvider, useDialogContext] = createDialogContext(DIALOG_NAME);
-var Dialog$1 = /* @__PURE__ */ __name$a((props) => {
+var Dialog$1 = /* @__PURE__ */ __name$9((props) => {
   const {
     __scopeDialog,
     children,
@@ -48326,6 +48889,7 @@ var Dialog$1 = /* @__PURE__ */ __name$a((props) => {
   } = props;
   const triggerRef = reactExports.useRef(null);
   const contentRef = reactExports.useRef(null);
+  const { nodes: branchNodes, registry: branchRegistry } = useFocusScopeBranchRegistry();
   const [open, setOpen] = useControllableState({
     prop: openProp,
     defaultProp: defaultOpen ?? false,
@@ -48351,6 +48915,8 @@ var Dialog$1 = /* @__PURE__ */ __name$a((props) => {
       onOpenChange: setOpen,
       onOpenToggle: reactExports.useCallback(() => setOpen((prevOpen) => !prevOpen), [setOpen]),
       modal,
+      branchNodes,
+      branchRegistry,
       children
     }
   );
@@ -48359,14 +48925,14 @@ var PORTAL_NAME$3 = "DialogPortal";
 var [PortalProvider$3, usePortalContext$3] = createDialogContext(PORTAL_NAME$3, {
   forceMount: void 0
 });
-var DialogPortal$1 = /* @__PURE__ */ __name$a((props) => {
+var DialogPortal$1 = /* @__PURE__ */ __name$9((props) => {
   const { __scopeDialog, forceMount, children, container } = props;
   const context = useDialogContext(PORTAL_NAME$3, __scopeDialog);
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(PortalProvider$3, { scope: __scopeDialog, forceMount, children: reactExports.Children.map(children, (child) => /* @__PURE__ */ jsxRuntimeExports.jsx(Presence, { present: forceMount || context.open, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Portal$1, { asChild: true, container, children: child }) })) });
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(PortalProvider$3, { scope: __scopeDialog, forceMount, children: reactExports.Children.map(children, (child) => /* @__PURE__ */ jsxRuntimeExports.jsx(Presence, { present: forceMount || context.open, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Portal, { asChild: true, container, children: child }) })) });
 }, "DialogPortal");
 var OVERLAY_NAME = "DialogOverlay";
 var DialogOverlay$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$a(function DialogOverlay2(props, forwardedRef) {
+  /* @__PURE__ */ __name$9(function DialogOverlay2(props, forwardedRef) {
     const portalContext = usePortalContext$3(OVERLAY_NAME, props.__scopeDialog);
     const { forceMount = portalContext.forceMount, ...overlayProps } = props;
     const context = useDialogContext(OVERLAY_NAME, props.__scopeDialog);
@@ -48376,29 +48942,42 @@ var DialogOverlay$1 = /* @__PURE__ */ reactExports.forwardRef(
 var Slot$2 = /* @__PURE__ */ createSlot("DialogOverlay.RemoveScroll");
 var DialogOverlayImpl = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$a(function DialogOverlayImpl2(props, forwardedRef) {
+  /* @__PURE__ */ __name$9(function DialogOverlayImpl2(props, forwardedRef) {
     const { __scopeDialog, ...overlayProps } = props;
     const context = useDialogContext(OVERLAY_NAME, __scopeDialog);
     const registerDismissableSurface = useDismissableLayerSurface();
     const composedRefs = useComposedRefs(forwardedRef, registerDismissableSurface);
     return (
-      // Make sure `Content` is scrollable even when it doesn't live inside `RemoveScroll`
-      // ie. when `Overlay` and `Content` are siblings
-      /* @__PURE__ */ jsxRuntimeExports.jsx(ReactRemoveScroll, { as: Slot$2, allowPinchZoom: true, shards: [context.contentRef], children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-        Primitive.div,
+      // Make sure `Content` is scrollable even when it doesn't live inside
+      // `RemoveScroll` (eg. when `Overlay` and `Content` are siblings). Nested
+      // layers are registered as branches and added as shards so they remain
+      // scrollable too. See https://github.com/radix-ui/primitives/issues/3423
+      /* @__PURE__ */ jsxRuntimeExports.jsx(
+        ReactRemoveScroll,
         {
-          "data-state": getState$3(context.open),
-          ...overlayProps,
-          ref: composedRefs,
-          style: { pointerEvents: "auto", ...overlayProps.style }
+          as: Slot$2,
+          allowPinchZoom: true,
+          shards: reactExports.useMemo(
+            () => [context.contentRef, ...context.branchNodes.map((node) => ({ current: node }))],
+            [context.contentRef, context.branchNodes]
+          ),
+          children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+            Primitive.div,
+            {
+              "data-state": getState$3(context.open),
+              ...overlayProps,
+              ref: composedRefs,
+              style: { pointerEvents: "auto", ...overlayProps.style }
+            }
+          )
         }
-      ) })
+      )
     );
   }, "DialogOverlayImpl")
 );
 var CONTENT_NAME$4 = "DialogContent";
 var DialogContent$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$a(function DialogContent2(props, forwardedRef) {
+  /* @__PURE__ */ __name$9(function DialogContent2(props, forwardedRef) {
     const portalContext = usePortalContext$3(CONTENT_NAME$4, props.__scopeDialog);
     const { forceMount = portalContext.forceMount, ...contentProps } = props;
     const context = useDialogContext(CONTENT_NAME$4, props.__scopeDialog);
@@ -48407,7 +48986,7 @@ var DialogContent$1 = /* @__PURE__ */ reactExports.forwardRef(
 );
 var DialogContentModal = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$a(function DialogContentModal2(props, forwardedRef) {
+  /* @__PURE__ */ __name$9(function DialogContentModal2(props, forwardedRef) {
     const context = useDialogContext(CONTENT_NAME$4, props.__scopeDialog);
     const contentRef = reactExports.useRef(null);
     const composedRefs = useComposedRefs(forwardedRef, context.contentRef, contentRef);
@@ -48442,7 +49021,7 @@ var DialogContentModal = /* @__PURE__ */ reactExports.forwardRef(
 );
 var DialogContentNonModal = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$a(function DialogContentNonModal2(props, forwardedRef) {
+  /* @__PURE__ */ __name$9(function DialogContentNonModal2(props, forwardedRef) {
     const context = useDialogContext(CONTENT_NAME$4, props.__scopeDialog);
     const hasInteractedOutsideRef = reactExports.useRef(false);
     const hasPointerDownOutsideRef = reactExports.useRef(false);
@@ -48483,16 +49062,25 @@ var DialogContentNonModal = /* @__PURE__ */ reactExports.forwardRef(
 );
 var DialogContentImpl = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$a(function DialogContentImpl2(props, forwardedRef) {
-    const { __scopeDialog, trapFocus, onOpenAutoFocus, onCloseAutoFocus, ...contentProps } = props;
+  /* @__PURE__ */ __name$9(function DialogContentImpl2(props, forwardedRef) {
+    const {
+      __scopeDialog,
+      trapFocus,
+      onOpenAutoFocus,
+      onCloseAutoFocus,
+      "aria-describedby": ariaDescribedby,
+      children,
+      ...contentProps
+    } = props;
     const context = useDialogContext(CONTENT_NAME$4, __scopeDialog);
     useFocusGuards();
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(FocusScopeBranchProvider, { registry: context.branchRegistry, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
       FocusScope,
       {
         asChild: true,
         loop: true,
         trapped: trapFocus,
+        branches: context.branchNodes,
         onMountAutoFocus: onOpenAutoFocus,
         onUnmountAutoFocus: onCloseAutoFocus,
         children: /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -48500,24 +49088,24 @@ var DialogContentImpl = /* @__PURE__ */ reactExports.forwardRef(
           {
             role: "dialog",
             id: context.contentId,
-            "aria-describedby": context.descriptionPresent ? context.descriptionId : void 0,
             "aria-labelledby": context.titlePresent ? context.titleId : void 0,
+            "aria-describedby": context.descriptionPresent ? concatAriaDescribedby$2(ariaDescribedby, context.descriptionId) : ariaDescribedby,
             "data-state": getState$3(context.open),
             ...contentProps,
             ref: forwardedRef,
             deferPointerDownOutside: true,
-            onDismiss: () => context.onOpenChange(false)
+            onDismiss: () => context.onOpenChange(false),
+            children
           }
         )
       }
     ) });
   }, "DialogContentImpl")
 );
-var TITLE_NAME = "DialogTitle";
 var DialogTitle$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$a(function DialogTitle2(props, forwardedRef) {
+  /* @__PURE__ */ __name$9(function DialogTitle2(props, forwardedRef) {
     const { __scopeDialog, ...titleProps } = props;
-    const context = useDialogContext(TITLE_NAME, __scopeDialog);
+    const context = useDialogContext("DialogTitle", __scopeDialog);
     const { setTitleCount } = context;
     useLayoutEffect2(() => {
       setTitleCount((count2) => count2 + 1);
@@ -48526,12 +49114,11 @@ var DialogTitle$1 = /* @__PURE__ */ reactExports.forwardRef(
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Primitive.h2, { id: context.titleId, ...titleProps, ref: forwardedRef });
   }, "DialogTitle")
 );
-var DESCRIPTION_NAME = "DialogDescription";
 var DialogDescription$1 = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$a(function DialogDescription2(props, forwardedRef) {
+  /* @__PURE__ */ __name$9(function DialogDescription2(props, forwardedRef) {
     const { __scopeDialog, ...descriptionProps } = props;
-    const context = useDialogContext(DESCRIPTION_NAME, __scopeDialog);
+    const context = useDialogContext("DialogDescription", __scopeDialog);
     const { setDescriptionCount } = context;
     useLayoutEffect2(() => {
       setDescriptionCount((count2) => count2 + 1);
@@ -48542,7 +49129,7 @@ var DialogDescription$1 = /* @__PURE__ */ reactExports.forwardRef(
 );
 var CLOSE_NAME = "DialogClose";
 var DialogClose = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$a(function DialogClose2(props, forwardedRef) {
+  /* @__PURE__ */ __name$9(function DialogClose2(props, forwardedRef) {
     const { __scopeDialog, ...closeProps } = props;
     const context = useDialogContext(CLOSE_NAME, __scopeDialog);
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -48556,10 +49143,21 @@ var DialogClose = /* @__PURE__ */ reactExports.forwardRef(
     );
   }, "DialogClose")
 );
+function concatAriaDescribedby$2(...values) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const value of values) {
+    if (typeof value !== "string") continue;
+    for (const id2 of String(value).trim().split(/\s+/)) {
+      if (id2) ids.add(id2);
+    }
+  }
+  return ids.size > 0 ? Array.from(ids).join(" ") : void 0;
+}
+__name$9(concatAriaDescribedby$2, "concatAriaDescribedby");
 function getState$3(open) {
   return open ? "open" : "closed";
 }
-__name$a(getState$3, "getState");
+__name$9(getState$3, "getState");
 var N$1 = '[cmdk-group=""]', Y = '[cmdk-group-items=""]', be = '[cmdk-group-heading=""]', le$1 = '[cmdk-item=""]', ce$1 = `${le$1}:not([aria-disabled="true"])`, Z$1 = "cmdk-item-select", T = "data-value", Re$1 = (r2, o2, n) => W(r2, o2, n), ue = reactExports.createContext(void 0), K$1 = () => reactExports.useContext(ue), de$1 = reactExports.createContext(void 0), ee$1 = () => reactExports.useContext(de$1), fe$1 = reactExports.createContext(void 0), me = reactExports.forwardRef((r2, o2) => {
   let n = L$1(() => {
     var e2, a2;
@@ -50905,13 +51503,14 @@ const arrow = (options2, deps) => {
     options: [options2, deps]
   };
 };
-var __defProp$9 = Object.defineProperty;
-var __name$9 = (target, value) => __defProp$9(target, "name", { value, configurable: true });
+var __defProp$8 = Object.defineProperty;
+var __name$8 = (target, value) => __defProp$8(target, "name", { value, configurable: true });
 function useSize(element) {
   const [size2, setSize] = reactExports.useState(void 0);
   useLayoutEffect2(() => {
     if (element) {
       setSize({ width: element.offsetWidth, height: element.offsetHeight });
+      let rAF = 0;
       const resizeObserver = new ResizeObserver((entries) => {
         if (!Array.isArray(entries)) {
           return;
@@ -50920,34 +51519,47 @@ function useSize(element) {
           return;
         }
         const entry = entries[0];
-        let width;
-        let height;
-        if ("borderBoxSize" in entry) {
-          const borderSizeEntry = entry["borderBoxSize"];
-          const borderSize = Array.isArray(borderSizeEntry) ? borderSizeEntry[0] : borderSizeEntry;
-          width = borderSize["inlineSize"];
-          height = borderSize["blockSize"];
-        } else {
-          width = element.offsetWidth;
-          height = element.offsetHeight;
-        }
-        setSize({ width, height });
+        window.cancelAnimationFrame(rAF);
+        rAF = window.requestAnimationFrame(() => {
+          let width;
+          let height;
+          if ("borderBoxSize" in entry) {
+            const borderSizeEntry = entry["borderBoxSize"];
+            const borderSize = Array.isArray(borderSizeEntry) ? borderSizeEntry[0] : borderSizeEntry;
+            width = borderSize["inlineSize"];
+            height = borderSize["blockSize"];
+          } else {
+            width = element.offsetWidth;
+            height = element.offsetHeight;
+          }
+          setSize({ width, height });
+        });
       });
       resizeObserver.observe(element, { box: "border-box" });
-      return () => resizeObserver.unobserve(element);
+      return () => {
+        window.cancelAnimationFrame(rAF);
+        resizeObserver.unobserve(element);
+      };
     } else {
       setSize(void 0);
     }
   }, [element]);
   return size2;
 }
-__name$9(useSize, "useSize");
-var __defProp$8 = Object.defineProperty;
-var __name$8 = (target, value) => __defProp$8(target, "name", { value, configurable: true });
+__name$8(useSize, "useSize");
+var __defProp$7 = Object.defineProperty;
+var __name$7 = (target, value) => __defProp$7(target, "name", { value, configurable: true });
+var Sticky = {
+  Partial: "partial"
+};
+var UpdatePositionStrategy = {
+  Optimized: "optimized",
+  Always: "always"
+};
 var POPPER_NAME = "Popper";
 var [createPopperContext, createPopperScope] = /* @__PURE__ */ createContextScope(POPPER_NAME);
 var [PopperProvider, usePopperContext] = createPopperContext(POPPER_NAME);
-var Popper = /* @__PURE__ */ __name$8((props) => {
+var Popper = /* @__PURE__ */ __name$7((props) => {
   const { __scopePopper, children } = props;
   const [anchor, setAnchor] = reactExports.useState(null);
   const [placementState, setPlacementState] = reactExports.useState(void 0);
@@ -50965,7 +51577,7 @@ var Popper = /* @__PURE__ */ __name$8((props) => {
 }, "Popper");
 var ANCHOR_NAME = "PopperAnchor";
 var PopperAnchor = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$8(function PopperAnchor2(props, forwardedRef) {
+  /* @__PURE__ */ __name$7(function PopperAnchor2(props, forwardedRef) {
     const { __scopePopper, virtualRef, ...anchorProps } = props;
     const context = usePopperContext(ANCHOR_NAME, __scopePopper);
     const ref2 = reactExports.useRef(null);
@@ -51008,7 +51620,7 @@ var PopperAnchor = /* @__PURE__ */ reactExports.forwardRef(
 var CONTENT_NAME$3 = "PopperContent";
 var [PopperContentProvider, useContentContext] = createPopperContext(CONTENT_NAME$3);
 var PopperContent = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$8(function PopperContent2(props, forwardedRef) {
+  /* @__PURE__ */ __name$7(function PopperContent2(props, forwardedRef) {
     const {
       __scopePopper,
       side = "bottom",
@@ -51019,9 +51631,9 @@ var PopperContent = /* @__PURE__ */ reactExports.forwardRef(
       avoidCollisions = true,
       collisionBoundary = [],
       collisionPadding: collisionPaddingProp = 0,
-      sticky = "partial",
+      sticky = Sticky.Partial,
       hideWhenDetached = false,
-      updatePositionStrategy = "optimized",
+      updatePositionStrategy = UpdatePositionStrategy.Optimized,
       onPlaced,
       ...contentProps
     } = props;
@@ -51046,9 +51658,9 @@ var PopperContent = /* @__PURE__ */ reactExports.forwardRef(
       // default to `fixed` strategy so users don't have to pick and we also avoid focus scroll issues
       strategy: "fixed",
       placement: desiredPlacement,
-      whileElementsMounted: /* @__PURE__ */ __name$8((...args) => {
+      whileElementsMounted: /* @__PURE__ */ __name$7((...args) => {
         const cleanup = autoUpdate(...args, {
-          animationFrame: updatePositionStrategy === "always"
+          animationFrame: updatePositionStrategy === UpdatePositionStrategy.Always
         });
         return cleanup;
       }, "whileElementsMounted"),
@@ -51060,13 +51672,15 @@ var PopperContent = /* @__PURE__ */ reactExports.forwardRef(
         avoidCollisions && shift({
           mainAxis: true,
           crossAxis: false,
-          limiter: sticky === "partial" ? limitShift() : void 0,
+          // Spread rather than passing `limiter: undefined`, which
+          // `exactOptionalPropertyTypes` rejects for Floating UI's optional option.
+          ...sticky === Sticky.Partial ? { limiter: limitShift() } : {},
           ...detectOverflowOptions
         }),
         avoidCollisions && flip({ ...detectOverflowOptions }),
         size({
           ...detectOverflowOptions,
-          apply: /* @__PURE__ */ __name$8(({ elements, rects, availableWidth, availableHeight }) => {
+          apply: /* @__PURE__ */ __name$7(({ elements, rects, availableWidth, availableHeight }) => {
             const { width: anchorWidth, height: anchorHeight } = rects.reference;
             const contentStyle = elements.floating.style;
             contentStyle.setProperty("--radix-popper-available-width", `${availableWidth}px`);
@@ -51077,18 +51691,22 @@ var PopperContent = /* @__PURE__ */ reactExports.forwardRef(
         }),
         arrow$12 && arrow({ element: arrow$12, padding: arrowPadding }),
         transformOrigin({ arrowWidth, arrowHeight }),
-        hideWhenDetached && hide({
-          strategy: "referenceHidden",
-          ...detectOverflowOptions,
-          // `hide` detects whether the anchor (reference) is clipped, so when
-          // no explicit `collisionBoundary` is set we fall back to Floating
-          // UI's default clipping ancestors (e.g. a scrollable menu). This
-          // lets an occluded submenu hide once its anchor scrolls out of view
-          // (#3237). The collision/size middlewares deliberately keep the
-          // viewport-based default to avoid clamping content rendered inside
-          // transformed or overflow-clipping portal containers.
-          boundary: hasExplicitBoundaries ? detectOverflowOptions.boundary : void 0
-        })
+        hideWhenDetached && // `hide` detects whether the anchor (reference) is clipped, so when
+        // no explicit `collisionBoundary` is set we omit `boundary` entirely
+        // and fall back to Floating UI's default clipping ancestors (e.g. a
+        // scrollable menu). This lets an occluded submenu hide once its anchor
+        // scrolls out of view (#3237). The collision/size middlewares
+        // deliberately keep the viewport-based default to avoid clamping
+        // content rendered inside transformed or overflow-clipping portal
+        // containers. The key is omitted rather than set to `undefined`
+        // because `exactOptionalPropertyTypes` rejects the explicit value.
+        hide(
+          hasExplicitBoundaries ? { strategy: "referenceHidden", ...detectOverflowOptions } : {
+            strategy: "referenceHidden",
+            padding: detectOverflowOptions.padding,
+            altBoundary: detectOverflowOptions.altBoundary
+          }
+        )
       ]
     });
     const setPlacementState = context.setPlacementState;
@@ -51171,8 +51789,8 @@ var PopperContent = /* @__PURE__ */ reactExports.forwardRef(
 function isNotNull(value) {
   return value !== null;
 }
-__name$8(isNotNull, "isNotNull");
-var transformOrigin = /* @__PURE__ */ __name$8((options2) => ({
+__name$7(isNotNull, "isNotNull");
+var transformOrigin = /* @__PURE__ */ __name$7((options2) => ({
   name: "transformOrigin",
   options: options2,
   fn(data2) {
@@ -51207,19 +51825,16 @@ function getSideAndAlignFromPlacement(placement) {
   const [side, align = "center"] = placement.split("-");
   return [side, align];
 }
-__name$8(getSideAndAlignFromPlacement, "getSideAndAlignFromPlacement");
-var Root2$1 = Popper;
-var Anchor = PopperAnchor;
-var Content = PopperContent;
-var __defProp$7 = Object.defineProperty;
-var __name$7 = (target, value) => __defProp$7(target, "name", { value, configurable: true });
+__name$7(getSideAndAlignFromPlacement, "getSideAndAlignFromPlacement");
+var __defProp$6 = Object.defineProperty;
+var __name$6 = (target, value) => __defProp$6(target, "name", { value, configurable: true });
 var POPOVER_NAME = "Popover";
 var [createPopoverContext, createPopoverScope] = /* @__PURE__ */ createContextScope(POPOVER_NAME, [
   createPopperScope
 ]);
 var usePopperScope$2 = createPopperScope();
 var [PopoverProvider, usePopoverContext] = createPopoverContext(POPOVER_NAME);
-var Popover$1 = /* @__PURE__ */ __name$7((props) => {
+var Popover$1 = /* @__PURE__ */ __name$6((props) => {
   const {
     __scopePopover,
     children,
@@ -51231,17 +51846,25 @@ var Popover$1 = /* @__PURE__ */ __name$7((props) => {
   const popperScope = usePopperScope$2(__scopePopover);
   const triggerRef = reactExports.useRef(null);
   const [hasCustomAnchor, setHasCustomAnchor] = reactExports.useState(false);
+  const [titleCount, setTitleCount] = reactExports.useState(0);
+  const [descriptionCount, setDescriptionCount] = reactExports.useState(0);
   const [open, setOpen] = useControllableState({
     prop: openProp,
     defaultProp: defaultOpen ?? false,
     onChange: onOpenChange,
     caller: POPOVER_NAME
   });
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(Root2$1, { ...popperScope, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(Popper, { ...popperScope, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
     PopoverProvider,
     {
       scope: __scopePopover,
       contentId: useId(),
+      titleId: useId(),
+      descriptionId: useId(),
+      titlePresent: titleCount > 0,
+      descriptionPresent: descriptionCount > 0,
+      setTitleCount,
+      setDescriptionCount,
       triggerRef,
       open,
       onOpenChange: setOpen,
@@ -51256,7 +51879,7 @@ var Popover$1 = /* @__PURE__ */ __name$7((props) => {
 }, "Popover");
 var TRIGGER_NAME$4 = "PopoverTrigger";
 var PopoverTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$7(function PopoverTrigger2(props, forwardedRef) {
+  /* @__PURE__ */ __name$6(function PopoverTrigger2(props, forwardedRef) {
     const { __scopePopover, ...triggerProps } = props;
     const context = usePopoverContext(TRIGGER_NAME$4, __scopePopover);
     const popperScope = usePopperScope$2(__scopePopover);
@@ -51274,22 +51897,22 @@ var PopoverTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
         onClick: composeEventHandlers(props.onClick, context.onOpenToggle)
       }
     );
-    return context.hasCustomAnchor ? trigger : /* @__PURE__ */ jsxRuntimeExports.jsx(Anchor, { asChild: true, ...popperScope, children: trigger });
+    return context.hasCustomAnchor ? trigger : /* @__PURE__ */ jsxRuntimeExports.jsx(PopperAnchor, { asChild: true, ...popperScope, children: trigger });
   }, "PopoverTrigger")
 );
 var PORTAL_NAME$2 = "PopoverPortal";
 var [PortalProvider$2, usePortalContext$2] = createPopoverContext(PORTAL_NAME$2, {
   forceMount: void 0
 });
-var PopoverPortal = /* @__PURE__ */ __name$7((props) => {
+var PopoverPortal = /* @__PURE__ */ __name$6((props) => {
   const { __scopePopover, forceMount, children, container } = props;
   const context = usePopoverContext(PORTAL_NAME$2, __scopePopover);
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(PortalProvider$2, { scope: __scopePopover, forceMount, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Presence, { present: forceMount || context.open, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Portal$1, { asChild: true, container, children }) }) });
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(PortalProvider$2, { scope: __scopePopover, forceMount, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Presence, { present: forceMount || context.open, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Portal, { asChild: true, container, children }) }) });
 }, "PopoverPortal");
 var CONTENT_NAME$2 = "PopoverContent";
 var PopoverContent$1 = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$7(function PopoverContent2(props, forwardedRef) {
+  /* @__PURE__ */ __name$6(function PopoverContent2(props, forwardedRef) {
     const portalContext = usePortalContext$2(CONTENT_NAME$2, props.__scopePopover);
     const { forceMount = portalContext.forceMount, ...contentProps } = props;
     const context = usePopoverContext(CONTENT_NAME$2, props.__scopePopover);
@@ -51299,48 +51922,62 @@ var PopoverContent$1 = /* @__PURE__ */ reactExports.forwardRef(
 var Slot$1 = /* @__PURE__ */ createSlot("PopoverContent.RemoveScroll");
 var PopoverContentModal = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$7(function PopoverContentModal2(props, forwardedRef) {
+  /* @__PURE__ */ __name$6(function PopoverContentModal2(props, forwardedRef) {
     const context = usePopoverContext(CONTENT_NAME$2, props.__scopePopover);
     const contentRef = reactExports.useRef(null);
     const composedRefs = useComposedRefs(forwardedRef, contentRef);
     const isRightClickOutsideRef = reactExports.useRef(false);
+    const { nodes: branchNodes, registry: branchRegistry } = useFocusScopeBranchRegistry();
     reactExports.useEffect(() => {
       const content = contentRef.current;
       if (content) return hideOthers(content);
     }, []);
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(ReactRemoveScroll, { as: Slot$1, allowPinchZoom: true, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-      PopoverContentImpl,
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(
+      ReactRemoveScroll,
       {
-        ...props,
-        ref: composedRefs,
-        trapFocus: context.open,
-        disableOutsidePointerEvents: true,
-        onCloseAutoFocus: composeEventHandlers(props.onCloseAutoFocus, (event) => {
-          event.preventDefault();
-          if (!isRightClickOutsideRef.current) context.triggerRef.current?.focus();
-        }),
-        onPointerDownOutside: composeEventHandlers(
-          props.onPointerDownOutside,
-          (event) => {
-            const originalEvent = event.detail.originalEvent;
-            const ctrlLeftClick = originalEvent.button === 0 && originalEvent.ctrlKey === true;
-            const isRightClick = originalEvent.button === 2 || ctrlLeftClick;
-            isRightClickOutsideRef.current = isRightClick;
-          },
-          { checkForDefaultPrevented: false }
+        as: Slot$1,
+        allowPinchZoom: true,
+        shards: reactExports.useMemo(
+          () => [contentRef, ...branchNodes.map((node) => ({ current: node }))],
+          [contentRef, branchNodes]
         ),
-        onFocusOutside: composeEventHandlers(
-          props.onFocusOutside,
-          (event) => event.preventDefault(),
-          { checkForDefaultPrevented: false }
+        children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+          PopoverContentImpl,
+          {
+            ...props,
+            ref: composedRefs,
+            branchNodes,
+            branchRegistry,
+            trapFocus: context.open,
+            disableOutsidePointerEvents: true,
+            onCloseAutoFocus: composeEventHandlers(props.onCloseAutoFocus, (event) => {
+              event.preventDefault();
+              if (!isRightClickOutsideRef.current) context.triggerRef.current?.focus();
+            }),
+            onPointerDownOutside: composeEventHandlers(
+              props.onPointerDownOutside,
+              (event) => {
+                const originalEvent = event.detail.originalEvent;
+                const ctrlLeftClick = originalEvent.button === 0 && originalEvent.ctrlKey === true;
+                const isRightClick = originalEvent.button === 2 || ctrlLeftClick;
+                isRightClickOutsideRef.current = isRightClick;
+              },
+              { checkForDefaultPrevented: false }
+            ),
+            onFocusOutside: composeEventHandlers(
+              props.onFocusOutside,
+              (event) => event.preventDefault(),
+              { checkForDefaultPrevented: false }
+            )
+          }
         )
       }
-    ) });
+    );
   }, "PopoverContentModal")
 );
 var PopoverContentNonModal = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$7(function PopoverContentNonModal2(props, forwardedRef) {
+  /* @__PURE__ */ __name$6(function PopoverContentNonModal2(props, forwardedRef) {
     const context = usePopoverContext(CONTENT_NAME$2, props.__scopePopover);
     const hasInteractedOutsideRef = reactExports.useRef(false);
     const hasPointerDownOutsideRef = reactExports.useRef(false);
@@ -51381,7 +52018,7 @@ var PopoverContentNonModal = /* @__PURE__ */ reactExports.forwardRef(
 );
 var PopoverContentImpl = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
-  /* @__PURE__ */ __name$7(function PopoverContentImpl2(props, forwardedRef) {
+  /* @__PURE__ */ __name$6(function PopoverContentImpl2(props, forwardedRef) {
     const {
       __scopePopover,
       trapFocus,
@@ -51392,17 +52029,24 @@ var PopoverContentImpl = /* @__PURE__ */ reactExports.forwardRef(
       onPointerDownOutside,
       onFocusOutside,
       onInteractOutside,
+      "aria-describedby": ariaDescribedby,
+      branchNodes,
+      branchRegistry,
       ...contentProps
     } = props;
     const context = usePopoverContext(CONTENT_NAME$2, __scopePopover);
     const popperScope = usePopperScope$2(__scopePopover);
+    const [contentNode, setContentNode] = reactExports.useState(null);
+    const composedRefs = useComposedRefs(forwardedRef, setContentNode);
+    useFocusScopeBranch(contentNode);
     useFocusGuards();
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(FocusScopeBranchProvider, { registry: branchRegistry, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
       FocusScope,
       {
         asChild: true,
         loop: true,
         trapped: trapFocus,
+        branches: branchNodes,
         onMountAutoFocus: onOpenAutoFocus,
         onUnmountAutoFocus: onCloseAutoFocus,
         children: /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -51417,14 +52061,16 @@ var PopoverContentImpl = /* @__PURE__ */ reactExports.forwardRef(
             onDismiss: () => context.onOpenChange(false),
             deferPointerDownOutside: true,
             children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-              Content,
+              PopperContent,
               {
                 "data-state": getState$2(context.open),
                 role: "dialog",
                 id: context.contentId,
+                "aria-labelledby": context.titlePresent ? context.titleId : void 0,
+                "aria-describedby": context.descriptionPresent ? concatAriaDescribedby$1(ariaDescribedby, context.descriptionId) : ariaDescribedby,
                 ...popperScope,
                 ...contentProps,
-                ref: forwardedRef,
+                ref: composedRefs,
                 style: {
                   ...contentProps.style,
                   // re-namespace exposed content custom properties
@@ -51441,21 +52087,28 @@ var PopoverContentImpl = /* @__PURE__ */ reactExports.forwardRef(
           }
         )
       }
-    );
+    ) });
   }, "PopoverContentImpl")
 );
 function getState$2(open) {
   return open ? "open" : "closed";
 }
-__name$7(getState$2, "getState");
-var Root2 = Popover$1;
-var Trigger$1 = PopoverTrigger$1;
-var Portal = PopoverPortal;
-var Content2$1 = PopoverContent$1;
-const Popover = Root2;
-const PopoverTrigger = Trigger$1;
-const PopoverContent = reactExports.forwardRef(({ className, align = "center", sideOffset = 4, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(Portal, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-  Content2$1,
+__name$6(getState$2, "getState");
+function concatAriaDescribedby$1(...values) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const value of values) {
+    if (typeof value !== "string") continue;
+    for (const id2 of String(value).trim().split(/\s+/)) {
+      if (id2) ids.add(id2);
+    }
+  }
+  return ids.size > 0 ? Array.from(ids).join(" ") : void 0;
+}
+__name$6(concatAriaDescribedby$1, "concatAriaDescribedby");
+const Popover = Popover$1;
+const PopoverTrigger = PopoverTrigger$1;
+const PopoverContent = reactExports.forwardRef(({ className, align = "center", sideOffset = 4, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(PopoverPortal, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+  PopoverContent$1,
   {
     ref: ref2,
     align,
@@ -51467,7 +52120,7 @@ const PopoverContent = reactExports.forwardRef(({ className, align = "center", s
     ...props
   }
 ) }));
-PopoverContent.displayName = Content2$1.displayName;
+PopoverContent.displayName = PopoverContent$1.displayName;
 function Combobox({
   value,
   onChange,
@@ -51549,10 +52202,10 @@ function Combobox({
     ] }) })
   ] });
 }
-var __defProp$6 = Object.defineProperty;
-var __name$6 = (target, value) => __defProp$6(target, "name", { value, configurable: true });
+var __defProp$5 = Object.defineProperty;
+var __name$5 = (target, value) => __defProp$5(target, "name", { value, configurable: true });
 var Label$1 = /* @__PURE__ */ reactExports.forwardRef(
-  /* @__PURE__ */ __name$6(function Label2(props, forwardedRef) {
+  /* @__PURE__ */ __name$5(function Label2(props, forwardedRef) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
       Primitive.label,
       {
@@ -51568,19 +52221,18 @@ var Label$1 = /* @__PURE__ */ reactExports.forwardRef(
     );
   }, "Label")
 );
-var Root = Label$1;
 const labelVariants = cva(
   "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
 );
 const Label = reactExports.forwardRef(({ className, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(
-  Root,
+  Label$1,
   {
     ref: ref2,
     className: cn$1(labelVariants(), className),
     ...props
   }
 ));
-Label.displayName = Root.displayName;
+Label.displayName = Label$1.displayName;
 const Input = reactExports.forwardRef(
   ({ className, type: type2, ...props }, ref2) => {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -55133,27 +55785,21 @@ const SamplingTab = ({ pendingRequests, onApprove, onReject }) => {
     ] })
   ] }) });
 };
-var __defProp$5 = Object.defineProperty;
-var __name$5 = (target, value) => __defProp$5(target, "name", { value, configurable: true });
-function clamp(value, [min2, max2]) {
-  return Math.min(max2, Math.max(min2, value));
-}
-__name$5(clamp, "clamp");
 var __defProp$4 = Object.defineProperty;
 var __name$4 = (target, value) => __defProp$4(target, "name", { value, configurable: true });
-function usePrevious(value) {
-  const ref2 = reactExports.useRef({ value, previous: value });
-  return reactExports.useMemo(() => {
-    if (ref2.current.value !== value) {
-      ref2.current.previous = ref2.current.value;
-      ref2.current.value = value;
-    }
-    return ref2.current.previous;
-  }, [value]);
+function clamp(value, [min2, max2]) {
+  return Math.min(max2, Math.max(min2, value));
 }
-__name$4(usePrevious, "usePrevious");
+__name$4(clamp, "clamp");
 var __defProp$3 = Object.defineProperty;
 var __name$3 = (target, value) => __defProp$3(target, "name", { value, configurable: true });
+var Position = {
+  ItemAligned: "item-aligned",
+  Popper: "popper"
+};
+var Direction = {
+  RTL: "rtl"
+};
 var OPEN_KEYS = [" ", "Enter", "ArrowUp", "ArrowDown"];
 var SELECTION_KEYS = [" ", "Enter"];
 var SELECT_NAME = "Select";
@@ -55202,6 +55848,15 @@ function SelectProvider(props) {
     caller: SELECT_NAME
   });
   const triggerPointerDownPosRef = reactExports.useRef(null);
+  const hasConsumerStoppedPropagationRef = reactExports.useRef(false);
+  const [userSelection, setUserSelection] = reactExports.useState(null);
+  const handleUserSelect = /* @__PURE__ */ __name$3((nextValue) => {
+    setUserSelection({
+      value: nextValue,
+      hasConsumerStoppedPropagation: hasConsumerStoppedPropagationRef.current
+    });
+    setValue(nextValue);
+  }, "handleUserSelect");
   const initialValueRef = reactExports.useRef(value);
   reactExports.useEffect(() => {
     const associatedForm = form ? trigger?.ownerDocument.getElementById(form) : trigger?.form;
@@ -55236,6 +55891,9 @@ function SelectProvider(props) {
     contentId,
     value,
     onValueChange: setValue,
+    hasConsumerStoppedPropagationRef,
+    userSelection,
+    onUserSelect: handleUserSelect,
     open,
     onOpenChange: setOpen,
     dir: direction,
@@ -55248,7 +55906,7 @@ function SelectProvider(props) {
     nativeSelectKey,
     isFormControl
   };
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(Root2$1, { ...popperScope, children: /* @__PURE__ */ jsxRuntimeExports.jsx(SelectProviderImpl, { scope: __scopeSelect, ...context, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Collection.Provider, { scope: __scopeSelect, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(Popper, { ...popperScope, children: /* @__PURE__ */ jsxRuntimeExports.jsx(SelectProviderImpl, { scope: __scopeSelect, ...context, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Collection.Provider, { scope: __scopeSelect, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
     SelectNativeOptionsProvider,
     {
       scope: __scopeSelect,
@@ -55293,7 +55951,7 @@ var SelectTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
       const currentItem = enabledItems.find((item) => item.value === context.value);
       const nextItem = findNextItem(enabledItems, search, currentItem);
       if (nextItem !== void 0) {
-        context.onValueChange(nextItem.value);
+        context.onUserSelect(nextItem.value);
       }
     });
     const handleOpen = /* @__PURE__ */ __name$3((pointerEvent) => {
@@ -55308,7 +55966,7 @@ var SelectTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
         };
       }
     }, "handleOpen");
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(Anchor, { asChild: true, ...popperScope, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(PopperAnchor, { asChild: true, ...popperScope, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
       Primitive.button,
       {
         type: "button",
@@ -55344,7 +56002,10 @@ var SelectTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
         onKeyDown: composeEventHandlers(triggerProps.onKeyDown, (event) => {
           const isTypingAhead = searchRef.current !== "";
           const isModifierKey = event.ctrlKey || event.altKey || event.metaKey;
-          if (!isModifierKey && event.key.length === 1) handleTypeaheadSearch(event.key);
+          if (!isModifierKey && event.key.length === 1) {
+            context.hasConsumerStoppedPropagationRef.current = event.isPropagationStopped();
+            handleTypeaheadSearch(event.key);
+          }
           if (isTypingAhead && event.key === " ") return;
           if (OPEN_KEYS.includes(event.key)) {
             handleOpen();
@@ -55391,7 +56052,7 @@ var [PortalProvider$1, usePortalContext$1] = createSelectContext(PORTAL_NAME$1,
 });
 var SelectPortal = /* @__PURE__ */ __name$3((props) => {
   const { __scopeSelect, forceMount, ...portalProps } = props;
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(PortalProvider$1, { scope: props.__scopeSelect, forceMount, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Portal$1, { asChild: true, ...portalProps }) });
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(PortalProvider$1, { scope: props.__scopeSelect, forceMount, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Portal, { asChild: true, ...portalProps }) });
 }, "SelectPortal");
 var CONTENT_NAME$1 = "SelectContent";
 var SelectContent$1 = /* @__PURE__ */ reactExports.forwardRef(
@@ -55422,7 +56083,7 @@ var SelectContentImpl = /* @__PURE__ */ reactExports.forwardRef(
   /* @__PURE__ */ __name$3(function SelectContentImpl2(props, forwardedRef) {
     const { __scopeSelect } = props;
     const {
-      position = "item-aligned",
+      position = Position.ItemAligned,
       onCloseAutoFocus,
       onEscapeKeyDown,
       onPointerDownOutside,
@@ -55452,6 +56113,8 @@ var SelectContentImpl = /* @__PURE__ */ reactExports.forwardRef(
     const getItems = useCollection(__scopeSelect);
     const [isPositioned, setIsPositioned] = reactExports.useState(false);
     const firstValidItemFoundRef = reactExports.useRef(false);
+    const firstItemFoundRef = reactExports.useRef(false);
+    const firstItemTextFoundRef = reactExports.useRef(false);
     reactExports.useEffect(() => {
       if (content) return hideOthers(content);
     }, [content]);
@@ -55531,11 +56194,15 @@ var SelectContentImpl = /* @__PURE__ */ reactExports.forwardRef(
     });
     const itemRefCallback = reactExports.useCallback(
       (node, value, disabled) => {
+        const isFirstItem = !firstItemFoundRef.current;
+        if (isFirstItem) firstItemFoundRef.current = true;
         const isFirstValidItem = !firstValidItemFoundRef.current && !disabled;
         const isSelectedItem = context.value !== void 0 && context.value === value;
         if (isSelectedItem || isFirstValidItem) {
           setSelectedItem(node);
           if (isFirstValidItem) firstValidItemFoundRef.current = true;
+        } else if (isFirstItem) {
+          setSelectedItem(node);
         }
       },
       [context.value]
@@ -55543,15 +56210,20 @@ var SelectContentImpl = /* @__PURE__ */ reactExports.forwardRef(
     const handleItemLeave = reactExports.useCallback(() => content?.focus(), [content]);
     const itemTextRefCallback = reactExports.useCallback(
       (node, value, disabled) => {
+        if (!node) return;
+        const isFirstItem = !firstItemTextFoundRef.current;
+        if (isFirstItem) firstItemTextFoundRef.current = true;
         const isFirstValidItem = !firstValidItemFoundRef.current && !disabled;
         const isSelectedItem = context.value !== void 0 && context.value === value;
         if (isSelectedItem || isFirstValidItem) {
           setSelectedItemText(node);
+        } else if (isFirstItem) {
+          setSelectedItemText(node);
         }
       },
       [context.value]
     );
-    const SelectPosition = position === "popper" ? SelectPopperPosition : SelectItemAlignedPosition;
+    const SelectPosition = position === Position.Popper ? SelectPopperPosition : SelectItemAlignedPosition;
     const popperContentProps = SelectPosition === SelectPopperPosition ? {
       side,
       sideOffset,
@@ -55667,7 +56339,7 @@ var SelectItemAlignedPosition = /* @__PURE__ */ reactExports.forwardRef(/* @__PU
       const contentRect = content.getBoundingClientRect();
       const valueNodeRect = context.valueNode.getBoundingClientRect();
       const itemTextRect = selectedItemText.getBoundingClientRect();
-      if (context.dir !== "rtl") {
+      if (context.dir !== Direction.RTL) {
         const itemTextOffset = itemTextRect.left - contentRect.left;
         const left = valueNodeRect.left - itemTextOffset;
         const leftDelta = triggerRect.left - left;
@@ -55821,7 +56493,7 @@ var SelectPopperPosition = /* @__PURE__ */ reactExports.forwardRef(/* @__PURE__
   } = props;
   const popperScope = usePopperScope$1(__scopeSelect);
   return /* @__PURE__ */ jsxRuntimeExports.jsx(
-    Content,
+    PopperContent,
     {
       ...popperScope,
       ...popperProps,
@@ -55944,12 +56616,12 @@ var SelectItem$1 = /* @__PURE__ */ reactExports.forwardRef(
     const composedRefs = useComposedRefs(forwardedRef, handleItemRefCallback);
     const textId = useId();
     const pointerTypeRef = reactExports.useRef("touch");
-    const handleSelect = /* @__PURE__ */ __name$3(() => {
-      if (!disabled) {
-        context.onValueChange(value);
-        context.onOpenChange(false);
-      }
-    }, "handleSelect");
+    function handleSelect(event) {
+      context.hasConsumerStoppedPropagationRef.current = event.isPropagationStopped();
+      context.onUserSelect(value);
+      context.onOpenChange(false);
+    }
+    __name$3(handleSelect, "handleSelect");
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
       SelectItemContextProvider,
       {
@@ -55983,11 +56655,21 @@ var SelectItem$1 = /* @__PURE__ */ reactExports.forwardRef(
                 ref: composedRefs,
                 onFocus: composeEventHandlers(itemProps.onFocus, () => setIsFocused(true)),
                 onBlur: composeEventHandlers(itemProps.onBlur, () => setIsFocused(false)),
-                onClick: composeEventHandlers(itemProps.onClick, () => {
-                  if (pointerTypeRef.current !== "mouse") handleSelect();
+                onClick: composeEventHandlers(itemProps.onClick, (event) => {
+                  if (disabled) {
+                    return;
+                  }
+                  if (pointerTypeRef.current !== "mouse") {
+                    handleSelect(event);
+                  }
                 }),
-                onPointerUp: composeEventHandlers(itemProps.onPointerUp, () => {
-                  if (pointerTypeRef.current === "mouse") handleSelect();
+                onPointerUp: composeEventHandlers(itemProps.onPointerUp, (event) => {
+                  if (disabled) {
+                    return;
+                  }
+                  if (pointerTypeRef.current === "mouse") {
+                    handleSelect(event);
+                  }
                 }),
                 onPointerDown: composeEventHandlers(itemProps.onPointerDown, (event) => {
                   pointerTypeRef.current = event.pointerType;
@@ -56014,7 +56696,7 @@ var SelectItem$1 = /* @__PURE__ */ reactExports.forwardRef(
                     return;
                   }
                   if (SELECTION_KEYS.includes(event.key)) {
-                    handleSelect();
+                    handleSelect(event);
                   }
                   if (event.key === " ") {
                     event.preventDefault();
@@ -56192,12 +56874,14 @@ var SelectBubbleInput = /* @__PURE__ */ reactExports.forwardRef(
   // blank line to reduce diff noise
   /* @__PURE__ */ __name$3(function SelectBubbleInput2({ __scopeSelect, ...props }, forwardedRef) {
     const context = useSelectContext(BUBBLE_INPUT_NAME$2, __scopeSelect);
-    const { value, onValueChange, required: required2, disabled, name: name2, autoComplete, form } = context;
+    const { value, onValueChange, required: required2, disabled, name: name2, autoComplete, form, userSelection } = context;
     const { nativeOptions, nativeSelectKey } = context;
     const ref2 = reactExports.useRef(null);
     const composedRefs = useComposedRefs(forwardedRef, ref2);
     const selectValue = value ?? "";
-    const prevValue = usePrevious(selectValue);
+    const prevValueRef = reactExports.useRef(selectValue);
+    const handledUserSelectionRef = reactExports.useRef(userSelection);
+    const isDispatchingUserSelectionRef = reactExports.useRef(false);
     const hasEmptyValueOption = Array.from(nativeOptions).some(
       (option) => (option.props.value ?? "") === ""
     );
@@ -56210,12 +56894,29 @@ var SelectBubbleInput = /* @__PURE__ */ reactExports.forwardRef(
         "value"
       );
       const setValue = descriptor.set;
-      if (prevValue !== selectValue && setValue) {
-        const event = new Event("change", { bubbles: true });
+      const isNewUserSelection = userSelection !== null && userSelection !== handledUserSelectionRef.current;
+      handledUserSelectionRef.current = userSelection;
+      const valueChanged = prevValueRef.current !== selectValue;
+      prevValueRef.current = selectValue;
+      const isUserInteraction = isNewUserSelection && valueChanged;
+      if (isNewUserSelection && !valueChanged && userSelection.value !== selectValue && !userSelection.hasConsumerStoppedPropagation && setValue) {
+        isDispatchingUserSelectionRef.current = true;
+        try {
+          setValue.call(select, userSelection.value);
+          select.dispatchEvent(new Event("change", { bubbles: true }));
+        } finally {
+          isDispatchingUserSelectionRef.current = false;
+          setValue.call(select, selectValue);
+        }
+        return;
+      }
+      const bubbles = isUserInteraction && !userSelection.hasConsumerStoppedPropagation;
+      if (valueChanged && setValue) {
+        const event = new Event("change", { bubbles });
         setValue.call(select, selectValue);
         select.dispatchEvent(event);
       }
-    }, [prevValue, selectValue]);
+    }, [selectValue, userSelection]);
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(
       Primitive.select,
       {
@@ -56226,7 +56927,11 @@ var SelectBubbleInput = /* @__PURE__ */ reactExports.forwardRef(
         autoComplete,
         disabled,
         form,
-        onChange: (event) => onValueChange(event.target.value),
+        onChange: (event) => {
+          if (!isDispatchingUserSelectionRef.current) {
+            onValueChange(event.target.value);
+          }
+        },
         ...props,
         style: { ...VISUALLY_HIDDEN_STYLES, ...props.style },
         ref: composedRefs,
@@ -56256,11 +56961,13 @@ function useTypeaheadSearch(onSearchChange) {
     (key) => {
       const search = searchRef.current + key;
       handleSearchChange(search);
-      (/* @__PURE__ */ __name$3((function updateSearch(value) {
+      function updateSearch(value) {
         searchRef.current = value;
         window.clearTimeout(timerRef.current);
         if (value !== "") timerRef.current = window.setTimeout(() => updateSearch(""), 1e3);
-      }), "updateSearch"))(search);
+      }
+      __name$3(updateSearch, "updateSearch");
+      updateSearch(search);
     },
     [handleSearchChange]
   );
@@ -56436,7 +57143,7 @@ const useTheme = () => {
     [theme, setThemeWithSideEffect]
   );
 };
-const version = "1.0.2";
+const version = "1.0.3";
 var __defProp$2 = Object.defineProperty;
 var __name$2 = (target, value) => __defProp$2(target, "name", { value, configurable: true });
 var [createTooltipContext, createTooltipScope] = /* @__PURE__ */ createContextScope("Tooltip", [
@@ -56556,7 +57263,7 @@ var Tooltip$1 = /* @__PURE__ */ __name$2((props) => {
     };
   }, []);
   const contentId = contentIdState ?? generatedContentId;
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(Root2$1, { ...popperScope, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(Popper, { ...popperScope, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
     TooltipContextProvider,
     {
       scope: __scopeTooltip,
@@ -56588,7 +57295,7 @@ var Tooltip$1 = /* @__PURE__ */ __name$2((props) => {
 var TRIGGER_NAME$2 = "TooltipTrigger";
 var TooltipTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
   /* @__PURE__ */ __name$2(function TooltipTrigger2(props, forwardedRef) {
-    const { __scopeTooltip, ...triggerProps } = props;
+    const { __scopeTooltip, "aria-describedby": ariaDescribedby, ...triggerProps } = props;
     const context = useTooltipContext(TRIGGER_NAME$2, __scopeTooltip);
     const providerContext = useTooltipProviderContext(TRIGGER_NAME$2, __scopeTooltip);
     const popperScope = usePopperScope(__scopeTooltip);
@@ -56600,10 +57307,10 @@ var TooltipTrigger$1 = /* @__PURE__ */ reactExports.forwardRef(
     reactExports.useEffect(() => {
       return () => document.removeEventListener("pointerup", handlePointerUp);
     }, [handlePointerUp]);
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(Anchor, { asChild: true, ...popperScope, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(PopperAnchor, { asChild: true, ...popperScope, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
       Primitive.button,
       {
-        "aria-describedby": context.open ? context.contentId : void 0,
+        "aria-describedby": context.open ? concatAriaDescribedby(ariaDescribedby, context.contentId) : ariaDescribedby,
         "data-state": context.stateAttribute,
         ...triggerProps,
         ref: composedRefs,
@@ -56724,6 +57431,9 @@ var TooltipContentImpl = /* @__PURE__ */ reactExports.forwardRef(
     const context = useTooltipContext(CONTENT_NAME, __scopeTooltip);
     const popperScope = usePopperScope(__scopeTooltip);
     const { onClose } = context;
+    const [contentNode, setContentNode] = reactExports.useState(null);
+    const composedRefs = useComposedRefs(forwardedRef, setContentNode);
+    useFocusScopeBranch(contentNode);
     reactExports.useEffect(() => {
       document.addEventListener(TOOLTIP_OPEN, onClose);
       return () => document.removeEventListener(TOOLTIP_OPEN, onClose);
@@ -56756,14 +57466,14 @@ var TooltipContentImpl = /* @__PURE__ */ reactExports.forwardRef(
         onFocusOutside: (event) => event.preventDefault(),
         onDismiss: onClose,
         children: /* @__PURE__ */ jsxRuntimeExports.jsxs(
-          Content,
+          PopperContent,
           {
             "data-state": context.stateAttribute,
             role: ariaLabel ? void 0 : "tooltip",
             id: ariaLabel ? void 0 : context.contentId,
             ...popperScope,
             ...contentProps,
-            ref: forwardedRef,
+            ref: composedRefs,
             style: {
               ...contentProps.style,
               // re-namespace exposed content custom properties
@@ -56777,7 +57487,7 @@ var TooltipContentImpl = /* @__PURE__ */ reactExports.forwardRef(
             },
             children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx(Slottable, { children }),
-              ariaLabel ? /* @__PURE__ */ jsxRuntimeExports.jsx(Root$2, { id: context.contentId, role: "tooltip", children: ariaLabel }) : null
+              ariaLabel ? /* @__PURE__ */ jsxRuntimeExports.jsx(VisuallyHidden, { id: context.contentId, role: "tooltip", children: ariaLabel }) : null
             ]
           }
         )
@@ -56906,15 +57616,22 @@ function getHullPresorted(points) {
   }
 }
 __name$2(getHullPresorted, "getHullPresorted");
-var Provider = TooltipProvider$1;
-var Root3 = Tooltip$1;
-var Trigger = TooltipTrigger$1;
-var Content2 = TooltipContent$1;
-const TooltipProvider = Provider;
-const Tooltip = Root3;
-const TooltipTrigger = Trigger;
+function concatAriaDescribedby(...values) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const value of values) {
+    if (typeof value !== "string") continue;
+    for (const id2 of String(value).trim().split(/\s+/)) {
+      if (id2) ids.add(id2);
+    }
+  }
+  return ids.size > 0 ? Array.from(ids).join(" ") : void 0;
+}
+__name$2(concatAriaDescribedby, "concatAriaDescribedby");
+const TooltipProvider = TooltipProvider$1;
+const Tooltip = Tooltip$1;
+const TooltipTrigger = TooltipTrigger$1;
 const TooltipContent = reactExports.forwardRef(({ className, sideOffset = 4, ...props }, ref2) => /* @__PURE__ */ jsxRuntimeExports.jsx(
-  Content2,
+  TooltipContent$1,
   {
     ref: ref2,
     sideOffset,
@@ -56925,7 +57642,7 @@ const TooltipContent = reactExports.forwardRef(({ className, sideOffset = 4, ...
     ...props
   }
 ));
-TooltipContent.displayName = Content2.displayName;
+TooltipContent.displayName = TooltipContent$1.displayName;
 const Textarea = reactExports.forwardRef(
   ({ className, ...props }, ref2) => {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -56970,11 +57687,7 @@ function SwitchProvider(props) {
   });
   const [control, setControl] = reactExports.useState(null);
   const [bubbleInput, setBubbleInput] = reactExports.useState(null);
-  const hasConsumerStoppedPropagationRef = reactExports.useRef(false);
-  const [userInteractionCount, onUserInteraction] = reactExports.useReducer(
-    (count2) => count2 + 1,
-    0
-  );
+  const [userClick, setUserClick] = reactExports.useState(null);
   const isFormControl = control ? !!form || !!control.closest("form") : (
     // We set this to true by default so that events bubble to forms without JS (SSR)
     true
@@ -56988,9 +57701,8 @@ function SwitchProvider(props) {
     name: name2,
     form,
     value,
-    hasConsumerStoppedPropagationRef,
-    userInteractionCount,
-    onUserInteraction,
+    userClick,
+    onUserClick: setUserClick,
     required: required2,
     defaultChecked,
     isFormControl,
@@ -57012,8 +57724,7 @@ var SwitchTrigger = /* @__PURE__ */ reactExports.forwardRef(
       required: required2,
       setControl,
       setChecked,
-      hasConsumerStoppedPropagationRef,
-      onUserInteraction,
+      onUserClick,
       isFormControl,
       bubbleInput
     } = useSwitchContext(TRIGGER_NAME$1, __scopeSwitch);
@@ -57041,11 +57752,13 @@ var SwitchTrigger = /* @__PURE__ */ reactExports.forwardRef(
         ...switchProps,
         ref: composedRefs,
         onClick: composeEventHandlers(onClick, (event) => {
-          onUserInteraction();
+          const hasConsumerStoppedPropagation = event.isPropagationStopped();
+          onUserClick({ requestedChecked: !checked, hasConsumerStoppedPropagation });
           setChecked((prevChecked) => !prevChecked);
           if (bubbleInput && isFormControl) {
-            hasConsumerStoppedPropagationRef.current = event.isPropagationStopped();
-            if (!hasConsumerStoppedPropagationRef.current) event.stopPropagation();
+            if (!hasConsumerStoppedPropagation) {
+              event.stopPropagation();
+            }
           }
         })
       }
@@ -57121,8 +57834,7 @@ var SwitchBubbleInput = /* @__PURE__ */ reactExports.forwardRef(
   /* @__PURE__ */ __name$1(function SwitchBubbleInput2({ __scopeSwitch, onClick, ...props }, forwardedRef) {
     const {
       control,
-      hasConsumerStoppedPropagationRef,
-      userInteractionCount,
+      userClick,
       checked,
       defaultChecked,
       required: required2,
@@ -57137,7 +57849,8 @@ var SwitchBubbleInput = /* @__PURE__ */ reactExports.forwardRef(
     const controlSize = useSize(control);
     const shouldStopClickPropagationRef = reactExports.useRef(false);
     const prevCheckedRef = reactExports.useRef(checked);
-    const prevUserInteractionCountRef = reactExports.useRef(userInteractionCount);
+    const handledUserClickRef = reactExports.useRef(userClick);
+    const pendingUserClickRef = reactExports.useRef(null);
     reactExports.useEffect(() => {
       const input = bubbleInput;
       if (!input) return;
@@ -57147,19 +57860,35 @@ var SwitchBubbleInput = /* @__PURE__ */ reactExports.forwardRef(
         "checked"
       );
       const setChecked = descriptor.set;
-      const isUserInteraction = userInteractionCount !== prevUserInteractionCountRef.current;
-      prevUserInteractionCountRef.current = userInteractionCount;
+      if (!setChecked) {
+        return;
+      }
       const checkedChanged = prevCheckedRef.current !== checked;
       prevCheckedRef.current = checked;
-      const bubbles = !(isUserInteraction && hasConsumerStoppedPropagationRef.current);
-      if (checkedChanged && setChecked) {
-        shouldStopClickPropagationRef.current = !isUserInteraction;
-        const event = new Event("click", { bubbles });
+      const isNewUserClick = userClick !== null && userClick !== handledUserClickRef.current;
+      handledUserClickRef.current = userClick;
+      if (isNewUserClick) {
+        pendingUserClickRef.current = checkedChanged ? null : userClick;
+        if (checkedChanged) {
+          setChecked.call(input, checked);
+        }
+        input.dispatchEvent(
+          new Event("click", { bubbles: !userClick.hasConsumerStoppedPropagation })
+        );
+      } else if (checkedChanged) {
+        const pendingUserClick = pendingUserClickRef.current;
+        pendingUserClickRef.current = null;
+        const isPendingUserChange = pendingUserClick?.requestedChecked === checked;
+        shouldStopClickPropagationRef.current = true;
         setChecked.call(input, checked);
-        input.dispatchEvent(event);
+        input.dispatchEvent(
+          new Event("click", {
+            bubbles: !(isPendingUserChange && pendingUserClick.hasConsumerStoppedPropagation)
+          })
+        );
         shouldStopClickPropagationRef.current = false;
       }
-    }, [bubbleInput, checked, hasConsumerStoppedPropagationRef, userInteractionCount]);
+    }, [bubbleInput, checked, userClick]);
     const defaultCheckedRef = reactExports.useRef(checked);
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
       Primitive.input,
@@ -58232,11 +58961,7 @@ function CheckboxProvider(props) {
   });
   const [control, setControl] = reactExports.useState(null);
   const [bubbleInput, setBubbleInput] = reactExports.useState(null);
-  const hasConsumerStoppedPropagationRef = reactExports.useRef(false);
-  const [userInteractionCount, onUserInteraction] = reactExports.useReducer(
-    (count2) => count2 + 1,
-    0
-  );
+  const [userClick, setUserClick] = reactExports.useState(null);
   const isFormControl = control ? !!form || !!control.closest("form") : (
     // We set this to true by default so that events bubble to forms without JS (SSR)
     true
@@ -58250,9 +58975,8 @@ function CheckboxProvider(props) {
     name: name2,
     form,
     value,
-    hasConsumerStoppedPropagationRef,
-    userInteractionCount,
-    onUserInteraction,
+    userClick,
+    onUserClick: setUserClick,
     required: required2,
     defaultChecked: isIndeterminate(defaultChecked) ? false : defaultChecked,
     isFormControl,
@@ -58280,8 +59004,7 @@ var CheckboxTrigger = /* @__PURE__ */ reactExports.forwardRef(
       required: required2,
       setControl,
       setChecked,
-      hasConsumerStoppedPropagationRef,
-      onUserInteraction,
+      onUserClick,
       isFormControl,
       bubbleInput
     } = useCheckboxContext(TRIGGER_NAME, __scopeCheckbox);
@@ -58312,11 +59035,14 @@ var CheckboxTrigger = /* @__PURE__ */ reactExports.forwardRef(
           if (event.key === "Enter") event.preventDefault();
         }),
         onClick: composeEventHandlers(onClick, (event) => {
-          onUserInteraction();
+          const hasConsumerStoppedPropagation = event.isPropagationStopped();
+          onUserClick({
+            requestedChecked: isIndeterminate(checked) ? true : !checked,
+            hasConsumerStoppedPropagation
+          });
           setChecked((prevChecked) => isIndeterminate(prevChecked) ? true : !prevChecked);
           if (bubbleInput && isFormControl) {
-            hasConsumerStoppedPropagationRef.current = event.isPropagationStopped();
-            if (!hasConsumerStoppedPropagationRef.current) event.stopPropagation();
+            if (!hasConsumerStoppedPropagation) event.stopPropagation();
           }
         })
       }
@@ -58400,8 +59126,7 @@ var CheckboxBubbleInput = /* @__PURE__ */ reactExports.forwardRef(
   /* @__PURE__ */ __name(function CheckboxBubbleInput2({ __scopeCheckbox, onClick, ...props }, forwardedRef) {
     const {
       control,
-      hasConsumerStoppedPropagationRef,
-      userInteractionCount,
+      userClick,
       checked,
       defaultChecked,
       required: required2,
@@ -58416,7 +59141,8 @@ var CheckboxBubbleInput = /* @__PURE__ */ reactExports.forwardRef(
     const controlSize = useSize(control);
     const shouldStopClickPropagationRef = reactExports.useRef(false);
     const prevCheckedRef = reactExports.useRef(checked);
-    const prevUserInteractionCountRef = reactExports.useRef(userInteractionCount);
+    const handledUserClickRef = reactExports.useRef(userClick);
+    const pendingUserClickRef = reactExports.useRef(null);
     reactExports.useEffect(() => {
       const input = bubbleInput;
       if (!input) return;
@@ -58426,20 +59152,35 @@ var CheckboxBubbleInput = /* @__PURE__ */ reactExports.forwardRef(
         "checked"
       );
       const setChecked = descriptor.set;
-      const isUserInteraction = userInteractionCount !== prevUserInteractionCountRef.current;
-      prevUserInteractionCountRef.current = userInteractionCount;
+      if (!setChecked) return;
       const checkedChanged = prevCheckedRef.current !== checked;
       prevCheckedRef.current = checked;
-      const bubbles = !(isUserInteraction && hasConsumerStoppedPropagationRef.current);
-      if (checkedChanged && setChecked) {
-        shouldStopClickPropagationRef.current = !isUserInteraction;
-        const event = new Event("click", { bubbles });
+      const isNewUserClick = userClick !== null && userClick !== handledUserClickRef.current;
+      handledUserClickRef.current = userClick;
+      if (isNewUserClick) {
+        pendingUserClickRef.current = checkedChanged ? null : userClick;
+        if (checkedChanged) {
+          input.indeterminate = isIndeterminate(checked);
+          setChecked.call(input, isIndeterminate(checked) ? false : checked);
+        }
+        input.dispatchEvent(
+          new Event("click", { bubbles: !userClick.hasConsumerStoppedPropagation })
+        );
+      } else if (checkedChanged) {
+        const pendingUserClick = pendingUserClickRef.current;
+        pendingUserClickRef.current = null;
+        const isPendingUserChange = pendingUserClick?.requestedChecked === checked;
+        shouldStopClickPropagationRef.current = true;
         input.indeterminate = isIndeterminate(checked);
         setChecked.call(input, isIndeterminate(checked) ? false : checked);
-        input.dispatchEvent(event);
+        input.dispatchEvent(
+          new Event("click", {
+            bubbles: !(isPendingUserChange && pendingUserClick.hasConsumerStoppedPropagation)
+          })
+        );
         shouldStopClickPropagationRef.current = false;
       }
-    }, [bubbleInput, checked, hasConsumerStoppedPropagationRef, userInteractionCount]);
+    }, [bubbleInput, checked, userClick]);
     const defaultCheckedRef = reactExports.useRef(isIndeterminate(checked) ? false : checked);
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
       Primitive.input,
@@ -65423,12 +66164,12 @@ const AppRenderer = ({
     []
   );
   const handleOpenLink = async ({ url: url2 }) => {
-    let isError = true;
-    if (url2.startsWith("https://") || url2.startsWith("http://")) {
-      window.open(url2, "_blank");
-      isError = false;
+    const target = parseHttpUrl(url2);
+    if (!target) {
+      return { isError: true };
     }
-    return { isError };
+    window.open(target, "_blank", "noopener,noreferrer");
+    return { isError: false };
   };
   const handleMessage = async (params, _extra) => {
     const message = params.content.filter(
@@ -66375,13 +67116,21 @@ const App = () => {
     tools: null,
     tasks: null
   });
-  const [command, setCommand] = reactExports.useState(getInitialCommand);
-  const [args, setArgs] = reactExports.useState(getInitialArgs);
-  const [sseUrl, setSseUrl] = reactExports.useState(getInitialSseUrl);
-  const [transportType, setTransportType] = reactExports.useState(getInitialTransportType);
+  const [command, setCommand] = reactExports.useState(
+    () => getOAuthCallbackSnapshot()?.command ?? getInitialCommand()
+  );
+  const [args, setArgs] = reactExports.useState(
+    () => getOAuthCallbackSnapshot()?.args ?? getInitialArgs()
+  );
+  const [sseUrl, setSseUrl] = reactExports.useState(
+    () => getOAuthCallbackSnapshot()?.serverUrl ?? getInitialSseUrl()
+  );
+  const [transportType, setTransportType] = reactExports.useState(
+    () => getOAuthCallbackSnapshot()?.transportType ?? getInitialTransportType()
+  );
   const [connectionType, setConnectionType] = reactExports.useState(
     () => {
-      return localStorage.getItem("lastConnectionType") || "proxy";
+      return getOAuthCallbackSnapshot()?.connectionType ?? (localStorage.getItem("lastConnectionType") || "proxy");
     }
   );
   const [logLevel, setLogLevel] = reactExports.useState("debug");
@@ -66702,11 +67451,21 @@ const App = () => {
   }, [config2]);
   const onOAuthConnect = reactExports.useCallback(
     (serverUrl) => {
+      const refusal = getOAuthReconnectRefusal(readOAuthConnectionSnapshot(), {
+        authorizedServerUrl: serverUrl,
+        sseUrl,
+        transportType,
+        connectionType,
+        proxyAddress: getMCPProxyAddress(config2)
+      });
+      clearOAuthConnectionSnapshot();
+      if (refusal) return refusal;
       setSseUrl(serverUrl);
       setIsAuthDebuggerVisible(false);
       void connectMcpServer();
+      return void 0;
     },
-    [connectMcpServer]
+    [connectMcpServer, sseUrl, transportType, connectionType, config2]
   );
   const onOAuthDebugConnect = reactExports.useCallback(
     async ({
@@ -67292,15 +68051,15 @@ const App = () => {
       connectionType
     }
   ) });
-  if (window.location.pathname === "/oauth/callback") {
+  if (window.location.pathname === OAUTH_CALLBACK_PATH) {
     const OAuthCallback = React.lazy(
-      () => __vitePreload(() => import("./OAuthCallback-at8T3Iwi.js"), true ? [] : void 0)
+      () => __vitePreload(() => import("./OAuthCallback-jbB02Bt3.js"), true ? [] : void 0)
     );
     return /* @__PURE__ */ jsxRuntimeExports.jsx(reactExports.Suspense, { fallback: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: "Loading..." }), children: /* @__PURE__ */ jsxRuntimeExports.jsx(OAuthCallback, { onConnect: onOAuthConnect }) });
   }
-  if (window.location.pathname === "/oauth/callback/debug") {
+  if (window.location.pathname === OAUTH_DEBUG_CALLBACK_PATH) {
     const OAuthDebugCallback = React.lazy(
-      () => __vitePreload(() => import("./OAuthDebugCallback-ZJ9hxfpr.js"), true ? [] : void 0)
+      () => __vitePreload(() => import("./OAuthDebugCallback-VeJ8bP3s.js"), true ? [] : void 0)
     );
     return /* @__PURE__ */ jsxRuntimeExports.jsx(reactExports.Suspense, { fallback: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: "Loading..." }), children: /* @__PURE__ */ jsxRuntimeExports.jsx(OAuthDebugCallback, { onConnect: onOAuthDebugConnect }) });
   }
@@ -67771,6 +68530,7 @@ export {
   InspectorOAuthClientProvider as I,
   SESSION_KEYS as S,
   auth as a,
+  clearOAuthConnectionSnapshot as c,
   generateOAuthErrorDescription as g,
   jsxRuntimeExports as j,
   parseOAuthCallbackParams as p,