@assistant-ui/react 0.15.17 → 0.15.19

package/dist/utils/Primitive.d.ts

@@ -1,5 +1,6 @@
-import { ComponentPropsWithoutRef, ComponentRef, ElementType, ForwardRefExoticComponent, ReactElement, RefAttributes } from "react";
+import { ComponentProps, ComponentPropsWithoutRef, ComponentRef, ElementType, ForwardRefExoticComponent, ReactElement, ReactNode, RefAttributes } from "react";
 import { Primitive as Primitive$1 } from "radix-ui/internal";
+import { Slot } from "radix-ui";
 //#region src/utils/Primitive.d.ts
 /**
  * Thin wrapper around Radix `Primitive` that adds `render` prop support.
@@ -16,6 +17,13 @@ type WithRenderPropProps<T extends ElementType> = ComponentPropsWithoutRef<T> &
   render?: ReactElement | undefined;
 };
 type PrimitiveProps<E extends PrimitiveNode> = WithRenderPropProps<(typeof Primitive$1)[E]>;
+/**
+ * Composes a `render` element at a call site that has already computed its props.
+ *
+ * `withRenderProp` wraps a component; this covers the case where the props are
+ * already in hand and the composition happens inline.
+ */
+declare function renderSlot(render: ReactElement, children: ReactNode, props: ComponentProps<typeof Slot.Root>): ReactElement;
 declare function withRenderProp<T extends ElementType>(Component: T): ForwardRefExoticComponent<WithRenderPropProps<T> & RefAttributes<ComponentRef<T>>>;
 declare const Primitive: {
   a: ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLAnchorElement> & import("react").AnchorHTMLAttributes<HTMLAnchorElement> & {
@@ -105,5 +113,5 @@ declare const Primitive: {
   } & RefAttributes<HTMLUListElement>>;
 };
 //#endregion
-export { Primitive, type PrimitiveProps, type WithRenderPropProps, withRenderProp };
+export { Primitive, type PrimitiveProps, type WithRenderPropProps, renderSlot, withRenderProp };
 //# sourceMappingURL=Primitive.d.ts.map

package/dist/utils/Primitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Primitive.d.ts","names":[],"sources":["../../src/utils/Primitive.tsx"],"mappings":";;;;;;;;;;;;cA0BM;KAmBD,wBAAwB;KAExB,oBAAoB,UAAU,eACjC,yBAAyB;EACvB,SAAS;;KAGR,eAAe,UAAU,iBAAiB,4BACrC,aAAgB;iBAajB,eAAe,UAAU,aAAa,WAAW,IAwCtC,0BAChB,oBAAoB,KAAK,cAAc,aAAa;cAclD;;;;IAxEO,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA"}
+{"version":3,"file":"Primitive.d.ts","names":[],"sources":["../../src/utils/Primitive.tsx"],"mappings":";;;;;;;;;;;;;cA4BM;KAmBD,wBAAwB;KAExB,oBAAoB,UAAU,eACjC,yBAAyB;EACvB,SAAS;;KAGR,eAAe,UAAU,iBAAiB,4BACrC,aAAgB;;;;;;;iBAoCjB,WACP,QAAQ,cACR,UAAU,WACV,OAAO,sBAAsB,KAAK,QACjC;iBAMM,eAAe,UAAU,aAAa,WAAW,IAmCtC,0BAChB,oBAAoB,KAAK,cAAc,aAAa;cAclD;;;;IApGO,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA;;;;;IAAA,SAAA"}

package/dist/utils/Primitive.js

@@ -2,6 +2,7 @@ import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
 import { cloneElement, forwardRef, isValidElement } from "@assistant-ui/tap/react-shim";
 import { jsx } from "react/jsx-runtime";
 import { Primitive as Primitive$1 } from "radix-ui/internal";
+import { Slot } from "radix-ui";
 //#region src/utils/Primitive.tsx
 /**
 * Thin wrapper around Radix `Primitive` that adds `render` prop support.
@@ -31,6 +32,25 @@ const NODES = [
 	"svg",
 	"ul"
 ];
+/**
+* Composes the children of a `render` element. Outer children win when supplied;
+* the render element's own children are the fallback.
+*/
+function composeRenderElement(render, children) {
+	return cloneElement(render, void 0, children !== void 0 ? children : render.props.children);
+}
+/**
+* Composes a `render` element at a call site that has already computed its props.
+*
+* `withRenderProp` wraps a component; this covers the case where the props are
+* already in hand and the composition happens inline.
+*/
+function renderSlot(render, children, props) {
+	return /* @__PURE__ */ jsx(Slot.Root, {
+		...props,
+		children: composeRenderElement(render, children)
+	});
+}
 function withRenderProp(Component) {
 	const Wrapped = forwardRef((t0, ref) => {
 		const $ = c(17);
@@ -53,13 +73,12 @@ function withRenderProp(Component) {
 		}
 		const Comp = Component;
 		if (render && isValidElement(render)) {
-			const renderChildren = children !== void 0 ? children : render.props.children;
 			const t1 = rest;
 			let t2;
-			if ($[5] !== render || $[6] !== renderChildren) {
-				t2 = cloneElement(render, void 0, renderChildren);
-				$[5] = render;
-				$[6] = renderChildren;
+			if ($[5] !== children || $[6] !== render) {
+				t2 = composeRenderElement(render, children);
+				$[5] = children;
+				$[6] = render;
 				$[7] = t2;
 			} else t2 = $[7];
 			let t3;
@@ -108,6 +127,6 @@ const Primitive = NODES.reduce((acc, node) => {
 	return acc;
 }, {});
 //#endregion
-export { Primitive, withRenderProp };
+export { Primitive, renderSlot, withRenderProp };
 
 //# sourceMappingURL=Primitive.js.map

package/dist/utils/Primitive.js.map

@@ -1 +1 @@
-{"version":3,"file":"Primitive.js","names":["ComponentPropsWithoutRef","ComponentRef","ElementType","ForwardRefExoticComponent","PropsWithoutRef","ReactElement","ReactNode","RefAttributes","cloneElement","forwardRef","isValidElement","Primitive","RadixPrimitive","NODES","const","PrimitiveNode","WithRenderPropProps","T","render","PrimitiveProps","E","WithRenderPropRuntimeProps","asChild","children","PrimitiveRef","withRenderProp","Component","Wrapped","t0","ref","$","_c","rest","Comp","renderChildren","undefined","props","Record","t1","t2","t3","componentName","displayName","name","createPrimitive","node","RadixComp","reduce","acc","ReturnType","K"],"sources":["../../src/utils/Primitive.tsx"],"sourcesContent":["import {\n  type ComponentPropsWithoutRef,\n  type ComponentRef,\n  type ElementType,\n  type ForwardRefExoticComponent,\n  type PropsWithoutRef,\n  type ReactElement,\n  type ReactNode,\n  type RefAttributes,\n  cloneElement,\n  forwardRef,\n  isValidElement,\n} from \"react\";\nimport { Primitive as RadixPrimitive } from \"radix-ui/internal\";\n\n/**\n * Thin wrapper around Radix `Primitive` that adds `render` prop support.\n *\n * When `render` is provided, it is converted to the equivalent `asChild` pattern:\n *   render={<Comp props />} + children  →  asChild + <Comp props>{children}</Comp>\n *\n * All prop merging, ref composition, and event handler chaining remain handled\n * by Radix's battle-tested Slot implementation — we add zero custom logic for that.\n */\n\n// Match @radix-ui/react-primitive's full element set\nconst NODES = [\n  \"a\",\n  \"button\",\n  \"div\",\n  \"form\",\n  \"h2\",\n  \"h3\",\n  \"img\",\n  \"input\",\n  \"label\",\n  \"li\",\n  \"nav\",\n  \"ol\",\n  \"p\",\n  \"select\",\n  \"span\",\n  \"svg\",\n  \"ul\",\n] as const;\ntype PrimitiveNode = (typeof NODES)[number];\n\ntype WithRenderPropProps<T extends ElementType> =\n  ComponentPropsWithoutRef<T> & {\n    render?: ReactElement | undefined;\n  };\n\ntype PrimitiveProps<E extends PrimitiveNode> = WithRenderPropProps<\n  (typeof RadixPrimitive)[E]\n>;\n\ntype WithRenderPropRuntimeProps<T extends ElementType> =\n  WithRenderPropProps<T> & {\n    asChild?: boolean | undefined;\n    children?: ReactNode | undefined;\n  };\n\ntype PrimitiveRef<E extends PrimitiveNode> = ComponentRef<\n  (typeof RadixPrimitive)[E]\n>;\n\nfunction withRenderProp<T extends ElementType>(Component: T) {\n  const Wrapped = forwardRef<ComponentRef<T>, WithRenderPropRuntimeProps<T>>(\n    (\n      {\n        render,\n        asChild,\n        children,\n        ...rest\n      }: PropsWithoutRef<WithRenderPropRuntimeProps<T>>,\n      ref,\n    ) => {\n      const Comp = Component as any;\n\n      if (render && isValidElement(render)) {\n        const renderChildren =\n          children !== undefined\n            ? children\n            : ((render.props as Record<string, unknown>).children as ReactNode);\n\n        return (\n          <Comp {...(rest as any)} asChild ref={ref}>\n            {cloneElement(render, undefined, renderChildren)}\n          </Comp>\n        );\n      }\n\n      return (\n        <Comp {...(rest as any)} asChild={asChild} ref={ref}>\n          {children}\n        </Comp>\n      );\n    },\n  );\n\n  const componentName =\n    typeof Component === \"string\"\n      ? Component\n      : (Component.displayName ?? Component.name ?? \"Component\");\n  Wrapped.displayName = componentName;\n\n  return Wrapped as ForwardRefExoticComponent<\n    WithRenderPropProps<T> & RefAttributes<ComponentRef<T>>\n  >;\n}\n\nfunction createPrimitive<E extends PrimitiveNode>(node: E) {\n  const RadixComp = RadixPrimitive[node];\n  const Component = withRenderProp(RadixComp);\n\n  Component.displayName = `Primitive.${node}`;\n  return Component as ForwardRefExoticComponent<\n    PrimitiveProps<E> & RefAttributes<PrimitiveRef<E>>\n  >;\n}\n\nconst Primitive = NODES.reduce(\n  (acc, node) => {\n    acc[node] = createPrimitive(node);\n    return acc;\n  },\n  {} as {\n    [K in PrimitiveNode]: ReturnType<typeof createPrimitive<K>>;\n  },\n);\n\nexport { Primitive, withRenderProp };\nexport type { PrimitiveProps, WithRenderPropProps };\n"],"mappings":";;;;;;;;;;;;;;AA0BA,MAAMa,QAAQ;CACZ;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;AAAI;AAuBN,SAASY,eAAsCC,WAAc;CAC3D,MAAMC,UAAUlB,YACdmB,IAAAC,QAAA;EAAA,MAAAC,IAAAC,EAAA,EAAA;EAAA,IAAAT;EAAA,IAAAC;EAAA,IAAAL;EAAA,IAAAc;EAAA,IAAAF,EAAA,OAAAF,IAAA;GACE,CAAA,CAAAV,QAAAI,SAAAC,UAAA,GAAAS,QAAAJ;GAKiDE,EAAA,KAAAF;GAAAE,EAAA,KAAAR;GAAAQ,EAAA,KAAAP;GAAAO,EAAA,KAAAZ;GAAAY,EAAA,KAAAE;EAAA,OAAA;GAAAV,UAAAQ,EAAA;GAAAP,WAAAO,EAAA;GAAAZ,SAAAY,EAAA;GAAAE,OAAAF,EAAA;EAAA;EAGjD,MAAAG,OAAaP;EAEb,IAAIR,UAAUR,eAAeQ,MAAM,GAAC;GAClC,MAAAgB,iBACEX,aAAaY,KAAAA,IAAbZ,WAEML,OAAMkB,MAAiCb;GAGlC,MAAAe,KAAAN;GAAW,IAAAO;GAAA,IAAAT,EAAA,OAAAZ,UAAAY,EAAA,OAAAI,gBAAA;IACnBK,KAAA/B,aAAaU,QAAQiB,KAAAA,GAAWD,cAAc;IAACJ,EAAA,KAAAZ;IAAAY,EAAA,KAAAI;IAAAJ,EAAA,KAAAS;GAAA,OAAAA,KAAAT,EAAA;GAAA,IAAAU;GAAA,IAAAV,EAAA,OAAAD,OAAAC,EAAA,OAAAQ,MAAAR,EAAA,QAAAS,IAAA;IADlDC,KAAA,oBAAC,MAAD;KAAK,GAAMF;KAAc,SAAA;KAAaT;KACnCU,UAAAA;IADE,CAAA;IAEET,EAAA,KAAAD;IAAAC,EAAA,KAAAQ;IAAAR,EAAA,MAAAS;IAAAT,EAAA,MAAAU;GAAA,OAAAA,KAAAV,EAAA;GAAA,OAFPU;EAEO;EAKE,MAAAF,KAAAN;EAAW,IAAAO;EAAA,IAAAT,EAAA,QAAAR,WAAAQ,EAAA,QAAAP,YAAAO,EAAA,QAAAD,OAAAC,EAAA,QAAAQ,IAAA;GAAtBC,KAAA,oBAAC,MAAD;IAAK,GAAMD;IAAuBhB;IAAcO;IAC7CN;GADE,CAAA;GAEEO,EAAA,MAAAR;GAAAQ,EAAA,MAAAP;GAAAO,EAAA,MAAAD;GAAAC,EAAA,MAAAQ;GAAAR,EAAA,MAAAS;EAAA,OAAAA,KAAAT,EAAA;EAAA,OAFPS;CAEO,CAGb;CAMAZ,QAAQe,cAHN,OAAOhB,cAAc,WACjBA,YACCA,UAAUgB,eAAehB,UAAUiB,QAAQ;CAGlD,OAAOhB;AAGT;AAEA,SAASiB,gBAAyCC,MAAS;CACzD,MAAMC,YAAYlC,YAAeiC;CACjC,MAAMnB,YAAYD,eAAeqB,SAAS;CAE1CpB,UAAUgB,cAAc,aAAaG;CACrC,OAAOnB;AAGT;AAEA,MAAMf,YAAYE,MAAMkC,QACrBC,KAAKH,SAAS;CACbG,IAAIH,QAAQD,gBAAgBC,IAAI;CAChC,OAAOG;AACT,GACA,CAAC,CAGH"}
+{"version":3,"file":"Primitive.js","names":["ComponentProps","ComponentPropsWithoutRef","ComponentRef","ElementType","ForwardRefExoticComponent","PropsWithoutRef","ReactElement","ReactNode","RefAttributes","cloneElement","forwardRef","isValidElement","Primitive","RadixPrimitive","Slot","NODES","const","PrimitiveNode","WithRenderPropProps","T","render","PrimitiveProps","E","WithRenderPropRuntimeProps","asChild","children","PrimitiveRef","composeRenderElement","undefined","props","renderSlot","Root","withRenderProp","Component","Wrapped","t0","ref","$","_c","rest","Comp","t1","t2","t3","componentName","displayName","name","createPrimitive","node","RadixComp","reduce","acc","ReturnType","K"],"sources":["../../src/utils/Primitive.tsx"],"sourcesContent":["import {\n  type ComponentProps,\n  type ComponentPropsWithoutRef,\n  type ComponentRef,\n  type ElementType,\n  type ForwardRefExoticComponent,\n  type PropsWithoutRef,\n  type ReactElement,\n  type ReactNode,\n  type RefAttributes,\n  cloneElement,\n  forwardRef,\n  isValidElement,\n} from \"react\";\nimport { Primitive as RadixPrimitive } from \"radix-ui/internal\";\nimport { Slot } from \"radix-ui\";\n\n/**\n * Thin wrapper around Radix `Primitive` that adds `render` prop support.\n *\n * When `render` is provided, it is converted to the equivalent `asChild` pattern:\n *   render={<Comp props />} + children  →  asChild + <Comp props>{children}</Comp>\n *\n * All prop merging, ref composition, and event handler chaining remain handled\n * by Radix's battle-tested Slot implementation — we add zero custom logic for that.\n */\n\n// Match @radix-ui/react-primitive's full element set\nconst NODES = [\n  \"a\",\n  \"button\",\n  \"div\",\n  \"form\",\n  \"h2\",\n  \"h3\",\n  \"img\",\n  \"input\",\n  \"label\",\n  \"li\",\n  \"nav\",\n  \"ol\",\n  \"p\",\n  \"select\",\n  \"span\",\n  \"svg\",\n  \"ul\",\n] as const;\ntype PrimitiveNode = (typeof NODES)[number];\n\ntype WithRenderPropProps<T extends ElementType> =\n  ComponentPropsWithoutRef<T> & {\n    render?: ReactElement | undefined;\n  };\n\ntype PrimitiveProps<E extends PrimitiveNode> = WithRenderPropProps<\n  (typeof RadixPrimitive)[E]\n>;\n\ntype WithRenderPropRuntimeProps<T extends ElementType> =\n  WithRenderPropProps<T> & {\n    asChild?: boolean | undefined;\n    children?: ReactNode | undefined;\n  };\n\ntype PrimitiveRef<E extends PrimitiveNode> = ComponentRef<\n  (typeof RadixPrimitive)[E]\n>;\n\n/**\n * Composes the children of a `render` element. Outer children win when supplied;\n * the render element's own children are the fallback.\n */\nfunction composeRenderElement(\n  render: ReactElement,\n  children: ReactNode,\n): ReactElement {\n  return cloneElement(\n    render,\n    undefined,\n    children !== undefined\n      ? children\n      : (render.props as { children?: ReactNode }).children,\n  );\n}\n\n/**\n * Composes a `render` element at a call site that has already computed its props.\n *\n * `withRenderProp` wraps a component; this covers the case where the props are\n * already in hand and the composition happens inline.\n */\nfunction renderSlot(\n  render: ReactElement,\n  children: ReactNode,\n  props: ComponentProps<typeof Slot.Root>,\n): ReactElement {\n  return (\n    <Slot.Root {...props}>{composeRenderElement(render, children)}</Slot.Root>\n  );\n}\n\nfunction withRenderProp<T extends ElementType>(Component: T) {\n  const Wrapped = forwardRef<ComponentRef<T>, WithRenderPropRuntimeProps<T>>(\n    (\n      {\n        render,\n        asChild,\n        children,\n        ...rest\n      }: PropsWithoutRef<WithRenderPropRuntimeProps<T>>,\n      ref,\n    ) => {\n      const Comp = Component as any;\n\n      if (render && isValidElement(render)) {\n        return (\n          <Comp {...(rest as any)} asChild ref={ref}>\n            {composeRenderElement(render, children)}\n          </Comp>\n        );\n      }\n\n      return (\n        <Comp {...(rest as any)} asChild={asChild} ref={ref}>\n          {children}\n        </Comp>\n      );\n    },\n  );\n\n  const componentName =\n    typeof Component === \"string\"\n      ? Component\n      : (Component.displayName ?? Component.name ?? \"Component\");\n  Wrapped.displayName = componentName;\n\n  return Wrapped as ForwardRefExoticComponent<\n    WithRenderPropProps<T> & RefAttributes<ComponentRef<T>>\n  >;\n}\n\nfunction createPrimitive<E extends PrimitiveNode>(node: E) {\n  const RadixComp = RadixPrimitive[node];\n  const Component = withRenderProp(RadixComp);\n\n  Component.displayName = `Primitive.${node}`;\n  return Component as ForwardRefExoticComponent<\n    PrimitiveProps<E> & RefAttributes<PrimitiveRef<E>>\n  >;\n}\n\nconst Primitive = NODES.reduce(\n  (acc, node) => {\n    acc[node] = createPrimitive(node);\n    return acc;\n  },\n  {} as {\n    [K in PrimitiveNode]: ReturnType<typeof createPrimitive<K>>;\n  },\n);\n\nexport { Primitive, renderSlot, withRenderProp };\nexport type { PrimitiveProps, WithRenderPropProps };\n"],"mappings":";;;;;;;;;;;;;;;AA4BA,MAAMe,QAAQ;CACZ;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;AAAI;;;;;AA2BN,SAASY,qBACPP,QACAK,UACc;CACd,OAAOhB,aACLW,QACAQ,KAAAA,GACAH,aAAaG,KAAAA,IACTH,WACCL,OAAOS,MAAmCJ,QACjD;AACF;;;;;;;AAQA,SAASK,WACPV,QACAK,UACAI,OACc;CACd,OACE,oBAAC,KAAK,MAAN;EAAW,GAAIA;EAAQF,UAAAA,qBAAqBP,QAAQK,QAAQ;CAAa,CAAA;AAE7E;AAEA,SAASO,eAAsCC,WAAc;CAC3D,MAAMC,UAAUxB,YACdyB,IAAAC,QAAA;EAAA,MAAAC,IAAAC,EAAA,EAAA;EAAA,IAAAd;EAAA,IAAAC;EAAA,IAAAL;EAAA,IAAAmB;EAAA,IAAAF,EAAA,OAAAF,IAAA;GACE,CAAA,CAAAf,QAAAI,SAAAC,UAAA,GAAAc,QAAAJ;GAKiDE,EAAA,KAAAF;GAAAE,EAAA,KAAAb;GAAAa,EAAA,KAAAZ;GAAAY,EAAA,KAAAjB;GAAAiB,EAAA,KAAAE;EAAA,OAAA;GAAAf,UAAAa,EAAA;GAAAZ,WAAAY,EAAA;GAAAjB,SAAAiB,EAAA;GAAAE,OAAAF,EAAA;EAAA;EAGjD,MAAAG,OAAaP;EAEb,IAAIb,UAAUT,eAAeS,MAAM,GAAC;GAErB,MAAAqB,KAAAF;GAAW,IAAAG;GAAA,IAAAL,EAAA,OAAAZ,YAAAY,EAAA,OAAAjB,QAAA;IACnBsB,KAAAf,qBAAqBP,QAAQK,QAAQ;IAACY,EAAA,KAAAZ;IAAAY,EAAA,KAAAjB;IAAAiB,EAAA,KAAAK;GAAA,OAAAA,KAAAL,EAAA;GAAA,IAAAM;GAAA,IAAAN,EAAA,OAAAD,OAAAC,EAAA,OAAAI,MAAAJ,EAAA,QAAAK,IAAA;IADzCC,KAAA,oBAAC,MAAD;KAAK,GAAMF;KAAc,SAAA;KAAaL;KACnCM,UAAAA;IADE,CAAA;IAEEL,EAAA,KAAAD;IAAAC,EAAA,KAAAI;IAAAJ,EAAA,MAAAK;IAAAL,EAAA,MAAAM;GAAA,OAAAA,KAAAN,EAAA;GAAA,OAFPM;EAEO;EAKE,MAAAF,KAAAF;EAAW,IAAAG;EAAA,IAAAL,EAAA,QAAAb,WAAAa,EAAA,QAAAZ,YAAAY,EAAA,QAAAD,OAAAC,EAAA,QAAAI,IAAA;GAAtBC,KAAA,oBAAC,MAAD;IAAK,GAAMD;IAAuBjB;IAAcY;IAC7CX;GADE,CAAA;GAEEY,EAAA,MAAAb;GAAAa,EAAA,MAAAZ;GAAAY,EAAA,MAAAD;GAAAC,EAAA,MAAAI;GAAAJ,EAAA,MAAAK;EAAA,OAAAA,KAAAL,EAAA;EAAA,OAFPK;CAEO,CAGb;CAMAR,QAAQW,cAHN,OAAOZ,cAAc,WACjBA,YACCA,UAAUY,eAAeZ,UAAUa,QAAQ;CAGlD,OAAOZ;AAGT;AAEA,SAASa,gBAAyCC,MAAS;CACzD,MAAMC,YAAYpC,YAAemC;CACjC,MAAMf,YAAYD,eAAeiB,SAAS;CAE1ChB,UAAUY,cAAc,aAAaG;CACrC,OAAOf;AAGT;AAEA,MAAMrB,YAAYG,MAAMmC,QACrBC,KAAKH,SAAS;CACbG,IAAIH,QAAQD,gBAAgBC,IAAI;CAChC,OAAOG;AACT,GACA,CAAC,CAGH"}

package/dist/utils/getSelectionMessageId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSelectionMessageId.d.ts","names":[],"sources":["../../src/utils/getSelectionMessageId.ts"],"mappings":";cA6Ca,wBAAyB,WAAW"}
+{"version":3,"file":"getSelectionMessageId.d.ts","names":[],"sources":["../../src/utils/getSelectionMessageId.ts"],"mappings":";cAwDa,wBAAyB,WAAW"}

package/dist/utils/getSelectionMessageId.js

@@ -25,6 +25,14 @@ const findQuoteMarker = (node, messageElement) => {
 	if (!messageElement.contains(marker)) return null;
 	return marker;
 };
+const intersectsExcluded = (scope, selection) => {
+	const ranges = Array.from({ length: selection.rangeCount }, (_, i) => selection.getRangeAt(i));
+	for (const marker of scope.querySelectorAll(QUOTE_SELECTABLE_SELECTOR)) {
+		if (!isExcluded(marker)) continue;
+		if (ranges.some((range) => range.intersectsNode(marker))) return true;
+	}
+	return false;
+};
 const getSelectionMessageId = (selection) => {
 	const { anchorNode, focusNode } = selection;
 	if (!anchorNode || !focusNode) return null;
@@ -37,9 +45,15 @@ const getSelectionMessageId = (selection) => {
 	const focusMarker = findQuoteMarker(focusNode, anchorMessageElement);
 	if (anchorMarker && isExcluded(anchorMarker)) return null;
 	if (focusMarker && isExcluded(focusMarker)) return null;
-	if (!hasQuoteSelectableRegion(anchorMessageElement)) return messageId;
-	if (!anchorMarker || anchorMarker !== focusMarker) return null;
-	return messageId;
+	if (hasQuoteSelectableRegion(anchorMessageElement)) {
+		if (!anchorMarker || anchorMarker !== focusMarker) return null;
+	}
+	const scope = anchorMarker ?? anchorMessageElement;
+	for (let i = 0; i < selection.rangeCount; i++) {
+		const { commonAncestorContainer } = selection.getRangeAt(i);
+		if (!scope.contains(commonAncestorContainer)) return null;
+	}
+	return intersectsExcluded(scope, selection) ? null : messageId;
 };
 //#endregion
 export { getSelectionMessageId };

package/dist/utils/getSelectionMessageId.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSelectionMessageId.js","names":["QUOTE_SELECTABLE_SELECTOR","getElement","node","Node","HTMLElement","parentElement","findMessageElement","el","id","getAttribute","isExcluded","marker","Element","hasQuoteSelectableRegion","messageElement","matches","querySelectorAll","findQuoteMarker","closest","contains","getSelectionMessageId","selection","Selection","anchorNode","focusNode","anchorMessageElement","focusMessageElement","messageId","anchorMarker","focusMarker"],"sources":["../../src/utils/getSelectionMessageId.ts"],"sourcesContent":["const QUOTE_SELECTABLE_SELECTOR = \"[data-aui-quote-selectable]\";\n\nconst getElement = (node: Node | null): HTMLElement | null => {\n  return node instanceof HTMLElement ? node : (node?.parentElement ?? null);\n};\n\nconst findMessageElement = (node: Node | null): HTMLElement | null => {\n  let el = node instanceof HTMLElement ? node : (node?.parentElement ?? null);\n  while (el) {\n    const id = el.getAttribute(\"data-message-id\");\n    if (id) return el;\n    el = el.parentElement;\n  }\n  return null;\n};\n\nconst isExcluded = (marker: Element): boolean => {\n  return marker.getAttribute(\"data-aui-quote-selectable\") === \"false\";\n};\n\nconst hasQuoteSelectableRegion = (messageElement: HTMLElement) => {\n  if (\n    messageElement.matches(QUOTE_SELECTABLE_SELECTOR) &&\n    !isExcluded(messageElement)\n  ) {\n    return true;\n  }\n  for (const marker of messageElement.querySelectorAll(\n    QUOTE_SELECTABLE_SELECTOR,\n  )) {\n    if (!isExcluded(marker)) return true;\n  }\n  return false;\n};\n\nconst findQuoteMarker = (\n  node: Node | null,\n  messageElement: HTMLElement,\n): HTMLElement | null => {\n  const marker = getElement(node)?.closest(QUOTE_SELECTABLE_SELECTOR);\n  if (!(marker instanceof HTMLElement)) return null;\n  if (!messageElement.contains(marker)) return null;\n  return marker;\n};\n\nexport const getSelectionMessageId = (selection: Selection): string | null => {\n  const { anchorNode, focusNode } = selection;\n  if (!anchorNode || !focusNode) return null;\n\n  const anchorMessageElement = findMessageElement(anchorNode);\n  const focusMessageElement = findMessageElement(focusNode);\n\n  if (!anchorMessageElement || anchorMessageElement !== focusMessageElement) {\n    return null;\n  }\n\n  const messageId = anchorMessageElement.getAttribute(\"data-message-id\");\n  if (!messageId) return null;\n\n  const anchorMarker = findQuoteMarker(anchorNode, anchorMessageElement);\n  const focusMarker = findQuoteMarker(focusNode, anchorMessageElement);\n\n  if (anchorMarker && isExcluded(anchorMarker)) return null;\n  if (focusMarker && isExcluded(focusMarker)) return null;\n\n  if (!hasQuoteSelectableRegion(anchorMessageElement)) return messageId;\n\n  if (!anchorMarker || anchorMarker !== focusMarker) return null;\n\n  return messageId;\n};\n"],"mappings":";AAAA,MAAMA,4BAA4B;AAElC,MAAMC,cAAcC,SAA0C;CAC5D,OAAOA,gBAAgBE,cAAcF,OAAQA,MAAMG,iBAAiB;AACtE;AAEA,MAAMC,sBAAsBJ,SAA0C;CACpE,IAAIK,KAAKL,gBAAgBE,cAAcF,OAAQA,MAAMG,iBAAiB;CACtE,OAAOE,IAAI;EAET,IADWA,GAAGE,aAAa,iBACvBD,GAAI,OAAOD;EACfA,KAAKA,GAAGF;CACV;CACA,OAAO;AACT;AAEA,MAAMK,cAAcC,WAA6B;CAC/C,OAAOA,OAAOF,aAAa,2BAA2B,MAAM;AAC9D;AAEA,MAAMI,4BAA4BC,mBAAgC;CAChE,IACEA,eAAeC,QAAQf,yBAAyB,KAChD,CAACU,WAAWI,cAAc,GAE1B,OAAO;CAET,KAAK,MAAMH,UAAUG,eAAeE,iBAClChB,yBACF,GACE,IAAI,CAACU,WAAWC,MAAM,GAAG,OAAO;CAElC,OAAO;AACT;AAEA,MAAMM,mBACJf,MACAY,mBACuB;CACvB,MAAMH,SAASV,WAAWC,IAAI,CAAC,EAAEgB,QAAQlB,yBAAyB;CAClE,IAAI,EAAEW,kBAAkBP,cAAc,OAAO;CAC7C,IAAI,CAACU,eAAeK,SAASR,MAAM,GAAG,OAAO;CAC7C,OAAOA;AACT;AAEA,MAAaS,yBAAyBC,cAAwC;CAC5E,MAAM,EAAEE,YAAYC,cAAcH;CAClC,IAAI,CAACE,cAAc,CAACC,WAAW,OAAO;CAEtC,MAAMC,uBAAuBnB,mBAAmBiB,UAAU;CAC1D,MAAMG,sBAAsBpB,mBAAmBkB,SAAS;CAExD,IAAI,CAACC,wBAAwBA,yBAAyBC,qBACpD,OAAO;CAGT,MAAMC,YAAYF,qBAAqBhB,aAAa,iBAAiB;CACrE,IAAI,CAACkB,WAAW,OAAO;CAEvB,MAAMC,eAAeX,gBAAgBM,YAAYE,oBAAoB;CACrE,MAAMI,cAAcZ,gBAAgBO,WAAWC,oBAAoB;CAEnE,IAAIG,gBAAgBlB,WAAWkB,YAAY,GAAG,OAAO;CACrD,IAAIC,eAAenB,WAAWmB,WAAW,GAAG,OAAO;CAEnD,IAAI,CAAChB,yBAAyBY,oBAAoB,GAAG,OAAOE;CAE5D,IAAI,CAACC,gBAAgBA,iBAAiBC,aAAa,OAAO;CAE1D,OAAOF;AACT"}
+{"version":3,"file":"getSelectionMessageId.js","names":["QUOTE_SELECTABLE_SELECTOR","getElement","node","Node","HTMLElement","parentElement","findMessageElement","el","id","getAttribute","isExcluded","marker","Element","hasQuoteSelectableRegion","messageElement","matches","querySelectorAll","findQuoteMarker","closest","contains","intersectsExcluded","scope","selection","Selection","ranges","Array","from","length","rangeCount","_","i","getRangeAt","some","range","intersectsNode","getSelectionMessageId","anchorNode","focusNode","anchorMessageElement","focusMessageElement","messageId","anchorMarker","focusMarker","commonAncestorContainer"],"sources":["../../src/utils/getSelectionMessageId.ts"],"sourcesContent":["const QUOTE_SELECTABLE_SELECTOR = \"[data-aui-quote-selectable]\";\n\nconst getElement = (node: Node | null): HTMLElement | null => {\n  return node instanceof HTMLElement ? node : (node?.parentElement ?? null);\n};\n\nconst findMessageElement = (node: Node | null): HTMLElement | null => {\n  let el = node instanceof HTMLElement ? node : (node?.parentElement ?? null);\n  while (el) {\n    const id = el.getAttribute(\"data-message-id\");\n    if (id) return el;\n    el = el.parentElement;\n  }\n  return null;\n};\n\nconst isExcluded = (marker: Element): boolean => {\n  return marker.getAttribute(\"data-aui-quote-selectable\") === \"false\";\n};\n\nconst hasQuoteSelectableRegion = (messageElement: HTMLElement) => {\n  if (\n    messageElement.matches(QUOTE_SELECTABLE_SELECTOR) &&\n    !isExcluded(messageElement)\n  ) {\n    return true;\n  }\n  for (const marker of messageElement.querySelectorAll(\n    QUOTE_SELECTABLE_SELECTOR,\n  )) {\n    if (!isExcluded(marker)) return true;\n  }\n  return false;\n};\n\nconst findQuoteMarker = (\n  node: Node | null,\n  messageElement: HTMLElement,\n): HTMLElement | null => {\n  const marker = getElement(node)?.closest(QUOTE_SELECTABLE_SELECTOR);\n  if (!(marker instanceof HTMLElement)) return null;\n  if (!messageElement.contains(marker)) return null;\n  return marker;\n};\n\nconst intersectsExcluded = (scope: Element, selection: Selection): boolean => {\n  const ranges = Array.from({ length: selection.rangeCount }, (_, i) =>\n    selection.getRangeAt(i),\n  );\n  for (const marker of scope.querySelectorAll(QUOTE_SELECTABLE_SELECTOR)) {\n    if (!isExcluded(marker)) continue;\n    if (ranges.some((range) => range.intersectsNode(marker))) return true;\n  }\n  return false;\n};\n\nexport const getSelectionMessageId = (selection: Selection): string | null => {\n  const { anchorNode, focusNode } = selection;\n  if (!anchorNode || !focusNode) return null;\n\n  const anchorMessageElement = findMessageElement(anchorNode);\n  const focusMessageElement = findMessageElement(focusNode);\n\n  if (!anchorMessageElement || anchorMessageElement !== focusMessageElement) {\n    return null;\n  }\n\n  const messageId = anchorMessageElement.getAttribute(\"data-message-id\");\n  if (!messageId) return null;\n\n  const anchorMarker = findQuoteMarker(anchorNode, anchorMessageElement);\n  const focusMarker = findQuoteMarker(focusNode, anchorMessageElement);\n\n  if (anchorMarker && isExcluded(anchorMarker)) return null;\n  if (focusMarker && isExcluded(focusMarker)) return null;\n\n  if (hasQuoteSelectableRegion(anchorMessageElement)) {\n    if (!anchorMarker || anchorMarker !== focusMarker) return null;\n  }\n\n  const scope = anchorMarker ?? anchorMessageElement;\n\n  for (let i = 0; i < selection.rangeCount; i++) {\n    const { commonAncestorContainer } = selection.getRangeAt(i);\n    if (!scope.contains(commonAncestorContainer)) return null;\n  }\n\n  return intersectsExcluded(scope, selection) ? null : messageId;\n};\n"],"mappings":";AAAA,MAAMA,4BAA4B;AAElC,MAAMC,cAAcC,SAA0C;CAC5D,OAAOA,gBAAgBE,cAAcF,OAAQA,MAAMG,iBAAiB;AACtE;AAEA,MAAMC,sBAAsBJ,SAA0C;CACpE,IAAIK,KAAKL,gBAAgBE,cAAcF,OAAQA,MAAMG,iBAAiB;CACtE,OAAOE,IAAI;EAET,IADWA,GAAGE,aAAa,iBACvBD,GAAI,OAAOD;EACfA,KAAKA,GAAGF;CACV;CACA,OAAO;AACT;AAEA,MAAMK,cAAcC,WAA6B;CAC/C,OAAOA,OAAOF,aAAa,2BAA2B,MAAM;AAC9D;AAEA,MAAMI,4BAA4BC,mBAAgC;CAChE,IACEA,eAAeC,QAAQf,yBAAyB,KAChD,CAACU,WAAWI,cAAc,GAE1B,OAAO;CAET,KAAK,MAAMH,UAAUG,eAAeE,iBAClChB,yBACF,GACE,IAAI,CAACU,WAAWC,MAAM,GAAG,OAAO;CAElC,OAAO;AACT;AAEA,MAAMM,mBACJf,MACAY,mBACuB;CACvB,MAAMH,SAASV,WAAWC,IAAI,CAAC,EAAEgB,QAAQlB,yBAAyB;CAClE,IAAI,EAAEW,kBAAkBP,cAAc,OAAO;CAC7C,IAAI,CAACU,eAAeK,SAASR,MAAM,GAAG,OAAO;CAC7C,OAAOA;AACT;AAEA,MAAMS,sBAAsBC,OAAgBC,cAAkC;CAC5E,MAAME,SAASC,MAAMC,KAAK,EAAEC,QAAQL,UAAUM,WAAW,IAAIC,GAAGC,MAC9DR,UAAUS,WAAWD,CAAC,CACxB;CACA,KAAK,MAAMnB,UAAUU,MAAML,iBAAiBhB,yBAAyB,GAAG;EACtE,IAAI,CAACU,WAAWC,MAAM,GAAG;EACzB,IAAIa,OAAOQ,MAAMC,UAAUA,MAAMC,eAAevB,MAAM,CAAC,GAAG,OAAO;CACnE;CACA,OAAO;AACT;AAEA,MAAawB,yBAAyBb,cAAwC;CAC5E,MAAM,EAAEc,YAAYC,cAAcf;CAClC,IAAI,CAACc,cAAc,CAACC,WAAW,OAAO;CAEtC,MAAMC,uBAAuBhC,mBAAmB8B,UAAU;CAC1D,MAAMG,sBAAsBjC,mBAAmB+B,SAAS;CAExD,IAAI,CAACC,wBAAwBA,yBAAyBC,qBACpD,OAAO;CAGT,MAAMC,YAAYF,qBAAqB7B,aAAa,iBAAiB;CACrE,IAAI,CAAC+B,WAAW,OAAO;CAEvB,MAAMC,eAAexB,gBAAgBmB,YAAYE,oBAAoB;CACrE,MAAMI,cAAczB,gBAAgBoB,WAAWC,oBAAoB;CAEnE,IAAIG,gBAAgB/B,WAAW+B,YAAY,GAAG,OAAO;CACrD,IAAIC,eAAehC,WAAWgC,WAAW,GAAG,OAAO;CAEnD,IAAI7B,yBAAyByB,oBAAoB,GAC3C;MAAA,CAACG,gBAAgBA,iBAAiBC,aAAa,OAAO;CAAA;CAG5D,MAAMrB,QAAQoB,gBAAgBH;CAE9B,KAAK,IAAIR,IAAI,GAAGA,IAAIR,UAAUM,YAAYE,KAAK;EAC7C,MAAM,EAAEa,4BAA4BrB,UAAUS,WAAWD,CAAC;EAC1D,IAAI,CAACT,MAAMF,SAASwB,uBAAuB,GAAG,OAAO;CACvD;CAEA,OAAOvB,mBAAmBC,OAAOC,SAAS,IAAI,OAAOkB;AACvD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react",
-  "version": "0.15.17",
+  "version": "0.15.19",
   "description": "Open-source TypeScript/React library for building production-grade AI chat experiences",
   "keywords": [
     "ai",
@@ -55,15 +55,15 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.3.16",
-    "@assistant-ui/store": "^0.3.11",
-    "@assistant-ui/tap": "^0.9.15",
-    "assistant-cloud": "^0.1.42",
-    "assistant-stream": "^0.3.40",
+    "@assistant-ui/core": "^0.3.18",
+    "@assistant-ui/store": "^0.3.13",
+    "@assistant-ui/tap": "^0.9.17",
+    "assistant-cloud": "^0.2.0",
+    "assistant-stream": "^0.3.42",
     "radix-ui": "^1.6.7",
     "react-textarea-autosize": "^8.5.9",
-    "safe-content-frame": "^0.0.28",
-    "zod": "^4.4.3",
+    "safe-content-frame": "^0.0.30",
+    "zod": "^4.5.4",
     "zustand": "^5.0.15"
   },
   "peerDependencies": {
@@ -81,13 +81,13 @@
     }
   },
   "devDependencies": {
-    "@assistant-ui/vite": "0.0.15",
-    "@assistant-ui/x-buildutils": "0.0.24",
-    "@testing-library/react": "^16.3.2",
+    "@assistant-ui/vite": "0.0.17",
+    "@assistant-ui/x-buildutils": "0.0.26",
+    "@testing-library/react": "^16.3.3",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^26.2.0",
+    "@types/node": "^26.4.1",
     "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.5",
+    "@types/react-dom": "^19.2.7",
     "jsdom": "^30.0.1",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",

package/src/context/providers/ThreadViewportProvider.tsx

@@ -25,8 +25,8 @@ const useThreadViewportStoreValue = (options: ThreadViewportStoreOptions) => {
 
   // Forward scrollToBottom from outer viewport to inner viewport
   useEffect(() => {
-    return outerViewport?.getState().onScrollToBottom(() => {
-      store.getState().scrollToBottom();
+    return outerViewport?.getState().onScrollToBottom((config) => {
+      store.getState().scrollToBottom(config);
     });
   }, [outerViewport, store]);
 

package/src/hooks/useToolCallElapsed.ts

@@ -36,6 +36,9 @@ export const useToolCallElapsed = (): number | undefined => {
 
   useEffect(() => {
     if (!running) return undefined;
+    // The clock is an external source; this catches the elapsed value up before
+    // the interval takes over.
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     setNow(Date.now());
     const id = setInterval(() => setNow(Date.now()), 1000);
     return () => clearInterval(id);

package/src/index.ts

@@ -43,8 +43,10 @@ export type {
   ThreadListItemState,
 } from "@assistant-ui/core";
 
+export { toolApprovalAcceptsText } from "@assistant-ui/core";
+
 export { useCloudThreadListRuntime } from "@assistant-ui/core/react";
-export { AssistantCloud } from "assistant-cloud";
+export { AssistantCloud, readAnonymousRefreshToken } from "assistant-cloud";
 
 // --- adapters/attachment ---
 export type { AttachmentAdapter } from "@assistant-ui/core";
@@ -360,6 +362,7 @@ export type {
   GenerativeUISpec,
   Unstable_AudioMessagePart,
   RespondToToolApprovalOptions,
+  ToolApprovalDisplay,
   ToolApprovalOption,
   ToolApprovalOptionKind,
   ToolApprovalResponse,
@@ -515,6 +518,7 @@ export {
   getMcpAppFromToolPart,
 } from "./mcp-apps";
 export type {
+  McpAppPartOptions,
   McpAppRendererOptions,
   McpAppMetadata,
   McpAppResource,
@@ -531,3 +535,12 @@ export type {
   ToolCallMessagePartMcpMetadata,
 } from "./mcp-apps";
 export type { McpAppResourceOutput } from "@assistant-ui/core/react";
+export type { ShimLoadError, ShimLoadErrorCode } from "safe-content-frame";
+
+// Unstable - WebMCP provider (exposes frontend tools to a WebMCP-capable browser)
+export {
+  unstable_useWebMcpProvider,
+  type Unstable_WebMcpProviderOptions,
+  type Unstable_WebMcpProviderResult,
+} from "./unstable/webmcp/useWebMcpProvider";
+export { defaultWebMcpFilter as unstable_defaultWebMcpFilter } from "./unstable/webmcp/convertTools";

package/src/mcp-apps/McpAppRenderer.test.tsx

@@ -9,16 +9,21 @@ import type {
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type {
   McpAppBridgeHandlers,
+  McpAppFrameProps,
+  McpAppHostContext,
   McpAppsHost,
   McpAppsRemoteHostOptions,
 } from "./types";
 
-const { framePropsMock } = vi.hoisted(() => ({ framePropsMock: vi.fn() }));
+const { appendMock, framePropsMock } = vi.hoisted(() => ({
+  appendMock: vi.fn(),
+  framePropsMock: vi.fn(),
+}));
 
 vi.mock("@assistant-ui/store", async (importOriginal) => ({
   ...(await importOriginal()),
   useAui: () => ({
-    thread: () => ({ append: vi.fn() }),
+    thread: { append: appendMock },
   }),
 }));
 
@@ -43,9 +48,12 @@ const createDeferred = <T,>() => {
   return { promise, resolve };
 };
 
-const createPart = (serverId?: string): ToolCallMessagePartProps => ({
+const createPart = (
+  serverId?: string,
+  toolCallId = "call-1",
+): ToolCallMessagePartProps => ({
   type: "tool-call",
-  toolCallId: "call-1",
+  toolCallId,
   toolName: "search",
   args: {},
   argsText: "{}",
@@ -105,6 +113,60 @@ function MemoizedHarness({ host }: { host: McpAppsHost }) {
   return <MemoizedPart Renderer={renderer.render} />;
 }
 
+const MemoizedPartById = memo(function MemoizedPartById({
+  Renderer,
+  toolCallId,
+}: {
+  Renderer: ToolCallMessagePartComponent;
+  toolCallId: string;
+}) {
+  return <Renderer {...createPart(undefined, toolCallId)} />;
+});
+
+function OptionsHarness({
+  host,
+  hostContext,
+  handlers,
+  forPart,
+  toolCallIds = ["call-1"],
+}: {
+  host: McpAppsHost;
+  hostContext?: McpAppHostContext;
+  handlers?: McpAppRendererOptions["handlers"];
+  forPart?: McpAppRendererOptions["forPart"];
+  toolCallIds?: string[];
+}) {
+  const renderer = useResource(
+    McpAppRenderer({
+      host: Host({ host }),
+      ...(hostContext === undefined ? {} : { hostContext }),
+      ...(handlers === undefined ? {} : { handlers }),
+      ...(forPart === undefined ? {} : { forPart }),
+    }),
+  );
+  return toolCallIds.map((toolCallId) => (
+    <MemoizedPartById
+      key={toolCallId}
+      Renderer={renderer.render}
+      toolCallId={toolCallId}
+    />
+  ));
+}
+
+const framePropsCalls = () =>
+  framePropsMock.mock.calls.map(([props]) => props as McpAppFrameProps);
+
+const loadingHost = (): McpAppsHost => ({
+  loadResource: vi.fn(async ({ uri }) => ({
+    uri,
+    mimeType: "text/html;profile=mcp-app" as const,
+    html: "",
+  })),
+  callTool: vi.fn(),
+  readResource: vi.fn(),
+  listResources: vi.fn(),
+});
+
 function RemoteHarness({
   url,
   headers,
@@ -127,9 +189,146 @@ function RemoteHarness({
 
 describe("McpAppRenderer", () => {
   beforeEach(() => {
+    appendMock.mockReset();
     framePropsMock.mockReset();
   });
 
+  it("loads newly mounted parts through the committed host", async () => {
+    const hostA = loadingHost();
+    const hostB = loadingHost();
+    const view = render(
+      <OptionsHarness host={hostA} toolCallIds={["call-1"]} />,
+    );
+    await waitFor(() => expect(hostA.loadResource).toHaveBeenCalledOnce());
+    vi.mocked(hostA.loadResource).mockClear();
+
+    view.rerender(
+      <OptionsHarness host={hostB} toolCallIds={["call-1", "call-2"]} />,
+    );
+    await waitFor(() => expect(hostB.loadResource).toHaveBeenCalled());
+
+    expect(hostA.loadResource).not.toHaveBeenCalled();
+  });
+
+  it("merges forPart handlers over the thread-wide handlers", async () => {
+    const onInitialized = vi.fn();
+    render(
+      <OptionsHarness
+        host={loadingHost()}
+        handlers={{ onInitialized }}
+        forPart={(part) => ({
+          handlers: {
+            requestDisplayMode: ({ mode }) => {
+              void part;
+              return { mode };
+            },
+          },
+        })}
+      />,
+    );
+
+    await waitFor(() => expect(framePropsCalls().length).toBeGreaterThan(0));
+    const handlers = framePropsCalls().at(-1)?.handlers;
+    expect(handlers?.requestDisplayMode).toBeDefined();
+    handlers?.onInitialized?.();
+    expect(onInitialized).toHaveBeenCalledOnce();
+  });
+
+  it("leaves mounted parts alone when renderer options are unchanged", async () => {
+    const host = loadingHost();
+    const hostContext: McpAppHostContext = { displayMode: "inline" };
+    const view = () => <OptionsHarness host={host} hostContext={hostContext} />;
+
+    const rendered = render(view());
+    await waitFor(() => expect(framePropsCalls().length).toBeGreaterThan(0));
+    const rendersBefore = framePropsCalls().length;
+
+    rendered.rerender(view());
+    expect(framePropsCalls().length).toBe(rendersBefore);
+  });
+
+  it("delivers a changed renderer host context to mounted parts", async () => {
+    const host = loadingHost();
+    const view = render(
+      <OptionsHarness host={host} hostContext={{ displayMode: "inline" }} />,
+    );
+    await waitFor(() =>
+      expect(framePropsCalls().at(-1)?.hostContext).toEqual({
+        displayMode: "inline",
+      }),
+    );
+
+    view.rerender(
+      <OptionsHarness
+        host={host}
+        hostContext={{ displayMode: "fullscreen" }}
+      />,
+    );
+    await waitFor(() =>
+      expect(framePropsCalls().at(-1)?.hostContext).toEqual({
+        displayMode: "fullscreen",
+      }),
+    );
+  });
+
+  it("resolves host context per part through forPart", async () => {
+    const modes: Record<string, string> = {
+      "call-1": "inline",
+      "call-2": "fullscreen",
+    };
+    render(
+      <OptionsHarness
+        host={loadingHost()}
+        hostContext={{ theme: "light" }}
+        toolCallIds={["call-1", "call-2"]}
+        forPart={(part) => ({
+          hostContext: {
+            theme: "light",
+            displayMode: modes[part.toolCallId] as "inline" | "fullscreen",
+          },
+        })}
+      />,
+    );
+
+    await waitFor(() => expect(framePropsCalls().length).toBeGreaterThan(1));
+    const delivered = framePropsCalls().map((props) => props.hostContext);
+    expect(delivered).toContainEqual({
+      theme: "light",
+      displayMode: "inline",
+    });
+    expect(delivered).toContainEqual({
+      theme: "light",
+      displayMode: "fullscreen",
+    });
+  });
+
+  it("gives forPart handlers the part that owns the frame", async () => {
+    const promoted: string[] = [];
+    render(
+      <OptionsHarness
+        host={loadingHost()}
+        toolCallIds={["call-1", "call-2"]}
+        forPart={(part) => ({
+          hostContext: { toolCallId: part.toolCallId },
+          handlers: {
+            requestDisplayMode: ({ mode }) => {
+              promoted.push(`${part.toolCallId}:${mode}`);
+              return { mode };
+            },
+          },
+        })}
+      />,
+    );
+
+    await waitFor(() => expect(framePropsCalls().length).toBeGreaterThan(1));
+    const second = framePropsCalls().find(
+      (props) => props.hostContext?.["toolCallId"] === "call-2",
+    );
+    await second?.handlers?.requestDisplayMode?.({ mode: "fullscreen" });
+
+    expect(promoted).toEqual(["call-2:fullscreen"]);
+  });
+
   it("injects serverId into loadResource and reloads when it changes", async () => {
     const loadResource = vi.fn(async ({ uri }: { uri: string }) => ({
       uri,
@@ -250,7 +449,7 @@ describe("McpAppRenderer", () => {
     framePropsMock.mockClear();
     view.rerender(<MemoizedHarness host={nextHost} />);
 
-    expect(nextHost.loadResource).toHaveBeenCalledTimes(1);
+    await waitFor(() => expect(nextHost.loadResource).toHaveBeenCalledTimes(1));
     expect(framePropsMock).not.toHaveBeenCalled();
 
     nextResource.resolve({
@@ -473,6 +672,55 @@ describe("McpAppRenderer", () => {
     expect(listResources).toHaveBeenCalledWith(params);
   });
 
+  it("appends MCP Apps message content in the default sendMessage handler", async () => {
+    render(<Harness host={loadingHost()} />);
+    await waitFor(() => expect(framePropsMock).toHaveBeenCalled());
+    const handlers = framePropsMock.mock.lastCall?.[0]
+      .handlers as McpAppBridgeHandlers;
+
+    expect(
+      handlers.sendMessage?.({
+        role: "user",
+        content: [
+          { type: "text", text: "Open Grade 5 Math" },
+          { type: "image", data: "image", mimeType: "image/png" },
+          { type: "text", text: "Period 4" },
+        ],
+      }),
+    ).toEqual({ ok: true });
+    expect(appendMock).toHaveBeenCalledWith({
+      content: [
+        { type: "text", text: "Open Grade 5 Math" },
+        { type: "text", text: "Period 4" },
+      ],
+    });
+
+    expect(handlers.sendMessage?.({ text: "typed instead" })).toEqual({
+      ok: true,
+    });
+    expect(appendMock).toHaveBeenLastCalledWith({
+      content: [{ type: "text", text: "typed instead" }],
+    });
+
+    expect(
+      handlers.sendMessage?.({
+        role: "user",
+        content: [{ type: "image", data: "image", mimeType: "image/png" }],
+      }),
+    ).toEqual({
+      isError: true,
+      ok: false,
+      reason: "no text content to append",
+    });
+
+    expect(handlers.sendMessage?.({ role: "user" })).toEqual({
+      isError: true,
+      ok: false,
+      reason: "unrecognised params shape",
+    });
+    expect(appendMock).toHaveBeenCalledTimes(2);
+  });
+
   it("uses caller UI handlers and keeps data-plane handlers on the host", async () => {
     const host: McpAppsHost = {
       loadResource: vi.fn(async ({ uri }) => ({