@assistant-ui/react 0.15.15 → 0.15.17

package/src/mcp-apps/app-frame.test.tsx

@@ -0,0 +1,102 @@
+// @vitest-environment jsdom
+import { act, startTransition, Suspense } from "react";
+import { cleanup, render } from "@testing-library/react";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type {
+  SandboxBridge,
+  SandboxHostProps,
+} from "../sandbox-host/SandboxHost";
+import type { CreateMcpAppBridgeOptions, McpAppBridge } from "./bridge";
+import { MCP_APP_MIME_TYPE } from "./types";
+
+const { sandboxHostMock, createMcpAppBridgeMock } = vi.hoisted(() => ({
+  sandboxHostMock: vi.fn(),
+  createMcpAppBridgeMock: vi.fn(),
+}));
+
+vi.mock("../sandbox-host/SandboxHost", () => ({
+  SandboxHost: sandboxHostMock,
+}));
+
+vi.mock("./bridge", async (importOriginal) => ({
+  ...(await importOriginal()),
+  createMcpAppBridge: createMcpAppBridgeMock,
+}));
+
+import { McpAppFrame } from "./app-frame";
+
+describe("McpAppFrame", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  it("keeps bridge options scoped to committed renders", async () => {
+    let committedCreateBridge: SandboxHostProps["createBridge"] | null = null;
+    sandboxHostMock.mockImplementation((props: SandboxHostProps) => {
+      committedCreateBridge ??= props.createBridge;
+      return null;
+    });
+    const bridge: McpAppBridge = {
+      onMessage: vi.fn(),
+      dispose: vi.fn(),
+      notifyToolInput: vi.fn(),
+      notifyToolResult: vi.fn(),
+      notifyHostContextChanged: vi.fn(),
+    };
+    createMcpAppBridgeMock.mockReturnValue(bridge);
+    const callToolA = vi.fn();
+    const callToolB = vi.fn();
+    const interruptedRender = vi.fn();
+    const pending = new Promise<never>(() => {});
+    const Block = () => {
+      interruptedRender();
+      throw pending;
+    };
+    const view = (
+      workspace: string,
+      callTool: typeof callToolA,
+      blocked: boolean,
+    ) => (
+      <Suspense fallback={null}>
+        <McpAppFrame
+          app={{ resourceUri: "ui://example/widget" }}
+          resource={{
+            uri: "ui://example/widget",
+            mimeType: MCP_APP_MIME_TYPE,
+            html: "",
+          }}
+          handlers={{ callTool }}
+          hostContext={{ workspace }}
+        />
+        {blocked ? <Block /> : null}
+      </Suspense>
+    );
+    const rendered = render(view("workspace-a", callToolA, false));
+
+    act(() => {
+      startTransition(() =>
+        rendered.rerender(view("workspace-b", callToolB, true)),
+      );
+    });
+    expect(interruptedRender).toHaveBeenCalled();
+    expect(committedCreateBridge).not.toBeNull();
+
+    const sandboxBridge: SandboxBridge = committedCreateBridge!(
+      {
+        iframe: document.createElement("iframe"),
+        origin: "https://widget.example",
+        sendMessage: vi.fn(),
+      },
+      { setHeight: vi.fn() },
+    );
+    const options = createMcpAppBridgeMock.mock
+      .calls[0]![0] as CreateMcpAppBridgeOptions;
+    expect(options.hostContext).toEqual({ workspace: "workspace-a" });
+    await options.handlers?.callTool?.({ name: "search" });
+    expect(callToolA).toHaveBeenCalledOnce();
+    expect(callToolB).not.toHaveBeenCalled();
+
+    sandboxBridge.dispose();
+  });
+});

package/src/mcp-apps/app-frame.tsx

@@ -1,6 +1,11 @@
 "use client";
 
