@assistant-ui/react 0.15.18 → 0.15.19

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","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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"}
+{"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","create","name","tool","entries","subscribe","onChange","unsubscribeContext","on","unsubscribeSelection","scope","event","isEqual","unstable_useMentionAdapter","options","adapter","directive","includeTools","toolsConfig","undefined","wantsTools","isCategorized","toolMentions","defaultIcon","toolItems","map","toTriggerItem","groups","cat","allGroups","length","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 = Object.create(null) as 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 ||\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/useMessageStallDetection.d.ts

@@ -17,11 +17,10 @@ type Unstable_MessageStallDetection = {
  * @deprecated Under active development and might change without notice.
  *
  * Detects mid-run output stalls on the current message: while the message is
- * running, watches a fingerprint of its content (part count plus text,
- * argument, and result sizes) and reports a stall once the fingerprint stops
- * changing for `thresholdMs`. Useful for re-surfacing a "still working"
- * indicator during tool think-time or provider stalls, after the first
- * tokens have already streamed.
+ * running, watches its text, reasoning, and tool-argument values plus tool-result
+ * availability and reports a stall once they stop changing for `thresholdMs`.
+ * Useful for re-surfacing a "still working" indicator during tool think-time or
+ * provider stalls, after the first tokens have already streamed.
  *
  * Must be used inside a message scope.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"useMessageStallDetection.d.ts","names":[],"sources":["../../src/unstable/useMessageStallDetection.ts"],"mappings":";KAKY;;;;;;EAMV;;KAGU;;EAEV;;EAEA;;;;;;;;;;;;;;iBAec,kCACd,UAAU,wCACT"}
+{"version":3,"file":"useMessageStallDetection.d.ts","names":[],"sources":["../../src/unstable/useMessageStallDetection.ts"],"mappings":";KAMY;;;;;;EAMV;;KAGU;;EAEV;;EAEA;;;;;;;;;;;;;iBAcc,kCACd,UAAU,wCACT"}

package/dist/unstable/useMessageStallDetection.js

@@ -1,36 +1,37 @@
 "use client";
 import { useAuiState } from "@assistant-ui/store";
 import { useEffect, useRef, useState } from "@assistant-ui/tap/react-shim";
+import { useShallowSelector } from "@assistant-ui/store/internal";
 //#region src/unstable/useMessageStallDetection.ts
 /**
 * @deprecated Under active development and might change without notice.
 *
 * Detects mid-run output stalls on the current message: while the message is
-* running, watches a fingerprint of its content (part count plus text,
-* argument, and result sizes) and reports a stall once the fingerprint stops
-* changing for `thresholdMs`. Useful for re-surfacing a "still working"
-* indicator during tool think-time or provider stalls, after the first
-* tokens have already streamed.
+* running, watches its text, reasoning, and tool-argument values plus tool-result
+* availability and reports a stall once they stop changing for `thresholdMs`.
+* Useful for re-surfacing a "still working" indicator during tool think-time or
+* provider stalls, after the first tokens have already streamed.
 *
 * Must be used inside a message scope.
 */
 function unstable_useMessageStallDetection(options) {
 	const thresholdMs = options?.thresholdMs ?? 2e3;
-	const fingerprint = useAuiState((s) => {
-		if (s.message.status?.type !== "running") return void 0;
-		let size = 0;
-		for (const part of s.message.content) if (part.type === "text" || part.type === "reasoning") size += part.text.length;
-		else if (part.type === "tool-call") size += part.argsText.length + (part.result !== void 0 ? 1 : 0);
-		return `${s.message.content.length}:${size}`;
-	});
-	const running = fingerprint !== void 0;
+	const activity = useAuiState(useShallowSelector((s) => {
+		if (!(s.message.status?.type === "running")) return [false];
+		const values = [true, s.message.content.length];
+		for (const part of s.message.content) if (part.type === "text" || part.type === "reasoning") values.push(part.type, part.text);
+		else if (part.type === "tool-call") values.push(part.type, part.argsText, part.result !== void 0);
+		else values.push(part.type);
+		return values;
+	}));
+	const running = activity[0] === true;
 	const lastActivityRef = useRef(Date.now());
 	const [stalled, setStalled] = useState(false);
 	const [, setTick] = useState(0);
 	useEffect(() => {
 		if (!running) return void 0;
 		lastActivityRef.current = Date.now();
-	}, [running, fingerprint]);
+	}, [running, activity]);
 	useEffect(() => {
 		if (!running) {
 			setStalled(false);
@@ -46,7 +47,7 @@ function unstable_useMessageStallDetection(options) {
 		return () => clearTimeout(id);
 	}, [
 		running,
-		fingerprint,
+		activity,
 		thresholdMs
 	]);
 	useEffect(() => {

package/dist/unstable/useMessageStallDetection.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMessageStallDetection.js","names":["useEffect","useRef","useState","useAuiState","Unstable_MessageStallDetectionOptions","thresholdMs","Unstable_MessageStallDetection","stalled","stalledForMs","unstable_useMessageStallDetection","options","fingerprint","s","message","status","type","undefined","size","part","content","text","length","argsText","result","running","lastActivityRef","Date","now","setStalled","setTick","current","sinceActivity","id","setTimeout","clearTimeout","setInterval","t","clearInterval","Math","max"],"sources":["../../src/unstable/useMessageStallDetection.ts"],"sourcesContent":["\"use client\";\n\nimport { useEffect, useRef, useState } from \"react\";\nimport { useAuiState } from \"@assistant-ui/store\";\n\nexport type Unstable_MessageStallDetectionOptions = {\n  /**\n   * Milliseconds of unchanged message content before the message counts as\n   * stalled.\n   * @default 2000\n   */\n  thresholdMs?: number | undefined;\n};\n\nexport type Unstable_MessageStallDetection = {\n  /** True while the message is running and its content has not changed for at least `thresholdMs`. */\n  stalled: boolean;\n  /** Milliseconds since the last observed content change. `0` while not stalled. */\n  stalledForMs: number;\n};\n\n/**\n * @deprecated Under active development and might change without notice.\n *\n * Detects mid-run output stalls on the current message: while the message is\n * running, watches a fingerprint of its content (part count plus text,\n * argument, and result sizes) and reports a stall once the fingerprint stops\n * changing for `thresholdMs`. Useful for re-surfacing a \"still working\"\n * indicator during tool think-time or provider stalls, after the first\n * tokens have already streamed.\n *\n * Must be used inside a message scope.\n */\nexport function unstable_useMessageStallDetection(\n  options?: Unstable_MessageStallDetectionOptions,\n): Unstable_MessageStallDetection {\n  const thresholdMs = options?.thresholdMs ?? 2000;\n\n  const fingerprint = useAuiState((s) => {\n    if (s.message.status?.type !== \"running\") return undefined;\n    let size = 0;\n    for (const part of s.message.content) {\n      if (part.type === \"text\" || part.type === \"reasoning\") {\n        size += part.text.length;\n      } else if (part.type === \"tool-call\") {\n        size += part.argsText.length + (part.result !== undefined ? 1 : 0);\n      }\n    }\n    return `${s.message.content.length}:${size}`;\n  });\n\n  const running = fingerprint !== undefined;\n  const lastActivityRef = useRef(Date.now());\n  const [stalled, setStalled] = useState(false);\n  const [, setTick] = useState(0);\n\n  useEffect(() => {\n    if (!running) return undefined;\n    lastActivityRef.current = Date.now();\n    return undefined;\n  }, [running, fingerprint]);\n\n  useEffect(() => {\n    if (!running) {\n      setStalled(false);\n      return undefined;\n    }\n\n    const sinceActivity = Date.now() - lastActivityRef.current;\n    if (sinceActivity >= thresholdMs) {\n      setStalled(true);\n      return undefined;\n    }\n\n    setStalled(false);\n    const id = setTimeout(() => setStalled(true), thresholdMs - sinceActivity);\n    return () => clearTimeout(id);\n  }, [running, fingerprint, thresholdMs]);\n\n  useEffect(() => {\n    if (!stalled) return undefined;\n    const id = setInterval(() => setTick((t) => t + 1), 1000);\n    return () => clearInterval(id);\n  }, [stalled]);\n\n  if (!stalled) return { stalled: false, stalledForMs: 0 };\n  return {\n    stalled: true,\n    stalledForMs: Math.max(0, Date.now() - lastActivityRef.current),\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAiCA,SAAgBS,kCACdC,SACgC;CAChC,MAAML,cAAcK,SAASL,eAAe;CAE5C,MAAMM,cAAcR,aAAaS,MAAM;EACrC,IAAIA,EAAEC,QAAQC,QAAQC,SAAS,WAAW,OAAOC,KAAAA;EACjD,IAAIC,OAAO;EACX,KAAK,MAAMC,QAAQN,EAAEC,QAAQM,SAC3B,IAAID,KAAKH,SAAS,UAAUG,KAAKH,SAAS,aACxCE,QAAQC,KAAKE,KAAKC;OACb,IAAIH,KAAKH,SAAS,aACvBE,QAAQC,KAAKI,SAASD,UAAUH,KAAKK,WAAWP,KAAAA,IAAY,IAAI;EAGpE,OAAO,GAAGJ,EAAEC,QAAQM,QAAQE,OAAM,GAAIJ;CACxC,CAAC;CAED,MAAMO,UAAUb,gBAAgBK,KAAAA;CAChC,MAAMS,kBAAkBxB,OAAOyB,KAAKC,IAAI,CAAC;CACzC,MAAM,CAACpB,SAASqB,cAAc1B,SAAS,KAAK;CAC5C,MAAM,GAAG2B,WAAW3B,SAAS,CAAC;CAE9BF,gBAAgB;EACd,IAAI,CAACwB,SAAS,OAAOR,KAAAA;EACrBS,gBAAgBK,UAAUJ,KAAKC,IAAI;CAErC,GAAG,CAACH,SAASb,WAAW,CAAC;CAEzBX,gBAAgB;EACd,IAAI,CAACwB,SAAS;GACZI,WAAW,KAAK;GAChB;EACF;EAEA,MAAMG,gBAAgBL,KAAKC,IAAI,IAAIF,gBAAgBK;EACnD,IAAIC,iBAAiB1B,aAAa;GAChCuB,WAAW,IAAI;GACf;EACF;EAEAA,WAAW,KAAK;EAChB,MAAMI,KAAKC,iBAAiBL,WAAW,IAAI,GAAGvB,cAAc0B,aAAa;EACzE,aAAaG,aAAaF,EAAE;CAC9B,GAAG;EAACR;EAASb;EAAaN;CAAW,CAAC;CAEtCL,gBAAgB;EACd,IAAI,CAACO,SAAS,OAAOS,KAAAA;EACrB,MAAMgB,KAAKG,kBAAkBN,SAASO,MAAMA,IAAI,CAAC,GAAG,GAAI;EACxD,aAAaC,cAAcL,EAAE;CAC/B,GAAG,CAACzB,OAAO,CAAC;CAEZ,IAAI,CAACA,SAAS,OAAO;EAAEA,SAAS;EAAOC,cAAc;CAAE;CACvD,OAAO;EACLD,SAAS;EACTC,cAAc8B,KAAKC,IAAI,GAAGb,KAAKC,IAAI,IAAIF,gBAAgBK,OAAO;CAChE;AACF"}
+{"version":3,"file":"useMessageStallDetection.js","names":["useEffect","useRef","useState","useAuiState","useShallowSelector","Unstable_MessageStallDetectionOptions","thresholdMs","Unstable_MessageStallDetection","stalled","stalledForMs","unstable_useMessageStallDetection","options","activity","s","running","message","status","type","values","content","length","part","push","text","argsText","result","undefined","lastActivityRef","Date","now","setStalled","setTick","current","sinceActivity","id","setTimeout","clearTimeout","setInterval","t","clearInterval","Math","max"],"sources":["../../src/unstable/useMessageStallDetection.ts"],"sourcesContent":["\"use client\";\n\nimport { useEffect, useRef, useState } from \"react\";\nimport { useAuiState } from \"@assistant-ui/store\";\nimport { useShallowSelector } from \"@assistant-ui/store/internal\";\n\nexport type Unstable_MessageStallDetectionOptions = {\n  /**\n   * Milliseconds of unchanged message content before the message counts as\n   * stalled.\n   * @default 2000\n   */\n  thresholdMs?: number | undefined;\n};\n\nexport type Unstable_MessageStallDetection = {\n  /** True while the message is running and its content has not changed for at least `thresholdMs`. */\n  stalled: boolean;\n  /** Milliseconds since the last observed content change. `0` while not stalled. */\n  stalledForMs: number;\n};\n\n/**\n * @deprecated Under active development and might change without notice.\n *\n * Detects mid-run output stalls on the current message: while the message is\n * running, watches its text, reasoning, and tool-argument values plus tool-result\n * availability and reports a stall once they stop changing for `thresholdMs`.\n * Useful for re-surfacing a \"still working\" indicator during tool think-time or\n * provider stalls, after the first tokens have already streamed.\n *\n * Must be used inside a message scope.\n */\nexport function unstable_useMessageStallDetection(\n  options?: Unstable_MessageStallDetectionOptions,\n): Unstable_MessageStallDetection {\n  const thresholdMs = options?.thresholdMs ?? 2000;\n\n  const activity = useAuiState(\n    useShallowSelector((s) => {\n      const running = s.message.status?.type === \"running\";\n      if (!running) return [false];\n\n      const values: unknown[] = [true, s.message.content.length];\n\n      for (const part of s.message.content) {\n        if (part.type === \"text\" || part.type === \"reasoning\") {\n          values.push(part.type, part.text);\n        } else if (part.type === \"tool-call\") {\n          values.push(part.type, part.argsText, part.result !== undefined);\n        } else {\n          values.push(part.type);\n        }\n      }\n      return values;\n    }),\n  );\n\n  const running = activity[0] === true;\n  const lastActivityRef = useRef(Date.now());\n  const [stalled, setStalled] = useState(false);\n  const [, setTick] = useState(0);\n\n  useEffect(() => {\n    if (!running) return undefined;\n    lastActivityRef.current = Date.now();\n    return undefined;\n  }, [running, activity]);\n\n  useEffect(() => {\n    if (!running) {\n      setStalled(false);\n      return undefined;\n    }\n\n    const sinceActivity = Date.now() - lastActivityRef.current;\n    if (sinceActivity >= thresholdMs) {\n      setStalled(true);\n      return undefined;\n    }\n\n    setStalled(false);\n    const id = setTimeout(() => setStalled(true), thresholdMs - sinceActivity);\n    return () => clearTimeout(id);\n  }, [running, activity, thresholdMs]);\n\n  useEffect(() => {\n    if (!stalled) return undefined;\n    const id = setInterval(() => setTick((t) => t + 1), 1000);\n    return () => clearInterval(id);\n  }, [stalled]);\n\n  if (!stalled) return { stalled: false, stalledForMs: 0 };\n  return {\n    stalled: true,\n    stalledForMs: Math.max(0, Date.now() - lastActivityRef.current),\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAiCA,SAAgBU,kCACdC,SACgC;CAChC,MAAML,cAAcK,SAASL,eAAe;CAE5C,MAAMM,WAAWT,YACfC,oBAAoBS,MAAM;EAExB,IAAI,EADYA,EAAEE,QAAQC,QAAQC,SAAS,YAC7B,OAAO,CAAC,KAAK;EAE3B,MAAMC,SAAoB,CAAC,MAAML,EAAEE,QAAQI,QAAQC,MAAM;EAEzD,KAAK,MAAMC,QAAQR,EAAEE,QAAQI,SAC3B,IAAIE,KAAKJ,SAAS,UAAUI,KAAKJ,SAAS,aACxCC,OAAOI,KAAKD,KAAKJ,MAAMI,KAAKE,IAAI;OAC3B,IAAIF,KAAKJ,SAAS,aACvBC,OAAOI,KAAKD,KAAKJ,MAAMI,KAAKG,UAAUH,KAAKI,WAAWC,KAAAA,CAAS;OAE/DR,OAAOI,KAAKD,KAAKJ,IAAI;EAGzB,OAAOC;CACT,CAAC,CACH;CAEA,MAAMJ,UAAUF,SAAS,OAAO;CAChC,MAAMe,kBAAkB1B,OAAO2B,KAAKC,IAAI,CAAC;CACzC,MAAM,CAACrB,SAASsB,cAAc5B,SAAS,KAAK;CAC5C,MAAM,GAAG6B,WAAW7B,SAAS,CAAC;CAE9BF,gBAAgB;EACd,IAAI,CAACc,SAAS,OAAOY,KAAAA;EACrBC,gBAAgBK,UAAUJ,KAAKC,IAAI;CAErC,GAAG,CAACf,SAASF,QAAQ,CAAC;CAEtBZ,gBAAgB;EACd,IAAI,CAACc,SAAS;GACZgB,WAAW,KAAK;GAChB;EACF;EAEA,MAAMG,gBAAgBL,KAAKC,IAAI,IAAIF,gBAAgBK;EACnD,IAAIC,iBAAiB3B,aAAa;GAChCwB,WAAW,IAAI;GACf;EACF;EAEAA,WAAW,KAAK;EAChB,MAAMI,KAAKC,iBAAiBL,WAAW,IAAI,GAAGxB,cAAc2B,aAAa;EACzE,aAAaG,aAAaF,EAAE;CAC9B,GAAG;EAACpB;EAASF;EAAUN;CAAW,CAAC;CAEnCN,gBAAgB;EACd,IAAI,CAACQ,SAAS,OAAOkB,KAAAA;EACrB,MAAMQ,KAAKG,kBAAkBN,SAASO,MAAMA,IAAI,CAAC,GAAG,GAAI;EACxD,aAAaC,cAAcL,EAAE;CAC/B,GAAG,CAAC1B,OAAO,CAAC;CAEZ,IAAI,CAACA,SAAS,OAAO;EAAEA,SAAS;EAAOC,cAAc;CAAE;CACvD,OAAO;EACLD,SAAS;EACTC,cAAc+B,KAAKC,IAAI,GAAGb,KAAKC,IAAI,IAAIF,gBAAgBK,OAAO;CAChE;AACF"}

package/dist/unstable/webmcp/convertTools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertTools.d.ts","names":[],"sources":["../../../src/unstable/webmcp/convertTools.ts"],"mappings":";;;;;;;;;;cAoBa,sBACX,eACA,MAAM;cAMK,sBAAuB,MAAM;cA2C7B,eACX,iBACA;EACE,MAAM;EACN;EACA,MAAM;MAEP,QAAQ;cA0CE,eACX,cACA,eAAe,gBACf,kBAAkB,gBACjB"}
+{"version":3,"file":"convertTools.d.ts","names":[],"sources":["../../../src/unstable/webmcp/convertTools.ts"],"mappings":";;;;;;;;;;cAoBa,sBACX,eACA,MAAM;cAMK,sBAAuB,MAAM;cA2C7B,eACX,iBACA;EACE,MAAM;EACN;EACA,MAAM;MAEP,QAAQ;cAwGE,eACX,cACA,eAAe,gBACf,kBAAkB,gBACjB"}

package/dist/unstable/webmcp/convertTools.js

@@ -64,6 +64,47 @@ const toMcpContent = async (result, options) => {
 	} : { content };
 };
 const isStandardSchema = (schema) => typeof schema === "object" && schema !== null && "~standard" in schema && schema["~standard"].version === 1;
+const TOOL_ABORTED = Symbol("assistant-ui.webmcp-tool-aborted");
+const isThenable = (value) => typeof value?.then === "function";
+const raceWithAbort = async (value, abortSignal) => {
+	let onAbort;
+	const abortPromise = new Promise((resolve) => {
+		onAbort = () => resolve(TOOL_ABORTED);
+		if (abortSignal.aborted) onAbort();
+		else abortSignal.addEventListener("abort", onAbort, { once: true });
+	});
+	try {
+		return await Promise.race([abortPromise, value]);
+	} finally {
+		abortSignal.removeEventListener("abort", onAbort);
+	}
+};
+const combineAbortSignals = (callerSignal, lifecycleSignal) => {
+	const controller = new AbortController();
+	const teardown = [];
+	const cleanup = () => {
+		while (teardown.length) teardown.pop()();
+	};
+	const abort = (reason) => {
+		cleanup();
+		controller.abort(reason);
+	};
+	const listen = (signal) => {
+		const onAbort = () => abort(signal.reason);
+		signal.addEventListener("abort", onAbort, { once: true });
+		teardown.push(() => signal.removeEventListener("abort", onAbort));
+	};
+	if (callerSignal.aborted) abort(callerSignal.reason);
+	else if (lifecycleSignal.aborted) abort(lifecycleSignal.reason);
+	else {
+		listen(callerSignal);
+		listen(lifecycleSignal);
+	}
+	return {
+		signal: controller.signal,
+		cleanup
+	};
+};
 const toWebMcpTool = (name, getTool, lifecycleSignal) => ({
 	name,
 	description: getTool().description ?? "",
@@ -73,13 +114,21 @@ const toWebMcpTool = (name, getTool, lifecycleSignal) => ({
 		const tool = getTool();
 		const args = rawArgs ?? {};
 		const toolCallId = generateId();
+		let cleanup;
 		try {
 			const callerSignal = context?.signal;
-			const abortSignal = !callerSignal ? lifecycleSignal : !lifecycleSignal ? callerSignal : AbortSignal.any([callerSignal, lifecycleSignal]);
+			let abortSignal;
+			if (callerSignal && lifecycleSignal) {
+				const combined = combineAbortSignals(callerSignal, lifecycleSignal);
+				abortSignal = combined.signal;
+				cleanup = combined.cleanup;
+			} else abortSignal = callerSignal ?? lifecycleSignal;
+			if (abortSignal?.aborted) return errorResult("Tool execution was cancelled.");
 			let executeFn = tool.execute;
 			if (isStandardSchema(tool.parameters)) {
-				let validation = tool.parameters["~standard"].validate(args);
-				validation = await validation;
+				const result = tool.parameters["~standard"].validate(args);
+				const validation = isThenable(result) ? abortSignal ? await raceWithAbort(result, abortSignal) : await result : result;
+				if (validation === TOOL_ABORTED) return errorResult("Tool execution was cancelled.");
 				if (validation.issues) {
 					const issues = validation.issues;
 					executeFn = tool.experimental_onSchemaValidationError ?? (() => {
@@ -101,6 +150,8 @@ const toWebMcpTool = (name, getTool, lifecycleSignal) => ({
 			});
 		} catch (e) {
 			return errorResult(e instanceof Error ? e.message : String(e));
+		} finally {
+			cleanup?.();
 		}
 	}
 });

package/dist/unstable/webmcp/convertTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertTools.js","names":["ToolResponse","toJSONSchema","Tool","ToolModelContentPart","generateId","WebMcpCallToolResult","WebMcpContent","WebMcpToolDescriptor","defaultWebMcpFilter","_name","tool","type","undefined","execute","disabled","toWebMcpInputSchema","parameters","properties","textContent","text","errorResult","message","isError","content","toText","value","toString","JSON","stringify","String","primitiveContent","mapModelContentPart","part","mediaType","startsWith","data","mimeType","toMcpContent","result","options","toolCallId","args","Record","Promise","response","toResponse","modelContent","map","toModelOutput","parts","input","output","e","console","warn","StandardSchemaLike","version","validate","issues","isStandardSchema","schema","toWebMcpTool","name","getTool","lifecycleSignal","AbortSignal","description","inputSchema","rawArgs","context","aborted","callerSignal","signal","abortSignal","any","executeFn","validation","experimental_onSchemaValidationError","Error","AbortController","human","reject"],"sources":["../../../src/unstable/webmcp/convertTools.ts"],"sourcesContent":["import {\n  ToolResponse,\n  toJSONSchema,\n  type Tool,\n  type ToolModelContentPart,\n} from \"assistant-stream\";\nimport { generateId } from \"@assistant-ui/core/internal\";\nimport type {\n  WebMcpCallToolResult,\n  WebMcpContent,\n  WebMcpToolDescriptor,\n} from \"./webmcp-host\";\n\n/**\n * The predicate the WebMCP provider uses when no `filter` is passed: an enabled\n * frontend tool with a client-side `execute`. A tool authored without a `type`\n * is included, because `execute` is what distinguishes the deprecated\n * type-less form from a backend or human tool. A `filter` replaces this, so\n * pass it through to narrow the default set rather than widen it.\n */\nexport const defaultWebMcpFilter = (\n  _name: string,\n  tool: Tool<any, any>,\n): boolean =>\n  (tool.type === \"frontend\" || tool.type === undefined) &&\n  !!tool.execute &&\n  !tool.disabled;\n\nexport const toWebMcpInputSchema = (tool: Tool<any, any>): unknown =>\n  tool.parameters\n    ? toJSONSchema(tool.parameters)\n    : { type: \"object\", properties: {} };\n\nconst textContent = (text: string): WebMcpContent => ({ type: \"text\", text });\n\nconst errorResult = (message: string): WebMcpCallToolResult => ({\n  isError: true,\n  content: [textContent(message)],\n});\n\n// bigint throws in JSON.stringify and symbol serializes to undefined, but both\n// have a faithful string form. A value that cannot be serialized at all still\n// throws through to the error result.\nconst toText = (value: unknown): string => {\n  if (typeof value === \"string\") return value;\n  if (typeof value === \"bigint\" || typeof value === \"symbol\") {\n    return value.toString();\n  }\n  return JSON.stringify(value) ?? String(value);\n};\n\nconst primitiveContent = (value: unknown): WebMcpContent[] => [\n  textContent(toText(value)),\n];\n\nconst mapModelContentPart = (part: ToolModelContentPart): WebMcpContent => {\n  if (part.type === \"text\") {\n    return textContent(part.text ?? \"\");\n  }\n  if (part.type === \"file\") {\n    if (\n      typeof part.mediaType === \"string\" &&\n      part.mediaType.startsWith(\"image/\")\n    ) {\n      return { type: \"image\", data: part.data ?? \"\", mimeType: part.mediaType };\n    }\n    return textContent(part.data ?? \"\");\n  }\n  return textContent(toText(part));\n};\n\nexport const toMcpContent = async (\n  result: unknown,\n  options: {\n    tool: Tool<any, any>;\n    toolCallId: string;\n    args: Record<string, unknown>;\n  },\n): Promise<WebMcpCallToolResult> => {\n  const response = ToolResponse.toResponse(result);\n  if (response.modelContent) {\n    const content = response.modelContent.map(mapModelContentPart);\n    return response.isError ? { isError: true, content } : { content };\n  }\n  if (!response.isError && options.tool.toModelOutput) {\n    try {\n      const parts = await options.tool.toModelOutput({\n        toolCallId: options.toolCallId,\n        input: options.args,\n        output: response.result,\n      });\n      return { content: parts.map(mapModelContentPart) };\n    } catch (e) {\n      console.warn(\n        \"[assistant-ui] toModelOutput threw; falling back to default projection.\",\n        e,\n      );\n    }\n  }\n  const content = primitiveContent(response.result);\n  return response.isError ? { isError: true, content } : { content };\n};\n\ntype StandardSchemaLike = {\n  \"~standard\": {\n    version: number;\n    validate: (\n      value: unknown,\n    ) =>\n      | { issues?: readonly unknown[] | undefined }\n      | Promise<{ issues?: readonly unknown[] | undefined }>;\n  };\n};\n\nconst isStandardSchema = (schema: unknown): schema is StandardSchemaLike =>\n  typeof schema === \"object\" &&\n  schema !== null &&\n  \"~standard\" in schema &&\n  (schema as StandardSchemaLike)[\"~standard\"].version === 1;\n\nexport const toWebMcpTool = (\n  name: string,\n  getTool: () => Tool<any, any>,\n  lifecycleSignal?: AbortSignal,\n): WebMcpToolDescriptor => ({\n  name,\n  description: getTool().description ?? \"\",\n  inputSchema: toWebMcpInputSchema(getTool()),\n  execute: async (rawArgs, context) => {\n    if (lifecycleSignal?.aborted) {\n      return errorResult(`Tool \"${name}\" is no longer registered`);\n    }\n    const tool = getTool();\n    const args = (rawArgs ?? {}) as Record<string, unknown>;\n    const toolCallId = generateId();\n    try {\n      const callerSignal = context?.signal;\n      const abortSignal = !callerSignal\n        ? lifecycleSignal\n        : !lifecycleSignal\n          ? callerSignal\n          : AbortSignal.any([callerSignal, lifecycleSignal]);\n      let executeFn = tool.execute;\n      if (isStandardSchema(tool.parameters)) {\n        let validation = tool.parameters[\"~standard\"].validate(args);\n        validation = await validation;\n        if (validation.issues) {\n          const issues = validation.issues;\n          executeFn =\n            tool.experimental_onSchemaValidationError ??\n            (() => {\n              throw new Error(\n                `Function parameter validation failed. ${JSON.stringify(issues)}`,\n              );\n            });\n        }\n      }\n\n      if (abortSignal?.aborted) {\n        return errorResult(\"Tool execution was cancelled.\");\n      }\n\n      if (!executeFn) {\n        return errorResult(`Tool \"${name}\" has no client-side implementation.`);\n      }\n\n      const result = await executeFn(args, {\n        toolCallId,\n        abortSignal: abortSignal ?? new AbortController().signal,\n        human: () =>\n          Promise.reject(\n            new Error(\"human input not supported in WebMCP context\"),\n          ),\n      });\n      return await toMcpContent(result, { tool, toolCallId, args });\n    } catch (e) {\n      return errorResult(e instanceof Error ? e.message : String(e));\n    }\n  },\n});\n"],"mappings":"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"}
+{"version":3,"file":"convertTools.js","names":["ToolResponse","toJSONSchema","Tool","ToolModelContentPart","generateId","WebMcpCallToolResult","WebMcpContent","WebMcpToolDescriptor","defaultWebMcpFilter","_name","tool","type","undefined","execute","disabled","toWebMcpInputSchema","parameters","properties","textContent","text","errorResult","message","isError","content","toText","value","toString","JSON","stringify","String","primitiveContent","mapModelContentPart","part","mediaType","startsWith","data","mimeType","toMcpContent","result","options","toolCallId","args","Record","Promise","response","toResponse","modelContent","map","toModelOutput","parts","input","output","e","console","warn","StandardSchemaLike","version","validate","issues","isStandardSchema","schema","TOOL_ABORTED","Symbol","isThenable","T","PromiseLike","then","raceWithAbort","abortSignal","AbortSignal","onAbort","abortPromise","resolve","aborted","addEventListener","once","race","removeEventListener","combineAbortSignals","callerSignal","lifecycleSignal","signal","cleanup","controller","AbortController","teardown","length","pop","abort","reason","listen","push","toWebMcpTool","name","getTool","description","inputSchema","rawArgs","context","combined","executeFn","validation","experimental_onSchemaValidationError","Error","human","reject"],"sources":["../../../src/unstable/webmcp/convertTools.ts"],"sourcesContent":["import {\n  ToolResponse,\n  toJSONSchema,\n  type Tool,\n  type ToolModelContentPart,\n} from \"assistant-stream\";\nimport { generateId } from \"@assistant-ui/core/internal\";\nimport type {\n  WebMcpCallToolResult,\n  WebMcpContent,\n  WebMcpToolDescriptor,\n} from \"./webmcp-host\";\n\n/**\n * The predicate the WebMCP provider uses when no `filter` is passed: an enabled\n * frontend tool with a client-side `execute`. A tool authored without a `type`\n * is included, because `execute` is what distinguishes the deprecated\n * type-less form from a backend or human tool. A `filter` replaces this, so\n * pass it through to narrow the default set rather than widen it.\n */\nexport const defaultWebMcpFilter = (\n  _name: string,\n  tool: Tool<any, any>,\n): boolean =>\n  (tool.type === \"frontend\" || tool.type === undefined) &&\n  !!tool.execute &&\n  !tool.disabled;\n\nexport const toWebMcpInputSchema = (tool: Tool<any, any>): unknown =>\n  tool.parameters\n    ? toJSONSchema(tool.parameters)\n    : { type: \"object\", properties: {} };\n\nconst textContent = (text: string): WebMcpContent => ({ type: \"text\", text });\n\nconst errorResult = (message: string): WebMcpCallToolResult => ({\n  isError: true,\n  content: [textContent(message)],\n});\n\n// bigint throws in JSON.stringify and symbol serializes to undefined, but both\n// have a faithful string form. A value that cannot be serialized at all still\n// throws through to the error result.\nconst toText = (value: unknown): string => {\n  if (typeof value === \"string\") return value;\n  if (typeof value === \"bigint\" || typeof value === \"symbol\") {\n    return value.toString();\n  }\n  return JSON.stringify(value) ?? String(value);\n};\n\nconst primitiveContent = (value: unknown): WebMcpContent[] => [\n  textContent(toText(value)),\n];\n\nconst mapModelContentPart = (part: ToolModelContentPart): WebMcpContent => {\n  if (part.type === \"text\") {\n    return textContent(part.text ?? \"\");\n  }\n  if (part.type === \"file\") {\n    if (\n      typeof part.mediaType === \"string\" &&\n      part.mediaType.startsWith(\"image/\")\n    ) {\n      return { type: \"image\", data: part.data ?? \"\", mimeType: part.mediaType };\n    }\n    return textContent(part.data ?? \"\");\n  }\n  return textContent(toText(part));\n};\n\nexport const toMcpContent = async (\n  result: unknown,\n  options: {\n    tool: Tool<any, any>;\n    toolCallId: string;\n    args: Record<string, unknown>;\n  },\n): Promise<WebMcpCallToolResult> => {\n  const response = ToolResponse.toResponse(result);\n  if (response.modelContent) {\n    const content = response.modelContent.map(mapModelContentPart);\n    return response.isError ? { isError: true, content } : { content };\n  }\n  if (!response.isError && options.tool.toModelOutput) {\n    try {\n      const parts = await options.tool.toModelOutput({\n        toolCallId: options.toolCallId,\n        input: options.args,\n        output: response.result,\n      });\n      return { content: parts.map(mapModelContentPart) };\n    } catch (e) {\n      console.warn(\n        \"[assistant-ui] toModelOutput threw; falling back to default projection.\",\n        e,\n      );\n    }\n  }\n  const content = primitiveContent(response.result);\n  return response.isError ? { isError: true, content } : { content };\n};\n\ntype StandardSchemaLike = {\n  \"~standard\": {\n    version: number;\n    validate: (\n      value: unknown,\n    ) =>\n      | { issues?: readonly unknown[] | undefined }\n      | Promise<{ issues?: readonly unknown[] | undefined }>;\n  };\n};\n\nconst isStandardSchema = (schema: unknown): schema is StandardSchemaLike =>\n  typeof schema === \"object\" &&\n  schema !== null &&\n  \"~standard\" in schema &&\n  (schema as StandardSchemaLike)[\"~standard\"].version === 1;\n\nconst TOOL_ABORTED = Symbol(\"assistant-ui.webmcp-tool-aborted\");\n\nconst isThenable = <T>(value: T | PromiseLike<T>): value is PromiseLike<T> =>\n  typeof (value as PromiseLike<T> | null | undefined)?.then === \"function\";\n\nconst raceWithAbort = async <T>(\n  value: PromiseLike<T>,\n  abortSignal: AbortSignal,\n): Promise<T | typeof TOOL_ABORTED> => {\n  let onAbort!: () => void;\n  const abortPromise = new Promise<typeof TOOL_ABORTED>((resolve) => {\n    onAbort = () => resolve(TOOL_ABORTED);\n    if (abortSignal.aborted) {\n      onAbort();\n    } else {\n      abortSignal.addEventListener(\"abort\", onAbort, { once: true });\n    }\n  });\n\n  try {\n    // Unlike assistant-stream's helper, cancellation wins when validation aborts and rejects synchronously.\n    return await Promise.race([abortPromise, value]);\n  } finally {\n    abortSignal.removeEventListener(\"abort\", onAbort);\n  }\n};\n\n// AbortSignal.any sits above the browserslist floor and rejects any input that\n// is not a native AbortSignal, which a navigator.modelContext polyfill's signal\n// is not. The merged signal tracks its inputs only until cleanup runs, where\n// the single-signal path hands the caller the lifecycle signal itself.\nconst combineAbortSignals = (\n  callerSignal: AbortSignal,\n  lifecycleSignal: AbortSignal,\n): { signal: AbortSignal; cleanup: () => void } => {\n  const controller = new AbortController();\n  const teardown: (() => void)[] = [];\n  const cleanup = () => {\n    while (teardown.length) teardown.pop()!();\n  };\n  const abort = (reason: unknown) => {\n    cleanup();\n    controller.abort(reason);\n  };\n  const listen = (signal: AbortSignal) => {\n    const onAbort = () => abort(signal.reason);\n    signal.addEventListener(\"abort\", onAbort, { once: true });\n    teardown.push(() => signal.removeEventListener(\"abort\", onAbort));\n  };\n\n  if (callerSignal.aborted) {\n    abort(callerSignal.reason);\n  } else if (lifecycleSignal.aborted) {\n    abort(lifecycleSignal.reason);\n  } else {\n    listen(callerSignal);\n    listen(lifecycleSignal);\n  }\n\n  return { signal: controller.signal, cleanup };\n};\n\nexport const toWebMcpTool = (\n  name: string,\n  getTool: () => Tool<any, any>,\n  lifecycleSignal?: AbortSignal,\n): WebMcpToolDescriptor => ({\n  name,\n  description: getTool().description ?? \"\",\n  inputSchema: toWebMcpInputSchema(getTool()),\n  execute: async (rawArgs, context) => {\n    if (lifecycleSignal?.aborted) {\n      return errorResult(`Tool \"${name}\" is no longer registered`);\n    }\n    const tool = getTool();\n    const args = (rawArgs ?? {}) as Record<string, unknown>;\n    const toolCallId = generateId();\n    let cleanup: (() => void) | undefined;\n    try {\n      const callerSignal = context?.signal;\n      let abortSignal: AbortSignal | undefined;\n      if (callerSignal && lifecycleSignal) {\n        const combined = combineAbortSignals(callerSignal, lifecycleSignal);\n        abortSignal = combined.signal;\n        cleanup = combined.cleanup;\n      } else {\n        abortSignal = callerSignal ?? lifecycleSignal;\n      }\n\n      if (abortSignal?.aborted) {\n        return errorResult(\"Tool execution was cancelled.\");\n      }\n\n      let executeFn = tool.execute;\n      if (isStandardSchema(tool.parameters)) {\n        const result = tool.parameters[\"~standard\"].validate(args);\n        const validation = isThenable(result)\n          ? abortSignal\n            ? await raceWithAbort(result, abortSignal)\n            : await result\n          : result;\n        if (validation === TOOL_ABORTED) {\n          return errorResult(\"Tool execution was cancelled.\");\n        }\n        if (validation.issues) {\n          const issues = validation.issues;\n          executeFn =\n            tool.experimental_onSchemaValidationError ??\n            (() => {\n              throw new Error(\n                `Function parameter validation failed. ${JSON.stringify(issues)}`,\n              );\n            });\n        }\n      }\n\n      if (abortSignal?.aborted) {\n        return errorResult(\"Tool execution was cancelled.\");\n      }\n\n      if (!executeFn) {\n        return errorResult(`Tool \"${name}\" has no client-side implementation.`);\n      }\n\n      const result = await executeFn(args, {\n        toolCallId,\n        abortSignal: abortSignal ?? new AbortController().signal,\n        human: () =>\n          Promise.reject(\n            new Error(\"human input not supported in WebMCP context\"),\n          ),\n      });\n      return await toMcpContent(result, { tool, toolCallId, args });\n    } catch (e) {\n      return errorResult(e instanceof Error ? e.message : String(e));\n    } finally {\n      cleanup?.();\n    }\n  },\n});\n"],"mappings":"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"}

package/dist/unstable/webmcp/useWebMcpProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWebMcpProvider.d.ts","names":[],"sources":["../../../src/unstable/webmcp/useWebMcpProvider.ts"],"mappings":";;KAcY;EACV,UAAU,cAAc,MAAM;;KAGpB;EACV;EACA;;;;;;;;;;cAwGW,6BACX,UAAS,mCACR"}
+{"version":3,"file":"useWebMcpProvider.d.ts","names":[],"sources":["../../../src/unstable/webmcp/useWebMcpProvider.ts"],"mappings":";;KAeY;EACV,UAAU,cAAc,MAAM;;KAGpB;EACV;EACA;;;;;;;;;;cAqGW,6BACX,UAAS,mCACR"}

package/dist/unstable/webmcp/useWebMcpProvider.js

@@ -7,6 +7,7 @@ import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
 import { useAui } from "@assistant-ui/store";
 import { useEffect, useState, useSyncExternalStore } from "@assistant-ui/tap/react-shim";
 import { useResources, useTapRoot, withKey } from "@assistant-ui/tap";
+import { shallowEqual } from "@assistant-ui/store/internal";
 //#region src/unstable/webmcp/useWebMcpProvider.ts
 const EMPTY_NAMES = Object.freeze([]);
 const EMPTY_TOOLS = Object.freeze({});
@@ -32,7 +33,7 @@ const useStableNames = (names) => {
 	const [cell] = useState(() => ({ names: EMPTY_NAMES }));
 	const next = names.filter((name) => name !== null).sort();
 	const previous = cell.names;
-	if (previous.length === next.length && previous.every((name_0, index) => name_0 === next[index])) return previous;
+	if (shallowEqual(previous, next)) return previous;
 	cell.names = next;
 	return next;
 };

package/dist/unstable/webmcp/useWebMcpProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWebMcpProvider.js","names":["c","_c","useEffect","useState","useSyncExternalStore","useResources","useTapRoot","withKey","useAui","AssistantClient","Tool","getDefaultWebMcpHost","WebMcpHost","defaultWebMcpFilter","toWebMcpInputSchema","WebMcpRegistrationResource","useModelContextSnapshot","ModelContextSnapshotSource","Unstable_WebMcpProviderOptions","filter","name","tool","Unstable_WebMcpProviderResult","status","registeredToolNames","EMPTY_NAMES","Object","freeze","EMPTY_TOOLS","Record","warned","WeakSet","signatures","WeakMap","description","signature","signatureOf","cached","get","JSON","stringify","set","NO_SUBSCRIPTION","modelContextToolSource","empty","read","aui","modelContext","getModelContext","tools","subscribe","onChange","useStableNames","names","cell","next","sort","previous","length","every","index","useWebMcpRegistry","t0","$","host","available","elements","entries","push","t1","error","has","add","console","warn","unstable_useWebMcpProvider","options","root","WebMcpProviderRoot","getValue","published","setPublished"],"sources":["../../../src/unstable/webmcp/useWebMcpProvider.ts"],"sourcesContent":["\"use client\";\n\nimport { useEffect, useState, useSyncExternalStore } from \"react\";\nimport { useResources, useTapRoot, withKey } from \"@assistant-ui/tap\";\nimport { useAui, type AssistantClient } from \"@assistant-ui/store\";\nimport type { Tool } from \"assistant-stream\";\nimport { getDefaultWebMcpHost, type WebMcpHost } from \"./webmcp-host\";\nimport { defaultWebMcpFilter, toWebMcpInputSchema } from \"./convertTools\";\nimport { WebMcpRegistrationResource } from \"./WebMcpRegistrationResource\";\nimport {\n  useModelContextSnapshot,\n  type ModelContextSnapshotSource,\n} from \"../useModelContextSnapshot\";\n\nexport type Unstable_WebMcpProviderOptions = {\n  filter?: (name: string, tool: Tool<any, any>) => boolean;\n};\n\nexport type Unstable_WebMcpProviderResult = {\n  status: \"unsupported\" | \"active\";\n  registeredToolNames: readonly string[];\n};\n\nconst EMPTY_NAMES: readonly string[] = Object.freeze([]);\nconst EMPTY_TOOLS: Record<string, Tool<any, any>> = Object.freeze({});\n\n// The description is re-read on every sync so mutating it in place is\n// observed; the schema is converted only when the tool object itself changes.\n// Keyed on the tool so a schema or filter that throws warns once instead of\n// on every model-context notify.\nconst warned = new WeakSet<Tool<any, any>>();\n\nconst signatures = new WeakMap<\n  Tool<any, any>,\n  { description: string | undefined; signature: string }\n>();\n\nconst signatureOf = (tool: Tool<any, any>) => {\n  const cached = signatures.get(tool);\n  if (cached && cached.description === tool.description)\n    return cached.signature;\n  const signature = `${tool.description ?? \"\"}\\u0000${JSON.stringify(\n    toWebMcpInputSchema(tool),\n  )}`;\n  signatures.set(tool, { description: tool.description, signature });\n  return signature;\n};\n\nconst NO_SUBSCRIPTION = () => {};\n\n// No `isEqual`: a caller republishing an unchanged tool set is how it asks for\n// a re-sync, which is what re-attempts a tool whose filter has stopped throwing\n// and what picks up a description edited in place on a stable tool object.\nconst modelContextToolSource: ModelContextSnapshotSource<\n  Record<string, Tool<any, any>>\n> = {\n  empty: EMPTY_TOOLS,\n  read: (aui) => aui.modelContext.getModelContext().tools ?? EMPTY_TOOLS,\n  subscribe: (aui, onChange) =>\n    aui.modelContext.subscribe?.(onChange) ?? NO_SUBSCRIPTION,\n};\n\nconst useStableNames = (names: readonly (string | null)[]) => {\n  const [cell] = useState(() => ({ names: EMPTY_NAMES }));\n  const next = names.filter((name): name is string => name !== null).sort();\n  const previous = cell.names;\n  if (\n    previous.length === next.length &&\n    previous.every((name, index) => name === next[index])\n  ) {\n    return previous;\n  }\n  cell.names = next;\n  return next;\n};\n\nconst useWebMcpRegistry = ({\n  aui,\n  host,\n  filter,\n}: {\n  aui: AssistantClient;\n  host: WebMcpHost;\n  filter: (name: string, tool: Tool<any, any>) => boolean;\n}) => {\n  const tools = useModelContextSnapshot(\n    aui,\n    host.available,\n    modelContextToolSource,\n  );\n\n  const elements = [];\n  for (const [name, tool] of Object.entries(tools)) {\n    try {\n      if (!filter(name, tool)) continue;\n      const signature = signatureOf(tool);\n      elements.push(\n        withKey(\n          name,\n          WebMcpRegistrationResource({ host, name, signature, tool }),\n          [host, name, signature, tool],\n        ),\n      );\n    } catch (error) {\n      if (warned.has(tool)) continue;\n      warned.add(tool);\n      console.warn(\n        `[assistant-ui] Skipping WebMCP registration for tool \"${name}\": filter or schema conversion failed.`,\n        error,\n      );\n    }\n  }\n\n  return useStableNames(useResources(elements));\n};\n\n/**\n * Publishes the frontend tools in the model context to a WebMCP-capable\n * browser, so the user's own browser agent can call them.\n *\n * Returns `status: \"unsupported\"` when the page exposes no\n * `document.modelContext` (or `navigator.modelContext`), and the sorted names\n * of the tools currently registered with the host.\n */\nexport const unstable_useWebMcpProvider = (\n  options: Unstable_WebMcpProviderOptions = {},\n): Unstable_WebMcpProviderResult => {\n  const aui = useAui();\n  const [host] = useState(getDefaultWebMcpHost);\n  const filter = options.filter ?? defaultWebMcpFilter;\n\n  const root = useTapRoot(function WebMcpProviderRoot() {\n    return useWebMcpRegistry({ aui, host, filter });\n  });\n  const registeredToolNames = useSyncExternalStore(\n    root.subscribe,\n    root.getValue,\n    () => EMPTY_NAMES,\n  );\n\n  const [published, setPublished] = useState(false);\n  useEffect(() => {\n    if (host.available) setPublished(true);\n  }, [host]);\n\n  return {\n    status: published ? \"active\" : \"unsupported\",\n    registeredToolNames,\n  };\n};\n"],"mappings":"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"}
+{"version":3,"file":"useWebMcpProvider.js","names":["c","_c","useEffect","useState","useSyncExternalStore","useResources","useTapRoot","withKey","useAui","AssistantClient","Tool","getDefaultWebMcpHost","WebMcpHost","defaultWebMcpFilter","toWebMcpInputSchema","WebMcpRegistrationResource","shallowEqual","useModelContextSnapshot","ModelContextSnapshotSource","Unstable_WebMcpProviderOptions","filter","name","tool","Unstable_WebMcpProviderResult","status","registeredToolNames","EMPTY_NAMES","Object","freeze","EMPTY_TOOLS","Record","warned","WeakSet","signatures","WeakMap","description","signature","signatureOf","cached","get","JSON","stringify","set","NO_SUBSCRIPTION","modelContextToolSource","empty","read","aui","modelContext","getModelContext","tools","subscribe","onChange","useStableNames","names","cell","next","sort","previous","useWebMcpRegistry","t0","$","host","available","elements","entries","push","t1","error","has","add","console","warn","unstable_useWebMcpProvider","options","root","WebMcpProviderRoot","getValue","published","setPublished"],"sources":["../../../src/unstable/webmcp/useWebMcpProvider.ts"],"sourcesContent":["\"use client\";\n\nimport { useEffect, useState, useSyncExternalStore } from \"react\";\nimport { useResources, useTapRoot, withKey } from \"@assistant-ui/tap\";\nimport { useAui, type AssistantClient } from \"@assistant-ui/store\";\nimport type { Tool } from \"assistant-stream\";\nimport { getDefaultWebMcpHost, type WebMcpHost } from \"./webmcp-host\";\nimport { defaultWebMcpFilter, toWebMcpInputSchema } from \"./convertTools\";\nimport { WebMcpRegistrationResource } from \"./WebMcpRegistrationResource\";\nimport { shallowEqual } from \"@assistant-ui/store/internal\";\nimport {\n  useModelContextSnapshot,\n  type ModelContextSnapshotSource,\n} from \"../useModelContextSnapshot\";\n\nexport type Unstable_WebMcpProviderOptions = {\n  filter?: (name: string, tool: Tool<any, any>) => boolean;\n};\n\nexport type Unstable_WebMcpProviderResult = {\n  status: \"unsupported\" | \"active\";\n  registeredToolNames: readonly string[];\n};\n\nconst EMPTY_NAMES: readonly string[] = Object.freeze([]);\nconst EMPTY_TOOLS: Record<string, Tool<any, any>> = Object.freeze({});\n\n// The description is re-read on every sync so mutating it in place is\n// observed; the schema is converted only when the tool object itself changes.\n// Keyed on the tool so a schema or filter that throws warns once instead of\n// on every model-context notify.\nconst warned = new WeakSet<Tool<any, any>>();\n\nconst signatures = new WeakMap<\n  Tool<any, any>,\n  { description: string | undefined; signature: string }\n>();\n\nconst signatureOf = (tool: Tool<any, any>) => {\n  const cached = signatures.get(tool);\n  if (cached && cached.description === tool.description)\n    return cached.signature;\n  const signature = `${tool.description ?? \"\"}\\u0000${JSON.stringify(\n    toWebMcpInputSchema(tool),\n  )}`;\n  signatures.set(tool, { description: tool.description, signature });\n  return signature;\n};\n\nconst NO_SUBSCRIPTION = () => {};\n\n// No `isEqual`: a caller republishing an unchanged tool set is how it asks for\n// a re-sync, which is what re-attempts a tool whose filter has stopped throwing\n// and what picks up a description edited in place on a stable tool object.\nconst modelContextToolSource: ModelContextSnapshotSource<\n  Record<string, Tool<any, any>>\n> = {\n  empty: EMPTY_TOOLS,\n  read: (aui) => aui.modelContext.getModelContext().tools ?? EMPTY_TOOLS,\n  subscribe: (aui, onChange) =>\n    aui.modelContext.subscribe?.(onChange) ?? NO_SUBSCRIPTION,\n};\n\nconst useStableNames = (names: readonly (string | null)[]) => {\n  const [cell] = useState(() => ({ names: EMPTY_NAMES }));\n  const next = names.filter((name): name is string => name !== null).sort();\n  const previous = cell.names;\n  if (shallowEqual(previous, next)) {\n    return previous;\n  }\n  cell.names = next;\n  return next;\n};\n\nconst useWebMcpRegistry = ({\n  aui,\n  host,\n  filter,\n}: {\n  aui: AssistantClient;\n  host: WebMcpHost;\n  filter: (name: string, tool: Tool<any, any>) => boolean;\n}) => {\n  const tools = useModelContextSnapshot(\n    aui,\n    host.available,\n    modelContextToolSource,\n  );\n\n  const elements = [];\n  for (const [name, tool] of Object.entries(tools)) {\n    try {\n      if (!filter(name, tool)) continue;\n      const signature = signatureOf(tool);\n      elements.push(\n        withKey(\n          name,\n          WebMcpRegistrationResource({ host, name, signature, tool }),\n          [host, name, signature, tool],\n        ),\n      );\n    } catch (error) {\n      if (warned.has(tool)) continue;\n      warned.add(tool);\n      console.warn(\n        `[assistant-ui] Skipping WebMCP registration for tool \"${name}\": filter or schema conversion failed.`,\n        error,\n      );\n    }\n  }\n\n  return useStableNames(useResources(elements));\n};\n\n/**\n * Publishes the frontend tools in the model context to a WebMCP-capable\n * browser, so the user's own browser agent can call them.\n *\n * Returns `status: \"unsupported\"` when the page exposes no\n * `document.modelContext` (or `navigator.modelContext`), and the sorted names\n * of the tools currently registered with the host.\n */\nexport const unstable_useWebMcpProvider = (\n  options: Unstable_WebMcpProviderOptions = {},\n): Unstable_WebMcpProviderResult => {\n  const aui = useAui();\n  const [host] = useState(getDefaultWebMcpHost);\n  const filter = options.filter ?? defaultWebMcpFilter;\n\n  const root = useTapRoot(function WebMcpProviderRoot() {\n    return useWebMcpRegistry({ aui, host, filter });\n  });\n  const registeredToolNames = useSyncExternalStore(\n    root.subscribe,\n    root.getValue,\n    () => EMPTY_NAMES,\n  );\n\n  const [published, setPublished] = useState(false);\n  useEffect(() => {\n    if (host.available) setPublished(true);\n  }, [host]);\n\n  return {\n    status: published ? \"active\" : \"unsupported\",\n    registeredToolNames,\n  };\n};\n"],"mappings":"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"}

package/dist/utils/Primitive.d.ts

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

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

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

package/dist/utils/Primitive.js

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

package/dist/utils/Primitive.js.map

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

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

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

package/dist/utils/getSelectionMessageId.js

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