@assistant-ui/react 0.14.9 → 0.14.12

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

@@ -9,7 +9,7 @@ import {
 import { useExternalStoreRuntime } from "../external-store/useExternalStoreRuntime";
 import type { AssistantRuntime } from "../../runtime/AssistantRuntime";
 import type { AddToolResultOptions } from "@assistant-ui/core";
-import { useState, useRef, useMemo } from "react";
+import { useMemo, useRef, useState } from "react";
 import {
   AssistantMessageAccumulator,
   DataStreamDecoder,
@@ -29,10 +29,7 @@ import type {
 import { useCommandQueue } from "./commandQueue";
 import { useRunManager } from "./runManager";
 import { useConvertedState } from "./useConvertedState";
-import {
-  type ToolExecutionStatus,
-  useToolInvocations,
-} from "./useToolInvocations";
+import type { ToolExecutionStatus } from "@assistant-ui/core";
 import { createRequestHeaders } from "@assistant-ui/core";
 import { useRemoteThreadListRuntime } from "../remote-thread-list/useRemoteThreadListRuntime";
 import { InMemoryThreadListAdapter } from "@assistant-ui/core";
@@ -116,23 +113,16 @@ export function useAssistantTransportState<T>(
 const useAssistantTransportThreadRuntime = <T>(
   options: AssistantTransportOptions<T>,
 ): AssistantRuntime => {
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const agentStateRef = useRef(options.initialState);
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const [, rerender] = useState(0);
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const resumeFlagRef = useRef(false);
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const parentIdRef = useRef<string | null | undefined>(undefined);
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const commandQueue = useCommandQueue({
     onQueue: () => runManager.schedule(),
   });
 
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const threadId = useAuiState((s) => s.threadListItem.remoteId);
 
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const runManager = useRunManager({
     onRun: async (signal: AbortSignal) => {
       const isResume = resumeFlagRef.current;
@@ -276,18 +266,15 @@ const useAssistantTransportThreadRuntime = <T>(
   });
 
   // Tool execution status state
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const [toolStatuses, setToolStatuses] = useState<
     Record<string, ToolExecutionStatus>
   >({});
 
   // Reactive conversion of agent state + connection metadata → UI state
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const pendingCommands = useMemo(
     () => [...commandQueue.state.inTransit, ...commandQueue.state.queued],
     [commandQueue.state],
   );
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const converted = useConvertedState(
     options.converter,
     agentStateRef.current,
@@ -297,12 +284,13 @@ const useAssistantTransportThreadRuntime = <T>(
   );
 
   // Create runtime
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const runtime = useExternalStoreRuntime({
     messages: converted.messages,
     state: converted.state,
     isRunning: converted.isRunning,
     adapters: options.adapters,
+    unstable_enableToolInvocations: true,
+    setToolStatuses,
     extras: {
       [symbolAssistantTransportExtras]: true,
       sendCommand: (command: AssistantTransportCommand) => {
@@ -324,7 +312,6 @@ const useAssistantTransportThreadRuntime = <T>(
     }),
     onCancel: async () => {
       runManager.cancel();
-      await toolInvocations.abort();
     },
     onResume: async () => {
       if (!options.resumeApi)
@@ -343,25 +330,19 @@ const useAssistantTransportThreadRuntime = <T>(
         toolName: toolOptions.toolName,
         isError: toolOptions.isError,
         ...(toolOptions.artifact && { artifact: toolOptions.artifact }),
+        ...(toolOptions.modelContent !== undefined && {
+          modelContent: toolOptions.modelContent,
+        }),
       };
 
       commandQueue.enqueue(command);
     },
     onLoadExternalState: async (state) => {
       agentStateRef.current = state as T;
-      toolInvocations.reset();
       rerender((prev) => prev + 1);
     },
   });
 
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
-  const toolInvocations = useToolInvocations({
-    state: converted,
-    getTools: () => runtime.thread.getModelContext().tools,
-    onResult: commandQueue.enqueue,
-    setToolStatuses,
-  });
-
   return runtime;
 };
 
@@ -373,7 +354,6 @@ export const useAssistantTransportRuntime = <T>(
 ): AssistantRuntime => {
   const runtime = useRemoteThreadListRuntime({
     runtimeHook: function RuntimeHook() {
-      // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
       return useAssistantTransportThreadRuntime(options);
     },
     adapter: new InMemoryThreadListAdapter(),

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

@@ -4,7 +4,7 @@ import type {
   AssistantTransportState,
   AssistantTransportStateConverter,
 } from "./types";
-import type { ToolExecutionStatus } from "./useToolInvocations";
+import type { ToolExecutionStatus } from "@assistant-ui/core";
 
 export function useConvertedState<T>(
   converter: AssistantTransportStateConverter<T>,

package/src/mcp-apps/McpAppRenderer.tsx

@@ -113,7 +113,6 @@ function InlineRenderer({
   const [loadedResource, setLoadedResource] = useState<LoadedResourceState>();
 
   const resourceUri = appForRender?.resourceUri;
-  // biome-ignore lint/correctness/useExhaustiveDependencies: re-fetches only when URI changes; mcp.app object identity is unstable across renders
   useEffect(() => {
     if (appForRender == null || resourceUri == null) return;
     let cancelled = false;
@@ -137,6 +136,7 @@ function InlineRenderer({
     return () => {
       cancelled = true;
     };
+    // oxlint-disable-next-line tap-hooks/exhaustive-deps -- re-fetch only when URI changes; appForRender identity is unstable and internalsRef is a stable ref
   }, [resourceUri]);
 
   const bridgeHandlers = useMemo<McpAppBridgeHandlers>(

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

@@ -21,7 +21,6 @@ function useBridgeNotify<T>(
   lastSentRef: MutableRefObject<T | undefined>,
   notify: (bridge: McpAppBridge, v: T) => void,
 ) {
-  // biome-ignore lint/correctness/useExhaustiveDependencies: refs and notify are stable; we re-run only when value changes.
   useEffect(() => {
     if (!bridgeRef.current) return;
     if (value === undefined) return;
@@ -32,6 +31,7 @@ function useBridgeNotify<T>(
     }
     notify(bridgeRef.current, value);
     lastSentRef.current = value;
+    // oxlint-disable-next-line tap-hooks/exhaustive-deps -- refs are stable; notify is assumed stable; re-run only when value changes
   }, [value]);
 }
 
@@ -131,7 +131,6 @@ export function McpAppFrame({
 
   const resourceUri = resource.uri;
 
-  // biome-ignore lint/correctness/useExhaustiveDependencies: re-mounts only on resource URI; live values flow through liveRef
   useEffect(() => {
     const container = containerRef.current;
     if (!container) return;
@@ -255,6 +254,7 @@ export function McpAppFrame({
       pendingHostContextRef.current = undefined;
       setContentHeight(undefined);
     };
+    // oxlint-disable-next-line tap-hooks/exhaustive-deps -- re-mount only on resource URI change; live values flow through liveRef
   }, [resourceUri]);
 
   useBridgeNotify(

package/src/primitives/assistantModal/AssistantModalRoot.tsx

@@ -28,7 +28,7 @@ const useAssistantModalOpenState = ({
     return aui.on("thread.runStart", () => {
       setOpen(true);
     });
-  }, [unstable_openOnRunStart, aui]);
+  }, [unstable_openOnRunStart, aui, setOpen]);
 
   return state;
 };

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

@@ -8,7 +8,7 @@ import { ComposerPrimitiveAttachmentDropzone } from "./ComposerAttachmentDropzon
 
 const addAttachment = vi.fn<(file: File) => Promise<void>>();
 
-globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+(globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
 
 vi.mock("@assistant-ui/store", async (importOriginal) => {
   const actual = await importOriginal<typeof import("@assistant-ui/store")>();

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

@@ -33,7 +33,7 @@ const plugin = {
 
 let pluginRegistry: { getPlugins: () => (typeof plugin)[] } | null = null;
 
-globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+(globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
 
 vi.mock("@assistant-ui/store", () => {
   const aui = {

package/src/primitives/composer/trigger/TriggerPopoverRootContext.test.tsx

@@ -11,7 +11,7 @@ import {
   useTriggerPopoverAriaPublish,
 } from "./TriggerPopoverRootContext";
 
-globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+(globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
 
 type PublishHandle = ReturnType<typeof useTriggerPopoverAriaPublish>;
 

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

@@ -64,12 +64,10 @@ export const TriggerKeyboardResource = resource(
   }): TriggerKeyboardResourceOutput => {
     const [highlightedIndex, setHighlightedIndex] = tapState(0);
 
-    // biome-ignore lint/correctness/useExhaustiveDependencies: intentional reset on list change
     tapEffect(() => {
       setHighlightedIndex(0);
     }, [navigableList]);
 
-    // biome-ignore lint/correctness/useExhaustiveDependencies: intentional reset
     tapEffect(() => {
       setHighlightedIndex(0);
     }, [isSearchMode, activeCategoryId]);

package/src/primitives/messagePart/MessagePartImage.tsx

@@ -37,7 +37,6 @@ export const MessagePartPrimitiveImage = forwardRef<
   MessagePartPrimitiveImage.Props
 >((props, forwardedRef) => {
   const { image } = useMessagePartImage();
-  // biome-ignore lint/performance/noImgElement: next/image not applicable here
   return <Primitive.img src={image} {...props} ref={forwardedRef} />;
 });
 

package/src/primitives/thread/useThreadViewportAutoScroll.ts

@@ -59,9 +59,13 @@ export const useThreadViewportAutoScroll = <TElement extends HTMLElement>({
   }
 
   const lastScrollTop = useRef<number>(0);
+  const lastScrollHeight = useRef<number>(0);
+  const lastObservedScrollHeight = useRef<number>(0);
+  const lastObservedClientHeight = useRef<number>(0);
 
   // Pending bottom-scroll intent. Planted by initialize/run-start/switch/button
-  // triggers, cleared only when handleScroll confirms we reached bottom.
+  // triggers, cleared when handleScroll confirms we reached bottom, or when the
+  // user actively scrolls up while content size is stable.
   const scrollingToBottomBehaviorRef = useRef<ScrollBehavior | null>(null);
 
   const scrollToBottom = useCallback((behavior: ScrollBehavior) => {
@@ -110,7 +114,7 @@ export const useThreadViewportAutoScroll = <TElement extends HTMLElement>({
 
     const isAtBottom = threadViewportStore.getState().isAtBottom;
     const newIsAtBottom =
-      Math.abs(div.scrollHeight - div.scrollTop - div.clientHeight) < 1 ||
+      Math.abs(div.scrollHeight - div.scrollTop - div.clientHeight) <= 1 ||
       div.scrollHeight <= div.clientHeight;
 
     const isInFlightDownwardScroll =
@@ -126,6 +130,12 @@ export const useThreadViewportAutoScroll = <TElement extends HTMLElement>({
         if (viewportOverflows) {
           scrollingToBottomBehaviorRef.current = null;
         }
+      } else if (
+        lastScrollTop.current > div.scrollTop &&
+        lastScrollHeight.current === div.scrollHeight
+      ) {
+        // scrollHeight equality rules out content-driven shifts being misread as user scroll-up
+        scrollingToBottomBehaviorRef.current = null;
       }
 
       const shouldUpdate =
@@ -139,9 +149,23 @@ export const useThreadViewportAutoScroll = <TElement extends HTMLElement>({
     }
 
     lastScrollTop.current = div.scrollTop;
+    lastScrollHeight.current = div.scrollHeight;
   };
 
   const resizeRef = useOnResizeContent(() => {
+    const div = divRef.current;
+    if (!div) return;
+
+    const { scrollHeight, clientHeight } = div;
+    if (
+      scrollHeight === lastObservedScrollHeight.current &&
+      clientHeight === lastObservedClientHeight.current
+    ) {
+      return;
+    }
+    lastObservedScrollHeight.current = scrollHeight;
+    lastObservedClientHeight.current = clientHeight;
+
     const scrollBehavior = scrollingToBottomBehaviorRef.current;
     if (scrollBehavior && hasActiveTopAnchor()) {
       // Let the top-anchor reserve own scrolling while a run starts to avoid a bottom-scroll race.

package/src/primitives/threadListItem/ThreadListItemTitle.test.tsx

@@ -5,7 +5,7 @@ import { ThreadListItemPrimitiveTitle } from "./ThreadListItemTitle";
 
 const mockUseAuiState = vi.fn();
 type UseAuiStateSelector = Parameters<
-  typeof import("@assistant-ui/store")["useAuiState"]
+  (typeof import("@assistant-ui/store"))["useAuiState"]
 >[0];
 
 vi.mock("@assistant-ui/store", async (importOriginal) => {

package/src/tests/BaseComposerRuntimeCore.test.ts

@@ -1,10 +1,10 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { BaseComposerRuntimeCore } from "../legacy-runtime/runtime-cores/composer/BaseComposerRuntimeCore";
-import type { AttachmentAdapter } from "../legacy-runtime/runtime-cores/adapters/attachment";
-import type { DictationAdapter } from "../legacy-runtime/runtime-cores/adapters/speech/SpeechAdapterTypes";
 import type {
   AppendMessage,
+  AttachmentAdapter,
   CreateAttachment,
+  DictationAdapter,
   PendingAttachment,
   SendOptions,
 } from "@assistant-ui/core";

package/src/tests/ExternalStoreThreadRuntimeCore.test.ts

@@ -255,6 +255,68 @@ describe("ExternalStoreThreadRuntimeCore", () => {
         "Runtime does not support cancelling runs.",
       );
     });
+
+    it("keeps a partially-streamed optimistic message on cancel", async () => {
+      // Only empty optimistic heads are evicted; one with content survives.
+      const optimisticAssistant = {
+        ...createAssistantMessage("server-msg", "partial answer"),
+        status: { type: "running" as const },
+        metadata: {
+          unstable_state: null,
+          unstable_annotations: [],
+          unstable_data: [],
+          steps: [],
+          custom: {},
+          isOptimistic: true,
+        },
+      } as ThreadMessage;
+      const setMessages = vi.fn();
+      const adapter = createBaseAdapter({
+        messages: [createUserMessage("u1"), optimisticAssistant],
+        isRunning: true,
+        onCancel: vi.fn(),
+        setMessages,
+      });
+      const core = new ExternalStoreThreadRuntimeCore(contextProvider, adapter);
+
+      core.cancelRun();
+
+      // cancelRun resyncs to the store via setTimeout(0); inspect the push.
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      const lastCall = setMessages.mock.lastCall?.[0] as ThreadMessage[];
+      expect(lastCall.map((m) => m.id)).toContain("server-msg");
+    });
+
+    it("evicts an empty optimistic head on cancel", async () => {
+      // An empty optimistic head is dropped on cancel, falling back to its prev.
+      const optimisticAssistant = {
+        ...createAssistantMessage("server-msg", ""),
+        content: [],
+        status: { type: "running" as const },
+        metadata: {
+          unstable_state: null,
+          unstable_annotations: [],
+          unstable_data: [],
+          steps: [],
+          custom: {},
+          isOptimistic: true,
+        },
+      } as ThreadMessage;
+      const setMessages = vi.fn();
+      const adapter = createBaseAdapter({
+        messages: [createUserMessage("u1"), optimisticAssistant],
+        isRunning: true,
+        onCancel: vi.fn(),
+        setMessages,
+      });
+      const core = new ExternalStoreThreadRuntimeCore(contextProvider, adapter);
+
+      core.cancelRun();
+
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      const lastCall = setMessages.mock.lastCall?.[0] as ThreadMessage[];
+      expect(lastCall.map((m) => m.id)).not.toContain("server-msg");
+    });
   });
 
   describe("optimistic assistant message", () => {

package/src/tests/MessageParts.loading.test.tsx

@@ -71,7 +71,7 @@ const RuntimeProvider: FC<
 
 const renderThread = (MessageComponent: FC, messages?: ThreadMessageLike[]) => {
   render(
-    <RuntimeProvider messages={messages}>
+    <RuntimeProvider messages={messages!}>
       <ThreadPrimitive.Messages components={{ Message: MessageComponent }} />
     </RuntimeProvider>,
   );

package/src/tests/RemoteThreadListRuntime.adapterProvider.test.tsx

@@ -7,15 +7,13 @@ import {
   RuntimeAdapterProvider,
   useRemoteThreadListRuntime,
   useRuntimeAdapters,
+  type RuntimeAdapters as RuntimeAdaptersShape,
 } from "@assistant-ui/core/react";
 import { makeAdapter } from "./remote-thread-list-test-helpers";
 import { useLocalRuntime } from "../legacy-runtime/runtime-cores/local/useLocalRuntime";
 import { AssistantRuntimeProvider } from "../context";
 import type { ChatModelAdapter, RemoteThreadListAdapter } from "../index";
-import type {
-  RuntimeAdapters as RuntimeAdaptersShape,
-  ThreadHistoryAdapter,
-} from "@assistant-ui/core";
+import type { ThreadHistoryAdapter } from "@assistant-ui/core";
 
 type CapturedAdapters = RuntimeAdaptersShape | null;
 

package/src/tests/auiV0Encode.test.ts

@@ -9,7 +9,7 @@ describe("auiV0Encode", () => {
       role: "assistant",
       status: { type: "complete", reason: "stop" },
       metadata: {
-        unstable_state: undefined,
+        unstable_state: null,
         unstable_annotations: [],
         unstable_data: [],
         steps: [],

package/src/unstable/useMentionAdapter.ts

@@ -92,7 +92,6 @@ export function unstable_useMentionAdapter(
   iconMap?: Record<string, Unstable_IconComponent>;
   fallbackIcon?: Unstable_IconComponent;
 } {
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const aui = useAui();
 
   const items = options?.items;
@@ -105,7 +104,6 @@ export function unstable_useMentionAdapter(
   const formatter = options?.formatter;
   const onInserted = options?.onInserted;
 
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const adapter = useMemo<Unstable_TriggerAdapter>(() => {
     const getModelContextTools = (): Unstable_TriggerItem[] => {
       if (!wantsTools) return [];
@@ -182,7 +180,6 @@ export function unstable_useMentionAdapter(
     };
   }, [aui, items, categories, wantsTools, toolsConfig]);
 
-  // biome-ignore lint/correctness/useHookAtTopLevel: `unstable_` prefix not recognized as hook
   const directive = useMemo<Unstable_MentionDirective>(
     () => ({
       formatter: formatter ?? unstable_defaultDirectiveFormatter,

package/src/unstable/useSlashCommandAdapter.ts

@@ -60,11 +60,9 @@ export function unstable_useSlashCommandAdapter(
 } {
   const { commands, removeOnExecute } = options;
 
-  // biome-ignore lint/correctness/useHookAtTopLevel: `unstable_` prefix not recognized as hook
   const commandsRef = useRef(commands);
   commandsRef.current = commands;
 
-  // biome-ignore lint/correctness/useHookAtTopLevel: `unstable_` prefix not recognized as hook
   return useMemo(() => {
     const adapter: Unstable_TriggerAdapter = {
       categories: () => [],

package/dist/legacy-runtime/runtime-cores/assistant-transport/useToolInvocations.d.ts

@@ -1,2 +0,0 @@
-import { ToolExecutionStatus, useToolInvocations } from "@assistant-ui/core/react";
-export { type ToolExecutionStatus, useToolInvocations };

package/dist/legacy-runtime/runtime-cores/assistant-transport/useToolInvocations.js

@@ -1,2 +0,0 @@
-import { useToolInvocations } from "@assistant-ui/core/react";
-export { useToolInvocations };