@assistant-ui/react 0.15.4 → 0.15.5

package/dist/primitives/selectionToolbar/SelectionToolbarRoot.js

@@ -4,6 +4,7 @@ import { getSelectionMessageId } from "../../utils/getSelectionMessageId.js";
 import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
 import { createContext, forwardRef, useContext, useEffect, useState } from "@assistant-ui/tap/react-shim";
 import { jsx } from "react/jsx-runtime";
+import { composeEventHandlers } from "@radix-ui/primitive";
 import { createPortal } from "react-dom";
 //#region src/primitives/selectionToolbar/SelectionToolbarRoot.tsx
 const SelectionToolbarContext = createContext(null);
@@ -117,10 +118,7 @@ const SelectionToolbarPrimitiveRoot = forwardRef((t0, forwardedRef) => {
 	const positionStyle = t5;
 	let t6;
 	if ($[10] !== onMouseDown) {
-		t6 = (e) => {
-			e.preventDefault();
-			onMouseDown?.(e);
-		};
+		t6 = composeEventHandlers(onMouseDown, _temp);
 		$[10] = onMouseDown;
 		$[11] = t6;
 	} else t6 = $[11];
@@ -151,6 +149,9 @@ const SelectionToolbarPrimitiveRoot = forwardRef((t0, forwardedRef) => {
 	return t8;
 });
 SelectionToolbarPrimitiveRoot.displayName = "SelectionToolbarPrimitive.Root";
+function _temp(e) {
+	e.preventDefault();
+}
 //#endregion
 export { SelectionToolbarPrimitiveRoot, useSelectionToolbarInfo };
 

package/dist/primitives/selectionToolbar/SelectionToolbarRoot.js.map

@@ -1 +1 @@
-{"version":3,"file":"SelectionToolbarRoot.js","names":["c","_c","Primitive","ComponentPropsWithoutRef","ComponentRef","createContext","forwardRef","useContext","useEffect","useState","createPortal","getSelectionMessageId","SelectionInfo","text","messageId","rect","DOMRect","SelectionToolbarContext","useSelectionToolbarInfo","SelectionToolbarPrimitiveRoot","Element","div","Props","t0","forwardedRef","$","onMouseDown","props","style","info","setInfo","t1","t2","Symbol","for","checkSelection","requestAnimationFrame","sel","window","getSelection","isCollapsed","toString","trim","range","getRangeAt","getBoundingClientRect","handleSelectionCollapse","sel_0","handleScroll","document","addEventListener","removeEventListener","t3","top","t4","left","width","t5","position","transform","zIndex","positionStyle","t6","e","preventDefault","t7","t8","body","displayName"],"sources":["../../../src/primitives/selectionToolbar/SelectionToolbarRoot.tsx"],"sourcesContent":["\"use client\";\n\nimport { Primitive } from \"../../utils/Primitive\";\nimport {\n  type ComponentPropsWithoutRef,\n  type ComponentRef,\n  createContext,\n  forwardRef,\n  useContext,\n  useEffect,\n  useState,\n} from \"react\";\nimport { createPortal } from \"react-dom\";\nimport { getSelectionMessageId } from \"../../utils/getSelectionMessageId\";\n\ntype SelectionInfo = {\n  text: string;\n  messageId: string;\n  rect: DOMRect;\n};\n\nconst SelectionToolbarContext = createContext<SelectionInfo | null>(null);\n\nexport const useSelectionToolbarInfo = () =>\n  useContext(SelectionToolbarContext);\n\nexport namespace SelectionToolbarPrimitiveRoot {\n  export type Element = ComponentRef<typeof Primitive.div>;\n  export type Props = ComponentPropsWithoutRef<typeof Primitive.div>;\n}\n\n/**\n * A floating toolbar that appears when text is selected within a message.\n *\n * Listens for mouse and keyboard selection events, validates that the\n * selection is within a single message, and renders a positioned portal\n * near the selection. Prevents mousedown from clearing the selection.\n *\n * @example\n * ```tsx\n * <SelectionToolbarPrimitive.Root>\n *   <SelectionToolbarPrimitive.Quote>Quote</SelectionToolbarPrimitive.Quote>\n * </SelectionToolbarPrimitive.Root>\n * ```\n */\nexport const SelectionToolbarPrimitiveRoot = forwardRef<\n  SelectionToolbarPrimitiveRoot.Element,\n  SelectionToolbarPrimitiveRoot.Props\n>(({ onMouseDown, style, ...props }, forwardedRef) => {\n  const [info, setInfo] = useState<SelectionInfo | null>(null);\n\n  useEffect(() => {\n    const checkSelection = () => {\n      requestAnimationFrame(() => {\n        const sel = window.getSelection();\n        if (!sel || sel.isCollapsed) {\n          setInfo(null);\n          return;\n        }\n\n        const text = sel.toString().trim();\n        if (!text) {\n          setInfo(null);\n          return;\n        }\n\n        const messageId = getSelectionMessageId(sel);\n        if (!messageId) {\n          setInfo(null);\n          return;\n        }\n\n        const range = sel.getRangeAt(0);\n        const rect = range.getBoundingClientRect();\n        setInfo({ text, messageId, rect });\n      });\n    };\n\n    const handleSelectionCollapse = () => {\n      const sel = window.getSelection();\n      if (!sel || sel.isCollapsed) {\n        setInfo(null);\n      }\n    };\n\n    const handleScroll = () => {\n      setInfo(null);\n    };\n\n    document.addEventListener(\"mouseup\", checkSelection);\n    document.addEventListener(\"keyup\", checkSelection);\n    document.addEventListener(\"selectionchange\", handleSelectionCollapse);\n    document.addEventListener(\"scroll\", handleScroll, true);\n\n    return () => {\n      document.removeEventListener(\"mouseup\", checkSelection);\n      document.removeEventListener(\"keyup\", checkSelection);\n      document.removeEventListener(\"selectionchange\", handleSelectionCollapse);\n      document.removeEventListener(\"scroll\", handleScroll, true);\n    };\n  }, []);\n\n  if (!info) return null;\n\n  const positionStyle: React.CSSProperties = {\n    position: \"fixed\",\n    top: `${info.rect.top - 8}px`,\n    left: `${info.rect.left + info.rect.width / 2}px`,\n    transform: \"translate(-50%, -100%)\",\n    zIndex: 50,\n    ...style,\n  };\n\n  return createPortal(\n    <SelectionToolbarContext.Provider value={info}>\n      <Primitive.div\n        {...props}\n        ref={forwardedRef}\n        style={positionStyle}\n        onMouseDown={(e) => {\n          // Prevent mousedown from clearing the text selection\n          e.preventDefault();\n          onMouseDown?.(e);\n        }}\n      />\n    </SelectionToolbarContext.Provider>,\n    document.body,\n  );\n});\n\nSelectionToolbarPrimitiveRoot.displayName = \"SelectionToolbarPrimitive.Root\";\n"],"mappings":";;;;;;;;AAqBA,MAAMiB,0BAA0BZ,cAAoC,IAAI;AAExE,MAAaa,gCAA0B;CAAA,OACrCX,WAAWU,uBAAuB;AAAC;;;;;;;;;;;;;;;AAqBrC,MAAaE,gCAAgCb,YAG3CiB,IAAAC,iBAAA;CAAA,MAAAC,IAAAxB,EAAA,EAAA;CAAA,IAAAyB;CAAA,IAAAC;CAAA,IAAAC;CAAA,IAAAH,EAAA,OAAAF,IAAA;EAAC,CAAA,CAAAG,aAAAE,UAAAD,SAAAJ;EAAgCE,EAAA,KAAAF;EAAAE,EAAA,KAAAC;EAAAD,EAAA,KAAAE;EAAAF,EAAA,KAAAG;CAAA,OAAA;EAAAF,cAAAD,EAAA;EAAAE,QAAAF,EAAA;EAAAG,QAAAH,EAAA;CAAA;CACjC,MAAA,CAAAI,MAAAC,WAAwBrB,SAA+B,IAAI;CAAE,IAAAsB;CAAA,IAAAC;CAAA,IAAAP,EAAA,OAAAQ,OAAAC,IAAA,2BAAA,GAAA;EAEnDH,WAAA;GACR,MAAAI,uBAAuB;IACrBC,4BAAsB;KACpB,MAAAC,MAAYC,OAAMC,aAAc;KAChC,IAAI,CAACF,OAAOA,IAAGG,aAAY;MACzBV,QAAQ,IAAI;MAAC;KAAA;KAIf,MAAAjB,OAAawB,IAAGI,SAAU,CAAC,CAAAC,KAAM;KACjC,IAAI,CAAC7B,MAAI;MACPiB,QAAQ,IAAI;MAAC;KAAA;KAIf,MAAAhB,YAAkBH,sBAAsB0B,GAAG;KAC3C,IAAI,CAACvB,WAAS;MACZgB,QAAQ,IAAI;MAAC;KAAA;KAKf,MAAAf,OADcsB,IAAGO,WAAY,CAChBD,CAAK,CAAAE,sBAAuB;KACzCf,QAAQ;MAAAjB;MAAAC;MAAAC;KAAwB,CAAC;IAAC,CACnC;GAAC;GAGJ,MAAA+B,gCAAgC;IAC9B,MAAAC,QAAYT,OAAMC,aAAc;IAChC,IAAI,CAACF,SAAOA,MAAGG,aACbV,QAAQ,IAAI;GACb;GAGH,MAAAkB,qBAAqB;IACnBlB,QAAQ,IAAI;GAAC;GAGfmB,SAAQC,iBAAkB,WAAWf,cAAc;GACnDc,SAAQC,iBAAkB,SAASf,cAAc;GACjDc,SAAQC,iBAAkB,mBAAmBJ,uBAAuB;GACpEG,SAAQC,iBAAkB,UAAUF,cAAc,IAAI;GAAC,aAEhD;IACLC,SAAQE,oBAAqB,WAAWhB,cAAc;IACtDc,SAAQE,oBAAqB,SAAShB,cAAc;IACpDc,SAAQE,oBAAqB,mBAAmBL,uBAAuB;IACvEG,SAAQE,oBAAqB,UAAUH,cAAc,IAAI;GAAC;EAC3D;EACAhB,KAAA,CAAA;EAAEP,EAAA,KAAAM;EAAAN,EAAA,KAAAO;CAAA,OAAA;EAAAD,KAAAN,EAAA;EAAAO,KAAAP,EAAA;CAAA;CAjDLjB,UAAUuB,IAiDPC,EAAE;CAEL,IAAI,CAACH,MAAI,OAAS;CAIX,MAAAuB,KAAA,GAAGvB,KAAId,KAAKsC,MAAO,EAAC;CACnB,MAAAC,KAAA,GAAGzB,KAAId,KAAKwC,OAAQ1B,KAAId,KAAKyC,QAAS,EAAC;CAAI,IAAAC;CAAA,IAAAhC,EAAA,OAAAG,SAAAH,EAAA,OAAA2B,MAAA3B,EAAA,OAAA6B,IAAA;EAHRG,KAAA;GAAAC,UAC/B;GAAOL,KACZD;GAAwBG,MACvBD;GAA2CK,WACtC;GAAwBC,QAC3B;GAAE,GACPhC;EACL;EAACH,EAAA,KAAAG;EAAAH,EAAA,KAAA2B;EAAA3B,EAAA,KAAA6B;EAAA7B,EAAA,KAAAgC;CAAA,OAAAA,KAAAhC,EAAA;CAPD,MAAAoC,gBAA2CJ;CAOzC,IAAAK;CAAA,IAAArC,EAAA,QAAAC,aAAA;EAQiBoC,MAAAC,MAAA;GAEXA,EAACC,eAAgB;GACjBtC,cAAcqC,CAAC;EAAC;EACjBtC,EAAA,MAAAC;EAAAD,EAAA,MAAAqC;CAAA,OAAAA,KAAArC,EAAA;CAAA,IAAAwC;CAAA,IAAAxC,EAAA,QAAAD,gBAAAC,EAAA,QAAAoC,iBAAApC,EAAA,QAAAE,SAAAF,EAAA,QAAAqC,IAAA;EARHG,KAAA,oBAAA,UAAA,KAAA;GAAA,GACMtC;GACCH,KAAAA;GACEqC,OAAAA;GACM,aAAAC;EAIZ,CAAA;EACDrC,EAAA,MAAAD;EAAAC,EAAA,MAAAoC;EAAApC,EAAA,MAAAE;EAAAF,EAAA,MAAAqC;EAAArC,EAAA,MAAAwC;CAAA,OAAAA,KAAAxC,EAAA;CAAA,IAAAyC;CAAA,IAAAzC,EAAA,QAAAI,QAAAJ,EAAA,QAAAwC,IAAA;EAXCC,KAAAxD,aACL,oBAAA,wBAAA,UAAA;GAAyCmB,OAAAA;GACvCoC,UAAAA;EAUF,CAAA,GACAhB,SAAQkB,IACV;EAAC1C,EAAA,MAAAI;EAAAJ,EAAA,MAAAwC;EAAAxC,EAAA,MAAAyC;CAAA,OAAAA,KAAAzC,EAAA;CAAA,OAdMyC;AAcN,CACF;AAED/C,8BAA8BiD,cAAc"}
+{"version":3,"file":"SelectionToolbarRoot.js","names":["c","_c","Primitive","composeEventHandlers","ComponentPropsWithoutRef","ComponentRef","createContext","forwardRef","useContext","useEffect","useState","createPortal","getSelectionMessageId","SelectionInfo","text","messageId","rect","DOMRect","SelectionToolbarContext","useSelectionToolbarInfo","SelectionToolbarPrimitiveRoot","Element","div","Props","t0","forwardedRef","$","onMouseDown","props","style","info","setInfo","t1","t2","Symbol","for","checkSelection","requestAnimationFrame","sel","window","getSelection","isCollapsed","toString","trim","range","getRangeAt","getBoundingClientRect","handleSelectionCollapse","sel_0","handleScroll","document","addEventListener","removeEventListener","t3","top","t4","left","width","t5","position","transform","zIndex","positionStyle","t6","_temp","t7","t8","body","displayName","e","preventDefault"],"sources":["../../../src/primitives/selectionToolbar/SelectionToolbarRoot.tsx"],"sourcesContent":["\"use client\";\n\nimport { Primitive } from \"../../utils/Primitive\";\nimport { composeEventHandlers } from \"@radix-ui/primitive\";\nimport {\n  type ComponentPropsWithoutRef,\n  type ComponentRef,\n  createContext,\n  forwardRef,\n  useContext,\n  useEffect,\n  useState,\n} from \"react\";\nimport { createPortal } from \"react-dom\";\nimport { getSelectionMessageId } from \"../../utils/getSelectionMessageId\";\n\ntype SelectionInfo = {\n  text: string;\n  messageId: string;\n  rect: DOMRect;\n};\n\nconst SelectionToolbarContext = createContext<SelectionInfo | null>(null);\n\nexport const useSelectionToolbarInfo = () =>\n  useContext(SelectionToolbarContext);\n\nexport namespace SelectionToolbarPrimitiveRoot {\n  export type Element = ComponentRef<typeof Primitive.div>;\n  export type Props = ComponentPropsWithoutRef<typeof Primitive.div>;\n}\n\n/**\n * A floating toolbar that appears when text is selected within a message.\n *\n * Listens for mouse and keyboard selection events, validates that the\n * selection is within a single message, and renders a positioned portal\n * near the selection. Prevents mousedown from clearing the selection.\n *\n * @example\n * ```tsx\n * <SelectionToolbarPrimitive.Root>\n *   <SelectionToolbarPrimitive.Quote>Quote</SelectionToolbarPrimitive.Quote>\n * </SelectionToolbarPrimitive.Root>\n * ```\n */\nexport const SelectionToolbarPrimitiveRoot = forwardRef<\n  SelectionToolbarPrimitiveRoot.Element,\n  SelectionToolbarPrimitiveRoot.Props\n>(({ onMouseDown, style, ...props }, forwardedRef) => {\n  const [info, setInfo] = useState<SelectionInfo | null>(null);\n\n  useEffect(() => {\n    const checkSelection = () => {\n      requestAnimationFrame(() => {\n        const sel = window.getSelection();\n        if (!sel || sel.isCollapsed) {\n          setInfo(null);\n          return;\n        }\n\n        const text = sel.toString().trim();\n        if (!text) {\n          setInfo(null);\n          return;\n        }\n\n        const messageId = getSelectionMessageId(sel);\n        if (!messageId) {\n          setInfo(null);\n          return;\n        }\n\n        const range = sel.getRangeAt(0);\n        const rect = range.getBoundingClientRect();\n        setInfo({ text, messageId, rect });\n      });\n    };\n\n    const handleSelectionCollapse = () => {\n      const sel = window.getSelection();\n      if (!sel || sel.isCollapsed) {\n        setInfo(null);\n      }\n    };\n\n    const handleScroll = () => {\n      setInfo(null);\n    };\n\n    document.addEventListener(\"mouseup\", checkSelection);\n    document.addEventListener(\"keyup\", checkSelection);\n    document.addEventListener(\"selectionchange\", handleSelectionCollapse);\n    document.addEventListener(\"scroll\", handleScroll, true);\n\n    return () => {\n      document.removeEventListener(\"mouseup\", checkSelection);\n      document.removeEventListener(\"keyup\", checkSelection);\n      document.removeEventListener(\"selectionchange\", handleSelectionCollapse);\n      document.removeEventListener(\"scroll\", handleScroll, true);\n    };\n  }, []);\n\n  if (!info) return null;\n\n  const positionStyle: React.CSSProperties = {\n    position: \"fixed\",\n    top: `${info.rect.top - 8}px`,\n    left: `${info.rect.left + info.rect.width / 2}px`,\n    transform: \"translate(-50%, -100%)\",\n    zIndex: 50,\n    ...style,\n  };\n\n  return createPortal(\n    <SelectionToolbarContext.Provider value={info}>\n      <Primitive.div\n        {...props}\n        ref={forwardedRef}\n        style={positionStyle}\n        onMouseDown={composeEventHandlers(onMouseDown, (e) => {\n          // Prevent mousedown from clearing the text selection\n          e.preventDefault();\n        })}\n      />\n    </SelectionToolbarContext.Provider>,\n    document.body,\n  );\n});\n\nSelectionToolbarPrimitiveRoot.displayName = \"SelectionToolbarPrimitive.Root\";\n"],"mappings":"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"}

package/dist/utils/createActionButton.js

@@ -21,8 +21,8 @@ const createActionButton = (displayName, useActionButton, forwardProps = []) =>
 		let t4;
 		if ($[0] !== forwardedRef || $[1] !== primitiveProps || $[2] !== t0.button || $[3] !== t2 || $[4] !== t3) {
 			t4 = /* @__PURE__ */ jsx(t0.button, {
-				...primitiveProps,
 				type: t1,
+				...primitiveProps,
 				ref: forwardedRef,
 				disabled: t2,
 				onClick: t3

package/dist/utils/createActionButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"createActionButton.js","names":["ComponentRef","forwardRef","ComponentPropsWithoutRef","MouseEventHandler","Primitive","composeEventHandlers","ActionButtonCallback","props","TProps","HTMLButtonElement","PrimitiveButtonProps","button","ActionButtonProps","THook","ActionButtonElement","createActionButton","displayName","useActionButton","forwardProps","NonNullable","ActionButton","forwardedRef","$","_c","forwardedProps","primitiveProps","Object","keys","Array","forEach","key","includes","callback","undefined","t0","t1","t2","disabled","t3","onClick","t4"],"sources":["../../src/utils/createActionButton.tsx"],"sourcesContent":["import {\n  type ComponentRef,\n  forwardRef,\n  type ComponentPropsWithoutRef,\n  type MouseEventHandler,\n} from \"react\";\nimport { Primitive } from \"./Primitive\";\nimport { composeEventHandlers } from \"@radix-ui/primitive\";\n\ntype ActionButtonCallback<TProps> = (\n  props: TProps,\n) => MouseEventHandler<HTMLButtonElement> | null;\n\ntype PrimitiveButtonProps = ComponentPropsWithoutRef<typeof Primitive.button>;\n\nexport type ActionButtonProps<THook> = PrimitiveButtonProps &\n  (THook extends (props: infer TProps) => unknown ? TProps : never);\n\nexport type ActionButtonElement = ComponentRef<typeof Primitive.button>;\n\nexport const createActionButton = <TProps,>(\n  displayName: string,\n  useActionButton: ActionButtonCallback<TProps>,\n  forwardProps: (keyof NonNullable<TProps>)[] = [],\n) => {\n  const ActionButton = forwardRef<\n    ActionButtonElement,\n    PrimitiveButtonProps & TProps\n  >((props, forwardedRef) => {\n    const forwardedProps = {} as TProps;\n    const primitiveProps = {} as PrimitiveButtonProps;\n\n    (Object.keys(props) as Array<keyof typeof props>).forEach((key) => {\n      if (forwardProps.includes(key as keyof TProps)) {\n        (forwardedProps as any)[key] = props[key];\n      } else {\n        (primitiveProps as any)[key] = props[key];\n      }\n    });\n\n    const callback = useActionButton(forwardedProps as TProps) ?? undefined;\n    return (\n      <Primitive.button\n        {...primitiveProps}\n        type=\"button\"\n        ref={forwardedRef}\n        disabled={primitiveProps.disabled || !callback}\n        onClick={composeEventHandlers(primitiveProps.onClick, callback)}\n      />\n    );\n  });\n\n  ActionButton.displayName = displayName;\n\n  return ActionButton;\n};\n"],"mappings":";;;;;;AAoBA,MAAae,sBACXC,aACAC,iBACAC,eAA8C,CAAA,MAC3C;CACH,MAAME,eAAenB,YAGnBM,OAAAc,iBAAA;EAAA,MAAAC,IAAAC,EAAA,CAAA;EACA,MAAAC,iBAAuB,CAAC;EACxB,MAAAC,iBAAuB,CAAC;EAExB,OAAOE,KAAMpB,KAAK,CAAC,CAA6BsB,SAAUC,QAAA;GACxD,IAAIZ,aAAYa,SAAUD,GAAmB,GAC3C,eAAwBA,OAAOvB,MAAMuB;QAErC,eAAwBA,OAAOvB,MAAMuB;EACtC,CACF;EAED,MAAAE,WAAiBf,gBAAgBO,cAAqC,KAArDS,KAAAA;EAEd,MAAAC,KAAA9B;EAEM,MAAA+B,KAAA;EAEK,MAAAC,KAAAX,eAAcY,YAAd,CAA4BL;EAC7B,MAAAM,KAAAjC,qBAAqBoB,eAAcc,SAAUP,QAAQ;EAAC,IAAAQ;EAAA,IAAAlB,EAAA,OAAAD,gBAAAC,EAAA,OAAAG,kBAAAH,EAAA,OAAAY,GAAAvB,UAAAW,EAAA,OAAAc,MAAAd,EAAA,OAAAgB,IAAA;GALjEE,KAAA,oBAAA,GAAA,QAAA;IAAA,GACMf;IACC,MAAAU;IACAd,KAAAA;IACK,UAAAe;IACD,SAAAE;GAAsD,CAAA;GAC/DhB,EAAA,KAAAD;GAAAC,EAAA,KAAAG;GAAAH,EAAA,KAAAY,GAAAvB;GAAAW,EAAA,KAAAc;GAAAd,EAAA,KAAAgB;GAAAhB,EAAA,KAAAkB;EAAA,OAAAA,KAAAlB,EAAA;EAAA,OANFkB;CAME,CAEL;CAEDpB,aAAaJ,cAAcA;CAE3B,OAAOI;AACT"}
+{"version":3,"file":"createActionButton.js","names":["ComponentRef","forwardRef","ComponentPropsWithoutRef","MouseEventHandler","Primitive","composeEventHandlers","ActionButtonCallback","props","TProps","HTMLButtonElement","PrimitiveButtonProps","button","ActionButtonProps","THook","ActionButtonElement","createActionButton","displayName","useActionButton","forwardProps","NonNullable","ActionButton","forwardedRef","$","_c","forwardedProps","primitiveProps","Object","keys","Array","forEach","key","includes","callback","undefined","t0","t1","t2","disabled","t3","onClick","t4"],"sources":["../../src/utils/createActionButton.tsx"],"sourcesContent":["import {\n  type ComponentRef,\n  forwardRef,\n  type ComponentPropsWithoutRef,\n  type MouseEventHandler,\n} from \"react\";\nimport { Primitive } from \"./Primitive\";\nimport { composeEventHandlers } from \"@radix-ui/primitive\";\n\ntype ActionButtonCallback<TProps> = (\n  props: TProps,\n) => MouseEventHandler<HTMLButtonElement> | null;\n\ntype PrimitiveButtonProps = ComponentPropsWithoutRef<typeof Primitive.button>;\n\nexport type ActionButtonProps<THook> = PrimitiveButtonProps &\n  (THook extends (props: infer TProps) => unknown ? TProps : never);\n\nexport type ActionButtonElement = ComponentRef<typeof Primitive.button>;\n\nexport const createActionButton = <TProps,>(\n  displayName: string,\n  useActionButton: ActionButtonCallback<TProps>,\n  forwardProps: (keyof NonNullable<TProps>)[] = [],\n) => {\n  const ActionButton = forwardRef<\n    ActionButtonElement,\n    PrimitiveButtonProps & TProps\n  >((props, forwardedRef) => {\n    const forwardedProps = {} as TProps;\n    const primitiveProps = {} as PrimitiveButtonProps;\n\n    (Object.keys(props) as Array<keyof typeof props>).forEach((key) => {\n      if (forwardProps.includes(key as keyof TProps)) {\n        (forwardedProps as any)[key] = props[key];\n      } else {\n        (primitiveProps as any)[key] = props[key];\n      }\n    });\n\n    const callback = useActionButton(forwardedProps as TProps) ?? undefined;\n    return (\n      <Primitive.button\n        type=\"button\"\n        {...primitiveProps}\n        ref={forwardedRef}\n        disabled={primitiveProps.disabled || !callback}\n        onClick={composeEventHandlers(primitiveProps.onClick, callback)}\n      />\n    );\n  });\n\n  ActionButton.displayName = displayName;\n\n  return ActionButton;\n};\n"],"mappings":";;;;;;AAoBA,MAAae,sBACXC,aACAC,iBACAC,eAA8C,CAAA,MAC3C;CACH,MAAME,eAAenB,YAGnBM,OAAAc,iBAAA;EAAA,MAAAC,IAAAC,EAAA,CAAA;EACA,MAAAC,iBAAuB,CAAC;EACxB,MAAAC,iBAAuB,CAAC;EAExB,OAAOE,KAAMpB,KAAK,CAAC,CAA6BsB,SAAUC,QAAA;GACxD,IAAIZ,aAAYa,SAAUD,GAAmB,GAC3C,eAAwBA,OAAOvB,MAAMuB;QAErC,eAAwBA,OAAOvB,MAAMuB;EACtC,CACF;EAED,MAAAE,WAAiBf,gBAAgBO,cAAqC,KAArDS,KAAAA;EAEd,MAAAC,KAAA9B;EACM,MAAA+B,KAAA;EAGK,MAAAC,KAAAX,eAAcY,YAAd,CAA4BL;EAC7B,MAAAM,KAAAjC,qBAAqBoB,eAAcc,SAAUP,QAAQ;EAAC,IAAAQ;EAAA,IAAAlB,EAAA,OAAAD,gBAAAC,EAAA,OAAAG,kBAAAH,EAAA,OAAAY,GAAAvB,UAAAW,EAAA,OAAAc,MAAAd,EAAA,OAAAgB,IAAA;GALjEE,KAAA,oBAAA,GAAA,QAAA;IACO,MAAAL;IAAQ,GACTV;IACCJ,KAAAA;IACK,UAAAe;IACD,SAAAE;GAAsD,CAAA;GAC/DhB,EAAA,KAAAD;GAAAC,EAAA,KAAAG;GAAAH,EAAA,KAAAY,GAAAvB;GAAAW,EAAA,KAAAc;GAAAd,EAAA,KAAAgB;GAAAhB,EAAA,KAAAkB;EAAA,OAAAA,KAAAlB,EAAA;EAAA,OANFkB;CAME,CAEL;CAEDpB,aAAaJ,cAAcA;CAE3B,OAAOI;AACT"}

package/dist/utils/useToolArgsFieldStatus.d.ts

@@ -1,5 +1,7 @@
 //#region src/utils/useToolArgsFieldStatus.d.ts
 declare const useToolArgsFieldStatus: (fieldPath: (string | number)[]) => {
+  type: string;
+} | {
   readonly type: "running";
 } | {
   readonly type: "complete";
@@ -7,8 +9,6 @@ declare const useToolArgsFieldStatus: (fieldPath: (string | number)[]) => {
   readonly type: "incomplete";
   readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
   readonly error?: unknown;
-} | {
-  type: string;
 };
 //#endregion
 export { useToolArgsFieldStatus };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react",
-  "version": "0.15.4",
+  "version": "0.15.5",
   "description": "Open-source TypeScript/React library for building production-grade AI chat experiences",
   "keywords": [
     "ai",
@@ -55,9 +55,9 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.3.5",
-    "@assistant-ui/store": "^0.3.3",
-    "@assistant-ui/tap": "^0.9.9",
+    "@assistant-ui/core": "^0.3.6",
+    "@assistant-ui/store": "^0.3.4",
+    "@assistant-ui/tap": "^0.9.10",
     "@radix-ui/primitive": "^1.1.7",
     "@radix-ui/react-collection": "^1.1.15",
     "@radix-ui/react-compose-refs": "^1.1.5",
@@ -67,7 +67,7 @@
     "@radix-ui/react-use-controllable-state": "^1.2.6",
     "@radix-ui/react-use-escape-keydown": "^1.1.5",
     "assistant-cloud": "^0.1.38",
-    "assistant-stream": "^0.3.33",
+    "assistant-stream": "^0.3.34",
     "nanoid": "^6.0.0",
     "radix-ui": "^1.6.7",
     "react-textarea-autosize": "^8.5.9",
@@ -100,7 +100,7 @@
     "react-dom": "^19.2.8",
     "vitest": "^4.1.10",
     "@assistant-ui/vite": "0.0.11",
-    "@assistant-ui/x-buildutils": "0.0.20"
+    "@assistant-ui/x-buildutils": "0.0.21"
   },
   "publishConfig": {
     "access": "public",

package/src/client/ExternalThread.ts

@@ -32,6 +32,7 @@ import type {
   ToolCallMessagePartStatus,
   ExternalThreadQueueAdapter,
   ExternalThreadBranchAdapter,
+  QueuePlacement,
 } from "@assistant-ui/core";
 import { ToolResponse } from "assistant-stream";
 import type { ReadonlyJSONValue } from "assistant-stream/utils";
@@ -175,7 +176,6 @@ const useMessageClient = ({
   };
 
   const handleSendEdit = (msg: AppendMessage) => {
-    queue?.clear("edit");
     onEdit?.({
       ...msg,
       parentId,
@@ -395,16 +395,17 @@ type ComposerClientResourceProps = {
 
 const useQueueItemClient = ({
   item,
-  onSteer,
+  onMove,
   onRemove,
 }: {
   item: QueueItemState;
-  onSteer: () => void;
+  onMove: (placement: QueuePlacement) => void;
   onRemove: () => void;
 }): ClientOutput<"queueItem"> => {
   return {
     getState: () => item,
-    steer: onSteer,
+    steer: () => onMove({ lane: "steer", insertAfter: null }),
+    move: onMove,
     remove: onRemove,
   };
 };
@@ -522,14 +523,24 @@ const useComposerClientResource = ({
     });
   };
 
-  const queueItems = queue?.items ?? EMPTY_QUEUE_ITEMS;
+  const steerItems = queue?.steerItems ?? EMPTY_QUEUE_ITEMS;
+  const laneItems = queue?.items ?? EMPTY_QUEUE_ITEMS;
+  const queueItems = useMemo(
+    () =>
+      steerItems.length === 0
+        ? laneItems
+        : laneItems.length === 0
+          ? steerItems
+          : [...steerItems, ...laneItems],
+    [steerItems, laneItems],
+  );
   const queueItemClients = useClientLookup(
     queueItems.map((item) =>
       withKey(
         item.id,
         QueueItemClient({
           item,
-          onSteer: () => queue?.steer(item.id),
+          onMove: (placement) => queue?.move(item.id, placement),
           onRemove: () => queue?.remove(item.id),
         }),
       ),
@@ -662,7 +673,8 @@ const useComposerClientResource = ({
           },
         };
         if (queue) {
-          queue.enqueue(composedMessage, { steer: opts?.steer ?? false });
+          if (opts?.steer ?? canCancel) queue.steer(composedMessage);
+          else queue.enqueue(composedMessage);
         } else {
           onSend?.(composedMessage);
         }
@@ -697,7 +709,10 @@ const useComposerClientResource = ({
     startDictation: () => {},
     stopDictation: () => {},
     setQuote,
-    queueItem: (selector: { index: number }) => {
+    queueItem: (selector: { index: number } | { id: string }) => {
+      if ("id" in selector) {
+        return queueItemClients.get({ key: selector.id });
+      }
       return queueItemClients.get(selector);
     },
   };
@@ -754,7 +769,6 @@ const useExternalThread = ({
     if (messageIndex === -1) return;
 
     const parentId = messageIndex > 0 ? messages[messageIndex - 1]!.id : null;
-    queue?.clear("reload");
     onReload?.(parentId);
   };
 
@@ -778,7 +792,6 @@ const useExternalThread = ({
   );
 
   const handleCancelRun = () => {
-    queue?.clear("cancel-run");
     onCancel?.();
   };
 
@@ -793,11 +806,10 @@ const useExternalThread = ({
     (): ExternalThreadQueueAdapter | undefined =>
       queue && {
         ...queue,
-        enqueue: (message, options) =>
-          queue.enqueue(
-            { ...message, parentId: message.parentId ?? headId },
-            options,
-          ),
+        enqueue: (message) =>
+          queue.enqueue({ ...message, parentId: message.parentId ?? headId }),
+        steer: (message) =>
+          queue.steer({ ...message, parentId: message.parentId ?? headId }),
       },
     [queue, headId],
   );
@@ -898,7 +910,7 @@ const useExternalThread = ({
               startRun: message.startRun,
             };
       if (queue) {
-        queue.enqueue(appendMessage, { steer: false });
+        queue.enqueue(appendMessage);
       } else {
         onNew?.(appendMessage);
       }

package/src/context/providers/MessageProvider.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import type { FC, PropsWithChildren } from "react";
-import { useAui, AuiProvider } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider } from "@assistant-ui/store";
 import {
   type ThreadMessageClientProps,
   ThreadMessageClient,
@@ -10,9 +10,11 @@ import {
 export const MessageProvider: FC<
   PropsWithChildren<ThreadMessageClientProps>
 > = ({ children, ...props }) => {
-  const aui = useAui({
-    message: ThreadMessageClient(props),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  const aui = useAui();
+  const config = AuiConfig({ message: ThreadMessageClient(props) });
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/index.ts

@@ -4,6 +4,7 @@
 export {
   useAui,
   AuiProvider,
+  AuiConfig,
   useAuiState,
   useAuiEvent,
   AuiIf,
@@ -167,7 +168,10 @@ export type { LocalRuntimeOptions } from "./legacy-runtime/runtime-cores/local/L
 // --- remote-thread-list ---
 export { useRemoteThreadListRuntime } from "./legacy-runtime/runtime-cores/remote-thread-list/useRemoteThreadListRuntime";
 export { useCloudThreadListAdapter } from "./legacy-runtime/runtime-cores/remote-thread-list/adapter/cloud";
-export type { RemoteThreadListAdapter } from "@assistant-ui/core";
+export type {
+  RemoteThreadListAdapter,
+  RemoteThreadListProviderComponent,
+} from "@assistant-ui/core";
 export { InMemoryThreadListAdapter } from "@assistant-ui/core";
 
 // Re-export from @assistant-ui/core (runtime-cores root)

package/src/legacy-runtime/AssistantRuntimeProvider.tsx

@@ -1,7 +1,11 @@
 "use client";
 
 import { type FC, memo, type PropsWithChildren, useEffect } from "react";
-import { type AssistantClient, useAui } from "@assistant-ui/store";
+import {
+  type AssistantClient,
+  type AuiConfig,
+  useAui,
+} from "@assistant-ui/store";
 import type { AssistantRuntime } from "./runtime/AssistantRuntime";
 import { AssistantProviderBase } from "@assistant-ui/core/react";
 import { ThreadPrimitiveViewportProvider } from "../context/providers/ThreadViewportProvider";
@@ -24,6 +28,12 @@ export namespace AssistantRuntimeProvider {
      * @defaultValue undefined
      */
     aui?: AssistantClient;
+
+    /**
+     * Optional extra scopes provided alongside the runtime's `threads`
+     * scope; build with `AuiConfig`.
+     */
+    config?: AuiConfig;
   }>;
 }
 
@@ -39,9 +49,9 @@ const DevToolsRegistration: FC = () => {
 
 export const AssistantRuntimeProviderImpl: FC<
   AssistantRuntimeProvider.Props
-> = ({ children, aui, runtime }) => {
+> = ({ children, aui, config, runtime }) => {
   return (
-    <AssistantProviderBase runtime={runtime} aui={aui ?? null}>
+    <AssistantProviderBase runtime={runtime} aui={aui ?? null} config={config}>
       <DevToolsRegistration />
       {/* TODO temporarily allow accessing viewport state from outside the viewport */}
       {/* TODO figure out if this behavior should be deprecated, since it is quite hacky */}

package/src/legacy-runtime/runtime-cores/assistant-transport/runManager.ts

@@ -9,6 +9,13 @@ export type RunManager = Readonly<{
 
 const disposeReason = Symbol("assistant-transport-dispose");
 
+const reportFinishError = (error: unknown) => {
+  console.error(
+    "[assistant-ui] Assistant transport onFinish callback threw an error",
+    error,
+  );
+};
+
 export function useRunManager(config: {
   onRun: (signal: AbortSignal) => Promise<void>;
   onFinish?: (() => void) | undefined;
@@ -52,7 +59,13 @@ export function useRunManager(config: {
         }
       } finally {
         if (!disposeAborted() && !stateRef.current.disposed) {
-          onFinishRef.current?.();
+          try {
+            void Promise.resolve(onFinishRef.current?.()).catch(
+              reportFinishError,
+            );
+          } catch (error) {
+            reportFinishError(error);
+          }
         }
         if (!stateRef.current.disposed && stateRef.current.pending) {
           startRun();

package/src/legacy-runtime/runtime-cores/assistant-transport/transport-scheduling.test.ts

@@ -146,6 +146,44 @@ describe("assistant transport scheduling contracts", () => {
     expect(seen[0]).toEqual([createMessageCommand("m1")]);
   });
 
+  it("settles the run when onFinish throws", async () => {
+    const error = new Error("telemetry failed");
+    const onFinish = vi.fn<() => void>().mockImplementationOnce(() => {
+      throw error;
+    });
+    const consoleError = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => {});
+
+    try {
+      const { result } = renderHook(() =>
+        useTransportSchedulingHarness({ onFinish }),
+      );
+
+      act(() => {
+        result.current.commandQueue.enqueue(createMessageCommand("m1"));
+      });
+
+      await waitFor(() => {
+        expect(result.current.runManager.isRunning).toBe(false);
+      });
+
+      act(() => {
+        result.current.commandQueue.enqueue(createMessageCommand("m2"));
+      });
+
+      await waitFor(() => {
+        expect(result.current.runBatchesRef.current).toHaveLength(2);
+      });
+      expect(consoleError).toHaveBeenCalledWith(
+        "[assistant-ui] Assistant transport onFinish callback threw an error",
+        error,
+      );
+    } finally {
+      consoleError.mockRestore();
+    }
+  });
+
   it("cancel returns combined in-flight and queued commands", async () => {
     const onCancel = vi.fn();
     const { result } = renderHook(() =>

package/src/legacy-runtime/runtime-cores/assistant-transport/types.ts

@@ -92,7 +92,9 @@ export type AssistantTransportProtocol = "data-stream" | "assistant-transport";
 
 export type SendCommandsRequestBody = {
   commands: QueuedCommand[];
-  state: unknown;
+  /** Absent on a resume with `resumeStateApi`; the server replays from its retained snapshot. */
+  state?: unknown;
+  runId?: string;
   system: string | undefined;
   tools: Record<string, unknown> | undefined;
   callSettings: LanguageModelV1CallSettings | undefined;
@@ -109,6 +111,8 @@ export type AssistantTransportOptions<T> = {
   initialState: T;
   api: string;
   resumeApi?: string;
+  /** Endpoint that returns the retained initial state and run ID for a resume stream. A 204 response means no run is active and the resume is skipped. */
+  resumeStateApi?: string;
   protocol?: AssistantTransportProtocol;
   /**
    * When `false`, stream decoding and state reconciliation tolerate malformed

package/src/legacy-runtime/runtime-cores/assistant-transport/useAssistantTransport.spec.md

@@ -16,6 +16,13 @@ Command Scheduling
   - If no run is in progress: start a run immediately and flush commands to the server.
 - A follow-up run that finds an empty queue is a no-op: no request is sent and no error is surfaced.
 - A resume run sends no commands; commands enqueued while it is pending or active are flushed in a follow-up run after it settles.
+
+Resume State
+
+- With `resumeStateApi` configured, a resume first posts `{ threadId }` there; the endpoint returns `{ runId, state }`, the state that started the active run.
+- The resume request carries `runId` and no `state`: the server replays from the snapshot it retained for that run, so neither `body` overrides nor a `prepareSendCommandsRequest` rebuild can substitute a different base. `runId` takes precedence over `body` fields and is re-attached after `prepareSendCommandsRequest` so a rebuilt body cannot drop it. The local base is replaced by the snapshot only after the resume stream responds OK, so a rejected resume keeps the local state.
+- A 204 response means no active run: the resume is skipped without error, and queued commands are flushed in a follow-up run.
+- A malformed snapshot response fails the resume before the replay request is sent.
 - Runs execute on a `queueMicrotask`, so multiple synchronous enqueues coalesce into a single request: the first run's flush takes all of them, and the coalesced follow-up run no-ops.
 
 Command Queue