@assistant-ui/react-ai-sdk 0.4.1 → 0.5.2

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as _assistant_ui_react from '@assistant-ui/react';
-import { AppendMessage, ReactThreadRuntime, ThreadMessage, Unsubscribe, ModelConfigProvider, INTERNAL, AddToolResultOptions } from '@assistant-ui/react';
+import { AppendMessage, ThreadMessage, ReactThreadRuntime, Unsubscribe, AddToolResultOptions, ModelConfigProvider, INTERNAL } from '@assistant-ui/react';
 import { ReactNode } from 'react';
 import { useChat, useAssistant } from 'ai/react';
 import { Message } from 'ai';
@@ -23,46 +23,9 @@ type VercelRSCAdapterBase<T> = {
 };
 type VercelRSCAdapter<T = VercelRSCMessage> = VercelRSCAdapterBase<T> & (T extends VercelRSCMessage ? object : RSCMessageConverter<T>);
 
-declare class VercelRSCThreadRuntime<T extends WeakKey = VercelRSCMessage> implements ReactThreadRuntime {
-    adapter: VercelRSCAdapter<T>;
-    private useAdapter;
-    readonly capabilities: Readonly<{
-        edit: false;
-        reload: false;
-        cancel: false;
-        copy: false;
-    }>;
-    private _subscriptions;
-    isRunning: boolean;
-    messages: ThreadMessage[];
-    constructor(adapter: VercelRSCAdapter<T>);
-    private withRunning;
-    getBranches(): readonly string[];
-    switchToBranch(): void;
-    append(message: AppendMessage): Promise<void>;
-    startRun(parentId: string | null): Promise<void>;
-    cancelRun(): void;
-    subscribe(callback: () => void): Unsubscribe;
-    onAdapterUpdated(): void;
-    private updateData;
-    unstable_synchronizer: () => null;
-    addToolResult(): void;
-}
-
-declare const BaseAssistantRuntime$2: typeof INTERNAL.BaseAssistantRuntime;
-declare class VercelRSCRuntime<T extends WeakKey = VercelRSCMessage> extends BaseAssistantRuntime$2<VercelRSCThreadRuntime<T>> {
-    private readonly _proxyConfigProvider;
-    constructor(adapter: VercelRSCAdapter<T>);
-    set adapter(adapter: VercelRSCAdapter<T>);
-    onAdapterUpdated(): void;
-    getModelConfig(): _assistant_ui_react.ModelConfig;
-    registerModelConfigProvider(provider: ModelConfigProvider): () => void;
-    switchToThread(): void;
-}
-
-declare const useVercelRSCRuntime: <T extends WeakKey>(adapter: VercelRSCAdapter<T>) => VercelRSCRuntime<T>;
+declare const useVercelRSCRuntime: <T extends WeakKey>(adapter: VercelRSCAdapter<T>) => _assistant_ui_react.ExternalStoreRuntime;
 
