@assistant-ui/react 0.15.16 → 0.15.18

package/dist/sandbox-host/SandboxHost.js

@@ -1,88 +1,164 @@
 "use client";
-import { invokeCallbackSafely } from "../utils/invokeCallbackSafely.js";
-import { useEffect, useRef, useState } from "@assistant-ui/tap/react-shim";
+import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
+import { useEffect, useLayoutEffect, useRef, useState } from "@assistant-ui/tap/react-shim";
 import { jsx } from "react/jsx-runtime";
-import { SafeContentFrame } from "safe-content-frame";
+import { invokeUserCallback } from "@assistant-ui/core/internal";
+import { SafeContentFrame, isShimLoadError } from "safe-content-frame";
 //#region src/sandbox-host/SandboxHost.tsx
 const DEFAULT_PRODUCT = "assistant-ui-sandbox";
 const DEFAULT_MAX_HEIGHT = 800;
+const LOAD_TIMEOUT_MS = 1e4;
 function isSandboxFrameMessage(event, frame) {
 	return event.source === frame.iframe.contentWindow && event.origin === frame.origin;
 }
-function SandboxHost({ content, contentKey, sandbox, maxHeight = DEFAULT_MAX_HEIGHT, createBridge, onError, containerProps }) {
+function SandboxHost(t0) {
+	const $ = c(21);
+	const { content, contentKey, sandbox, maxHeight: t1, createBridge, onError, containerProps } = t0;
+	const maxHeight = t1 === void 0 ? DEFAULT_MAX_HEIGHT : t1;
 	const containerRef = useRef(null);
 	const [contentHeight, setContentHeight] = useState(void 0);
-	const liveRef = useRef(null);
-	liveRef.current = {
-		content,
-		sandbox,
-		createBridge,
-		onError
-	};
-	useEffect(() => {
-		const container = containerRef.current;
-		if (!container) return;
-		let cancelled = false;
-		let frame = null;
-		let bridge = null;
-		let onMessage = null;
-		const { content: liveContent, sandbox: sb } = liveRef.current;
-		const scf = new SafeContentFrame(sb?.product ?? DEFAULT_PRODUCT, {
-			...sb?.sandbox !== void 0 && { sandbox: sb.sandbox },
-			...sb?.useShadowDom !== void 0 && { useShadowDom: sb.useShadowDom },
-			...sb?.enableBrowserCaching !== void 0 && { enableBrowserCaching: sb.enableBrowserCaching },
-			...sb?.salt !== void 0 && { salt: sb.salt }
-		});
-		const renderOpts = sb?.unsafeDocumentWrite !== void 0 ? { unsafeDocumentWrite: sb.unsafeDocumentWrite } : void 0;
-		scf.renderHtml(liveContent.html, container, renderOpts).then((rendered) => {
-			if (cancelled) {
-				rendered.dispose();
-				return;
-			}
-			frame = rendered;
-			bridge = liveRef.current.createBridge({
-				iframe: rendered.iframe,
-				origin: rendered.origin,
-				sendMessage: rendered.sendMessage
-			}, { setHeight: (height) => {
-				if (typeof height === "number" && Number.isFinite(height) && height > 0) setContentHeight(height);
-			} });
-			onMessage = (event) => {
-				if (!isSandboxFrameMessage(event, rendered)) return;
-				bridge?.onMessage(event);
+	let t2;
+	if ($[0] !== content || $[1] !== createBridge || $[2] !== onError || $[3] !== sandbox) {
+		t2 = {
+			content,
+			sandbox,
+			createBridge,
+			onError
+		};
+		$[0] = content;
+		$[1] = createBridge;
+		$[2] = onError;
+		$[3] = sandbox;
+		$[4] = t2;
+	} else t2 = $[4];
+	const liveRef = useRef(t2);
+	let t3;
+	let t4;
+	if ($[5] !== content || $[6] !== createBridge || $[7] !== onError || $[8] !== sandbox) {
+		t3 = () => {
+			liveRef.current = {
+				content,
+				sandbox,
+				createBridge,
+				onError
 			};
-			window.addEventListener("message", onMessage);
-		}).catch((err) => {
-			if (cancelled) return;
-			frame?.dispose();
-			frame = null;
-			const error = err instanceof Error ? err : new Error(String(err));
-			invokeCallbackSafely(() => liveRef.current.onError?.(error), "SandboxHost onError");
-		});
-		return () => {
-			cancelled = true;
-			if (onMessage) {
-				window.removeEventListener("message", onMessage);
-				onMessage = null;
-			}
-			bridge?.dispose();
-			bridge = null;
-			frame?.dispose();
-			frame = null;
-			setContentHeight(void 0);
 		};
-	}, [contentKey]);
+		t4 = [
+			content,
+			sandbox,
+			createBridge,
+			onError
+		];
+		$[5] = content;
+		$[6] = createBridge;
+		$[7] = onError;
+		$[8] = sandbox;
+		$[9] = t3;
+		$[10] = t4;
+	} else {
+		t3 = $[9];
+		t4 = $[10];
+	}
+	useLayoutEffect(t3, t4);
+	let t5;
+	if ($[11] === Symbol.for("react.memo_cache_sentinel")) {
+		t5 = () => {
+			const container = containerRef.current;
+			if (!container) return;
+			let cancelled = false;
+			let frame = null;
+			let bridge = null;
+			let onMessage = null;
+			const { content: liveContent, sandbox: sb } = liveRef.current;
+			const reportError = (err) => {
+				const error = err instanceof Error ? err : new Error(String(err));
+				invokeUserCallback("assistant-ui", "SandboxHost onError", liveRef.current.onError?.bind(liveRef.current), error);
+			};
+			const scf = new SafeContentFrame(sb?.product ?? DEFAULT_PRODUCT, {
+				...sb?.sandbox !== void 0 && { sandbox: sb.sandbox },
+				...sb?.useShadowDom !== void 0 && { useShadowDom: sb.useShadowDom },
+				...sb?.enableBrowserCaching !== void 0 && { enableBrowserCaching: sb.enableBrowserCaching },
+				...sb?.salt !== void 0 && { salt: sb.salt }
+			});
+			const renderOpts = sb?.unsafeDocumentWrite !== void 0 ? { unsafeDocumentWrite: sb.unsafeDocumentWrite } : void 0;
+			scf.renderHtml(liveContent.html, container, renderOpts).then((rendered) => {
+				if (cancelled) {
+					rendered.dispose();
+					return;
+				}
+				frame = rendered;
+				bridge = liveRef.current.createBridge({
+					iframe: rendered.iframe,
+					origin: rendered.origin,
+					sendMessage: rendered.sendMessage
+				}, { setHeight: (height) => {
+					if (typeof height === "number" && Number.isFinite(height) && height > 0) setContentHeight(height);
+				} });
+				onMessage = (event) => {
+					if (!isSandboxFrameMessage(event, rendered)) return;
+					bridge?.onMessage(event);
+				};
+				window.addEventListener("message", onMessage);
+				rendered.fullyLoadedPromiseWithTimeout(LOAD_TIMEOUT_MS).catch((err_0) => {
+					if (cancelled) return;
+					if (isShimLoadError(err_0) && err_0.code === "render-timeout") return;
+					reportError(err_0);
+				});
+			}).catch((err_1) => {
+				if (cancelled) return;
+				frame?.dispose();
+				frame = null;
+				reportError(err_1);
+			});
+			return () => {
+				cancelled = true;
+				if (onMessage) {
+					window.removeEventListener("message", onMessage);
+					onMessage = null;
+				}
+				bridge?.dispose();
+				bridge = null;
+				frame?.dispose();
+				frame = null;
+				setContentHeight(void 0);
+			};
+		};
+		$[11] = t5;
+	} else t5 = $[11];
+	let t6;
+	if ($[12] !== contentKey) {
+		t6 = [contentKey];
+		$[12] = contentKey;
+		$[13] = t6;
+	} else t6 = $[13];
+	useEffect(t5, t6);
 	const resolvedHeight = contentHeight != null ? Math.min(contentHeight, maxHeight) : void 0;
-	const mergedStyle = resolvedHeight != null ? {
-		...sandbox?.style,
-		height: resolvedHeight
-	} : sandbox?.style;
-	return /* @__PURE__ */ jsx("div", {
-		...containerProps,
-		ref: containerRef,
-		className: sandbox?.className,
-		style: mergedStyle
-	});
+	let t7;
+	if ($[14] !== resolvedHeight || $[15] !== sandbox?.style) {
+		t7 = resolvedHeight != null ? {
+			...sandbox?.style,
+			height: resolvedHeight
+		} : sandbox?.style;
+		$[14] = resolvedHeight;
+		$[15] = sandbox?.style;
+		$[16] = t7;
+	} else t7 = $[16];
+	const mergedStyle = t7;
+	const t8 = sandbox?.className;
+	let t9;
+	if ($[17] !== containerProps || $[18] !== mergedStyle || $[19] !== t8) {
+		t9 = /* @__PURE__ */ jsx("div", {
+			...containerProps,
+			ref: containerRef,
+			className: t8,
+			style: mergedStyle
+		});
+		$[17] = containerProps;
+		$[18] = mergedStyle;
+		$[19] = t8;
+		$[20] = t9;
+	} else t9 = $[20];
+	return t9;
 }
 //#endregion
 export { SandboxHost, isSandboxFrameMessage };

package/dist/sandbox-host/SandboxHost.js.map

@@ -1 +1 @@
-{"version":3,"file":"SandboxHost.js","names":["CSSProperties","useEffect","useRef","useState","RenderedFrame","SafeContentFrame","SandboxOption","invokeCallbackSafely","DEFAULT_PRODUCT","DEFAULT_MAX_HEIGHT","SandboxHostConfig","sandbox","useShadowDom","enableBrowserCaching","salt","product","className","style","unsafeDocumentWrite","SandboxHostFrame","Pick","SandboxHostApi","setHeight","height","SandboxBridge","onMessage","event","MessageEvent","dispose","SandboxContent","html","SandboxHostProps","content","contentKey","maxHeight","createBridge","frame","host","onError","error","Error","containerProps","Record","isSandboxFrameMessage","iframe","HTMLIFrameElement","origin","source","contentWindow","LiveSnapshot","SandboxHost","containerRef","HTMLDivElement","contentHeight","setContentHeight","undefined","liveRef","current","container","cancelled","bridge","liveContent","sb","scf","renderOpts","renderHtml","then","rendered","hostApi","Number","isFinite","sendMessage","window","addEventListener","catch","err","String","removeEventListener","resolvedHeight","Math","min","mergedStyle"],"sources":["../../src/sandbox-host/SandboxHost.tsx"],"sourcesContent":["\"use client\";\n\nimport { type CSSProperties, useEffect, useRef, useState } from \"react\";\nimport {\n  type RenderedFrame,\n  SafeContentFrame,\n  type SandboxOption,\n} from \"safe-content-frame\";\nimport { invokeCallbackSafely } from \"../utils/invokeCallbackSafely\";\n\nconst DEFAULT_PRODUCT = \"assistant-ui-sandbox\";\nconst DEFAULT_MAX_HEIGHT = 800;\n\nexport type SandboxHostConfig = {\n  sandbox?: SandboxOption[];\n  useShadowDom?: boolean;\n  enableBrowserCaching?: boolean;\n  salt?: string;\n  product?: string;\n  className?: string;\n  style?: CSSProperties;\n  unsafeDocumentWrite?: boolean;\n};\n\nexport type SandboxHostFrame = Pick<\n  RenderedFrame,\n  \"iframe\" | \"origin\" | \"sendMessage\"\n>;\n\nexport type SandboxHostApi = {\n  setHeight: (height: number) => void;\n};\n\nexport type SandboxBridge = {\n  onMessage: (event: MessageEvent) => void;\n  dispose: () => void;\n};\n\nexport type SandboxContent = { html: string };\n\nexport type SandboxHostProps = {\n  content: SandboxContent;\n  contentKey: string;\n  sandbox?: SandboxHostConfig | undefined;\n  maxHeight?: number | undefined;\n  createBridge: (\n    frame: SandboxHostFrame,\n    host: SandboxHostApi,\n  ) => SandboxBridge;\n  onError?: ((error: Error) => void) | undefined;\n  containerProps?: Record<string, string | undefined> | undefined;\n};\n\nexport function isSandboxFrameMessage(\n  event: MessageEvent,\n  frame: { iframe: HTMLIFrameElement; origin: string },\n): boolean {\n  return (\n    event.source === frame.iframe.contentWindow && event.origin === frame.origin\n  );\n}\n\ntype LiveSnapshot = {\n  content: SandboxContent;\n  sandbox: SandboxHostConfig | undefined;\n  createBridge: SandboxHostProps[\"createBridge\"];\n  onError: SandboxHostProps[\"onError\"];\n};\n\nexport function SandboxHost({\n  content,\n  contentKey,\n  sandbox,\n  maxHeight = DEFAULT_MAX_HEIGHT,\n  createBridge,\n  onError,\n  containerProps,\n}: SandboxHostProps) {\n  const containerRef = useRef<HTMLDivElement>(null);\n  const [contentHeight, setContentHeight] = useState<number | undefined>(\n    undefined,\n  );\n\n  const liveRef = useRef<LiveSnapshot>(null!);\n  liveRef.current = { content, sandbox, createBridge, onError };\n\n  useEffect(() => {\n    const container = containerRef.current;\n    if (!container) return;\n\n    let cancelled = false;\n    let frame: RenderedFrame | null = null;\n    let bridge: SandboxBridge | null = null;\n    let onMessage: ((event: MessageEvent) => void) | null = null;\n\n    const { content: liveContent, sandbox: sb } = liveRef.current;\n\n    const scf = new SafeContentFrame(sb?.product ?? DEFAULT_PRODUCT, {\n      ...(sb?.sandbox !== undefined && { sandbox: sb.sandbox }),\n      ...(sb?.useShadowDom !== undefined && { useShadowDom: sb.useShadowDom }),\n      ...(sb?.enableBrowserCaching !== undefined && {\n        enableBrowserCaching: sb.enableBrowserCaching,\n      }),\n      ...(sb?.salt !== undefined && { salt: sb.salt }),\n    });\n\n    const renderOpts =\n      sb?.unsafeDocumentWrite !== undefined\n        ? { unsafeDocumentWrite: sb.unsafeDocumentWrite }\n        : undefined;\n\n    scf\n      .renderHtml(liveContent.html, container, renderOpts)\n      .then((rendered) => {\n        if (cancelled) {\n          rendered.dispose();\n          return;\n        }\n        frame = rendered;\n\n        const hostApi: SandboxHostApi = {\n          setHeight: (height) => {\n            if (\n              typeof height === \"number\" &&\n              Number.isFinite(height) &&\n              height > 0\n            ) {\n              setContentHeight(height);\n            }\n          },\n        };\n\n        bridge = liveRef.current.createBridge(\n          {\n            iframe: rendered.iframe,\n            origin: rendered.origin,\n            sendMessage: rendered.sendMessage,\n          },\n          hostApi,\n        );\n\n        // Single owner of the window listener; the cross-origin guard runs\n        // here so the bridge only sees frame-validated messages.\n        onMessage = (event) => {\n          if (!isSandboxFrameMessage(event, rendered)) return;\n          bridge?.onMessage(event);\n        };\n        window.addEventListener(\"message\", onMessage);\n      })\n      .catch((err) => {\n        if (cancelled) return;\n        frame?.dispose();\n        frame = null;\n        const error = err instanceof Error ? err : new Error(String(err));\n        invokeCallbackSafely(\n          () => liveRef.current.onError?.(error),\n          \"SandboxHost onError\",\n        );\n      });\n\n    return () => {\n      cancelled = true;\n      if (onMessage) {\n        window.removeEventListener(\"message\", onMessage);\n        onMessage = null;\n      }\n      bridge?.dispose();\n      bridge = null;\n      frame?.dispose();\n      frame = null;\n      setContentHeight(undefined);\n    };\n    // oxlint-disable-next-line react/exhaustive-deps -- re-init only on contentKey change; live values flow through liveRef\n  }, [contentKey]);\n\n  const resolvedHeight =\n    contentHeight != null ? Math.min(contentHeight, maxHeight) : undefined;\n  const mergedStyle =\n    resolvedHeight != null\n      ? { ...sandbox?.style, height: resolvedHeight }\n      : sandbox?.style;\n\n  return (\n    <div\n      {...containerProps}\n      ref={containerRef}\n      className={sandbox?.className}\n      style={mergedStyle}\n    />\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"SandboxHost.js","names":["c","_c","CSSProperties","useEffect","useLayoutEffect","useRef","useState","isShimLoadError","RenderedFrame","SafeContentFrame","SandboxOption","invokeUserCallback","DEFAULT_PRODUCT","DEFAULT_MAX_HEIGHT","LOAD_TIMEOUT_MS","SandboxHostConfig","sandbox","useShadowDom","enableBrowserCaching","salt","product","className","style","unsafeDocumentWrite","SandboxHostFrame","Pick","SandboxHostApi","setHeight","height","SandboxBridge","onMessage","event","MessageEvent","dispose","SandboxContent","html","SandboxHostProps","content","contentKey","maxHeight","createBridge","frame","host","onError","error","Error","containerProps","Record","isSandboxFrameMessage","iframe","HTMLIFrameElement","origin","source","contentWindow","LiveSnapshot","SandboxHost","t0","$","t1","undefined","containerRef","contentHeight","setContentHeight","t2","liveRef","t3","t4","current","t5","Symbol","for","container","cancelled","bridge","liveContent","sb","reportError","err","String","bind","scf","renderOpts","renderHtml","then","rendered","hostApi","Number","isFinite","sendMessage","window","addEventListener","fullyLoadedPromiseWithTimeout","catch","err_0","code","err_1","removeEventListener","t6","resolvedHeight","Math","min","t7","mergedStyle","t8","t9"],"sources":["../../src/sandbox-host/SandboxHost.tsx"],"sourcesContent":["\"use client\";\n\nimport {\n  type CSSProperties,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n  useState,\n} from \"react\";\nimport {\n  isShimLoadError,\n  type RenderedFrame,\n  SafeContentFrame,\n  type SandboxOption,\n} from \"safe-content-frame\";\nimport { invokeUserCallback } from \"@assistant-ui/core/internal\";\n\nconst DEFAULT_PRODUCT = \"assistant-ui-sandbox\";\nconst DEFAULT_MAX_HEIGHT = 800;\nconst LOAD_TIMEOUT_MS = 10_000;\n\nexport type SandboxHostConfig = {\n  sandbox?: SandboxOption[];\n  useShadowDom?: boolean;\n  enableBrowserCaching?: boolean;\n  salt?: string;\n  product?: string;\n  className?: string;\n  style?: CSSProperties;\n  unsafeDocumentWrite?: boolean;\n};\n\nexport type SandboxHostFrame = Pick<\n  RenderedFrame,\n  \"iframe\" | \"origin\" | \"sendMessage\"\n>;\n\nexport type SandboxHostApi = {\n  setHeight: (height: number) => void;\n};\n\nexport type SandboxBridge = {\n  onMessage: (event: MessageEvent) => void;\n  dispose: () => void;\n};\n\nexport type SandboxContent = { html: string };\n\nexport type SandboxHostProps = {\n  content: SandboxContent;\n  contentKey: string;\n  sandbox?: SandboxHostConfig | undefined;\n  maxHeight?: number | undefined;\n  createBridge: (\n    frame: SandboxHostFrame,\n    host: SandboxHostApi,\n  ) => SandboxBridge;\n  onError?: ((error: Error) => void) | undefined;\n  containerProps?: Record<string, string | undefined> | undefined;\n};\n\nexport function isSandboxFrameMessage(\n  event: MessageEvent,\n  frame: { iframe: HTMLIFrameElement; origin: string },\n): boolean {\n  return (\n    event.source === frame.iframe.contentWindow && event.origin === frame.origin\n  );\n}\n\ntype LiveSnapshot = {\n  content: SandboxContent;\n  sandbox: SandboxHostConfig | undefined;\n  createBridge: SandboxHostProps[\"createBridge\"];\n  onError: SandboxHostProps[\"onError\"];\n};\n\nexport function SandboxHost({\n  content,\n  contentKey,\n  sandbox,\n  maxHeight = DEFAULT_MAX_HEIGHT,\n  createBridge,\n  onError,\n  containerProps,\n}: SandboxHostProps) {\n  const containerRef = useRef<HTMLDivElement>(null);\n  const [contentHeight, setContentHeight] = useState<number | undefined>(\n    undefined,\n  );\n\n  const liveRef = useRef<LiveSnapshot>({\n    content,\n    sandbox,\n    createBridge,\n    onError,\n  });\n  useLayoutEffect(() => {\n    liveRef.current = { content, sandbox, createBridge, onError };\n  }, [content, sandbox, createBridge, onError]);\n\n  useEffect(() => {\n    const container = containerRef.current;\n    if (!container) return;\n\n    let cancelled = false;\n    let frame: RenderedFrame | null = null;\n    let bridge: SandboxBridge | null = null;\n    let onMessage: ((event: MessageEvent) => void) | null = null;\n\n    const { content: liveContent, sandbox: sb } = liveRef.current;\n\n    const reportError = (err: unknown) => {\n      const error = err instanceof Error ? err : new Error(String(err));\n      invokeUserCallback(\n        \"assistant-ui\",\n        \"SandboxHost onError\",\n        liveRef.current.onError?.bind(liveRef.current),\n        error,\n      );\n    };\n\n    const scf = new SafeContentFrame(sb?.product ?? DEFAULT_PRODUCT, {\n      ...(sb?.sandbox !== undefined && { sandbox: sb.sandbox }),\n      ...(sb?.useShadowDom !== undefined && { useShadowDom: sb.useShadowDom }),\n      ...(sb?.enableBrowserCaching !== undefined && {\n        enableBrowserCaching: sb.enableBrowserCaching,\n      }),\n      ...(sb?.salt !== undefined && { salt: sb.salt }),\n    });\n\n    const renderOpts =\n      sb?.unsafeDocumentWrite !== undefined\n        ? { unsafeDocumentWrite: sb.unsafeDocumentWrite }\n        : undefined;\n\n    scf\n      .renderHtml(liveContent.html, container, renderOpts)\n      .then((rendered) => {\n        if (cancelled) {\n          rendered.dispose();\n          return;\n        }\n        frame = rendered;\n\n        const hostApi: SandboxHostApi = {\n          setHeight: (height) => {\n            if (\n              typeof height === \"number\" &&\n              Number.isFinite(height) &&\n              height > 0\n            ) {\n              setContentHeight(height);\n            }\n          },\n        };\n\n        bridge = liveRef.current.createBridge(\n          {\n            iframe: rendered.iframe,\n            origin: rendered.origin,\n            sendMessage: rendered.sendMessage,\n          },\n          hostApi,\n        );\n\n        // Single owner of the window listener; the cross-origin guard runs\n        // here so the bridge only sees frame-validated messages.\n        onMessage = (event) => {\n          if (!isSandboxFrameMessage(event, rendered)) return;\n          bridge?.onMessage(event);\n        };\n        window.addEventListener(\"message\", onMessage);\n\n        // renderHtml resolves at iframe load, which a shim that was never\n        // served also reaches, so a completed render is only known once the\n        // frame says so. render-timeout is excluded because the shim is\n        // running and the guest may still paint, and reporting it would leave\n        // a host that renders an error state showing one over a frame that\n        // recovers.\n        rendered.fullyLoadedPromiseWithTimeout(LOAD_TIMEOUT_MS).catch((err) => {\n          if (cancelled) return;\n          if (isShimLoadError(err) && err.code === \"render-timeout\") return;\n          reportError(err);\n        });\n      })\n      .catch((err) => {\n        if (cancelled) return;\n        frame?.dispose();\n        frame = null;\n        reportError(err);\n      });\n\n    return () => {\n      cancelled = true;\n      if (onMessage) {\n        window.removeEventListener(\"message\", onMessage);\n        onMessage = null;\n      }\n      bridge?.dispose();\n      bridge = null;\n      frame?.dispose();\n      frame = null;\n      setContentHeight(undefined);\n    };\n    // oxlint-disable-next-line react/exhaustive-deps -- re-init only on contentKey change; live values flow through liveRef\n  }, [contentKey]);\n\n  const resolvedHeight =\n    contentHeight != null ? Math.min(contentHeight, maxHeight) : undefined;\n  const mergedStyle =\n    resolvedHeight != null\n      ? { ...sandbox?.style, height: resolvedHeight }\n      : sandbox?.style;\n\n  return (\n    <div\n      {...containerProps}\n      ref={containerRef}\n      className={sandbox?.className}\n      style={mergedStyle}\n    />\n  );\n}\n"],"mappings":"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"}

package/dist/unstable/useLiveCompletionAdapter.js

@@ -39,7 +39,9 @@ function unstable_useLiveCompletionAdapter(options) {
 	});
 	const [isLoading, setIsLoading] = useState(false);
 	const fetcherRef = useRef(fetcher);
-	fetcherRef.current = fetcher;
+	useLayoutEffect(() => {
+		fetcherRef.current = fetcher;
+	}, [fetcher]);
 	const timerRef = useRef(null);
 	const tokenRef = useRef(0);
 	const pendingQueryRef = useRef(null);

package/dist/unstable/useLiveCompletionAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLiveCompletionAdapter.js","names":["useCallback","useEffect","useLayoutEffect","useMemo","useRef","useState","Unstable_TriggerAdapter","Unstable_TriggerItem","Unstable_UseLiveCompletionAdapterOptions","fetcher","query","Promise","cacheKey","debounceMs","enabled","NO_QUERY","unstable_useLiveCompletionAdapter","options","adapter","isLoading","state","setState","items","failed","setIsLoading","fetcherRef","current","timerRef","ReturnType","setTimeout","tokenRef","pendingQueryRef","retryableQueryRef","pendingRetryQueryRef","cancelTimer","clearTimeout","rearmPendingRetry","scheduleFetch","token","resolve","then","invalidatePending","cacheKeyRef","s","categories","categoryItems","search","queueMicrotask"],"sources":["../../src/unstable/useLiveCompletionAdapter.ts"],"sourcesContent":["\"use client\";\n\nimport {\n  useCallback,\n  useEffect,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n  useState,\n} from \"react\";\nimport type {\n  Unstable_TriggerAdapter,\n  Unstable_TriggerItem,\n} from \"@assistant-ui/core\";\n\nexport type Unstable_UseLiveCompletionAdapterOptions = {\n  /**\n   * Fetches the items for a query from an async source. Called debounced; the\n   * resolved items are cached and returned synchronously to the popover on the\n   * next render.\n   */\n  readonly fetcher: (query: string) => Promise<readonly Unstable_TriggerItem[]>;\n  /**\n   * Identifies the fetcher's data source. Change this when switching accounts,\n   * workspaces, or another boundary that should invalidate cached results.\n   */\n  readonly cacheKey?: string | number | undefined;\n  /** Debounce applied before a fetch fires, in milliseconds. @default 60 */\n  readonly debounceMs?: number | undefined;\n  /** When `false`, no fetch is scheduled and the adapter stays empty. @default true */\n  readonly enabled?: boolean | undefined;\n};\n\n/** Sentinel that no real query (including the empty string) equals, so the first query always fetches. */\nconst NO_QUERY = \"\\u0000\";\n\n/**\n * @deprecated Under active development and may change without notice.\n *\n * Bridges an async completion source (a server search, a gateway RPC) into the\n * synchronous `Unstable_TriggerAdapter` that `ComposerTriggerPopover` consumes.\n * `search(query)` returns the last fetched items synchronously and schedules a\n * debounced fetch when the query changes; when results arrive the returned\n * `adapter` identity changes, which re-runs the popover's lookup so the fresh\n * items render. This is a search-only adapter (`categories` are empty).\n *\n * `isLoading` is `true` while a fetch is in flight. Pass it to the popover's\n * `isLoading` prop to render a loading state.\n *\n * @example\n * ```tsx\n * const mentions = unstable_useLiveCompletionAdapter({\n *   fetcher: (query) => searchUsers(query),\n * });\n *\n * <ComposerTriggerPopover\n *   char=\"@\"\n *   adapter={mentions.adapter}\n *   isLoading={mentions.isLoading}\n *   directive={{ onInserted }}\n * />\n * ```\n */\nexport function unstable_useLiveCompletionAdapter(\n  options: Unstable_UseLiveCompletionAdapterOptions,\n): { adapter: Unstable_TriggerAdapter; isLoading: boolean } {\n  const { fetcher, cacheKey, debounceMs = 60, enabled = true } = options;\n\n  const [state, setState] = useState<{\n    query: string;\n    items: readonly Unstable_TriggerItem[];\n    failed: boolean;\n  }>({ query: NO_QUERY, items: [], failed: false });\n  const [isLoading, setIsLoading] = useState(false);\n\n  const fetcherRef = useRef(fetcher);\n  fetcherRef.current = fetcher;\n\n  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);\n  const tokenRef = useRef(0);\n  const pendingQueryRef = useRef<string | null>(null);\n  const retryableQueryRef = useRef<string | null>(null);\n  const pendingRetryQueryRef = useRef<string | null>(null);\n\n  const cancelTimer = useCallback(() => {\n    if (timerRef.current !== null) {\n      clearTimeout(timerRef.current);\n      timerRef.current = null;\n    }\n  }, []);\n\n  const rearmPendingRetry = useCallback(() => {\n    const query = pendingRetryQueryRef.current;\n    if (query === null) return;\n    retryableQueryRef.current = query;\n    pendingRetryQueryRef.current = null;\n  }, []);\n\n  const scheduleFetch = useCallback(\n    (query: string) => {\n      if (!enabled) return;\n      if (pendingQueryRef.current === query) return;\n      rearmPendingRetry();\n      if (retryableQueryRef.current === query) {\n        retryableQueryRef.current = null;\n        pendingRetryQueryRef.current = query;\n      }\n      pendingQueryRef.current = query;\n      cancelTimer();\n      const token = ++tokenRef.current;\n      setIsLoading(true);\n      timerRef.current = setTimeout(() => {\n        timerRef.current = null;\n        Promise.resolve()\n          .then(() => fetcherRef.current(query))\n          .then(\n            (items) => {\n              if (token !== tokenRef.current) return;\n              pendingRetryQueryRef.current = null;\n              setState({ query, items, failed: false });\n              setIsLoading(false);\n            },\n            () => {\n              if (token !== tokenRef.current) return;\n              pendingQueryRef.current = null;\n              pendingRetryQueryRef.current = null;\n              setState({ query, items: [], failed: true });\n              setIsLoading(false);\n            },\n          );\n      }, debounceMs);\n    },\n    [enabled, debounceMs, cancelTimer, rearmPendingRetry],\n  );\n\n  const invalidatePending = useCallback(() => {\n    rearmPendingRetry();\n    cancelTimer();\n    pendingQueryRef.current = null;\n    tokenRef.current += 1;\n    setIsLoading(false);\n  }, [cancelTimer, rearmPendingRetry]);\n\n  const cacheKeyRef = useRef(cacheKey);\n  useLayoutEffect(() => {\n    if (cacheKeyRef.current === cacheKey) return;\n    cacheKeyRef.current = cacheKey;\n    invalidatePending();\n    retryableQueryRef.current = null;\n    pendingRetryQueryRef.current = null;\n    setState({ query: NO_QUERY, items: [], failed: false });\n  }, [cacheKey, invalidatePending]);\n\n  useEffect(() => {\n    if (enabled) return;\n    invalidatePending();\n    setState((s) =>\n      s.query === NO_QUERY ? s : { query: NO_QUERY, items: [], failed: false },\n    );\n  }, [enabled, invalidatePending]);\n\n  useEffect(() => cancelTimer, [cancelTimer]);\n\n  // Arm retries only after the failed state commits. Arming during rejection\n  // would let the failure render immediately schedule another request.\n  useEffect(() => {\n    retryableQueryRef.current = state.failed ? state.query : null;\n  }, [state]);\n\n  const adapter = useMemo<Unstable_TriggerAdapter>(\n    () => ({\n      categories: () => [],\n      categoryItems: () => [],\n      search: (query: string) => {\n        // search() runs inside the popover's render; defer state updates with\n        // queueMicrotask so they are not dispatched while another component renders.\n        if (query !== state.query || retryableQueryRef.current === query) {\n          queueMicrotask(() => scheduleFetch(query));\n        } else if (\n          pendingQueryRef.current !== null &&\n          pendingQueryRef.current !== query\n        ) {\n          // the query returned to a cached value while a fetch for a different\n          // query is in flight; drop it so its result cannot overwrite the cache\n          queueMicrotask(invalidatePending);\n        }\n        return state.items;\n      },\n    }),\n    [state, scheduleFetch, invalidatePending],\n  );\n\n  return { adapter, isLoading };\n}\n"],"mappings":"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"}
+{"version":3,"file":"useLiveCompletionAdapter.js","names":["useCallback","useEffect","useLayoutEffect","useMemo","useRef","useState","Unstable_TriggerAdapter","Unstable_TriggerItem","Unstable_UseLiveCompletionAdapterOptions","fetcher","query","Promise","cacheKey","debounceMs","enabled","NO_QUERY","unstable_useLiveCompletionAdapter","options","adapter","isLoading","state","setState","items","failed","setIsLoading","fetcherRef","current","timerRef","ReturnType","setTimeout","tokenRef","pendingQueryRef","retryableQueryRef","pendingRetryQueryRef","cancelTimer","clearTimeout","rearmPendingRetry","scheduleFetch","token","resolve","then","invalidatePending","cacheKeyRef","s","categories","categoryItems","search","queueMicrotask"],"sources":["../../src/unstable/useLiveCompletionAdapter.ts"],"sourcesContent":["\"use client\";\n\nimport {\n  useCallback,\n  useEffect,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n  useState,\n} from \"react\";\nimport type {\n  Unstable_TriggerAdapter,\n  Unstable_TriggerItem,\n} from \"@assistant-ui/core\";\n\nexport type Unstable_UseLiveCompletionAdapterOptions = {\n  /**\n   * Fetches the items for a query from an async source. Called debounced; the\n   * resolved items are cached and returned synchronously to the popover on the\n   * next render.\n   */\n  readonly fetcher: (query: string) => Promise<readonly Unstable_TriggerItem[]>;\n  /**\n   * Identifies the fetcher's data source. Change this when switching accounts,\n   * workspaces, or another boundary that should invalidate cached results.\n   */\n  readonly cacheKey?: string | number | undefined;\n  /** Debounce applied before a fetch fires, in milliseconds. @default 60 */\n  readonly debounceMs?: number | undefined;\n  /** When `false`, no fetch is scheduled and the adapter stays empty. @default true */\n  readonly enabled?: boolean | undefined;\n};\n\n/** Sentinel that no real query (including the empty string) equals, so the first query always fetches. */\nconst NO_QUERY = \"\\u0000\";\n\n/**\n * @deprecated Under active development and may change without notice.\n *\n * Bridges an async completion source (a server search, a gateway RPC) into the\n * synchronous `Unstable_TriggerAdapter` that `ComposerTriggerPopover` consumes.\n * `search(query)` returns the last fetched items synchronously and schedules a\n * debounced fetch when the query changes; when results arrive the returned\n * `adapter` identity changes, which re-runs the popover's lookup so the fresh\n * items render. This is a search-only adapter (`categories` are empty).\n *\n * `isLoading` is `true` while a fetch is in flight. Pass it to the popover's\n * `isLoading` prop to render a loading state.\n *\n * @example\n * ```tsx\n * const mentions = unstable_useLiveCompletionAdapter({\n *   fetcher: (query) => searchUsers(query),\n * });\n *\n * <ComposerTriggerPopover\n *   char=\"@\"\n *   adapter={mentions.adapter}\n *   isLoading={mentions.isLoading}\n *   directive={{ onInserted }}\n * />\n * ```\n */\nexport function unstable_useLiveCompletionAdapter(\n  options: Unstable_UseLiveCompletionAdapterOptions,\n): { adapter: Unstable_TriggerAdapter; isLoading: boolean } {\n  const { fetcher, cacheKey, debounceMs = 60, enabled = true } = options;\n\n  const [state, setState] = useState<{\n    query: string;\n    items: readonly Unstable_TriggerItem[];\n    failed: boolean;\n  }>({ query: NO_QUERY, items: [], failed: false });\n  const [isLoading, setIsLoading] = useState(false);\n\n  const fetcherRef = useRef(fetcher);\n  // The debounce timer must only observe fetchers from committed renders.\n  useLayoutEffect(() => {\n    fetcherRef.current = fetcher;\n  }, [fetcher]);\n\n  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);\n  const tokenRef = useRef(0);\n  const pendingQueryRef = useRef<string | null>(null);\n  const retryableQueryRef = useRef<string | null>(null);\n  const pendingRetryQueryRef = useRef<string | null>(null);\n\n  const cancelTimer = useCallback(() => {\n    if (timerRef.current !== null) {\n      clearTimeout(timerRef.current);\n      timerRef.current = null;\n    }\n  }, []);\n\n  const rearmPendingRetry = useCallback(() => {\n    const query = pendingRetryQueryRef.current;\n    if (query === null) return;\n    retryableQueryRef.current = query;\n    pendingRetryQueryRef.current = null;\n  }, []);\n\n  const scheduleFetch = useCallback(\n    (query: string) => {\n      if (!enabled) return;\n      if (pendingQueryRef.current === query) return;\n      rearmPendingRetry();\n      if (retryableQueryRef.current === query) {\n        retryableQueryRef.current = null;\n        pendingRetryQueryRef.current = query;\n      }\n      pendingQueryRef.current = query;\n      cancelTimer();\n      const token = ++tokenRef.current;\n      setIsLoading(true);\n      timerRef.current = setTimeout(() => {\n        timerRef.current = null;\n        Promise.resolve()\n          .then(() => fetcherRef.current(query))\n          .then(\n            (items) => {\n              if (token !== tokenRef.current) return;\n              pendingRetryQueryRef.current = null;\n              setState({ query, items, failed: false });\n              setIsLoading(false);\n            },\n            () => {\n              if (token !== tokenRef.current) return;\n              pendingQueryRef.current = null;\n              pendingRetryQueryRef.current = null;\n              setState({ query, items: [], failed: true });\n              setIsLoading(false);\n            },\n          );\n      }, debounceMs);\n    },\n    [enabled, debounceMs, cancelTimer, rearmPendingRetry],\n  );\n\n  const invalidatePending = useCallback(() => {\n    rearmPendingRetry();\n    cancelTimer();\n    pendingQueryRef.current = null;\n    tokenRef.current += 1;\n    setIsLoading(false);\n  }, [cancelTimer, rearmPendingRetry]);\n\n  const cacheKeyRef = useRef(cacheKey);\n  useLayoutEffect(() => {\n    if (cacheKeyRef.current === cacheKey) return;\n    cacheKeyRef.current = cacheKey;\n    invalidatePending();\n    retryableQueryRef.current = null;\n    pendingRetryQueryRef.current = null;\n    setState({ query: NO_QUERY, items: [], failed: false });\n  }, [cacheKey, invalidatePending]);\n\n  useEffect(() => {\n    if (enabled) return;\n    invalidatePending();\n    setState((s) =>\n      s.query === NO_QUERY ? s : { query: NO_QUERY, items: [], failed: false },\n    );\n  }, [enabled, invalidatePending]);\n\n  useEffect(() => cancelTimer, [cancelTimer]);\n\n  // Arm retries only after the failed state commits. Arming during rejection\n  // would let the failure render immediately schedule another request.\n  useEffect(() => {\n    retryableQueryRef.current = state.failed ? state.query : null;\n  }, [state]);\n\n  const adapter = useMemo<Unstable_TriggerAdapter>(\n    () => ({\n      categories: () => [],\n      categoryItems: () => [],\n      search: (query: string) => {\n        // search() runs inside the popover's render; defer state updates with\n        // queueMicrotask so they are not dispatched while another component renders.\n        if (query !== state.query || retryableQueryRef.current === query) {\n          queueMicrotask(() => scheduleFetch(query));\n        } else if (\n          pendingQueryRef.current !== null &&\n          pendingQueryRef.current !== query\n        ) {\n          // the query returned to a cached value while a fetch for a different\n          // query is in flight; drop it so its result cannot overwrite the cache\n          queueMicrotask(invalidatePending);\n        }\n        return state.items;\n      },\n    }),\n    [state, scheduleFetch, invalidatePending],\n  );\n\n  return { adapter, isLoading };\n}\n"],"mappings":";;;;AAkCA,MAAMe,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BjB,SAAgBC,kCACdC,SAC0D;CAC1D,MAAM,EAAER,SAASG,UAAUC,aAAa,IAAIC,UAAU,SAASG;CAE/D,MAAM,CAACG,OAAOC,YAAYhB,SAIvB;EAAEK,OAAOK;EAAUO,OAAO,CAAA;EAAIC,QAAQ;CAAM,CAAC;CAChD,MAAM,CAACJ,WAAWK,gBAAgBnB,SAAS,KAAK;CAEhD,MAAMoB,aAAarB,OAAOK,OAAO;CAEjCP,sBAAsB;EACpBuB,WAAWC,UAAUjB;CACvB,GAAG,CAACA,OAAO,CAAC;CAEZ,MAAMkB,WAAWvB,OAA6C,IAAI;CAClE,MAAM0B,WAAW1B,OAAO,CAAC;CACzB,MAAM2B,kBAAkB3B,OAAsB,IAAI;CAClD,MAAM4B,oBAAoB5B,OAAsB,IAAI;CACpD,MAAM6B,uBAAuB7B,OAAsB,IAAI;CAEvD,MAAM8B,cAAclC,kBAAkB;EACpC,IAAI2B,SAASD,YAAY,MAAM;GAC7BS,aAAaR,SAASD,OAAO;GAC7BC,SAASD,UAAU;EACrB;CACF,GAAG,CAAA,CAAE;CAEL,MAAMU,oBAAoBpC,kBAAkB;EAC1C,MAAMU,QAAQuB,qBAAqBP;EACnC,IAAIhB,UAAU,MAAM;EACpBsB,kBAAkBN,UAAUhB;EAC5BuB,qBAAqBP,UAAU;CACjC,GAAG,CAAA,CAAE;CAEL,MAAMW,gBAAgBrC,aACnBU,UAAkB;EACjB,IAAI,CAACI,SAAS;EACd,IAAIiB,gBAAgBL,YAAYhB,OAAO;EACvC0B,kBAAkB;EAClB,IAAIJ,kBAAkBN,YAAYhB,OAAO;GACvCsB,kBAAkBN,UAAU;GAC5BO,qBAAqBP,UAAUhB;EACjC;EACAqB,gBAAgBL,UAAUhB;EAC1BwB,YAAY;EACZ,MAAMI,QAAQ,EAAER,SAASJ;EACzBF,aAAa,IAAI;EACjBG,SAASD,UAAUG,iBAAiB;GAClCF,SAASD,UAAU;GACnBf,QAAQ4B,QAAQ,CAAC,CACdC,WAAWf,WAAWC,QAAQhB,KAAK,CAAC,CAAC,CACrC8B,MACElB,UAAU;IACT,IAAIgB,UAAUR,SAASJ,SAAS;IAChCO,qBAAqBP,UAAU;IAC/BL,SAAS;KAAEX;KAAOY;KAAOC,QAAQ;IAAM,CAAC;IACxCC,aAAa,KAAK;GACpB,SACM;IACJ,IAAIc,UAAUR,SAASJ,SAAS;IAChCK,gBAAgBL,UAAU;IAC1BO,qBAAqBP,UAAU;IAC/BL,SAAS;KAAEX;KAAOY,OAAO,CAAA;KAAIC,QAAQ;IAAK,CAAC;IAC3CC,aAAa,KAAK;GACpB,CACF;EACJ,GAAGX,UAAU;CACf,GACA;EAACC;EAASD;EAAYqB;EAAaE;CAAiB,CACtD;CAEA,MAAMK,oBAAoBzC,kBAAkB;EAC1CoC,kBAAkB;EAClBF,YAAY;EACZH,gBAAgBL,UAAU;EAC1BI,SAASJ,WAAW;EACpBF,aAAa,KAAK;CACpB,GAAG,CAACU,aAAaE,iBAAiB,CAAC;CAEnC,MAAMM,cAActC,OAAOQ,QAAQ;CACnCV,sBAAsB;EACpB,IAAIwC,YAAYhB,YAAYd,UAAU;EACtC8B,YAAYhB,UAAUd;EACtB6B,kBAAkB;EAClBT,kBAAkBN,UAAU;EAC5BO,qBAAqBP,UAAU;EAC/BL,SAAS;GAAEX,OAAOK;GAAUO,OAAO,CAAA;GAAIC,QAAQ;EAAM,CAAC;CACxD,GAAG,CAACX,UAAU6B,iBAAiB,CAAC;CAEhCxC,gBAAgB;EACd,IAAIa,SAAS;EACb2B,kBAAkB;EAClBpB,UAAUsB,MACRA,EAAEjC,UAAUK,WAAW4B,IAAI;GAAEjC,OAAOK;GAAUO,OAAO,CAAA;GAAIC,QAAQ;EAAM,CACzE;CACF,GAAG,CAACT,SAAS2B,iBAAiB,CAAC;CAE/BxC,gBAAgBiC,aAAa,CAACA,WAAW,CAAC;CAI1CjC,gBAAgB;EACd+B,kBAAkBN,UAAUN,MAAMG,SAASH,MAAMV,QAAQ;CAC3D,GAAG,CAACU,KAAK,CAAC;CAyBV,OAAO;EAAEF,SAvBOf,eACP;GACLyC,kBAAkB,CAAA;GAClBC,qBAAqB,CAAA;GACrBC,SAASpC,UAAkB;IAGzB,IAAIA,UAAUU,MAAMV,SAASsB,kBAAkBN,YAAYhB,OACzDqC,qBAAqBV,cAAc3B,KAAK,CAAC;SACpC,IACLqB,gBAAgBL,YAAY,QAC5BK,gBAAgBL,YAAYhB,OAI5BqC,eAAeN,iBAAiB;IAElC,OAAOrB,MAAME;GACf;EACF,IACA;GAACF;GAAOiB;GAAeI;EAAiB,CAGjCvB;EAASC;CAAU;AAC9B"}