-import { type MutableRefObject, useEffect, useRef } from "react";
+import {
+  type MutableRefObject,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+} from "react";
 import { type McpAppBridge, createMcpAppBridge } from "./bridge";
 import {
   SandboxHost,
@@ -121,14 +126,22 @@ export function McpAppFrame({
     undefined,
   );
 
-  const liveRef = useRef<LiveSnapshot>(null!);
-  liveRef.current = {
+  const liveRef = useRef<LiveSnapshot>({
     handlers,
     hostInfo,
     hostContext,
     input,
     output,
-  };
+  });
+  useLayoutEffect(() => {
+    liveRef.current = {
+      handlers,
+      hostInfo,
+      hostContext,
+      input,
+      output,
+    };
+  }, [handlers, hostInfo, hostContext, input, output]);
 
   const createBridge = (
     frame: SandboxHostFrame,

package/src/mcp-apps/bridge.test.ts

@@ -560,4 +560,25 @@ describe("createMcpAppBridge", () => {
     consoleError.mockRestore();
     bridge.dispose();
   });
+
+  it("preserves the onError receiver", () => {
+    const { frame } = makeFrame();
+    const handlers = {
+      calls: 0,
+      onError() {
+        expect(this).toBe(handlers);
+        this.calls += 1;
+      },
+    };
+    const bridge = createMcpAppBridge({ frame, handlers });
+
+    deliver(bridge, {
+      jsonrpc: "2.0",
+      method: "notifications/error",
+      params: { message: "kaboom" },
+    });
+
+    expect(handlers.calls).toBe(1);
+    bridge.dispose();
+  });
 });

package/src/mcp-apps/bridge.ts

@@ -1,4 +1,5 @@
 import type { SandboxHostFrame } from "../sandbox-host/SandboxHost";
+import { invokeCallbackSafely } from "../utils/invokeCallbackSafely";
 import {
   MCP_APP_PROTOCOL_VERSION,
   type McpAppBridgeHandlers,
@@ -123,21 +124,8 @@ export function createMcpAppBridge(
     });
   };
 
-  const reportErrorCallbackFailure = (error: unknown) => {
-    console.error(
-      "[assistant-ui] MCP App onError callback threw an error",
-      error,
-    );
-  };
-
   const reportError = (error: Error) => {
-    try {
-      void Promise.resolve(handlers.onError?.(error)).catch(
-        reportErrorCallbackFailure,
-      );
-    } catch (callbackError) {
-      reportErrorCallbackFailure(callbackError);
-    }
+    invokeCallbackSafely(() => handlers.onError?.(error), "MCP App onError");
   };
 
   const handleRequest = async (req: McpAppJsonRpcRequest) => {

package/src/mcp-apps/index.ts

@@ -13,5 +13,6 @@ export type {
   McpAppsHost,
   McpAppsRemoteHostOptions,
   McpAppToolCallParams,
+  McpAppBridgeHandlers,
   ToolCallMessagePartMcpMetadata,
 } from "./types";

package/src/model-context/frame/AssistantFrame.test.ts

@@ -27,7 +27,7 @@ describe("AssistantFrame Integration", () => {
             parentHandler({
               data,
               source: iframeWindow,
-              origin: "*",
+              origin: window.location.origin,
             } as MessageEvent);
           });
         }
@@ -44,7 +44,7 @@ describe("AssistantFrame Integration", () => {
             iframeHandler({
               data,
               source: parentWindow, // parent window is the source for subscription
-              origin: "*",
+              origin: window.location.origin,
             } as MessageEvent);
           });
         }
@@ -104,7 +104,7 @@ describe("AssistantFrame Integration", () => {
             type: "model-context-request",
           }),
         }),
-        "*",
+        window.location.origin,
       );
     });
 

package/src/model-context/frame/SPEC_AssistantFrame.md

@@ -88,7 +88,7 @@ All messages are wrapped with a channel identifier to avoid conflicts with other
 
 #### Security Considerations
 
-1. **Origin Validation**: Both sides can specify `targetOrigin` to restrict message sources
+1. **Origin Validation**: Both sides default to the current page's origin and can specify an exact `targetOrigin` for cross-origin frames; providers share a fail-closed origin policy
 2. **Window Reference**: Host (parent) only accepts messages from the specific iframe window it's connected to
 3. **Message Channel**: Using a unique channel identifier prevents cross-talk with other postMessage users
 

