@assistant-ui/react 0.15.21 → 0.15.23

package/src/unstable/webmcp/WebMcpRegistrationResource.ts

@@ -10,6 +10,7 @@ export type WebMcpRegistrationProps = {
   /** Re-registers when it changes; an execute-only edit reads through instead. */
   signature: string;
   tool: Tool<any, any>;
+  getCurrentTool: (name: string) => Tool<any, any> | undefined;
 };
 
 // The explainer specifies NotAllowedError for a page whose tools permission is
@@ -26,16 +27,12 @@ const useWebMcpRegistration = ({
   name,
   signature,
   tool,
+  getCurrentTool,
 }: WebMcpRegistrationProps): string | null => {
   // A refused name is remembered for as long as the tool stays in the model
   // context, so a permanent collision warns once rather than on every sync.
   const [refused, setRefused] = useState(false);
-  const toolRef = useRef(tool);
-  // Commit phase, so an abandoned render cannot hand the host a tool the tree
-  // never committed.
-  useEffect(() => {
-    toolRef.current = tool;
-  }, [tool]);
+  const fallbackToolRef = useRef(tool);
 
   useEffect(() => {
     if (refused) return undefined;
@@ -53,7 +50,11 @@ const useWebMcpRegistration = ({
 
     try {
       dispose = host.registerTool(
-        toWebMcpTool(name, () => toolRef.current, lifecycle.signal),
+        toWebMcpTool(
+          name,
+          () => getCurrentTool(name) ?? fallbackToolRef.current,
+          lifecycle.signal,
+        ),
         (error) =>
           refuse(
             notPermitted(error)
@@ -84,7 +85,7 @@ const useWebMcpRegistration = ({
         );
       }
     };
-  }, [host, name, signature, refused]);
+  }, [getCurrentTool, host, name, signature, refused]);
 
   return refused ? null : name;
 };

package/src/unstable/webmcp/convertTools.test.ts

@@ -7,7 +7,7 @@ import {
   toWebMcpTool,
 } from "./convertTools";
 
-type WeatherArgs = { city: string };
+type WeatherArgs = { city: string; unit?: "c" | "f" | undefined };
 type FrontendTool = Extract<Tool<WeatherArgs, unknown>, { type: "frontend" }>;
 
 const jsonSchema: FrontendTool["parameters"] = {
@@ -200,6 +200,25 @@ describe("toWebMcpTool schema validation", () => {
     expect(result).toEqual({ content: [text("ok")] });
   });
 
+  it("uses schema output for execution and model content", async () => {
+    const args = { city: " Paris ", extra: true };
+    const result = await descriptorFor({
+      parameters: z.object({
+        city: z.string().trim(),
+        unit: z.enum(["c", "f"]).default("c"),
+      }),
+      execute: ({ city, unit }) => `Weather in ${city} (${unit})`,
+      toModelOutput: ({ input, output }) => [
+        { type: "text", text: `${JSON.stringify(input)}: ${output}` },
+      ],
+    }).execute(args);
+
+    expect(result).toEqual({
+      content: [text('{"city":"Paris","unit":"c"}: Weather in Paris (c)')],
+    });
+    expect(args).toEqual({ city: " Paris ", extra: true });
+  });
+
   it("returns a validation error when the arguments do not validate", async () => {
     const execute = vi.fn(async () => "ok");
     const result = await zodTool({ execute }).execute({ city: 42 });
@@ -214,10 +233,11 @@ describe("toWebMcpTool schema validation", () => {
     const execute = vi.fn(async () => "ok");
     const result = await zodTool({
       execute,
-      experimental_onSchemaValidationError: async () => "recovered",
+      experimental_onSchemaValidationError: async (args) =>
+        `Invalid: ${JSON.stringify(args)}`,
     }).execute({ city: 42 });
     expect(execute).not.toHaveBeenCalled();
-    expect(result).toEqual({ content: [text("recovered")] });
+    expect(result).toEqual({ content: [text('Invalid: {"city":42}')] });
   });
 
   it("awaits a validator that returns a non-Promise thenable", async () => {

package/src/unstable/webmcp/convertTools.ts

@@ -101,16 +101,10 @@ export const toMcpContent = async (
   return response.isError ? { isError: true, content } : { content };
 };
 
-type StandardSchemaLike = {
-  "~standard": {
-    version: number;
-    validate: (
-      value: unknown,
-    ) =>
-      | { issues?: readonly unknown[] | undefined }
-      | Promise<{ issues?: readonly unknown[] | undefined }>;
-  };
-};
+type StandardSchemaLike = Extract<
+  NonNullable<Tool["parameters"]>,
+  { readonly "~standard": unknown }
+>;
 
 const isStandardSchema = (schema: unknown): schema is StandardSchemaLike =>
   typeof schema === "object" &&
@@ -193,7 +187,7 @@ export const toWebMcpTool = (
       return errorResult(`Tool "${name}" is no longer registered`);
     }
     const tool = getTool();
-    const args = (rawArgs ?? {}) as Record<string, unknown>;
+    let args = (rawArgs ?? {}) as Record<string, unknown>;
     const toolCallId = generateId();
     let cleanup: (() => void) | undefined;
     try {
@@ -231,6 +225,8 @@ export const toWebMcpTool = (
                 `Function parameter validation failed. ${JSON.stringify(issues)}`,
               );
             });
+        } else {
+          args = validation.value;
         }
       }
 

package/src/unstable/webmcp/useWebMcpProvider.test.tsx

@@ -1,7 +1,7 @@
 // @vitest-environment jsdom
 
-import { StrictMode, type ReactNode } from "react";
-import { cleanup } from "@testing-library/react";
+import { StrictMode, type ReactNode, useLayoutEffect } from "react";
+import { act, cleanup } from "@testing-library/react";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { Tool } from "assistant-stream";
 import type {
@@ -195,6 +195,40 @@ describe("unstable_useWebMcpProvider", () => {
     expect(host.unregisterCalls).toEqual([]);
   });
 
+  it("calls through to the committed implementation from a descendant layout effect", async () => {
+    const host = useHost(createFakeWebMcpHost());
+    const provider = createProvider({
+      search: frontendTool({ execute: async () => "first" }),
+    });
+    let invoke = false;
+    let execution: ReturnType<WebMcpToolDescriptor["execute"]> | undefined;
+
+    const InvokeOnCommit = ({ children }: { children: ReactNode }) => {
+      useLayoutEffect(() => {
+        if (invoke) execution = host.registry.get("search")?.execute({});
+      });
+      return children;
+    };
+    const { rerender } = mountProvider(provider, {}, (children) => (
+      <InvokeOnCommit>{children}</InvokeOnCommit>
+    ));
+    await waitForNames(["search"]);
+
+    act(() => {
+      invoke = true;
+      provider.setTools({
+        search: frontendTool({ execute: async () => "second" }),
+      });
+      rerender({});
+    });
+
+    await expect(execution).resolves.toEqual({
+      content: [{ type: "text", text: "second" }],
+    });
+    expect(host.registerCalls).toEqual(["search"]);
+    expect(host.unregisterCalls).toEqual([]);
+  });
+
   it("re-registers when the description or the schema changes", async () => {
     const host = useHost(createFakeWebMcpHost());
     const provider = createProvider({ search: frontendTool() });

package/src/unstable/webmcp/useWebMcpProvider.ts

@@ -1,8 +1,15 @@
 "use client";
 
-import { useEffect, useState, useSyncExternalStore } from "react";
+import {
+  useCallback,
+  useEffect,
+  useInsertionEffect,
+  useRef,
+  useState,
+  useSyncExternalStore,
+} from "react";
 import { useResources, useTapRoot, withKey } from "@assistant-ui/tap";
-import { useAui, type AssistantClient } from "@assistant-ui/store";
+import { useAui } from "@assistant-ui/store";
 import type { Tool } from "assistant-stream";
 import { getDefaultWebMcpHost, type WebMcpHost } from "./webmcp-host";
 import { defaultWebMcpFilter, toWebMcpInputSchema } from "./convertTools";
@@ -73,20 +80,16 @@ const useStableNames = (names: readonly (string | null)[]) => {
 };
 
 const useWebMcpRegistry = ({
-  aui,
   host,
   filter,
+  tools,
+  getCurrentTool,
 }: {
-  aui: AssistantClient;
   host: WebMcpHost;
   filter: (name: string, tool: Tool<any, any>) => boolean;
+  tools: Record<string, Tool<any, any>>;
+  getCurrentTool: (name: string) => Tool<any, any> | undefined;
 }) => {
-  const tools = useModelContextSnapshot(
-    aui,
-    host.available,
-    modelContextToolSource,
-  );
-
   const elements = [];
   for (const [name, tool] of Object.entries(tools)) {
     try {
@@ -95,8 +98,14 @@ const useWebMcpRegistry = ({
       elements.push(
         withKey(
           name,
-          WebMcpRegistrationResource({ host, name, signature, tool }),
-          [host, name, signature, tool],
+          WebMcpRegistrationResource({
+            host,
+            name,
+            signature,
+            tool,
+            getCurrentTool,
+          }),
+          [host, name, signature, tool, getCurrentTool],
         ),
       );
     } catch (error) {
@@ -126,9 +135,27 @@ export const unstable_useWebMcpProvider = (
   const aui = useAui();
   const [host] = useState(getDefaultWebMcpHost);
   const filter = options.filter ?? defaultWebMcpFilter;
+  const tools = useModelContextSnapshot(
+    aui,
+    host.available,
+    modelContextToolSource,
+  );
+  const currentToolsRef = useRef(tools);
+  useInsertionEffect(() => {
+    currentToolsRef.current = tools;
+  }, [tools]);
+  const getCurrentTool = useCallback(
+    (name: string) => currentToolsRef.current[name],
+    [],
+  );
 
   const root = useTapRoot(function WebMcpProviderRoot() {
-    return useWebMcpRegistry({ aui, host, filter });
+    return useWebMcpRegistry({
+      host,
+      filter,
+      tools,
+      getCurrentTool,
+    });
   });
   const registeredToolNames = useSyncExternalStore(
     root.subscribe,

package/src/utils/getSelectionMessageId.test.ts

@@ -30,6 +30,34 @@ afterEach(() => {
 });
 
 describe("getSelectionMessageId", () => {
+  it("rejects a message outside the supplied thread root", () => {
+    document.body.innerHTML = `
+      <div id="first-thread">
+        <div data-message-id="message-1"><p id="first">first</p></div>
+      </div>
+      <div id="second-thread">
+        <div data-message-id="message-1"><p>second</p></div>
+      </div>
+    `;
+    const firstThread = document.querySelector("#first-thread");
+    const secondThread = document.querySelector("#second-thread");
+    assert(firstThread);
+    assert(secondThread);
+    const selection = selectText(textNode("#first"));
+
+    expect(getSelectionMessageId(selection, firstThread)).toBe("message-1");
+    expect(getSelectionMessageId(selection, secondThread)).toBeNull();
+  });
+
+  it("falls back to an unscoped selection when a declared root has no element", () => {
+    document.body.innerHTML = `
+      <div data-message-id="message-1"><p id="text">text</p></div>
+    `;
+    const selection = selectText(textNode("#text"));
+
+    expect(getSelectionMessageId(selection, null)).toBe("message-1");
+  });
+
   it("accepts selections anywhere in a message without quote regions", () => {
     document.body.innerHTML = `
       <div data-message-id="message-1">

package/src/utils/getSelectionMessageId.ts

@@ -54,7 +54,10 @@ const intersectsExcluded = (scope: Element, selection: Selection): boolean => {
   return false;
 };
 
-export const getSelectionMessageId = (selection: Selection): string | null => {
+export const getSelectionMessageId = (
+  selection: Selection,
+  root?: Element | null,
+): string | null => {
   const { anchorNode, focusNode } = selection;
   if (!anchorNode || !focusNode) return null;
 
@@ -64,6 +67,9 @@ export const getSelectionMessageId = (selection: Selection): string | null => {
   if (!anchorMessageElement || anchorMessageElement !== focusMessageElement) {
     return null;
   }
+  if (root && !root.contains(anchorMessageElement)) {
+    return null;
+  }
 
   const messageId = anchorMessageElement.getAttribute("data-message-id");
   if (!messageId) return null;

package/dist/tests/remote-thread-list-test-helpers.d.ts

@@ -1,5 +0,0 @@
-import { RemoteThreadListAdapter } from "../index.js";
-//#region src/tests/remote-thread-list-test-helpers.d.ts
-export declare function makeAdapter(overrides?: Partial<RemoteThreadListAdapter>): RemoteThreadListAdapter;
-//#endregion
-//# sourceMappingURL=remote-thread-list-test-helpers.d.ts.map

package/dist/tests/remote-thread-list-test-helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"remote-thread-list-test-helpers.d.ts","names":[],"sources":["../../src/tests/remote-thread-list-test-helpers.ts"],"mappings":";;wBAGgB,YACd,YAAW,QAAQ,2BAClB"}

package/dist/tests/remote-thread-list-test-helpers.js

@@ -1,29 +0,0 @@
-import { vi } from "vitest";
-//#region src/tests/remote-thread-list-test-helpers.ts
-function makeAdapter(overrides = {}) {
-	return {
-		list: vi.fn(async () => ({ threads: [] })),
-		initialize: vi.fn(async (threadId) => ({
-			remoteId: threadId,
-			externalId: threadId
-		})),
-		rename: vi.fn(async () => {}),
-		archive: vi.fn(async () => {}),
-		unarchive: vi.fn(async () => {}),
-		delete: vi.fn(async () => {}),
-		generateTitle: vi.fn(async () => new ReadableStream({ start(c) {
-			c.close();
-		} })),
-		fetch: vi.fn(async (id) => ({
-			status: "regular",
-			remoteId: id,
-			externalId: id,
-			title: "Test"
-		})),
-		...overrides
-	};
-}
-//#endregion
-export { makeAdapter };
-
-//# sourceMappingURL=remote-thread-list-test-helpers.js.map

package/dist/tests/remote-thread-list-test-helpers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"remote-thread-list-test-helpers.js","names":["vi","RemoteThreadListAdapter","makeAdapter","overrides","Partial","list","fn","threads","initialize","threadId","remoteId","externalId","rename","archive","unarchive","delete","generateTitle","ReadableStream","start","c","close","fetch","id","status","const","title"],"sources":["../../src/tests/remote-thread-list-test-helpers.ts"],"sourcesContent":["import { vi } from \"vitest\";\nimport type { RemoteThreadListAdapter } from \"../index\";\n\nexport function makeAdapter(\n  overrides: Partial<RemoteThreadListAdapter> = {},\n): RemoteThreadListAdapter {\n  return {\n    list: vi.fn(async () => ({ threads: [] })),\n    initialize: vi.fn(async (threadId: string) => ({\n      remoteId: threadId,\n      externalId: threadId,\n    })),\n    rename: vi.fn(async () => {}),\n    archive: vi.fn(async () => {}),\n    unarchive: vi.fn(async () => {}),\n    delete: vi.fn(async () => {}),\n    generateTitle: vi.fn(\n      async () =>\n        new ReadableStream({\n          start(c) {\n            c.close();\n          },\n        }) as never,\n    ),\n    fetch: vi.fn(async (id: string) => ({\n      status: \"regular\" as const,\n      remoteId: id,\n      externalId: id,\n      title: \"Test\",\n    })),\n    ...overrides,\n  };\n}\n"],"mappings":";;AAGA,SAAgBE,YACdC,YAA8C,CAAC,GACtB;CACzB,OAAO;EACLE,MAAML,GAAGM,GAAG,aAAa,EAAEC,SAAS,CAAA,EAAG,EAAE;EACzCC,YAAYR,GAAGM,GAAG,OAAOG,cAAsB;GAC7CC,UAAUD;GACVE,YAAYF;EACd,EAAE;EACFG,QAAQZ,GAAGM,GAAG,YAAY,CAAC,CAAC;EAC5BO,SAASb,GAAGM,GAAG,YAAY,CAAC,CAAC;EAC7BQ,WAAWd,GAAGM,GAAG,YAAY,CAAC,CAAC;EAC/BS,QAAQf,GAAGM,GAAG,YAAY,CAAC,CAAC;EAC5BU,eAAehB,GAAGM,GAChB,YACE,IAAIW,eAAe,EACjBC,MAAMC,GAAG;GACPA,EAAEC,MAAM;EACV,EACF,CAAC,CACL;EACAC,OAAOrB,GAAGM,GAAG,OAAOgB,QAAgB;GAClCC,QAAQ;GACRb,UAAUY;GACVX,YAAYW;GACZG,OAAO;EACT,EAAE;EACF,GAAGtB;CACL;AACF"}

package/dist/tests/setup.d.ts

@@ -1 +0,0 @@
-export {}

package/dist/tests/setup.js

@@ -1,6 +0,0 @@
-import { vi } from "vitest";
-//#region src/tests/setup.ts
-vi.setSystemTime(/* @__PURE__ */ new Date("2023-01-01"));
-//#endregion
-
-//# sourceMappingURL=setup.js.map

package/dist/tests/setup.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"setup.js","names":["vi","setSystemTime","Date"],"sources":["../../src/tests/setup.ts"],"sourcesContent":["// This file contains setup code for tests\nimport { vi } from \"vitest\";\n\n// Use Vitest's built-in to mock Date\nvi.setSystemTime(new Date(\"2023-01-01\"));\n"],"mappings":";;AAIAA,GAAGC,8BAAc,IAAIC,KAAK,YAAY,CAAC"}