package/dist/unstable/useMentionAdapter.d.ts

@@ -21,7 +21,10 @@ type Unstable_MentionCategory = {
   readonly items: readonly Unstable_Mention[];
 };
 type Unstable_ModelContextToolsOptions = {
-  /** Wrap tools in a dedicated category (drill-down mode). */
+  /**
+   * Wrap tools in a dedicated category. Selects drill-down mode on its own
+   * when `categories` is unset and `items` is omitted.
+   */
   readonly category?: {
     readonly id: string;
     readonly label: string;
@@ -32,7 +35,10 @@ type Unstable_ModelContextToolsOptions = {
   readonly icon?: string;
 };
 type Unstable_UseMentionAdapterOptions = {
-  /** Flat mention list. Ignored when `categories` is set. */
+  /**
+   * Flat mention list. Ignored when `categories` is set, and keeps the
+   * adapter flat when a tool `category` is configured.
+   */
   readonly items?: readonly Unstable_Mention[];
   /** Categorized mentions for drill-down navigation. */
   readonly categories?: readonly Unstable_MentionCategory[];
@@ -41,7 +47,7 @@ type Unstable_UseMentionAdapterOptions = {
    * - `false`: exclude.
    * - `true`: include (default when no `items`/`categories`; as a category
    *   if `categories` is set, flat otherwise).
-   * - object: explicit config.
+   * - object: explicit config; `category` also selects drill-down mode.
    *
    * Omitted → defaults to `true` iff neither `items` nor `categories`.
    */

package/dist/unstable/useMentionAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMentionAdapter.d.ts","names":[],"sources":["../../src/unstable/useMentionAdapter.ts"],"mappings":";;;;;KAcY,yBAAyB;EAAK;;KAE9B;WACD;WACA;WACA;WACA;;WAEA;WACA,WAAW;;KAGV;WACD;WACA;WACA,gBAAgB;;KAGf;;WAED;aAAsB;aAAqB;;;WAE3C,eAAe;;WAEf;;KAGC;;WAED,iBAAiB;;WAEjB,sBAAsB;;;;;;;;;;WAUtB,qCAEL;;WAEK,YAAY;;WAEZ,cAAc,MAAM;;WAEpB,UAAU,eAAe;;WAEzB,eAAe;;KAGd;WACD,WAAW;WACX,eAAe,MAAM;;;;;;;;;;;;;;;iBAgBhB,2BACd,UAAU;EAEV,SAAS;EACT,WAAW;EACX,UAAU,eAAe;EACzB,eAAe"}
+{"version":3,"file":"useMentionAdapter.d.ts","names":[],"sources":["../../src/unstable/useMentionAdapter.ts"],"mappings":";;;;;KAoBY,yBAAyB;EAAK;;KAE9B;WACD;WACA;WACA;WACA;;WAEA;WACA,WAAW;;KAGV;WACD;WACA;WACA,gBAAgB;;KAGf;;;;;WAKD;aAAsB;aAAqB;;;WAE3C,eAAe;;WAEf;;KAGC;;;;;WAKD,iBAAiB;;WAEjB,sBAAsB;;;;;;;;;;WAUtB,qCAEL;;WAEK,YAAY;;WAEZ,cAAc,MAAM;;WAEpB,UAAU,eAAe;;WAEzB,eAAe;;KAGd;WACD,WAAW;WACX,eAAe,MAAM;;;;;;;;;;;;;;;iBAoDhB,2BACd,UAAU;EAEV,SAAS;EACT,WAAW;EACX,UAAU,eAAe;EACzB,eAAe"}

package/dist/unstable/useMentionAdapter.js

@@ -1,8 +1,33 @@
 "use client";
+import { matchesTriggerItemQuery } from "../primitives/composer/trigger/matchesTriggerItemQuery.js";
+import { shallowEqualRecords, useModelContextSnapshot } from "./useModelContextSnapshot.js";
 import { useAui } from "@assistant-ui/store";
 import { unstable_defaultDirectiveFormatter } from "@assistant-ui/core";
 import { useMemo } from "@assistant-ui/tap/react-shim";
 //#region src/unstable/useMentionAdapter.ts
+const EMPTY_TOOL_MENTIONS = Object.freeze({});
+const toolMentionSource = {
+	empty: EMPTY_TOOL_MENTIONS,
+	read: (aui) => {
+		const tools = aui.thread.getModelContext().tools;
+		if (!tools) return EMPTY_TOOL_MENTIONS;
+		const mentions = {};
+		for (const [name, tool] of Object.entries(tools)) mentions[name] = tool.description;
+		return mentions;
+	},
+	subscribe: (aui, onChange) => {
+		const unsubscribeContext = aui.on("thread.modelContextUpdate", onChange);
+		const unsubscribeSelection = aui.on({
+			scope: "*",
+			event: "threads.selectionChanged"
+		}, onChange);
+		return () => {
+			unsubscribeContext();
+			unsubscribeSelection();
+		};
+	},
+	isEqual: shallowEqualRecords
+};
 /**
 * @deprecated Under active development and might change without notice.
 *
@@ -25,38 +50,30 @@ function unstable_useMentionAdapter(options) {
 	const wantsTools = includeTools !== false;
 	const formatter = options?.formatter;
 	const onInserted = options?.onInserted;
+	const isCategorized = categories !== void 0 && categories.length > 0 || toolsConfig?.category !== void 0 && items === void 0;
+	const toolMentions = useModelContextSnapshot(aui, wantsTools, toolMentionSource);
 	return {
 		adapter: useMemo(() => {
-			const getModelContextTools = () => {
-				if (!wantsTools) return [];
-				const tools = aui.thread.getModelContext().tools;
-				if (!tools) return [];
-				const formatLabel = toolsConfig?.formatLabel;
-				const defaultIcon = toolsConfig?.icon;
-				return Object.entries(tools).map(([name, tool]) => toTriggerItem({
-					id: name,
-					type: "tool",
-					label: formatLabel ? formatLabel(name) : name,
-					description: tool.description ?? void 0,
-					icon: defaultIcon
-				}));
-			};
-			if (categories && categories.length > 0) {
-				const groups = categories.map((cat) => ({
+			const formatLabel = toolsConfig?.formatLabel;
+			const defaultIcon = toolsConfig?.icon;
+			const toolItems = wantsTools ? Object.entries(toolMentions).map(([name, description]) => toTriggerItem({
+				id: name,
+				type: "tool",
+				label: formatLabel ? formatLabel(name) : name,
+				description,
+				icon: defaultIcon
+			})) : [];
+			if (isCategorized) {
+				const groups = (categories ?? []).map((cat) => ({
 					id: cat.id,
 					label: cat.label,
 					items: cat.items.map(toTriggerItem)
 				}));
-				let toolCategory = null;
-				if (wantsTools) {
-					const toolItems = getModelContextTools();
-					if (toolItems.length > 0) toolCategory = {
-						id: toolsConfig?.category?.id ?? "tools",
-						label: toolsConfig?.category?.label ?? "Tools",
-						items: toolItems
-					};
-				}
-				const allGroups = toolCategory ? [...groups, toolCategory] : groups;
+				const allGroups = toolItems.length > 0 ? [...groups, {
+					id: toolsConfig?.category?.id ?? "tools",
+					label: toolsConfig?.category?.label ?? "Tools",
+					items: toolItems
+				}] : groups;
 				return {
 					categories: () => allGroups.map(({ id, label }) => ({
 						id,
@@ -65,31 +82,28 @@ function unstable_useMentionAdapter(options) {
 					categoryItems: (id) => allGroups.find((g) => g.id === id)?.items ?? [],
 					search: (query) => {
 						const lower = query.toLowerCase();
-						return allGroups.flatMap((g) => g.items).filter((item) => matchesQuery(item, lower));
+						return allGroups.flatMap((g) => g.items).filter((item) => matchesTriggerItemQuery(item, lower));
 					}
 				};
 			}
 			const flatItems = (items ?? []).map(toTriggerItem);
-			const getFlatPool = () => {
-				if (!wantsTools) return flatItems;
-				const toolItems = getModelContextTools();
-				const seen = new Set(flatItems.map((i) => i.id));
-				return [...flatItems, ...toolItems.filter((t) => !seen.has(t.id))];
-			};
+			const seen = new Set(flatItems.map((i) => i.id));
+			const flatPool = [...flatItems, ...toolItems.filter((t) => !seen.has(t.id))];
 			return {
 				categories: () => [],
 				categoryItems: () => [],
 				search: (query) => {
 					const lower = query.toLowerCase();
-					return getFlatPool().filter((item) => matchesQuery(item, lower));
+					return flatPool.filter((item) => matchesTriggerItemQuery(item, lower));
 				}
 			};
 		}, [
-			aui,
 			items,
 			categories,
 			wantsTools,
-			toolsConfig
+			toolsConfig,
+			isCategorized,
+			toolMentions
 		]),
 		directive: useMemo(() => ({
 			formatter: formatter ?? unstable_defaultDirectiveFormatter,
@@ -112,13 +126,6 @@ function toTriggerItem(m) {
 		...metadata !== void 0 ? { metadata } : {}
 	};
 }
-function matchesQuery(item, lower) {
-	if (!lower) return true;
-	if (item.id.toLowerCase().includes(lower)) return true;
-	if (item.label.toLowerCase().includes(lower)) return true;
-	if (item.description?.toLowerCase().includes(lower)) return true;
-	return false;
-}
 //#endregion
 export { unstable_useMentionAdapter };
 

package/dist/unstable/useMentionAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMentionAdapter.js","names":["useMemo","FC","useAui","Unstable_DirectiveFormatter","Unstable_TriggerAdapter","Unstable_TriggerCategory","Unstable_TriggerItem","unstable_defaultDirectiveFormatter","ReadonlyJSONObject","Unstable_IconComponent","className","Unstable_Mention","id","type","label","description","icon","metadata","Unstable_MentionCategory","items","Unstable_ModelContextToolsOptions","category","formatLabel","toolName","Unstable_UseMentionAdapterOptions","categories","includeModelContextTools","formatter","onInserted","item","iconMap","Record","fallbackIcon","Unstable_MentionDirective","unstable_useMentionAdapter","options","adapter","directive","aui","includeTools","toolsConfig","undefined","wantsTools","getModelContextTools","ctx","thread","getModelContext","tools","defaultIcon","Object","entries","map","name","tool","toTriggerItem","length","groups","cat","toolCategory","toolItems","allGroups","categoryItems","find","g","search","query","lower","toLowerCase","flatMap","filter","matchesQuery","flatItems","getFlatPool","seen","Set","i","t","has","m","includes"],"sources":["../../src/unstable/useMentionAdapter.ts"],"sourcesContent":["\"use client\";\n\nimport { useMemo, type FC } from \"react\";\nimport { useAui } from \"@assistant-ui/store\";\nimport type {\n  Unstable_DirectiveFormatter,\n  Unstable_TriggerAdapter,\n  Unstable_TriggerCategory,\n  Unstable_TriggerItem,\n} from \"@assistant-ui/core\";\nimport { unstable_defaultDirectiveFormatter } from \"@assistant-ui/core\";\nimport type { ReadonlyJSONObject } from \"assistant-stream/utils\";\n\n/** Icon component shape consumed by `ComposerTriggerPopover`'s `iconMap`. */\nexport type Unstable_IconComponent = FC<{ className?: string }>;\n\nexport type Unstable_Mention = {\n  readonly id: string;\n  readonly type: string;\n  readonly label: string;\n  readonly description?: string | undefined;\n  /** Shortcut for `metadata.icon`; merged with `metadata` if both are given. */\n  readonly icon?: string | undefined;\n  readonly metadata?: ReadonlyJSONObject | undefined;\n};\n\nexport type Unstable_MentionCategory = {\n  readonly id: string;\n  readonly label: string;\n  readonly items: readonly Unstable_Mention[];\n};\n\nexport type Unstable_ModelContextToolsOptions = {\n  /** Wrap tools in a dedicated category (drill-down mode). */\n  readonly category?: { readonly id: string; readonly label: string };\n  /** Format tool name for display. */\n  readonly formatLabel?: (toolName: string) => string;\n  /** Default icon key for each tool. */\n  readonly icon?: string;\n};\n\nexport type Unstable_UseMentionAdapterOptions = {\n  /** Flat mention list. Ignored when `categories` is set. */\n  readonly items?: readonly Unstable_Mention[];\n  /** Categorized mentions for drill-down navigation. */\n  readonly categories?: readonly Unstable_MentionCategory[];\n  /**\n   * How tools registered in model context integrate.\n   * - `false`: exclude.\n   * - `true`: include (default when no `items`/`categories`; as a category\n   *   if `categories` is set, flat otherwise).\n   * - object: explicit config.\n   *\n   * Omitted → defaults to `true` iff neither `items` nor `categories`.\n   */\n  readonly includeModelContextTools?:\n    | boolean\n    | Unstable_ModelContextToolsOptions;\n  /** Directive formatter. @default unstable_defaultDirectiveFormatter */\n  readonly formatter?: Unstable_DirectiveFormatter;\n  /** Fires after an item is inserted into the composer. */\n  readonly onInserted?: (item: Unstable_TriggerItem) => void;\n  /** Maps `metadata.icon` / `category.id` string keys to React components. */\n  readonly iconMap?: Record<string, Unstable_IconComponent>;\n  /** Fallback icon when no entry in `iconMap` matches. */\n  readonly fallbackIcon?: Unstable_IconComponent;\n};\n\nexport type Unstable_MentionDirective = {\n  readonly formatter: Unstable_DirectiveFormatter;\n  readonly onInserted?: ((item: Unstable_TriggerItem) => void) | undefined;\n};\n\n/**\n * @deprecated Under active development and might change without notice.\n *\n * Creates a spreadable `{ adapter, directive }` bundle for `@` mentions.\n * Supports tools registered in model context, explicit items, or both —\n * flat or categorized.\n *\n * @example\n * ```tsx\n * const mention = unstable_useMentionAdapter();\n * <ComposerTriggerPopover char=\"@\" {...mention} />\n * ```\n */\nexport function unstable_useMentionAdapter(\n  options?: Unstable_UseMentionAdapterOptions,\n): {\n  adapter: Unstable_TriggerAdapter;\n  directive: Unstable_MentionDirective;\n  iconMap?: Record<string, Unstable_IconComponent>;\n  fallbackIcon?: Unstable_IconComponent;\n} {\n  const aui = useAui();\n\n  const items = options?.items;\n  const categories = options?.categories;\n  const includeTools =\n    options?.includeModelContextTools ?? (!items && !categories);\n  const toolsConfig =\n    typeof includeTools === \"object\" ? includeTools : undefined;\n  const wantsTools = includeTools !== false;\n  const formatter = options?.formatter;\n  const onInserted = options?.onInserted;\n\n  const adapter = useMemo<Unstable_TriggerAdapter>(() => {\n    const getModelContextTools = (): Unstable_TriggerItem[] => {\n      if (!wantsTools) return [];\n      const ctx = aui.thread.getModelContext();\n      const tools = ctx.tools;\n      if (!tools) return [];\n      const formatLabel = toolsConfig?.formatLabel;\n      const defaultIcon = toolsConfig?.icon;\n      return Object.entries(tools).map(([name, tool]) =>\n        toTriggerItem({\n          id: name,\n          type: \"tool\",\n          label: formatLabel ? formatLabel(name) : name,\n          description: tool.description ?? undefined,\n          icon: defaultIcon,\n        }),\n      );\n    };\n\n    // Categorized: drill-down mode\n    if (categories && categories.length > 0) {\n      const groups = categories.map((cat) => ({\n        id: cat.id,\n        label: cat.label,\n        items: cat.items.map(toTriggerItem),\n      }));\n\n      let toolCategory: {\n        id: string;\n        label: string;\n        items: Unstable_TriggerItem[];\n      } | null = null;\n      if (wantsTools) {\n        const toolItems = getModelContextTools();\n        if (toolItems.length > 0) {\n          toolCategory = {\n            id: toolsConfig?.category?.id ?? \"tools\",\n            label: toolsConfig?.category?.label ?? \"Tools\",\n            items: toolItems,\n          };\n        }\n      }\n      const allGroups = toolCategory ? [...groups, toolCategory] : groups;\n\n      return {\n        categories: () => allGroups.map(({ id, label }) => ({ id, label })),\n        categoryItems: (id) => allGroups.find((g) => g.id === id)?.items ?? [],\n        search: (query) => {\n          const lower = query.toLowerCase();\n          return allGroups\n            .flatMap((g) => g.items)\n            .filter((item) => matchesQuery(item, lower));\n        },\n      };\n    }\n\n    // Flat: items + (optionally) tools, all in one search pool\n    const flatItems = (items ?? []).map(toTriggerItem);\n    const getFlatPool = (): Unstable_TriggerItem[] => {\n      if (!wantsTools) return flatItems;\n      const toolItems = getModelContextTools();\n      // Dedupe by id — explicit items win.\n      const seen = new Set(flatItems.map((i) => i.id));\n      return [...flatItems, ...toolItems.filter((t) => !seen.has(t.id))];\n    };\n\n    return {\n      categories: (): readonly Unstable_TriggerCategory[] => [],\n      categoryItems: () => [],\n      search: (query) => {\n        const lower = query.toLowerCase();\n        return getFlatPool().filter((item) => matchesQuery(item, lower));\n      },\n    };\n  }, [aui, items, categories, wantsTools, toolsConfig]);\n\n  const directive = useMemo<Unstable_MentionDirective>(\n    () => ({\n      formatter: formatter ?? unstable_defaultDirectiveFormatter,\n      ...(onInserted ? { onInserted } : {}),\n    }),\n    [formatter, onInserted],\n  );\n\n  return {\n    adapter,\n    directive,\n    ...(options?.iconMap ? { iconMap: options.iconMap } : {}),\n    ...(options?.fallbackIcon ? { fallbackIcon: options.fallbackIcon } : {}),\n  };\n}\n\nfunction toTriggerItem(m: Unstable_Mention): Unstable_TriggerItem {\n  const metadata =\n    m.icon !== undefined ? { ...(m.metadata ?? {}), icon: m.icon } : m.metadata;\n  return {\n    id: m.id,\n    type: m.type,\n    label: m.label,\n    ...(m.description !== undefined ? { description: m.description } : {}),\n    ...(metadata !== undefined ? { metadata } : {}),\n  };\n}\n\nfunction matchesQuery(item: Unstable_TriggerItem, lower: string): boolean {\n  if (!lower) return true;\n  if (item.id.toLowerCase().includes(lower)) return true;\n  if (item.label.toLowerCase().includes(lower)) return true;\n  if (item.description?.toLowerCase().includes(lower)) return true;\n  return false;\n}\n"],"mappings":"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"}
+{"version":3,"file":"useMentionAdapter.js","names":["useMemo","FC","useAui","Unstable_DirectiveFormatter","Unstable_TriggerAdapter","Unstable_TriggerCategory","Unstable_TriggerItem","unstable_defaultDirectiveFormatter","ReadonlyJSONObject","matchesTriggerItemQuery","shallowEqualRecords","useModelContextSnapshot","ModelContextSnapshotSource","Unstable_IconComponent","className","Unstable_Mention","id","type","label","description","icon","metadata","Unstable_MentionCategory","items","Unstable_ModelContextToolsOptions","category","formatLabel","toolName","Unstable_UseMentionAdapterOptions","categories","includeModelContextTools","formatter","onInserted","item","iconMap","Record","fallbackIcon","Unstable_MentionDirective","EMPTY_TOOL_MENTIONS","Readonly","Object","freeze","toolMentionSource","empty","read","aui","tools","thread","getModelContext","mentions","name","tool","entries","subscribe","onChange","unsubscribeContext","on","unsubscribeSelection","scope","event","isEqual","unstable_useMentionAdapter","options","adapter","directive","includeTools","toolsConfig","undefined","wantsTools","isCategorized","length","toolMentions","defaultIcon","toolItems","map","toTriggerItem","groups","cat","allGroups","categoryItems","find","g","search","query","lower","toLowerCase","flatMap","filter","flatItems","seen","Set","i","flatPool","t","has","m"],"sources":["../../src/unstable/useMentionAdapter.ts"],"sourcesContent":["\"use client\";\n\nimport { useMemo, type FC } from \"react\";\nimport { useAui } from \"@assistant-ui/store\";\nimport type {\n  Unstable_DirectiveFormatter,\n  Unstable_TriggerAdapter,\n  Unstable_TriggerCategory,\n  Unstable_TriggerItem,\n} from \"@assistant-ui/core\";\nimport { unstable_defaultDirectiveFormatter } from \"@assistant-ui/core\";\nimport type { ReadonlyJSONObject } from \"assistant-stream/utils\";\nimport { matchesTriggerItemQuery } from \"../primitives/composer/trigger/matchesTriggerItemQuery\";\nimport {\n  shallowEqualRecords,\n  useModelContextSnapshot,\n  type ModelContextSnapshotSource,\n} from \"./useModelContextSnapshot\";\n\n/** Icon component shape consumed by `ComposerTriggerPopover`'s `iconMap`. */\nexport type Unstable_IconComponent = FC<{ className?: string }>;\n\nexport type Unstable_Mention = {\n  readonly id: string;\n  readonly type: string;\n  readonly label: string;\n  readonly description?: string | undefined;\n  /** Shortcut for `metadata.icon`; merged with `metadata` if both are given. */\n  readonly icon?: string | undefined;\n  readonly metadata?: ReadonlyJSONObject | undefined;\n};\n\nexport type Unstable_MentionCategory = {\n  readonly id: string;\n  readonly label: string;\n  readonly items: readonly Unstable_Mention[];\n};\n\nexport type Unstable_ModelContextToolsOptions = {\n  /**\n   * Wrap tools in a dedicated category. Selects drill-down mode on its own\n   * when `categories` is unset and `items` is omitted.\n   */\n  readonly category?: { readonly id: string; readonly label: string };\n  /** Format tool name for display. */\n  readonly formatLabel?: (toolName: string) => string;\n  /** Default icon key for each tool. */\n  readonly icon?: string;\n};\n\nexport type Unstable_UseMentionAdapterOptions = {\n  /**\n   * Flat mention list. Ignored when `categories` is set, and keeps the\n   * adapter flat when a tool `category` is configured.\n   */\n  readonly items?: readonly Unstable_Mention[];\n  /** Categorized mentions for drill-down navigation. */\n  readonly categories?: readonly Unstable_MentionCategory[];\n  /**\n   * How tools registered in model context integrate.\n   * - `false`: exclude.\n   * - `true`: include (default when no `items`/`categories`; as a category\n   *   if `categories` is set, flat otherwise).\n   * - object: explicit config; `category` also selects drill-down mode.\n   *\n   * Omitted → defaults to `true` iff neither `items` nor `categories`.\n   */\n  readonly includeModelContextTools?:\n    | boolean\n    | Unstable_ModelContextToolsOptions;\n  /** Directive formatter. @default unstable_defaultDirectiveFormatter */\n  readonly formatter?: Unstable_DirectiveFormatter;\n  /** Fires after an item is inserted into the composer. */\n  readonly onInserted?: (item: Unstable_TriggerItem) => void;\n  /** Maps `metadata.icon` / `category.id` string keys to React components. */\n  readonly iconMap?: Record<string, Unstable_IconComponent>;\n  /** Fallback icon when no entry in `iconMap` matches. */\n  readonly fallbackIcon?: Unstable_IconComponent;\n};\n\nexport type Unstable_MentionDirective = {\n  readonly formatter: Unstable_DirectiveFormatter;\n  readonly onInserted?: ((item: Unstable_TriggerItem) => void) | undefined;\n};\n\nconst EMPTY_TOOL_MENTIONS: Readonly<Record<string, string | undefined>> =\n  Object.freeze({});\n\n// The description is copied out rather than reached through the tool, so a\n// provider that returns a stable tool object and edits it in place is observed.\nconst toolMentionSource: ModelContextSnapshotSource<\n  Readonly<Record<string, string | undefined>>\n> = {\n  empty: EMPTY_TOOL_MENTIONS,\n  read: (aui) => {\n    const tools = aui.thread.getModelContext().tools;\n    if (!tools) return EMPTY_TOOL_MENTIONS;\n    const mentions: Record<string, string | undefined> = {};\n    for (const [name, tool] of Object.entries(tools)) {\n      mentions[name] = tool.description;\n    }\n    return mentions;\n  },\n  subscribe: (aui, onChange) => {\n    const unsubscribeContext = aui.on(\"thread.modelContextUpdate\", onChange);\n    // Rebinding the thread event subject to a new thread does not replay it,\n    // so a switch between threads carrying different providers is its own\n    // refresh trigger. Subscribed globally because a composer can render\n    // without a thread list scope.\n    const unsubscribeSelection = aui.on(\n      { scope: \"*\", event: \"threads.selectionChanged\" },\n      onChange,\n    );\n    return () => {\n      unsubscribeContext();\n      unsubscribeSelection();\n    };\n  },\n  isEqual: shallowEqualRecords,\n};\n\n/**\n * @deprecated Under active development and might change without notice.\n *\n * Creates a spreadable `{ adapter, directive }` bundle for `@` mentions.\n * Supports tools registered in model context, explicit items, or both —\n * flat or categorized.\n *\n * @example\n * ```tsx\n * const mention = unstable_useMentionAdapter();\n * <ComposerTriggerPopover char=\"@\" {...mention} />\n * ```\n */\nexport function unstable_useMentionAdapter(\n  options?: Unstable_UseMentionAdapterOptions,\n): {\n  adapter: Unstable_TriggerAdapter;\n  directive: Unstable_MentionDirective;\n  iconMap?: Record<string, Unstable_IconComponent>;\n  fallbackIcon?: Unstable_IconComponent;\n} {\n  const aui = useAui();\n\n  const items = options?.items;\n  const categories = options?.categories;\n  const includeTools =\n    options?.includeModelContextTools ?? (!items && !categories);\n  const toolsConfig =\n    typeof includeTools === \"object\" ? includeTools : undefined;\n  const wantsTools = includeTools !== false;\n  const formatter = options?.formatter;\n  const onInserted = options?.onInserted;\n  const isCategorized =\n    (categories !== undefined && categories.length > 0) ||\n    (toolsConfig?.category !== undefined && items === undefined);\n  const toolMentions = useModelContextSnapshot(\n    aui,\n    wantsTools,\n    toolMentionSource,\n  );\n\n  const adapter = useMemo<Unstable_TriggerAdapter>(() => {\n    const formatLabel = toolsConfig?.formatLabel;\n    const defaultIcon = toolsConfig?.icon;\n    const toolItems = wantsTools\n      ? Object.entries(toolMentions).map(([name, description]) =>\n          toTriggerItem({\n            id: name,\n            type: \"tool\",\n            label: formatLabel ? formatLabel(name) : name,\n            description,\n            icon: defaultIcon,\n          }),\n        )\n      : [];\n\n    // Categorized: drill-down mode\n    if (isCategorized) {\n      const groups = (categories ?? []).map((cat) => ({\n        id: cat.id,\n        label: cat.label,\n        items: cat.items.map(toTriggerItem),\n      }));\n      const allGroups =\n        toolItems.length > 0\n          ? [\n              ...groups,\n              {\n                id: toolsConfig?.category?.id ?? \"tools\",\n                label: toolsConfig?.category?.label ?? \"Tools\",\n                items: toolItems,\n              },\n            ]\n          : groups;\n\n      return {\n        categories: () => allGroups.map(({ id, label }) => ({ id, label })),\n        categoryItems: (id) => allGroups.find((g) => g.id === id)?.items ?? [],\n        search: (query) => {\n          const lower = query.toLowerCase();\n          return allGroups\n            .flatMap((g) => g.items)\n            .filter((item) => matchesTriggerItemQuery(item, lower));\n        },\n      };\n    }\n\n    // Flat: items + (optionally) tools, all in one search pool\n    const flatItems = (items ?? []).map(toTriggerItem);\n    // Dedupe by id — explicit items win.\n    const seen = new Set(flatItems.map((i) => i.id));\n    const flatPool = [\n      ...flatItems,\n      ...toolItems.filter((t) => !seen.has(t.id)),\n    ];\n\n    return {\n      categories: (): readonly Unstable_TriggerCategory[] => [],\n      categoryItems: () => [],\n      search: (query) => {\n        const lower = query.toLowerCase();\n        return flatPool.filter((item) => matchesTriggerItemQuery(item, lower));\n      },\n    };\n  }, [items, categories, wantsTools, toolsConfig, isCategorized, toolMentions]);\n\n  const directive = useMemo<Unstable_MentionDirective>(\n    () => ({\n      formatter: formatter ?? unstable_defaultDirectiveFormatter,\n      ...(onInserted ? { onInserted } : {}),\n    }),\n    [formatter, onInserted],\n  );\n\n  return {\n    adapter,\n    directive,\n    ...(options?.iconMap ? { iconMap: options.iconMap } : {}),\n    ...(options?.fallbackIcon ? { fallbackIcon: options.fallbackIcon } : {}),\n  };\n}\n\nfunction toTriggerItem(m: Unstable_Mention): Unstable_TriggerItem {\n  const metadata =\n    m.icon !== undefined ? { ...(m.metadata ?? {}), icon: m.icon } : m.metadata;\n  return {\n    id: m.id,\n    type: m.type,\n    label: m.label,\n    ...(m.description !== undefined ? { description: m.description } : {}),\n    ...(metadata !== undefined ? { metadata } : {}),\n  };\n}\n"],"mappings":"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"}

package/dist/unstable/useModelContextSnapshot.d.ts

@@ -0,0 +1,34 @@
+import { AssistantClient } from "@assistant-ui/store";
+import { Unsubscribe } from "@assistant-ui/core";
+//#region src/unstable/useModelContextSnapshot.d.ts
+/**
+ * Where a snapshot comes from and what counts as a change to it. Declared once
+ * per consumer at module scope: the subscription effect keys on this object, so
+ * an inline source without an `isEqual` re-reads itself into a render loop.
+ */
+type ModelContextSnapshotSource<T> = {
+  /** Seeds the snapshot when it starts disabled. */
+  readonly empty: T;
+  /** Projects the fields the consumer observes out of the live model context. */
+  read(aui: AssistantClient): T;
+  subscribe(aui: AssistantClient, onChange: () => void): Unsubscribe;
+  /**
+   * An equal pair keeps the previous reference. Omitted by a consumer that
+   * re-derives on every notification, where a caller republishing an unchanged
+   * tool set is how it asks to be re-run.
+   */
+  isEqual?(previous: T, next: T): boolean;
+};
+/**
+ * `getModelContext()` rebuilds its result on every call, so a projection of the
+ * fields a consumer observes is held in state and refreshed on notification
+ * rather than read during render. Keeping the previous reference for an equal
+ * projection is what stops a notification carrying no observable change from
+ * invalidating everything derived from it.
+ */
+declare const useModelContextSnapshot: <T>(aui: AssistantClient, enabled: boolean, source: ModelContextSnapshotSource<T>) => T;
+/** Shallow own-key comparison, for a projection whose values are records. */
+declare const shallowEqualRecords: (previous: Readonly<Record<string, unknown>>, next: Readonly<Record<string, unknown>>) => boolean;
+//#endregion
+export { ModelContextSnapshotSource, shallowEqualRecords, useModelContextSnapshot };
+//# sourceMappingURL=useModelContextSnapshot.d.ts.map

package/dist/unstable/useModelContextSnapshot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useModelContextSnapshot.d.ts","names":[],"sources":["../../src/unstable/useModelContextSnapshot.ts"],"mappings":";;;;;;;;KAWY,2BAA2B;;WAE5B,OAAO;;EAEhB,KAAK,KAAK,kBAAkB;EAC5B,UAAU,KAAK,iBAAiB,uBAAuB;;;;;;EAMvD,SAAS,UAAU,GAAG,MAAM;;;;;;;;;cAUjB,0BAA2B,GACtC,KAAK,iBACL,kBACA,QAAQ,2BAA2B,OAClC;;cAqBU,sBACX,UAAU,SAAS,0BACnB,MAAM,SAAS"}