-declare const getVercelRSCMessage: <T>(message: ThreadMessage) => T | undefined;
+declare const getVercelRSCMessage: (message: ThreadMessage) => unknown;
 
 declare class VercelUseChatThreadRuntime implements ReactThreadRuntime {
     vercel: ReturnType<typeof useChat>;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _assistant_ui_react from '@assistant-ui/react';
-import { AppendMessage, ReactThreadRuntime, ThreadMessage, Unsubscribe, ModelConfigProvider, INTERNAL, AddToolResultOptions } from '@assistant-ui/react';
+import { AppendMessage, ThreadMessage, ReactThreadRuntime, Unsubscribe, AddToolResultOptions, ModelConfigProvider, INTERNAL } from '@assistant-ui/react';
 import { ReactNode } from 'react';
 import { useChat, useAssistant } from 'ai/react';
 import { Message } from 'ai';
@@ -23,46 +23,9 @@ type VercelRSCAdapterBase<T> = {
 };
 type VercelRSCAdapter<T = VercelRSCMessage> = VercelRSCAdapterBase<T> & (T extends VercelRSCMessage ? object : RSCMessageConverter<T>);
 
-declare class VercelRSCThreadRuntime<T extends WeakKey = VercelRSCMessage> implements ReactThreadRuntime {
-    adapter: VercelRSCAdapter<T>;
-    private useAdapter;
-    readonly capabilities: Readonly<{
-        edit: false;
-        reload: false;
-        cancel: false;
-        copy: false;
-    }>;
-    private _subscriptions;
-    isRunning: boolean;
-    messages: ThreadMessage[];
-    constructor(adapter: VercelRSCAdapter<T>);
-    private withRunning;
-    getBranches(): readonly string[];
-    switchToBranch(): void;
-    append(message: AppendMessage): Promise<void>;
-    startRun(parentId: string | null): Promise<void>;
-    cancelRun(): void;
-    subscribe(callback: () => void): Unsubscribe;
-    onAdapterUpdated(): void;
-    private updateData;
-    unstable_synchronizer: () => null;
-    addToolResult(): void;
-}
-
-declare const BaseAssistantRuntime$2: typeof INTERNAL.BaseAssistantRuntime;
-declare class VercelRSCRuntime<T extends WeakKey = VercelRSCMessage> extends BaseAssistantRuntime$2<VercelRSCThreadRuntime<T>> {
-    private readonly _proxyConfigProvider;
-    constructor(adapter: VercelRSCAdapter<T>);
-    set adapter(adapter: VercelRSCAdapter<T>);
-    onAdapterUpdated(): void;
-    getModelConfig(): _assistant_ui_react.ModelConfig;
-    registerModelConfigProvider(provider: ModelConfigProvider): () => void;
-    switchToThread(): void;
-}
-
-declare const useVercelRSCRuntime: <T extends WeakKey>(adapter: VercelRSCAdapter<T>) => VercelRSCRuntime<T>;
+declare const useVercelRSCRuntime: <T extends WeakKey>(adapter: VercelRSCAdapter<T>) => _assistant_ui_react.ExternalStoreRuntime;
 
-declare const getVercelRSCMessage: <T>(message: ThreadMessage) => T | undefined;
+declare const getVercelRSCMessage: (message: ThreadMessage) => unknown;
 
 declare class VercelUseChatThreadRuntime implements ReactThreadRuntime {
     vercel: ReturnType<typeof useChat>;

package/dist/index.js

@@ -29,39 +29,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/rsc/useVercelRSCRuntime.tsx
-var import_react4 = require("react");
-
-// src/rsc/VercelRSCRuntime.tsx
-var import_react3 = require("@assistant-ui/react");
-
-// src/rsc/VercelRSCThreadRuntime.tsx
-var import_react2 = require("@assistant-ui/react");
-var import_zustand = require("zustand");
-
-// src/rsc/useVercelRSCSync.tsx
-var import_react = require("react");
-
-// src/utils/ThreadMessageConverter.ts
-var ThreadMessageConverter = class {
-  cache = /* @__PURE__ */ new WeakMap();
-  convertMessages(messages, converter, keyMapper = (key) => key) {
-    return messages.map((m) => {
-      const key = keyMapper(m);
-      const cached = this.cache.get(key);
-      const newMessage = converter(m, cached);
-      this.cache.set(key, newMessage);
-      return newMessage;
-    });
-  }
-};
-
-// src/rsc/getVercelRSCMessage.tsx
-var symbolInnerRSCMessage = Symbol("innerVercelRSCMessage");
-var getVercelRSCMessage = (message) => {
-  return message[symbolInnerRSCMessage];
-};
-
-// src/rsc/useVercelRSCSync.tsx
+var import_react = require("@assistant-ui/react");
 var vercelToThreadMessage = (converter, rawMessage) => {
   const message = converter(rawMessage);
   return {
@@ -69,152 +37,40 @@ var vercelToThreadMessage = (converter, rawMessage) => {
     role: message.role,
     content: [{ type: "ui", display: message.display }],
     createdAt: message.createdAt ?? /* @__PURE__ */ new Date(),
-    ...{ status: { type: "done" } },
-    [symbolInnerRSCMessage]: rawMessage
+    ...{ status: { type: "complete", reason: "unknown" } }
   };
 };
-var useVercelRSCSync = (adapter, updateData) => {
-  const [converter, convertCallback] = (0, import_react.useMemo)(() => {
-    const rscConverter = adapter.convertMessage ?? ((m) => m);
-    const convertCallback2 = (m, cache) => {
-      if (cache) return cache;
-      return vercelToThreadMessage(rscConverter, m);
-    };
-    return [new ThreadMessageConverter(), convertCallback2];
-  }, [adapter.convertMessage]);
-  (0, import_react.useEffect)(() => {
-    updateData(converter.convertMessages(adapter.messages, convertCallback));
-  }, [updateData, converter, convertCallback, adapter.messages]);
-};
-
-// src/rsc/VercelRSCThreadRuntime.tsx
-var { ProxyConfigProvider } = import_react2.INTERNAL;
-var EMPTY_BRANCHES = Object.freeze([]);
-var CAPABILITIES = Object.freeze({
-  edit: false,
-  reload: false,
-  cancel: false,
-  copy: false
-});
-var VercelRSCThreadRuntime = class {
-  constructor(adapter) {
-    this.adapter = adapter;
-    this.useAdapter = (0, import_zustand.create)(() => ({
-      adapter
-    }));
-  }
-  useAdapter;
-  capabilities = CAPABILITIES;
-  _subscriptions = /* @__PURE__ */ new Set();
-  isRunning = false;
-  messages = [];
-  withRunning = (callback) => {
-    this.isRunning = true;
-    return callback.finally(() => {
-      this.isRunning = false;
-    });
-  };
-  getBranches() {
-    return EMPTY_BRANCHES;
-  }
-  switchToBranch() {
-    throw new Error(
-      "Branch switching is not supported by VercelRSCAssistantProvider."
-    );
-  }
-  async append(message) {
-    if (message.role !== "user")
-      throw new Error(
-        "Only appending user messages are supported in VercelRSCRuntime. This is likely an internal bug in assistant-ui."
-      );
-    if (message.parentId !== (this.messages.at(-1)?.id ?? null)) {
-      if (!this.adapter.edit)
-        throw new Error(
-          "Message editing is not enabled, please provide an edit callback to VercelRSCAssistantProvider."
-        );
-      await this.withRunning(this.adapter.edit(message));
-    } else {
-      await this.withRunning(this.adapter.append(message));
-    }
-  }
-  async startRun(parentId) {
-    if (!this.adapter.reload)
-      throw new Error(
-        "Message reloading is not enabled, please provide a reload callback to VercelRSCAssistantProvider."
-      );
-    await this.withRunning(this.adapter.reload(parentId));
-  }
-  cancelRun() {
-    throw new Error("VercelRSCRuntime does not support cancelling runs.");
-  }
-  subscribe(callback) {
-    this._subscriptions.add(callback);
-    return () => this._subscriptions.delete(callback);
-  }
-  onAdapterUpdated() {
-    if (this.useAdapter.getState().adapter !== this.adapter) {
-      this.useAdapter.setState({ adapter: this.adapter });
-    }
-  }
-  updateData = (messages) => {
-    this.messages = messages;
-    for (const callback of this._subscriptions) callback();
-  };
-  unstable_synchronizer = () => {
-    const { adapter } = this.useAdapter();
-    useVercelRSCSync(adapter, this.updateData);
-    return null;
+var useVercelRSCRuntime = (adapter) => {
+  const eAdapter = {
+    messages: adapter.messages,
+    onNew: adapter.append,
+    onEdit: adapter.edit,
+    onReload: adapter.reload,
+    convertMessage: (m) => vercelToThreadMessage(
+      adapter.convertMessage ?? ((m2) => m2),
+      m
+    )
   };
-  addToolResult() {
-    throw new Error("VercelRSCRuntime does not support adding tool results");
-  }
-};
-
-// src/rsc/VercelRSCRuntime.tsx
-var { BaseAssistantRuntime } = import_react3.INTERNAL;
-var VercelRSCRuntime = class extends BaseAssistantRuntime {
-  _proxyConfigProvider = new ProxyConfigProvider();
-  constructor(adapter) {
-    super(new VercelRSCThreadRuntime(adapter));
-  }
-  set adapter(adapter) {
-    this.thread.adapter = adapter;
-  }
-  onAdapterUpdated() {
-    return this.thread.onAdapterUpdated();
-  }
-  getModelConfig() {
-    return this._proxyConfigProvider.getModelConfig();
-  }
-  registerModelConfigProvider(provider) {
-    return this._proxyConfigProvider.registerModelConfigProvider(provider);
-  }
-  switchToThread() {
-    throw new Error("VercelRSCRuntime does not support switching threads");
-  }
+  const runtime = (0, import_react.useExternalStoreRuntime)(eAdapter);
+  return runtime;
 };
 
-// src/rsc/useVercelRSCRuntime.tsx
-var useVercelRSCRuntime = (adapter) => {
-  const [runtime] = (0, import_react4.useState)(() => new VercelRSCRuntime(adapter));
-  (0, import_react4.useInsertionEffect)(() => {
-    runtime.adapter = adapter;
-  });
-  (0, import_react4.useEffect)(() => {
-    runtime.onAdapterUpdated();
-  });
-  return runtime;
+// src/rsc/getVercelRSCMessage.tsx
+var import_react2 = require("@assistant-ui/react");
+var symbolInnerRSCMessage = Symbol("innerVercelRSCMessage");
+var getVercelRSCMessage = (message) => {
+  return (0, import_react2.getExternalStoreMessage)(message);
 };
 
 // src/ui/use-chat/useVercelUseChatRuntime.tsx
-var import_react10 = require("react");
+var import_react8 = require("react");
 
 // src/ui/use-chat/VercelUseChatRuntime.tsx
-var import_react9 = require("@assistant-ui/react");
+var import_react7 = require("@assistant-ui/react");
 
 // src/ui/use-chat/VercelUseChatThreadRuntime.tsx
-var import_react8 = require("@assistant-ui/react");
-var import_zustand2 = require("zustand");
+var import_react6 = require("@assistant-ui/react");
+var import_zustand = require("zustand");
 
 // src/ui/getVercelAIMessage.tsx
 var symbolInnerAIMessage = Symbol("innerVercelAIUIMessage");
@@ -237,11 +93,11 @@ var sliceMessagesUntil = (messages, messageId) => {
 };
 
 // src/ui/utils/useVercelAIComposerSync.tsx
-var import_react5 = require("@assistant-ui/react");
-var import_react6 = require("react");
+var import_react3 = require("@assistant-ui/react");
+var import_react4 = require("react");
 var useVercelAIComposerSync = (vercel) => {
-  const { useComposer } = (0, import_react5.useThreadContext)();
-  (0, import_react6.useEffect)(() => {
+  const { useComposer } = (0, import_react3.useThreadContext)();
+  (0, import_react4.useEffect)(() => {
     useComposer.setState({
       value: vercel.input,
       setValue: vercel.setInput
@@ -250,7 +106,23 @@ var useVercelAIComposerSync = (vercel) => {
 };
 
 // src/ui/utils/useVercelAIThreadSync.tsx
-var import_react7 = require("react");
+var import_react5 = require("react");
+
+// src/utils/ThreadMessageConverter.ts
+var ThreadMessageConverter = class {
+  cache = /* @__PURE__ */ new WeakMap();
+  convertMessages(messages, converter, keyMapper = (key) => key) {
+    return messages.map((m) => {
+      const key = keyMapper(m);
+      const cached = this.cache.get(key);
+      const newMessage = converter(m, cached);
+      this.cache.set(key, newMessage);
+      return newMessage;
+    });
+  }
+};
+
+// src/ui/utils/useVercelAIThreadSync.tsx
 var getIsRunning = (vercel) => {
   if ("isLoading" in vercel) return vercel.isLoading;
   return vercel.status === "in_progress";
@@ -352,12 +224,15 @@ var shallowArrayEqual = (a, b) => {
 };
 var useVercelAIThreadSync = (vercel, updateData) => {
   const isRunning = getIsRunning(vercel);
-  const converter = (0, import_react7.useMemo)(() => new ThreadMessageConverter(), []);
-  (0, import_react7.useEffect)(() => {
+  const converter = (0, import_react5.useMemo)(() => new ThreadMessageConverter(), []);
+  (0, import_react5.useEffect)(() => {
     const lastMessageId = vercel.messages.at(-1)?.id;
     const convertCallback = (messages2, cache) => {
-      const status = {
-        type: lastMessageId === messages2[0].id && isRunning ? "in_progress" : "done"
+      const status = lastMessageId === messages2[0].id && isRunning ? {
+        type: "running"
+      } : {
+        type: "complete",
+        reason: "unknown"
       };
       if (cache && shallowArrayEqual(cache.content, messages2) && (cache.role !== "assistant" || cache.status.type === status.type))
         return cache;
@@ -373,11 +248,11 @@ var useVercelAIThreadSync = (vercel, updateData) => {
 };
 
 // src/ui/use-chat/VercelUseChatThreadRuntime.tsx
-var { MessageRepository } = import_react8.INTERNAL;
+var { MessageRepository } = import_react6.INTERNAL;
 var hasUpcomingMessage = (isRunning, messages) => {
   return isRunning && messages[messages.length - 1]?.role !== "assistant";
 };
-var CAPABILITIES2 = Object.freeze({
+var CAPABILITIES = Object.freeze({
   edit: true,
   reload: true,
   cancel: true,
@@ -386,7 +261,7 @@ var CAPABILITIES2 = Object.freeze({
 var VercelUseChatThreadRuntime = class {
   constructor(vercel) {
     this.vercel = vercel;
-    this.useVercel = (0, import_zustand2.create)(() => ({
+    this.useVercel = (0, import_zustand.create)(() => ({
       vercel
     }));
   }
@@ -394,7 +269,7 @@ var VercelUseChatThreadRuntime = class {
   repository = new MessageRepository();
   assistantOptimisticId = null;
   useVercel;
-  capabilities = CAPABILITIES2;
+  capabilities = CAPABILITIES;
   messages = [];
   isRunning = false;
   getBranches(messageId) {
@@ -474,7 +349,7 @@ var VercelUseChatThreadRuntime = class {
         vm.at(-1)?.id ?? null,
         {
           role: "assistant",
-          content: [{ type: "text", text: "" }]
+          content: []
         }
       );
     }
@@ -497,9 +372,9 @@ var VercelUseChatThreadRuntime = class {
 };
 
 // src/ui/use-chat/VercelUseChatRuntime.tsx
-var { ProxyConfigProvider: ProxyConfigProvider2, BaseAssistantRuntime: BaseAssistantRuntime2 } = import_react9.INTERNAL;
-var VercelUseChatRuntime = class extends BaseAssistantRuntime2 {
-  _proxyConfigProvider = new ProxyConfigProvider2();
+var { ProxyConfigProvider, BaseAssistantRuntime } = import_react7.INTERNAL;
+var VercelUseChatRuntime = class extends BaseAssistantRuntime {
+  _proxyConfigProvider = new ProxyConfigProvider();
   constructor(vercel) {
     super(new VercelUseChatThreadRuntime(vercel));
   }
@@ -531,26 +406,26 @@ var VercelUseChatRuntime = class extends BaseAssistantRuntime2 {
 
 // src/ui/use-chat/useVercelUseChatRuntime.tsx
 var useVercelUseChatRuntime = (chatHelpers) => {
-  const [runtime] = (0, import_react10.useState)(() => new VercelUseChatRuntime(chatHelpers));
-  (0, import_react10.useInsertionEffect)(() => {
+  const [runtime] = (0, import_react8.useState)(() => new VercelUseChatRuntime(chatHelpers));
+  (0, import_react8.useInsertionEffect)(() => {
     runtime.vercel = chatHelpers;
   });
-  (0, import_react10.useEffect)(() => {
+  (0, import_react8.useEffect)(() => {
     runtime.onVercelUpdated();
   });
   return runtime;
 };
 
 // src/ui/use-assistant/useVercelUseAssistantRuntime.tsx
-var import_react12 = require("react");
+var import_react10 = require("react");
 
 // src/ui/use-assistant/VercelUseAssistantRuntime.tsx
-var import_react11 = require("@assistant-ui/react");
+var import_react9 = require("@assistant-ui/react");
 
 // src/ui/use-assistant/VercelUseAssistantThreadRuntime.tsx
-var import_zustand3 = require("zustand");
-var EMPTY_BRANCHES2 = Object.freeze([]);
-var CAPABILITIES3 = Object.freeze({
+var import_zustand2 = require("zustand");
+var EMPTY_BRANCHES = Object.freeze([]);
+var CAPABILITIES2 = Object.freeze({
   edit: false,
   reload: false,
   cancel: false,
@@ -559,17 +434,17 @@ var CAPABILITIES3 = Object.freeze({
 var VercelUseAssistantThreadRuntime = class {
   constructor(vercel) {
     this.vercel = vercel;
-    this.useVercel = (0, import_zustand3.create)(() => ({
+    this.useVercel = (0, import_zustand2.create)(() => ({
       vercel
     }));
   }
   _subscriptions = /* @__PURE__ */ new Set();
-  capabilities = CAPABILITIES3;
+  capabilities = CAPABILITIES2;
   useVercel;
   messages = [];
   isRunning = false;
   getBranches() {
-    return EMPTY_BRANCHES2;
+    return EMPTY_BRANCHES;
   }
   switchToBranch() {
     throw new Error(
@@ -616,9 +491,9 @@ var VercelUseAssistantThreadRuntime = class {
       vm.push({
         id: "__optimistic__result",
         createdAt: /* @__PURE__ */ new Date(),
-        status: { type: "in_progress" },
+        status: { type: "running" },
         role: "assistant",
-        content: [{ type: "text", text: "" }]
+        content: []
       });
     }
     this.messages = vm;
@@ -639,12 +514,12 @@ var VercelUseAssistantThreadRuntime = class {
 };
 
 // src/ui/use-assistant/VercelUseAssistantRuntime.tsx
-var { ProxyConfigProvider: ProxyConfigProvider3, BaseAssistantRuntime: BaseAssistantRuntime3 } = import_react11.INTERNAL;
+var { ProxyConfigProvider: ProxyConfigProvider2, BaseAssistantRuntime: BaseAssistantRuntime2 } = import_react9.INTERNAL;
 var hasUpcomingMessage2 = (isRunning, messages) => {
   return isRunning && messages[messages.length - 1]?.role !== "assistant";
 };
-var VercelUseAssistantRuntime = class extends BaseAssistantRuntime3 {
-  _proxyConfigProvider = new ProxyConfigProvider3();
+var VercelUseAssistantRuntime = class extends BaseAssistantRuntime2 {
+  _proxyConfigProvider = new ProxyConfigProvider2();
   constructor(vercel) {
     super(new VercelUseAssistantThreadRuntime(vercel));
   }
@@ -674,13 +549,13 @@ var VercelUseAssistantRuntime = class extends BaseAssistantRuntime3 {
 
 // src/ui/use-assistant/useVercelUseAssistantRuntime.tsx
 var useVercelUseAssistantRuntime = (assistantHelpers) => {
-  const [runtime] = (0, import_react12.useState)(
+  const [runtime] = (0, import_react10.useState)(
     () => new VercelUseAssistantRuntime(assistantHelpers)
   );
-  (0, import_react12.useInsertionEffect)(() => {
+  (0, import_react10.useInsertionEffect)(() => {
     runtime.vercel = assistantHelpers;
   });
-  (0, import_react12.useEffect)(() => {
+  (0, import_react10.useEffect)(() => {
     runtime.onVercelUpdated();
   });
   return runtime;