package/src/model-context/frame/useAssistantFrameHost.ts

@@ -20,7 +20,7 @@ type UseAssistantFrameHostOptions = {
  *
  *   useAssistantFrameHost({
  *     iframeRef,
- *     targetOrigin: "https://trusted-domain.com", // optional
+ *     targetOrigin: "https://trusted-domain.com",
  *   });
  *
  *   return <iframe ref={iframeRef} src="..." />;
@@ -29,7 +29,7 @@ type UseAssistantFrameHostOptions = {
  */
 export const useAssistantFrameHost = ({
   iframeRef,
-  targetOrigin = "*",
+  targetOrigin,
   register,
 }: UseAssistantFrameHostOptions): void => {
   useEffect(() => {

package/src/model-context/makeAssistantVisible.tsx

@@ -12,7 +12,7 @@ import {
   useContext,
 } from "react";
 import { useAui } from "@assistant-ui/store";
-import { useComposedRefs } from "@radix-ui/react-compose-refs";
+import { useComposedRefs } from "radix-ui/internal";
 import { tool } from "@assistant-ui/core";
 
 const click = tool({

package/src/primitives/actionBar/ActionBarCopy.tsx

@@ -2,7 +2,7 @@
 
 import { forwardRef } from "react";
 import type { ActionButtonProps } from "../../utils/createActionButton";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import { Primitive } from "../../utils/Primitive";
 import { useActionBarCopy } from "@assistant-ui/core/react";
 import { useAuiState } from "@assistant-ui/store";

package/src/primitives/actionBar/ActionBarExportMarkdown.test.tsx

@@ -0,0 +1,67 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import type * as AssistantStore from "@assistant-ui/store";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ActionBarPrimitiveExportMarkdown } from "./ActionBarExportMarkdown";
+
+const { getCopyText } = vi.hoisted(() => ({
+  getCopyText: vi.fn(() => "# Exported message"),
+}));
+
+(globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
+
+vi.mock("@assistant-ui/store", async (importOriginal) => {
+  const actual = await importOriginal<typeof AssistantStore>();
+  return {
+    ...actual,
+    useAui: () => ({ message: { getCopyText } }),
+    useAuiState: () => true,
+  };
+});
+
+describe("ActionBarPrimitiveExportMarkdown", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    getCopyText.mockClear();
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(async () => {
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    vi.restoreAllMocks();
+  });
+
+  it("handles rejected asynchronous exports", async () => {
+    const error = new Error("remote save failed");
+    const onExport = vi.fn().mockRejectedValue(error);
+    const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+
+    await act(async () => {
+      root.render(
+        <ActionBarPrimitiveExportMarkdown onExport={onExport}>
+          Export
+        </ActionBarPrimitiveExportMarkdown>,
+      );
+    });
+
+    await act(async () => {
+      container.querySelector("button")!.click();
+    });
+
+    expect(onExport).toHaveBeenCalledWith("# Exported message");
+    expect(errorSpy).toHaveBeenCalledWith(
+      "[assistant-ui] markdown export failed:",
+      error,
+    );
+  });
+});

package/src/primitives/actionBar/ActionBarExportMarkdown.tsx

@@ -2,7 +2,7 @@
 
 import { forwardRef, useCallback } from "react";
 import type { ActionButtonProps } from "../../utils/createActionButton";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import { Primitive } from "../../utils/Primitive";
 import { useAuiState, useAui } from "@assistant-ui/store";
 
@@ -61,7 +61,9 @@ export const ActionBarPrimitiveExportMarkdown = forwardRef<
       ref={forwardedRef}
       disabled={disabled || !callback}
       onClick={composeEventHandlers(onClick, () => {
-        callback?.();
+        void callback?.().catch((error: unknown) => {
+          console.error("[assistant-ui] markdown export failed:", error);
+        });
       })}
     />
   );

package/src/primitives/actionBar/ActionBarFeedbackNegative.tsx

@@ -2,7 +2,7 @@
 
 import { forwardRef } from "react";
 import type { ActionButtonProps } from "../../utils/createActionButton";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import { Primitive } from "../../utils/Primitive";
 import { useAuiState } from "@assistant-ui/store";
 import { useActionBarFeedbackNegative as useActionBarFeedbackNegativeBehavior } from "@assistant-ui/core/react";

package/src/primitives/actionBar/ActionBarFeedbackPositive.tsx

@@ -2,7 +2,7 @@
 
 import { forwardRef } from "react";
 import type { ActionButtonProps } from "../../utils/createActionButton";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import { useAuiState } from "@assistant-ui/store";
 import { Primitive } from "../../utils/Primitive";
 import { useActionBarFeedbackPositive as useActionBarFeedbackPositiveBehavior } from "@assistant-ui/core/react";

package/src/primitives/actionBar/ActionBarStopSpeaking.tsx

@@ -3,7 +3,7 @@
 import { forwardRef } from "react";
 import type { ActionButtonProps } from "../../utils/createActionButton";
 import { Primitive } from "../../utils/Primitive";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import { useActionBarStopSpeaking as useActionBarStopSpeakingBehavior } from "@assistant-ui/core/react";
 
 const useActionBarStopSpeaking = () => {

package/src/primitives/actionBarMore/scope.ts

@@ -1,8 +1,8 @@
 import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
-import type { Scope } from "@radix-ui/react-context";
+import type { Context } from "radix-ui/internal";
 
 export const useDropdownMenuScope: ReturnType<
   typeof DropdownMenuPrimitive.createDropdownMenuScope
 > = DropdownMenuPrimitive.createDropdownMenuScope();
 
-export type ScopedProps<P> = P & { __scopeActionBarMore?: Scope };
+export type ScopedProps<P> = P & { __scopeActionBarMore?: Context.Scope };

package/src/primitives/assistantModal/AssistantModalContent.tsx

@@ -6,7 +6,7 @@ import {
   forwardRef,
 } from "react";
 import { Popover as PopoverPrimitive } from "radix-ui";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import type { WithRenderPropProps } from "../../utils/Primitive";
 import { PopoverRenderContent } from "./popoverRenderPrimitives";
 import { type ScopedProps, usePopoverScope } from "./scope";

package/src/primitives/assistantModal/scope.ts

@@ -1,7 +1,7 @@
 import { Popover as PopoverPrimitive } from "radix-ui";
-import type { Scope } from "@radix-ui/react-context";
+import type { Context } from "radix-ui/internal";
 
 export const usePopoverScope: ReturnType<
   typeof PopoverPrimitive.createPopoverScope
 > = PopoverPrimitive.createPopoverScope();
-export type ScopedProps<P> = P & { __scopeAssistantModal?: Scope };
+export type ScopedProps<P> = P & { __scopeAssistantModal?: Context.Scope };

package/src/primitives/branchPicker/BranchPickerRoot.tsx

@@ -6,7 +6,7 @@ import {
   forwardRef,
   type ComponentPropsWithoutRef,
 } from "react";
-import { MessagePrimitiveIf as If } from "../message/MessageIf";
+import { AuiIf } from "@assistant-ui/store";
 
 export namespace BranchPickerPrimitiveRoot {
   export type Element = ComponentRef<typeof Primitive.div>;
@@ -42,9 +42,11 @@ export const BranchPickerPrimitiveRoot = forwardRef<
   BranchPickerPrimitiveRoot.Props
 >(({ hideWhenSingleBranch, ...rest }, ref) => {
   return (
-    <If hasBranches={hideWhenSingleBranch ? true : undefined}>
+    <AuiIf
+      condition={(s) => !hideWhenSingleBranch || s.message.branchCount >= 2}
+    >
       <Primitive.div {...rest} ref={ref} />
-    </If>
+    </AuiIf>
   );
 });
 

package/src/primitives/composer/ComposerAttachmentDropzone.tsx

@@ -9,7 +9,7 @@ import {
   isValidElement,
 } from "react";
 
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import { Slot } from "radix-ui";
 import type React from "react";
 import { useAui } from "@assistant-ui/store";

package/src/primitives/composer/ComposerDictationTranscript.tsx

@@ -21,11 +21,11 @@ export namespace ComposerPrimitiveDictationTranscript {
  *
  * @example
  * ```tsx
- * <ComposerPrimitive.If dictation>
+ * <AuiIf condition={(s) => s.composer.dictation != null}>
  *   <div className="dictation-preview">
  *     <ComposerPrimitive.DictationTranscript />
  *   </div>
- * </ComposerPrimitive.If>
+ * </AuiIf>
  * ```
  */
 export const ComposerPrimitiveDictationTranscript = forwardRef<

package/src/primitives/composer/ComposerInput.test.tsx

@@ -81,7 +81,8 @@ vi.mock("./trigger/TriggerPopoverRootContext", () => ({
 
 let escapeKeydownHandler: ((event: KeyboardEvent) => void) | null = null;
 
-vi.mock("@radix-ui/react-use-escape-keydown", () => ({
+vi.mock("radix-ui/internal", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("radix-ui/internal")>()),
   useEscapeKeydown: (handler: (event: KeyboardEvent) => void) => {
     escapeKeydownHandler = handler;
   },

package/src/primitives/composer/ComposerInput.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import { composeEventHandlers } from "@radix-ui/primitive";
-import { useComposedRefs } from "@radix-ui/react-compose-refs";
+import { composeEventHandlers } from "radix-ui/internal";
+import { useComposedRefs } from "radix-ui/internal";
 import { Slot } from "radix-ui";
 import {
   type ClipboardEvent,
@@ -19,7 +19,7 @@ import TextareaAutosize, {
   type TextareaAutosizeProps,
   type TextareaHeightChangeMeta,
 } from "react-textarea-autosize";
-import { useEscapeKeydown } from "@radix-ui/react-use-escape-keydown";
+import { useEscapeKeydown } from "radix-ui/internal";
 import { useOnScrollToBottom } from "../../utils/hooks/useOnScrollToBottom";
 import { useMediaQuery } from "../../utils/hooks/useMediaQuery";
 import { useAui } from "@assistant-ui/store";

package/src/primitives/composer/ComposerQuote.tsx

@@ -8,7 +8,7 @@ import {
   useCallback,
 } from "react";
 import { useAui, useAuiState } from "@assistant-ui/store";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 
 // ---- Root ----
 

package/src/primitives/composer/ComposerRoot.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import { useAuiState } from "@assistant-ui/store";
 import { Primitive } from "../../utils/Primitive";
 import {

package/src/primitives/composer/trigger/TriggerPopover.tsx

@@ -28,6 +28,7 @@ import {
   useTriggerPopoverAriaPublish,
   useTriggerPopoverRootContext,
 } from "./TriggerPopoverRootContext";
+import type { TriggerMatcher } from "./detectTrigger";
 
 const TriggerPopoverScopeContext =
   createContext<TriggerPopoverResourceOutput | null>(null);
@@ -70,6 +71,8 @@ export namespace ComposerPrimitiveTriggerPopover {
   > & {
     /** The character(s) that activate this trigger (e.g. `"@"`, `"/"`). Also serves as the trigger identity within the root. */
     readonly char: string;
+    /** Overrides trigger detection for both textarea and Lexical inputs. `endOffset` is the exclusive replace bound. */
+    readonly matcher?: TriggerMatcher | undefined;
     /** Adapter providing categories and items. */
     readonly adapter?: Unstable_TriggerAdapter | undefined;
     /** Whether the adapter is resolving items, surfaced to the popover scope for async sources. @default false */
@@ -111,6 +114,7 @@ export const ComposerPrimitiveTriggerPopover = forwardRef<
   (
     {
       char,
+      matcher,
       adapter,
       isLoading = false,
       "aria-label": ariaLabel,
@@ -122,6 +126,15 @@ export const ComposerPrimitiveTriggerPopover = forwardRef<
     const aui = useAui();
     const text = useAuiState((s) => s.composer.text);
     const popoverId = useId();
+    const matcherRef = useRef(matcher);
+    useEffect(() => {
+      matcherRef.current = matcher;
+    });
+    const [registeredMatcher] = useState(
+      () => (nextText: string, triggerChar: string, cursorPosition: number) =>
+        matcherRef.current!(nextText, triggerChar, cursorPosition),
+    );
+    const hasMatcher = matcher !== undefined;
 
     // Track in state (for resource reactivity) + ref (dev warning on duplicate registrations).
     const behaviorRef = useRef<TriggerBehavior | null>(null);
@@ -165,6 +178,7 @@ export const ComposerPrimitiveTriggerPopover = forwardRef<
         adapter,
         text,
         triggerChar: char,
+        matcher,
         behavior: behavior ?? undefined,
         aui,
         popoverId,
@@ -178,10 +192,11 @@ export const ComposerPrimitiveTriggerPopover = forwardRef<
     useEffect(() => {
       return root.register({
         char,
+        ...(hasMatcher ? { matcher: registeredMatcher } : {}),
         ...(behavior ? { behavior } : {}),
         resource: getResource(),
       });
-    }, [root, char, behavior]);
+    }, [root, char, hasMatcher, behavior]);
 
     const pluginRegistry = useComposerInputPluginRegistryOptional();
     useEffect(() => {

package/src/primitives/composer/trigger/TriggerPopoverBack.tsx

@@ -6,7 +6,7 @@ import {
   type ComponentPropsWithoutRef,
   forwardRef,
 } from "react";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import { useTriggerPopoverScopeContext } from "./TriggerPopover";
 
 export namespace ComposerPrimitiveTriggerPopoverBack {

package/src/primitives/composer/trigger/TriggerPopoverCategories.tsx

@@ -8,7 +8,7 @@ import {
   forwardRef,
   useCallback,
 } from "react";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import { useTriggerPopoverScopeContext } from "./TriggerPopover";
 import type { Unstable_TriggerCategory } from "@assistant-ui/core";
 

package/src/primitives/composer/trigger/TriggerPopoverItems.tsx

@@ -8,7 +8,7 @@ import {
   forwardRef,
   useCallback,
 } from "react";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { composeEventHandlers } from "radix-ui/internal";
 import { useTriggerPopoverScopeContext } from "./TriggerPopover";
 import type { Unstable_TriggerItem } from "@assistant-ui/core";
 

package/src/primitives/composer/trigger/TriggerPopoverResource.ts

@@ -14,6 +14,7 @@ import {
   type SelectItemOverride,
   type TriggerBehavior,
 } from "./triggerSelectionResource";
+import type { TriggerMatcher } from "./detectTrigger";
 
 export type { SelectItemOverride, TriggerBehavior };
 export type { TriggerPopoverKeyEvent } from "./triggerKeyboardResource";
@@ -57,6 +58,7 @@ const useTriggerPopoverResource = ({
   adapter,
   text,
   triggerChar,
+  matcher,
   behavior,
   aui,
   popoverId,
@@ -65,6 +67,7 @@ const useTriggerPopoverResource = ({
   adapter: Unstable_TriggerAdapter | undefined;
   text: string;
   triggerChar: string;
+  matcher: TriggerMatcher | undefined;
   behavior: TriggerBehavior | undefined;
   aui: AssistantClient;
   /** Stable ID for accessible element IDs (pass React's useId() from component layer). */
@@ -72,7 +75,7 @@ const useTriggerPopoverResource = ({
   isLoading: boolean;
 }): TriggerPopoverResourceOutput => {
   const detection = useResource(
-    TriggerDetectionResource({ text, triggerChar }),
+    TriggerDetectionResource({ text, triggerChar, matcher }),
   );
 
   const open =