@assistant-ui/react-ai-sdk 1.1.2 → 1.1.4

package/dist/ui/use-chat/useAISDKRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAISDKRuntime.d.ts","sourceRoot":"","sources":["../../../src/ui/use-chat/useAISDKRuntime.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAEL,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,EAIjB,MAAM,qBAAqB,CAAC;AAa7B,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EACL,CAAC,WAAW,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,GAAG;QAC/C,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;KAC5C,CAAC,GACF,SAAS,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,SAAS,SAAS,GAAG,SAAS,EACtE,aAAa,UAAU,CAAC,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC,EACnD,eAAc,mBAAwB,qBA2FvC,CAAC"}
+{"version":3,"file":"useAISDKRuntime.d.ts","sourceRoot":"","sources":["../../../src/ui/use-chat/useAISDKRuntime.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAEL,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,EAMjB,MAAM,qBAAqB,CAAC;AAY7B,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EACL,CAAC,WAAW,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,GAAG;QAC/C,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;KAC5C,CAAC,GACF,SAAS,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,SAAS,SAAS,GAAG,SAAS,EACtE,aAAa,UAAU,CAAC,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC,EACnD,eAAc,mBAAwB,qBA0HvC,CAAC"}

package/dist/ui/use-chat/useAISDKRuntime.js

@@ -1,9 +1,11 @@
 "use client";
 
 // src/ui/use-chat/useAISDKRuntime.tsx
+import { useState, useMemo } from "react";
 import {
   useExternalStoreRuntime,
-  useRuntimeAdapters
+  useRuntimeAdapters,
+  INTERNAL
 } from "@assistant-ui/react";
 import { sliceMessagesUntil } from "../utils/sliceMessagesUntil.js";
 import { toCreateMessage } from "../utils/toCreateMessage.js";
@@ -14,23 +16,43 @@ import {
   aiSDKV5FormatAdapter
 } from "../adapters/aiSDKFormatAdapter.js";
 import { useExternalHistory } from "./useExternalHistory.js";
-import { useMemo } from "react";
 var useAISDKRuntime = (chatHelpers, { adapters } = {}) => {
   const contextAdapters = useRuntimeAdapters();
+  const isRunning = chatHelpers.status === "submitted" || chatHelpers.status == "streaming";
+  const [toolStatuses, setToolStatuses] = useState({});
   const messages = AISDKMessageConverter.useThreadMessages({
-    isRunning: chatHelpers.status === "submitted" || chatHelpers.status == "streaming",
-    messages: chatHelpers.messages
+    isRunning,
+    messages: chatHelpers.messages,
+    metadata: useMemo(() => ({ toolStatuses }), [toolStatuses])
+  });
+  const runtimeRef = useMemo(
+    () => ({
+      get current() {
+        return runtime;
+      }
+    }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+  const toolInvocations = INTERNAL.useToolInvocations({
+    state: {
+      messages,
+      isRunning
+    },
+    getTools: () => runtimeRef.current.thread.getModelContext().tools,
+    onResult: (command) => {
+      if (command.type === "add-tool-result") {
+        chatHelpers.addToolResult({
+          tool: command.toolName,
+          toolCallId: command.toolCallId,
+          output: command.result
+        });
+      }
+    },
+    setToolStatuses
   });
   const isLoading = useExternalHistory(
-    useMemo(
-      () => ({
-        get current() {
-          return runtime;
-        }
-      }),
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      []
-    ),
+    runtimeRef,
     adapters?.history ?? contextAdapters?.history,
     AISDKMessageConverter.toThreadMessages,
     aiSDKV5FormatAdapter,
@@ -39,7 +61,7 @@ var useAISDKRuntime = (chatHelpers, { adapters } = {}) => {
     }
   );
   const runtime = useExternalStoreRuntime({
-    isRunning: chatHelpers.status === "submitted" || chatHelpers.status === "streaming",
+    isRunning,
     messages,
     setMessages: (messages2) => chatHelpers.setMessages(
       messages2.map(getVercelAIMessages).filter(Boolean).flat()
@@ -47,7 +69,10 @@ var useAISDKRuntime = (chatHelpers, { adapters } = {}) => {
     onImport: (messages2) => chatHelpers.setMessages(
       messages2.map(getVercelAIMessages).filter(Boolean).flat()
     ),
-    onCancel: async () => chatHelpers.stop(),
+    onCancel: async () => {
+      chatHelpers.stop();
+      toolInvocations.abort();
+    },
     onNew: async (message) => {
       const createMessage = toCreateMessage(message);
       await chatHelpers.sendMessage(createMessage, {
@@ -77,6 +102,7 @@ var useAISDKRuntime = (chatHelpers, { adapters } = {}) => {
         output: result
       });
     },
+    onResumeToolCall: (options) => toolInvocations.resume(options.toolCallId, options.payload),
     adapters: {
       attachments: vercelAttachmentAdapter,
       ...contextAdapters,

package/dist/ui/use-chat/useAISDKRuntime.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/ui/use-chat/useAISDKRuntime.tsx"],"sourcesContent":["\"use client\";\n\nimport type { UIMessage, useChat } from \"@ai-sdk/react\";\nimport {\n  useExternalStoreRuntime,\n  ExternalStoreAdapter,\n  ThreadHistoryAdapter,\n  AssistantRuntime,\n  ThreadMessage,\n  MessageFormatAdapter,\n  useRuntimeAdapters,\n} from \"@assistant-ui/react\";\nimport { sliceMessagesUntil } from \"../utils/sliceMessagesUntil\";\nimport { toCreateMessage } from \"../utils/toCreateMessage\";\nimport { vercelAttachmentAdapter } from \"../utils/vercelAttachmentAdapter\";\nimport { getVercelAIMessages } from \"../getVercelAIMessages\";\nimport { AISDKMessageConverter } from \"../utils/convertMessage\";\nimport {\n  AISDKStorageFormat,\n  aiSDKV5FormatAdapter,\n} from \"../adapters/aiSDKFormatAdapter\";\nimport { useExternalHistory } from \"./useExternalHistory\";\nimport { useMemo } from \"react\";\n\nexport type AISDKRuntimeAdapter = {\n  adapters?:\n    | (NonNullable<ExternalStoreAdapter[\"adapters\"]> & {\n        history?: ThreadHistoryAdapter | undefined;\n      })\n    | undefined;\n};\n\nexport const useAISDKRuntime = <UI_MESSAGE extends UIMessage = UIMessage>(\n  chatHelpers: ReturnType<typeof useChat<UI_MESSAGE>>,\n  { adapters }: AISDKRuntimeAdapter = {},\n) => {\n  const contextAdapters = useRuntimeAdapters();\n  const messages = AISDKMessageConverter.useThreadMessages({\n    isRunning:\n      chatHelpers.status === \"submitted\" || chatHelpers.status == \"streaming\",\n    messages: chatHelpers.messages,\n  });\n\n  const isLoading = useExternalHistory(\n    useMemo(\n      () => ({\n        get current(): AssistantRuntime {\n          return runtime;\n        },\n      }),\n      // eslint-disable-next-line react-hooks/exhaustive-deps\n      [],\n    ),\n    adapters?.history ?? contextAdapters?.history,\n    AISDKMessageConverter.toThreadMessages as (\n      messages: UI_MESSAGE[],\n    ) => ThreadMessage[],\n    aiSDKV5FormatAdapter as MessageFormatAdapter<\n      UI_MESSAGE,\n      AISDKStorageFormat\n    >,\n    (messages) => {\n      chatHelpers.setMessages(messages);\n    },\n  );\n\n  const runtime = useExternalStoreRuntime({\n    isRunning:\n      chatHelpers.status === \"submitted\" || chatHelpers.status === \"streaming\",\n    messages,\n    setMessages: (messages) =>\n      chatHelpers.setMessages(\n        messages\n          .map(getVercelAIMessages<UI_MESSAGE>)\n          .filter(Boolean)\n          .flat(),\n      ),\n    onImport: (messages) =>\n      chatHelpers.setMessages(\n        messages\n          .map(getVercelAIMessages<UI_MESSAGE>)\n          .filter(Boolean)\n          .flat(),\n      ),\n    onCancel: async () => chatHelpers.stop(),\n    onNew: async (message) => {\n      const createMessage = toCreateMessage<UI_MESSAGE>(message);\n      await chatHelpers.sendMessage(createMessage, {\n        metadata: message.runConfig,\n      });\n    },\n    onEdit: async (message) => {\n      const newMessages = sliceMessagesUntil(\n        chatHelpers.messages,\n        message.parentId,\n      );\n      chatHelpers.setMessages(newMessages);\n\n      const createMessage = toCreateMessage<UI_MESSAGE>(message);\n      await chatHelpers.sendMessage(createMessage, {\n        metadata: message.runConfig,\n      });\n    },\n    onReload: async (parentId: string | null, config) => {\n      const newMessages = sliceMessagesUntil(chatHelpers.messages, parentId);\n      chatHelpers.setMessages(newMessages);\n\n      await chatHelpers.regenerate({ metadata: config.runConfig });\n    },\n    onAddToolResult: ({ toolCallId, result }) => {\n      chatHelpers.addToolResult({\n        tool: toolCallId,\n        toolCallId,\n        output: result,\n      });\n    },\n    adapters: {\n      attachments: vercelAttachmentAdapter,\n      ...contextAdapters,\n      ...adapters,\n    },\n    isLoading,\n  });\n\n  return runtime;\n};\n"],"mappings":";;;AAGA;AAAA,EACE;AAAA,EAMA;AAAA,OACK;AACP,SAAS,0BAA0B;AACnC,SAAS,uBAAuB;AAChC,SAAS,+BAA+B;AACxC,SAAS,2BAA2B;AACpC,SAAS,6BAA6B;AACtC;AAAA,EAEE;AAAA,OACK;AACP,SAAS,0BAA0B;AACnC,SAAS,eAAe;AAUjB,IAAM,kBAAkB,CAC7B,aACA,EAAE,SAAS,IAAyB,CAAC,MAClC;AACH,QAAM,kBAAkB,mBAAmB;AAC3C,QAAM,WAAW,sBAAsB,kBAAkB;AAAA,IACvD,WACE,YAAY,WAAW,eAAe,YAAY,UAAU;AAAA,IAC9D,UAAU,YAAY;AAAA,EACxB,CAAC;AAED,QAAM,YAAY;AAAA,IAChB;AAAA,MACE,OAAO;AAAA,QACL,IAAI,UAA4B;AAC9B,iBAAO;AAAA,QACT;AAAA,MACF;AAAA;AAAA,MAEA,CAAC;AAAA,IACH;AAAA,IACA,UAAU,WAAW,iBAAiB;AAAA,IACtC,sBAAsB;AAAA,IAGtB;AAAA,IAIA,CAACA,cAAa;AACZ,kBAAY,YAAYA,SAAQ;AAAA,IAClC;AAAA,EACF;AAEA,QAAM,UAAU,wBAAwB;AAAA,IACtC,WACE,YAAY,WAAW,eAAe,YAAY,WAAW;AAAA,IAC/D;AAAA,IACA,aAAa,CAACA,cACZ,YAAY;AAAA,MACVA,UACG,IAAI,mBAA+B,EACnC,OAAO,OAAO,EACd,KAAK;AAAA,IACV;AAAA,IACF,UAAU,CAACA,cACT,YAAY;AAAA,MACVA,UACG,IAAI,mBAA+B,EACnC,OAAO,OAAO,EACd,KAAK;AAAA,IACV;AAAA,IACF,UAAU,YAAY,YAAY,KAAK;AAAA,IACvC,OAAO,OAAO,YAAY;AACxB,YAAM,gBAAgB,gBAA4B,OAAO;AACzD,YAAM,YAAY,YAAY,eAAe;AAAA,QAC3C,UAAU,QAAQ;AAAA,MACpB,CAAC;AAAA,IACH;AAAA,IACA,QAAQ,OAAO,YAAY;AACzB,YAAM,cAAc;AAAA,QAClB,YAAY;AAAA,QACZ,QAAQ;AAAA,MACV;AACA,kBAAY,YAAY,WAAW;AAEnC,YAAM,gBAAgB,gBAA4B,OAAO;AACzD,YAAM,YAAY,YAAY,eAAe;AAAA,QAC3C,UAAU,QAAQ;AAAA,MACpB,CAAC;AAAA,IACH;AAAA,IACA,UAAU,OAAO,UAAyB,WAAW;AACnD,YAAM,cAAc,mBAAmB,YAAY,UAAU,QAAQ;AACrE,kBAAY,YAAY,WAAW;AAEnC,YAAM,YAAY,WAAW,EAAE,UAAU,OAAO,UAAU,CAAC;AAAA,IAC7D;AAAA,IACA,iBAAiB,CAAC,EAAE,YAAY,OAAO,MAAM;AAC3C,kBAAY,cAAc;AAAA,QACxB,MAAM;AAAA,QACN;AAAA,QACA,QAAQ;AAAA,MACV,CAAC;AAAA,IACH;AAAA,IACA,UAAU;AAAA,MACR,aAAa;AAAA,MACb,GAAG;AAAA,MACH,GAAG;AAAA,IACL;AAAA,IACA;AAAA,EACF,CAAC;AAED,SAAO;AACT;","names":["messages"]}
+{"version":3,"sources":["../../../src/ui/use-chat/useAISDKRuntime.tsx"],"sourcesContent":["\"use client\";\n\nimport { useState, useMemo } from \"react\";\nimport type { UIMessage, useChat } from \"@ai-sdk/react\";\nimport {\n  useExternalStoreRuntime,\n  ExternalStoreAdapter,\n  ThreadHistoryAdapter,\n  AssistantRuntime,\n  ThreadMessage,\n  MessageFormatAdapter,\n  useRuntimeAdapters,\n  INTERNAL,\n  type ToolExecutionStatus,\n} from \"@assistant-ui/react\";\nimport { sliceMessagesUntil } from \"../utils/sliceMessagesUntil\";\nimport { toCreateMessage } from \"../utils/toCreateMessage\";\nimport { vercelAttachmentAdapter } from \"../utils/vercelAttachmentAdapter\";\nimport { getVercelAIMessages } from \"../getVercelAIMessages\";\nimport { AISDKMessageConverter } from \"../utils/convertMessage\";\nimport {\n  AISDKStorageFormat,\n  aiSDKV5FormatAdapter,\n} from \"../adapters/aiSDKFormatAdapter\";\nimport { useExternalHistory } from \"./useExternalHistory\";\n\nexport type AISDKRuntimeAdapter = {\n  adapters?:\n    | (NonNullable<ExternalStoreAdapter[\"adapters\"]> & {\n        history?: ThreadHistoryAdapter | undefined;\n      })\n    | undefined;\n};\n\nexport const useAISDKRuntime = <UI_MESSAGE extends UIMessage = UIMessage>(\n  chatHelpers: ReturnType<typeof useChat<UI_MESSAGE>>,\n  { adapters }: AISDKRuntimeAdapter = {},\n) => {\n  const contextAdapters = useRuntimeAdapters();\n  const isRunning =\n    chatHelpers.status === \"submitted\" || chatHelpers.status == \"streaming\";\n\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n\n  const messages = AISDKMessageConverter.useThreadMessages({\n    isRunning,\n    messages: chatHelpers.messages,\n    metadata: useMemo(() => ({ toolStatuses }), [toolStatuses]),\n  });\n\n  const runtimeRef = useMemo(\n    () => ({\n      get current(): AssistantRuntime {\n        return runtime;\n      },\n    }),\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    [],\n  );\n\n  const toolInvocations = INTERNAL.useToolInvocations({\n    state: {\n      messages,\n      isRunning,\n    },\n    getTools: () => runtimeRef.current.thread.getModelContext().tools,\n    onResult: (command: any) => {\n      if (command.type === \"add-tool-result\") {\n        chatHelpers.addToolResult({\n          tool: command.toolName,\n          toolCallId: command.toolCallId,\n          output: command.result,\n        });\n      }\n    },\n    setToolStatuses,\n  });\n\n  const isLoading = useExternalHistory(\n    runtimeRef,\n    adapters?.history ?? contextAdapters?.history,\n    AISDKMessageConverter.toThreadMessages as (\n      messages: UI_MESSAGE[],\n    ) => ThreadMessage[],\n    aiSDKV5FormatAdapter as MessageFormatAdapter<\n      UI_MESSAGE,\n      AISDKStorageFormat\n    >,\n    (messages) => {\n      chatHelpers.setMessages(messages);\n    },\n  );\n\n  const runtime = useExternalStoreRuntime({\n    isRunning,\n    messages,\n    setMessages: (messages) =>\n      chatHelpers.setMessages(\n        messages\n          .map(getVercelAIMessages<UI_MESSAGE>)\n          .filter(Boolean)\n          .flat(),\n      ),\n    onImport: (messages) =>\n      chatHelpers.setMessages(\n        messages\n          .map(getVercelAIMessages<UI_MESSAGE>)\n          .filter(Boolean)\n          .flat(),\n      ),\n    onCancel: async () => {\n      chatHelpers.stop();\n      toolInvocations.abort();\n    },\n    onNew: async (message) => {\n      const createMessage = toCreateMessage<UI_MESSAGE>(message);\n      await chatHelpers.sendMessage(createMessage, {\n        metadata: message.runConfig,\n      });\n    },\n    onEdit: async (message) => {\n      const newMessages = sliceMessagesUntil(\n        chatHelpers.messages,\n        message.parentId,\n      );\n      chatHelpers.setMessages(newMessages);\n\n      const createMessage = toCreateMessage<UI_MESSAGE>(message);\n      await chatHelpers.sendMessage(createMessage, {\n        metadata: message.runConfig,\n      });\n    },\n    onReload: async (parentId: string | null, config) => {\n      const newMessages = sliceMessagesUntil(chatHelpers.messages, parentId);\n      chatHelpers.setMessages(newMessages);\n\n      await chatHelpers.regenerate({ metadata: config.runConfig });\n    },\n    onAddToolResult: ({ toolCallId, result }) => {\n      chatHelpers.addToolResult({\n        tool: toolCallId,\n        toolCallId,\n        output: result,\n      });\n    },\n    onResumeToolCall: (options) =>\n      toolInvocations.resume(options.toolCallId, options.payload),\n    adapters: {\n      attachments: vercelAttachmentAdapter,\n      ...contextAdapters,\n      ...adapters,\n    },\n    isLoading,\n  });\n\n  return runtime;\n};\n"],"mappings":"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","names":["messages"]}

package/dist/ui/use-chat/useChatRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useChatRuntime.d.ts","sourceRoot":"","sources":["../../../src/ui/use-chat/useChatRuntime.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAW,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,gBAAgB,EAGjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAmB,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAG9B,MAAM,MAAM,qBAAqB,CAAC,UAAU,SAAS,SAAS,GAAG,SAAS,IACxE,QAAQ,CAAC,UAAU,CAAC,GAAG;IACrB,KAAK,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;CACxD,CAAC;AAEJ,eAAO,MAAM,oBAAoB,GAAI,UAAU,SAAS,SAAS,GAAG,SAAS,EAC3E,UAAU,qBAAqB,CAAC,UAAU,CAAC,KAC1C,gBAgDF,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,UAAU,SAAS,SAAS,GAAG,SAAS,EAAE,wBAGtE,qBAAqB,CAAC,UAAU,CAAM,KAAG,gBAQ3C,CAAC"}
+{"version":3,"file":"useChatRuntime.d.ts","sourceRoot":"","sources":["../../../src/ui/use-chat/useChatRuntime.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAW,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,gBAAgB,EAGjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAmB,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAG9B,MAAM,MAAM,qBAAqB,CAAC,UAAU,SAAS,SAAS,GAAG,SAAS,IACxE,QAAQ,CAAC,UAAU,CAAC,GAAG;IACrB,KAAK,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;CACxD,CAAC;AAEJ,eAAO,MAAM,oBAAoB,GAAI,UAAU,SAAS,SAAS,GAAG,SAAS,EAC3E,UAAU,qBAAqB,CAAC,UAAU,CAAC,KAC1C,gBAsBF,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,UAAU,SAAS,SAAS,GAAG,SAAS,EAAE,wBAGtE,qBAAqB,CAAC,UAAU,CAAM,KAAG,gBAQ3C,CAAC"}

package/dist/ui/use-chat/useChatRuntime.js

@@ -17,34 +17,7 @@ var useChatThreadRuntime = (options) => {
   const transport = transportOptions ?? new AssistantChatTransport();
   const chat = useChat({
     ...chatOptions,
-    transport,
-    onToolCall: async ({ toolCall }) => {
-      await chatOptions.onToolCall?.({ toolCall });
-      const tools = runtime.thread.getModelContext().tools;
-      const tool = tools?.[toolCall.toolName];
-      if (tool) {
-        try {
-          const result = await tool.execute?.(toolCall.input, {
-            toolCallId: toolCall.toolCallId,
-            abortSignal: new AbortController().signal
-            // dummy signal for now
-          });
-          chat.addToolResult({
-            tool: toolCall.toolName,
-            toolCallId: toolCall.toolCallId,
-            output: result
-          });
-        } catch (error) {
-          chat.addToolResult({
-            tool: toolCall.toolName,
-            toolCallId: toolCall.toolCallId,
-            output: {
-              error: error instanceof Error ? error.message : String(error)
-            }
-          });
-        }
-      }
-    }
+    transport
   });
   const runtime = useAISDKRuntime(chat, {
     adapters

package/dist/ui/use-chat/useChatRuntime.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/ui/use-chat/useChatRuntime.tsx"],"sourcesContent":["\"use client\";\n\nimport { useChat, type UIMessage } from \"@ai-sdk/react\";\nimport type { AssistantCloud } from \"assistant-cloud\";\nimport {\n  AssistantRuntime,\n  unstable_useCloudThreadListAdapter,\n  unstable_useRemoteThreadListRuntime,\n} from \"@assistant-ui/react\";\nimport { useAISDKRuntime, type AISDKRuntimeAdapter } from \"./useAISDKRuntime\";\nimport { ChatInit } from \"ai\";\nimport { AssistantChatTransport } from \"./AssistantChatTransport\";\n\nexport type UseChatRuntimeOptions<UI_MESSAGE extends UIMessage = UIMessage> =\n  ChatInit<UI_MESSAGE> & {\n    cloud?: AssistantCloud | undefined;\n    adapters?: AISDKRuntimeAdapter[\"adapters\"] | undefined;\n  };\n\nexport const useChatThreadRuntime = <UI_MESSAGE extends UIMessage = UIMessage>(\n  options?: UseChatRuntimeOptions<UI_MESSAGE>,\n): AssistantRuntime => {\n  const {\n    adapters,\n    transport: transportOptions,\n    ...chatOptions\n  } = options ?? {};\n  const transport = transportOptions ?? new AssistantChatTransport();\n\n  const chat = useChat({\n    ...chatOptions,\n    transport,\n    onToolCall: async ({ toolCall }) => {\n      await chatOptions.onToolCall?.({ toolCall });\n\n      const tools = runtime.thread.getModelContext().tools;\n      const tool = tools?.[toolCall.toolName];\n      if (tool) {\n        try {\n          const result = await tool.execute?.(toolCall.input, {\n            toolCallId: toolCall.toolCallId,\n            abortSignal: new AbortController().signal, // dummy signal for now\n          });\n          chat.addToolResult({\n            tool: toolCall.toolName,\n            toolCallId: toolCall.toolCallId,\n            output: result,\n          });\n        } catch (error) {\n          chat.addToolResult({\n            tool: toolCall.toolName,\n            toolCallId: toolCall.toolCallId,\n            output: {\n              error: error instanceof Error ? error.message : String(error),\n            },\n          });\n        }\n      }\n    },\n  });\n\n  const runtime = useAISDKRuntime(chat as any, {\n    adapters,\n  });\n  if (transport instanceof AssistantChatTransport) {\n    transport.setRuntime(runtime);\n  }\n\n  return runtime;\n};\n\nexport const useChatRuntime = <UI_MESSAGE extends UIMessage = UIMessage>({\n  cloud,\n  ...options\n}: UseChatRuntimeOptions<UI_MESSAGE> = {}): AssistantRuntime => {\n  const cloudAdapter = unstable_useCloudThreadListAdapter({ cloud });\n  return unstable_useRemoteThreadListRuntime({\n    runtimeHook: function RuntimeHook() {\n      return useChatThreadRuntime(options);\n    },\n    adapter: cloudAdapter,\n  });\n};\n"],"mappings":";;;AAEA,SAAS,eAA+B;AAExC;AAAA,EAEE;AAAA,EACA;AAAA,OACK;AACP,SAAS,uBAAiD;AAE1D,SAAS,8BAA8B;AAQhC,IAAM,uBAAuB,CAClC,YACqB;AACrB,QAAM;AAAA,IACJ;AAAA,IACA,WAAW;AAAA,IACX,GAAG;AAAA,EACL,IAAI,WAAW,CAAC;AAChB,QAAM,YAAY,oBAAoB,IAAI,uBAAuB;AAEjE,QAAM,OAAO,QAAQ;AAAA,IACnB,GAAG;AAAA,IACH;AAAA,IACA,YAAY,OAAO,EAAE,SAAS,MAAM;AAClC,YAAM,YAAY,aAAa,EAAE,SAAS,CAAC;AAE3C,YAAM,QAAQ,QAAQ,OAAO,gBAAgB,EAAE;AAC/C,YAAM,OAAO,QAAQ,SAAS,QAAQ;AACtC,UAAI,MAAM;AACR,YAAI;AACF,gBAAM,SAAS,MAAM,KAAK,UAAU,SAAS,OAAO;AAAA,YAClD,YAAY,SAAS;AAAA,YACrB,aAAa,IAAI,gBAAgB,EAAE;AAAA;AAAA,UACrC,CAAC;AACD,eAAK,cAAc;AAAA,YACjB,MAAM,SAAS;AAAA,YACf,YAAY,SAAS;AAAA,YACrB,QAAQ;AAAA,UACV,CAAC;AAAA,QACH,SAAS,OAAO;AACd,eAAK,cAAc;AAAA,YACjB,MAAM,SAAS;AAAA,YACf,YAAY,SAAS;AAAA,YACrB,QAAQ;AAAA,cACN,OAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAAA,YAC9D;AAAA,UACF,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAED,QAAM,UAAU,gBAAgB,MAAa;AAAA,IAC3C;AAAA,EACF,CAAC;AACD,MAAI,qBAAqB,wBAAwB;AAC/C,cAAU,WAAW,OAAO;AAAA,EAC9B;AAEA,SAAO;AACT;AAEO,IAAM,iBAAiB,CAA2C;AAAA,EACvE;AAAA,EACA,GAAG;AACL,IAAuC,CAAC,MAAwB;AAC9D,QAAM,eAAe,mCAAmC,EAAE,MAAM,CAAC;AACjE,SAAO,oCAAoC;AAAA,IACzC,aAAa,SAAS,cAAc;AAClC,aAAO,qBAAqB,OAAO;AAAA,IACrC;AAAA,IACA,SAAS;AAAA,EACX,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../src/ui/use-chat/useChatRuntime.tsx"],"sourcesContent":["\"use client\";\n\nimport { useChat, type UIMessage } from \"@ai-sdk/react\";\nimport type { AssistantCloud } from \"assistant-cloud\";\nimport {\n  AssistantRuntime,\n  unstable_useCloudThreadListAdapter,\n  unstable_useRemoteThreadListRuntime,\n} from \"@assistant-ui/react\";\nimport { useAISDKRuntime, type AISDKRuntimeAdapter } from \"./useAISDKRuntime\";\nimport { ChatInit } from \"ai\";\nimport { AssistantChatTransport } from \"./AssistantChatTransport\";\n\nexport type UseChatRuntimeOptions<UI_MESSAGE extends UIMessage = UIMessage> =\n  ChatInit<UI_MESSAGE> & {\n    cloud?: AssistantCloud | undefined;\n    adapters?: AISDKRuntimeAdapter[\"adapters\"] | undefined;\n  };\n\nexport const useChatThreadRuntime = <UI_MESSAGE extends UIMessage = UIMessage>(\n  options?: UseChatRuntimeOptions<UI_MESSAGE>,\n): AssistantRuntime => {\n  const {\n    adapters,\n    transport: transportOptions,\n    ...chatOptions\n  } = options ?? {};\n  const transport = transportOptions ?? new AssistantChatTransport();\n\n  const chat = useChat({\n    ...chatOptions,\n    transport,\n  });\n\n  const runtime = useAISDKRuntime(chat, {\n    adapters,\n  });\n\n  if (transport instanceof AssistantChatTransport) {\n    transport.setRuntime(runtime);\n  }\n\n  return runtime;\n};\n\nexport const useChatRuntime = <UI_MESSAGE extends UIMessage = UIMessage>({\n  cloud,\n  ...options\n}: UseChatRuntimeOptions<UI_MESSAGE> = {}): AssistantRuntime => {\n  const cloudAdapter = unstable_useCloudThreadListAdapter({ cloud });\n  return unstable_useRemoteThreadListRuntime({\n    runtimeHook: function RuntimeHook() {\n      return useChatThreadRuntime(options);\n    },\n    adapter: cloudAdapter,\n  });\n};\n"],"mappings":";;;AAEA,SAAS,eAA+B;AAExC;AAAA,EAEE;AAAA,EACA;AAAA,OACK;AACP,SAAS,uBAAiD;AAE1D,SAAS,8BAA8B;AAQhC,IAAM,uBAAuB,CAClC,YACqB;AACrB,QAAM;AAAA,IACJ;AAAA,IACA,WAAW;AAAA,IACX,GAAG;AAAA,EACL,IAAI,WAAW,CAAC;AAChB,QAAM,YAAY,oBAAoB,IAAI,uBAAuB;AAEjE,QAAM,OAAO,QAAQ;AAAA,IACnB,GAAG;AAAA,IACH;AAAA,EACF,CAAC;AAED,QAAM,UAAU,gBAAgB,MAAM;AAAA,IACpC;AAAA,EACF,CAAC;AAED,MAAI,qBAAqB,wBAAwB;AAC/C,cAAU,WAAW,OAAO;AAAA,EAC9B;AAEA,SAAO;AACT;AAEO,IAAM,iBAAiB,CAA2C;AAAA,EACvE;AAAA,EACA,GAAG;AACL,IAAuC,CAAC,MAAwB;AAC9D,QAAM,eAAe,mCAAmC,EAAE,MAAM,CAAC;AACjE,SAAO,oCAAoC;AAAA,IACzC,aAAa,SAAS,cAAc;AAClC,aAAO,qBAAqB,OAAO;AAAA,IACrC;AAAA,IACA,SAAS;AAAA,EACX,CAAC;AACH;","names":[]}

package/dist/ui/use-chat/useExternalHistory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useExternalHistory.d.ts","sourceRoot":"","sources":["../../../src/ui/use-chat/useExternalHistory.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,aAAa,EACb,oBAAoB,EAEpB,uBAAuB,EACvB,yBAAyB,EAG1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAA+B,SAAS,EAAE,MAAM,OAAO,CAAC;AAI/D,eAAO,MAAM,2BAA2B,GAAI,QAAQ,EAClD,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,aAAa,EAAE,EAC3D,UAAU,uBAAuB,CAAC,QAAQ,CAAC,KAC1C,yBAWF,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,QAAQ,EACzC,YAAY,SAAS,CAAC,gBAAgB,CAAC,EACvC,gBAAgB,oBAAoB,GAAG,SAAS,EAChD,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,aAAa,EAAE,EAC3D,sBAAsB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,EACzD,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,IAAI,YAuF9C,CAAC"}
+{"version":3,"file":"useExternalHistory.d.ts","sourceRoot":"","sources":["../../../src/ui/use-chat/useExternalHistory.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,aAAa,EACb,oBAAoB,EAEpB,uBAAuB,EACvB,yBAAyB,EAG1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAA+B,SAAS,EAAe,MAAM,OAAO,CAAC;AAI5E,eAAO,MAAM,2BAA2B,GAAI,QAAQ,EAClD,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,aAAa,EAAE,EAC3D,UAAU,uBAAuB,CAAC,QAAQ,CAAC,KAC1C,yBAWF,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,QAAQ,EACzC,YAAY,SAAS,CAAC,gBAAgB,CAAC,EACvC,gBAAgB,oBAAoB,GAAG,SAAS,EAChD,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,aAAa,EAAE,EAC3D,sBAAsB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,EACzD,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,IAAI,YAmG9C,CAAC"}

package/dist/ui/use-chat/useExternalHistory.js

@@ -6,7 +6,7 @@ import {
   INTERNAL,
   useAssistantApi
 } from "@assistant-ui/react";
-import { useRef, useEffect, useState } from "react";
+import { useRef, useEffect, useState, useCallback } from "react";
 var { MessageRepository } = INTERNAL;
 var toExportedMessageRepository = (toThreadMessages, messages) => {
   return {
@@ -23,9 +23,13 @@ var toExportedMessageRepository = (toThreadMessages, messages) => {
 var useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storageFormatAdapter, onSetMessages) => {
   const loadedRef = useRef(false);
   const api = useAssistantApi();
+  const optionalThreadListItem = useCallback(
+    () => api.threadListItem.source ? api.threadListItem() : null,
+    [api]
+  );
   const [isLoading, setIsLoading] = useState(
     // we only load history if there is a remote id
-    () => api.threadListItem().getState().remoteId !== void 0
+    () => optionalThreadListItem()?.getState().remoteId !== void 0
   );
   const historyIds = useRef(/* @__PURE__ */ new Set());
   const onSetMessagesRef = useRef(() => onSetMessages);
@@ -59,13 +63,20 @@ var useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storageF
     };
     if (!loadedRef.current) {
       loadedRef.current = true;
-      if (!api.threadListItem().getState().remoteId) {
+      if (!optionalThreadListItem()?.getState().remoteId) {
         setIsLoading(false);
         return;
       }
       loadHistory();
     }
-  }, [api, historyAdapter, storageFormatAdapter, toThreadMessages, runtimeRef]);
+  }, [
+    api,
+    historyAdapter,
+    storageFormatAdapter,
+    toThreadMessages,
+    runtimeRef,
+    optionalThreadListItem
+  ]);
   useEffect(() => {
     return runtimeRef.current.thread.subscribe(async () => {
       const { messages, isRunning } = runtimeRef.current.thread.getState();

package/dist/ui/use-chat/useExternalHistory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/ui/use-chat/useExternalHistory.tsx"],"sourcesContent":["\"use client\";\n\nimport {\n  AssistantRuntime,\n  ThreadHistoryAdapter,\n  ThreadMessage,\n  MessageFormatAdapter,\n  getExternalStoreMessages,\n  MessageFormatRepository,\n  ExportedMessageRepository,\n  INTERNAL,\n  useAssistantApi,\n} from \"@assistant-ui/react\";\nimport { useRef, useEffect, useState, RefObject } from \"react\";\n\nconst { MessageRepository } = INTERNAL;\n\nexport const toExportedMessageRepository = <TMessage,>(\n  toThreadMessages: (messages: TMessage[]) => ThreadMessage[],\n  messages: MessageFormatRepository<TMessage>,\n): ExportedMessageRepository => {\n  return {\n    headId: messages.headId!,\n    messages: messages.messages.map((m) => {\n      const message = toThreadMessages([m.message])[0]!;\n      return {\n        ...m,\n        message,\n      };\n    }),\n  };\n};\n\nexport const useExternalHistory = <TMessage,>(\n  runtimeRef: RefObject<AssistantRuntime>,\n  historyAdapter: ThreadHistoryAdapter | undefined,\n  toThreadMessages: (messages: TMessage[]) => ThreadMessage[],\n  storageFormatAdapter: MessageFormatAdapter<TMessage, any>,\n  onSetMessages: (messages: TMessage[]) => void,\n) => {\n  const loadedRef = useRef(false);\n\n  const api = useAssistantApi();\n  const [isLoading, setIsLoading] = useState(\n    // we only load history if there is a remote id\n    () => api.threadListItem().getState().remoteId !== undefined,\n  );\n\n  const historyIds = useRef(new Set<string>());\n\n  const onSetMessagesRef = useRef<typeof onSetMessages>(() => onSetMessages);\n  useEffect(() => {\n    onSetMessagesRef.current = onSetMessages;\n  });\n\n  // Load messages from history adapter on mount\n  useEffect(() => {\n    if (!historyAdapter || loadedRef.current) return;\n\n    const loadHistory = async () => {\n      setIsLoading(true);\n      try {\n        const repo = await historyAdapter\n          .withFormat?.(storageFormatAdapter)\n          .load();\n        if (repo && repo.messages.length > 0) {\n          const converted = toExportedMessageRepository(toThreadMessages, repo);\n          runtimeRef.current.thread.import(converted);\n\n          const tempRepo = new MessageRepository();\n          tempRepo.import(converted);\n          const messages = tempRepo.getMessages();\n\n          onSetMessagesRef.current(\n            messages.map(getExternalStoreMessages<TMessage>).flat(),\n          );\n\n          historyIds.current = new Set(\n            converted.messages.map((m) => m.message.id),\n          );\n        }\n      } catch (error) {\n        console.error(\"Failed to load message history:\", error);\n      } finally {\n        setIsLoading(false);\n      }\n    };\n\n    if (!loadedRef.current) {\n      loadedRef.current = true;\n      if (!api.threadListItem().getState().remoteId) {\n        setIsLoading(false);\n        return;\n      }\n\n      loadHistory();\n    }\n  }, [api, historyAdapter, storageFormatAdapter, toThreadMessages, runtimeRef]);\n\n  useEffect(() => {\n    return runtimeRef.current.thread.subscribe(async () => {\n      const { messages, isRunning } = runtimeRef.current.thread.getState();\n      if (isRunning) return;\n\n      for (let i = 0; i < messages.length; i++) {\n        const message = messages[i]!;\n        if (\n          message.status === undefined ||\n          message.status.type === \"complete\" ||\n          message.status.type === \"incomplete\"\n        ) {\n          if (historyIds.current.has(message.id)) continue;\n          historyIds.current.add(message.id);\n\n          const parentId = i > 0 ? messages[i - 1]!.id : null;\n          await historyAdapter?.withFormat?.(storageFormatAdapter).append({\n            parentId,\n            message: getExternalStoreMessages<TMessage>(message)[0]!,\n          });\n        }\n      }\n    });\n  }, [historyAdapter, storageFormatAdapter, runtimeRef]);\n\n  return isLoading;\n};\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../src/ui/use-chat/useExternalHistory.tsx"],"sourcesContent":["\"use client\";\n\nimport {\n  AssistantRuntime,\n  ThreadHistoryAdapter,\n  ThreadMessage,\n  MessageFormatAdapter,\n  getExternalStoreMessages,\n  MessageFormatRepository,\n  ExportedMessageRepository,\n  INTERNAL,\n  useAssistantApi,\n} from \"@assistant-ui/react\";\nimport { useRef, useEffect, useState, RefObject, useCallback } from \"react\";\n\nconst { MessageRepository } = INTERNAL;\n\nexport const toExportedMessageRepository = <TMessage,>(\n  toThreadMessages: (messages: TMessage[]) => ThreadMessage[],\n  messages: MessageFormatRepository<TMessage>,\n): ExportedMessageRepository => {\n  return {\n    headId: messages.headId!,\n    messages: messages.messages.map((m) => {\n      const message = toThreadMessages([m.message])[0]!;\n      return {\n        ...m,\n        message,\n      };\n    }),\n  };\n};\n\nexport const useExternalHistory = <TMessage,>(\n  runtimeRef: RefObject<AssistantRuntime>,\n  historyAdapter: ThreadHistoryAdapter | undefined,\n  toThreadMessages: (messages: TMessage[]) => ThreadMessage[],\n  storageFormatAdapter: MessageFormatAdapter<TMessage, any>,\n  onSetMessages: (messages: TMessage[]) => void,\n) => {\n  const loadedRef = useRef(false);\n\n  const api = useAssistantApi();\n  const optionalThreadListItem = useCallback(\n    () => (api.threadListItem.source ? api.threadListItem() : null),\n    [api],\n  );\n\n  const [isLoading, setIsLoading] = useState(\n    // we only load history if there is a remote id\n    () => optionalThreadListItem()?.getState().remoteId !== undefined,\n  );\n\n  const historyIds = useRef(new Set<string>());\n\n  const onSetMessagesRef = useRef<typeof onSetMessages>(() => onSetMessages);\n  useEffect(() => {\n    onSetMessagesRef.current = onSetMessages;\n  });\n\n  // Load messages from history adapter on mount\n  useEffect(() => {\n    if (!historyAdapter || loadedRef.current) return;\n\n    const loadHistory = async () => {\n      setIsLoading(true);\n      try {\n        const repo = await historyAdapter\n          .withFormat?.(storageFormatAdapter)\n          .load();\n        if (repo && repo.messages.length > 0) {\n          const converted = toExportedMessageRepository(toThreadMessages, repo);\n          runtimeRef.current.thread.import(converted);\n\n          const tempRepo = new MessageRepository();\n          tempRepo.import(converted);\n          const messages = tempRepo.getMessages();\n\n          onSetMessagesRef.current(\n            messages.map(getExternalStoreMessages<TMessage>).flat(),\n          );\n\n          historyIds.current = new Set(\n            converted.messages.map((m) => m.message.id),\n          );\n        }\n      } catch (error) {\n        console.error(\"Failed to load message history:\", error);\n      } finally {\n        setIsLoading(false);\n      }\n    };\n\n    if (!loadedRef.current) {\n      loadedRef.current = true;\n      if (!optionalThreadListItem()?.getState().remoteId) {\n        setIsLoading(false);\n        return;\n      }\n\n      loadHistory();\n    }\n  }, [\n    api,\n    historyAdapter,\n    storageFormatAdapter,\n    toThreadMessages,\n    runtimeRef,\n    optionalThreadListItem,\n  ]);\n\n  useEffect(() => {\n    return runtimeRef.current.thread.subscribe(async () => {\n      const { messages, isRunning } = runtimeRef.current.thread.getState();\n      if (isRunning) return;\n\n      for (let i = 0; i < messages.length; i++) {\n        const message = messages[i]!;\n        if (\n          message.status === undefined ||\n          message.status.type === \"complete\" ||\n          message.status.type === \"incomplete\"\n        ) {\n          if (historyIds.current.has(message.id)) continue;\n          historyIds.current.add(message.id);\n\n          const parentId = i > 0 ? messages[i - 1]!.id : null;\n          await historyAdapter?.withFormat?.(storageFormatAdapter).append({\n            parentId,\n            message: getExternalStoreMessages<TMessage>(message)[0]!,\n          });\n        }\n      }\n    });\n  }, [historyAdapter, storageFormatAdapter, runtimeRef]);\n\n  return isLoading;\n};\n"],"mappings":"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","names":[]}

package/dist/ui/utils/convertMessage.d.ts

@@ -1,11 +1,13 @@
 import { UIMessage } from "ai";
+import { type useExternalMessageConverter } from "@assistant-ui/react";
 export declare const AISDKMessageConverter: {
-    useThreadMessages: ({ messages, isRunning, joinStrategy, }: {
+    useThreadMessages: ({ messages, isRunning, joinStrategy, metadata, }: {
         messages: UIMessage<unknown, import("ai").UIDataTypes, import("ai").UITools>[];
         isRunning: boolean;
         joinStrategy?: "concat-content" | "none" | undefined;
+        metadata?: useExternalMessageConverter.Metadata;
     }) => import("@assistant-ui/react").ThreadMessage[];
-    toThreadMessages: (messages: UIMessage<unknown, import("ai").UIDataTypes, import("ai").UITools>[], isRunning?: boolean) => import("@assistant-ui/react").ThreadMessage[];
+    toThreadMessages: (messages: UIMessage<unknown, import("ai").UIDataTypes, import("ai").UITools>[], isRunning?: boolean, metadata?: useExternalMessageConverter.Metadata) => import("@assistant-ui/react").ThreadMessage[];
     toOriginalMessages: (input: import("@assistant-ui/react").ThreadState | import("@assistant-ui/react").ThreadMessage | import("@assistant-ui/react").ThreadMessage["content"][number]) => unknown[];
     toOriginalMessage: (input: import("@assistant-ui/react").ThreadState | import("@assistant-ui/react").ThreadMessage | import("@assistant-ui/react").ThreadMessage["content"][number]) => {};
     useOriginalMessage: () => {};

package/dist/ui/utils/convertMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertMessage.d.ts","sourceRoot":"","sources":["../../../src/ui/utils/convertMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,MAAM,IAAI,CAAC;AA8I7C,eAAO,MAAM,qBAAqB;;;;;;;0HAtHZ,sDAGrB;yHAGS,sDAAiB;;;CAoL1B,CAAC"}
+{"version":3,"file":"convertMessage.d.ts","sourceRoot":"","sources":["../../../src/ui/utils/convertMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,EAML,KAAK,2BAA2B,EACjC,MAAM,qBAAqB,CAAC;AAqK7B,eAAO,MAAM,qBAAqB;;;;;;;;0HA/IxB,sDACD;yHAIW,sDACP;;;CA6MZ,CAAC"}

package/dist/ui/utils/convertMessage.js

@@ -3,7 +3,10 @@ import { isToolUIPart } from "ai";
 import {
   unstable_createMessageConverter
 } from "@assistant-ui/react";
-var convertParts = (message) => {
+function stripClosingDelimiters(json) {
+  return json.replace(/[}\]"]+$/, "");
+}
+var convertParts = (message, metadata) => {
   if (!message.parts || message.parts.length === 0) {
     return [];
   }
@@ -37,14 +40,26 @@ var convertParts = (message) => {
         isError = true;
         result = { error: part.errorText };
       }
+      let argsText = JSON.stringify(args);
+      if (part.state === "input-streaming") {
+        argsText = stripClosingDelimiters(argsText);
+      }
+      const toolStatus = metadata.toolStatuses?.[toolCallId];
       return {
         type: "tool-call",
         toolName,
         toolCallId,
-        argsText: JSON.stringify(args),
+        argsText,
         args,
         result,
-        isError
+        isError,
+        ...toolStatus?.type === "interrupt" && {
+          interrupt: toolStatus.payload,
+          status: {
+            type: "requires-action",
+            reason: "interrupt"
+          }
+        }
       };
     }
     if (type === "dynamic-tool") {
@@ -63,6 +78,7 @@ var convertParts = (message) => {
         isError = true;
         result = { error: part.errorText };
       }
+      const toolStatus = metadata.toolStatuses?.[toolCallId];
       return {
         type: "tool-call",
         toolName,
@@ -70,7 +86,14 @@ var convertParts = (message) => {
         argsText: JSON.stringify(args),
         args,
         result,
-        isError
+        isError,
+        ...toolStatus?.type === "interrupt" && {
+          interrupt: toolStatus.payload,
+          status: {
+            type: "requires-action",
+            reason: "interrupt"
+          }
+        }
       };
     }
     if (type === "source-url") {
@@ -99,7 +122,7 @@ var convertParts = (message) => {
   }).filter(Boolean);
 };
 var AISDKMessageConverter = unstable_createMessageConverter(
-  (message) => {
+  (message, metadata) => {
     const createdAt = /* @__PURE__ */ new Date();
     switch (message.role) {
       case "user":
@@ -107,7 +130,7 @@ var AISDKMessageConverter = unstable_createMessageConverter(
           role: "user",
           id: message.id,
           createdAt,
-          content: convertParts(message),
+          content: convertParts(message, metadata),
           attachments: message.parts?.filter((p) => p.type === "file").map((part, idx) => {
             return {
               id: idx.toString(),
@@ -135,14 +158,14 @@ var AISDKMessageConverter = unstable_createMessageConverter(
           role: "system",
           id: message.id,
           createdAt,
-          content: convertParts(message)
+          content: convertParts(message, metadata)
         };
       case "assistant":
         return {
           role: "assistant",
           id: message.id,
           createdAt,
-          content: convertParts(message),
+          content: convertParts(message, metadata),
           metadata: {
             unstable_annotations: message.annotations,
             unstable_data: Array.isArray(message.data) ? message.data : message.data ? [message.data] : void 0,

package/dist/ui/utils/convertMessage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/ui/utils/convertMessage.ts"],"sourcesContent":["import { isToolUIPart, UIMessage } from \"ai\";\nimport {\n  unstable_createMessageConverter,\n  type ReasoningMessagePart,\n  type ToolCallMessagePart,\n  type TextMessagePart,\n  type SourceMessagePart,\n} from \"@assistant-ui/react\";\n\nconst convertParts = (message: UIMessage) => {\n  if (!message.parts || message.parts.length === 0) {\n    return [];\n  }\n\n  return message.parts\n    .filter((p) => p.type !== \"step-start\" && p.type !== \"file\")\n    .map((part) => {\n      const type = part.type;\n\n      // Handle text parts\n      if (type === \"text\") {\n        return {\n          type: \"text\",\n          text: part.text,\n        } satisfies TextMessagePart;\n      }\n\n      // Handle reasoning parts\n      if (type === \"reasoning\") {\n        return {\n          type: \"reasoning\",\n          text: part.text,\n        } satisfies ReasoningMessagePart;\n      }\n\n      // Handle tool-* parts (AI SDK v5 tool calls)\n      if (isToolUIPart(part)) {\n        const toolName = type.replace(\"tool-\", \"\");\n        const toolCallId = part.toolCallId;\n\n        // Extract args and result based on state\n        let args: any = {};\n        let result: any = undefined;\n        let isError = false;\n\n        if (\n          part.state === \"input-streaming\" ||\n          part.state === \"input-available\"\n        ) {\n          args = part.input || {};\n        } else if (part.state === \"output-available\") {\n          args = part.input || {};\n          result = part.output;\n        } else if (part.state === \"output-error\") {\n          args = part.input || {};\n          isError = true;\n          result = { error: part.errorText };\n        }\n\n        return {\n          type: \"tool-call\",\n          toolName,\n          toolCallId,\n          argsText: JSON.stringify(args),\n          args,\n          result,\n          isError,\n        } satisfies ToolCallMessagePart;\n      }\n\n      // Handle dynamic-tool parts\n      if (type === \"dynamic-tool\") {\n        const toolName = part.toolName;\n        const toolCallId = part.toolCallId;\n\n        // Extract args and result based on state\n        let args: any = {};\n        let result: any = undefined;\n        let isError = false;\n\n        if (\n          part.state === \"input-streaming\" ||\n          part.state === \"input-available\"\n        ) {\n          args = part.input || {};\n        } else if (part.state === \"output-available\") {\n          args = part.input || {};\n          result = part.output;\n        } else if (part.state === \"output-error\") {\n          args = part.input || {};\n          isError = true;\n          result = { error: part.errorText };\n        }\n\n        return {\n          type: \"tool-call\",\n          toolName,\n          toolCallId,\n          argsText: JSON.stringify(args),\n          args,\n          result,\n          isError,\n        } satisfies ToolCallMessagePart;\n      }\n\n      // Handle source-url parts\n      if (type === \"source-url\") {\n        return {\n          type: \"source\",\n          sourceType: \"url\",\n          id: part.sourceId,\n          url: part.url,\n          title: part.title || \"\",\n        } satisfies SourceMessagePart;\n      }\n\n      // Handle source-document parts\n      if (type === \"source-document\") {\n        console.warn(\n          `Source document part type ${type} is not yet supported in conversion`,\n        );\n        return null;\n      }\n\n      // Handle data-* parts (AI SDK v5 data parts)\n      if (type.startsWith(\"data-\")) {\n        // For now, we'll skip data parts as they don't have a direct equivalent\n        // in the assistant-ui types. They could be converted to a custom message part\n        // or handled differently based on the specific use case.\n        console.warn(\n          `Data part type ${type} is not yet supported in conversion`,\n        );\n        return null;\n      }\n\n      // For unsupported types, we'll skip them instead of throwing\n      console.warn(`Unsupported message part type: ${type}`);\n      return null;\n    })\n    .filter(Boolean) as any[];\n};\n\nexport const AISDKMessageConverter = unstable_createMessageConverter(\n  (message: UIMessage) => {\n    // UIMessage doesn't have createdAt, so we'll use current date or undefined\n    const createdAt = new Date();\n    switch (message.role) {\n      case \"user\":\n        return {\n          role: \"user\",\n          id: message.id,\n          createdAt,\n          content: convertParts(message),\n          attachments: message.parts\n            ?.filter((p) => p.type === \"file\")\n            .map((part, idx) => {\n              return {\n                id: idx.toString(),\n                type: part.mediaType.startsWith(\"image/\") ? \"image\" : \"file\",\n                name: part.filename ?? \"file\",\n                content: [\n                  part.mediaType.startsWith(\"image/\")\n                    ? {\n                        type: \"image\",\n                        image: part.url,\n                        filename: part.filename!,\n                      }\n                    : {\n                        type: \"file\",\n                        filename: part.filename!,\n                        data: part.url,\n                        mimeType: part.mediaType,\n                      },\n                ],\n                contentType: part.mediaType ?? \"unknown/unknown\",\n                status: { type: \"complete\" as const },\n              };\n            }),\n        };\n\n      case \"system\":\n        return {\n          role: \"system\",\n          id: message.id,\n          createdAt,\n          content: convertParts(message),\n        };\n\n      case \"assistant\":\n        return {\n          role: \"assistant\",\n          id: message.id,\n          createdAt,\n          content: convertParts(message),\n          metadata: {\n            unstable_annotations: (message as any).annotations,\n            unstable_data: Array.isArray((message as any).data)\n              ? (message as any).data\n              : (message as any).data\n                ? [(message as any).data]\n                : undefined,\n            custom: {},\n          },\n        };\n\n      default:\n        console.warn(`Unsupported message role: ${message.role}`);\n        return [];\n    }\n  },\n);\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../src/ui/utils/convertMessage.ts"],"sourcesContent":["import { isToolUIPart, UIMessage } from \"ai\";\nimport {\n  unstable_createMessageConverter,\n  type ReasoningMessagePart,\n  type ToolCallMessagePart,\n  type TextMessagePart,\n  type SourceMessagePart,\n  type useExternalMessageConverter,\n} from \"@assistant-ui/react\";\n\nfunction stripClosingDelimiters(json: string) {\n  return json.replace(/[}\\]\"]+$/, \"\");\n}\n\nconst convertParts = (\n  message: UIMessage,\n  metadata: useExternalMessageConverter.Metadata,\n) => {\n  if (!message.parts || message.parts.length === 0) {\n    return [];\n  }\n\n  return message.parts\n    .filter((p) => p.type !== \"step-start\" && p.type !== \"file\")\n    .map((part) => {\n      const type = part.type;\n\n      // Handle text parts\n      if (type === \"text\") {\n        return {\n          type: \"text\",\n          text: part.text,\n        } satisfies TextMessagePart;\n      }\n\n      // Handle reasoning parts\n      if (type === \"reasoning\") {\n        return {\n          type: \"reasoning\",\n          text: part.text,\n        } satisfies ReasoningMessagePart;\n      }\n\n      // Handle tool-* parts (AI SDK v5 tool calls)\n      if (isToolUIPart(part)) {\n        const toolName = type.replace(\"tool-\", \"\");\n        const toolCallId = part.toolCallId;\n\n        // Extract args and result based on state\n        let args: any = {};\n        let result: any = undefined;\n        let isError = false;\n\n        if (\n          part.state === \"input-streaming\" ||\n          part.state === \"input-available\"\n        ) {\n          args = part.input || {};\n        } else if (part.state === \"output-available\") {\n          args = part.input || {};\n          result = part.output;\n        } else if (part.state === \"output-error\") {\n          args = part.input || {};\n          isError = true;\n          result = { error: part.errorText };\n        }\n\n        let argsText = JSON.stringify(args);\n        if (part.state === \"input-streaming\") {\n          // the argsText is not complete, so we need to strip the closing delimiters\n          // these are added by the AI SDK in fix-json\n          argsText = stripClosingDelimiters(argsText);\n        }\n\n        const toolStatus = metadata.toolStatuses?.[toolCallId];\n        return {\n          type: \"tool-call\",\n          toolName,\n          toolCallId,\n          argsText,\n          args,\n          result,\n          isError,\n          ...(toolStatus?.type === \"interrupt\" && {\n            interrupt: toolStatus.payload,\n            status: {\n              type: \"requires-action\" as const,\n              reason: \"interrupt\",\n            },\n          }),\n        } satisfies ToolCallMessagePart;\n      }\n\n      // Handle dynamic-tool parts\n      if (type === \"dynamic-tool\") {\n        const toolName = part.toolName;\n        const toolCallId = part.toolCallId;\n\n        // Extract args and result based on state\n        let args: any = {};\n        let result: any = undefined;\n        let isError = false;\n\n        if (\n          part.state === \"input-streaming\" ||\n          part.state === \"input-available\"\n        ) {\n          args = part.input || {};\n        } else if (part.state === \"output-available\") {\n          args = part.input || {};\n          result = part.output;\n        } else if (part.state === \"output-error\") {\n          args = part.input || {};\n          isError = true;\n          result = { error: part.errorText };\n        }\n\n        const toolStatus = metadata.toolStatuses?.[toolCallId];\n        return {\n          type: \"tool-call\",\n          toolName,\n          toolCallId,\n          argsText: JSON.stringify(args),\n          args,\n          result,\n          isError,\n          ...(toolStatus?.type === \"interrupt\" && {\n            interrupt: toolStatus.payload,\n            status: {\n              type: \"requires-action\" as const,\n              reason: \"interrupt\",\n            },\n          }),\n        } satisfies ToolCallMessagePart;\n      }\n\n      // Handle source-url parts\n      if (type === \"source-url\") {\n        return {\n          type: \"source\",\n          sourceType: \"url\",\n          id: part.sourceId,\n          url: part.url,\n          title: part.title || \"\",\n        } satisfies SourceMessagePart;\n      }\n\n      // Handle source-document parts\n      if (type === \"source-document\") {\n        console.warn(\n          `Source document part type ${type} is not yet supported in conversion`,\n        );\n        return null;\n      }\n\n      // Handle data-* parts (AI SDK v5 data parts)\n      if (type.startsWith(\"data-\")) {\n        // For now, we'll skip data parts as they don't have a direct equivalent\n        // in the assistant-ui types. They could be converted to a custom message part\n        // or handled differently based on the specific use case.\n        console.warn(\n          `Data part type ${type} is not yet supported in conversion`,\n        );\n        return null;\n      }\n\n      // For unsupported types, we'll skip them instead of throwing\n      console.warn(`Unsupported message part type: ${type}`);\n      return null;\n    })\n    .filter(Boolean) as any[];\n};\n\nexport const AISDKMessageConverter = unstable_createMessageConverter(\n  (message: UIMessage, metadata: useExternalMessageConverter.Metadata) => {\n    // UIMessage doesn't have createdAt, so we'll use current date or undefined\n    const createdAt = new Date();\n    switch (message.role) {\n      case \"user\":\n        return {\n          role: \"user\",\n          id: message.id,\n          createdAt,\n          content: convertParts(message, metadata),\n          attachments: message.parts\n            ?.filter((p) => p.type === \"file\")\n            .map((part, idx) => {\n              return {\n                id: idx.toString(),\n                type: part.mediaType.startsWith(\"image/\") ? \"image\" : \"file\",\n                name: part.filename ?? \"file\",\n                content: [\n                  part.mediaType.startsWith(\"image/\")\n                    ? {\n                        type: \"image\",\n                        image: part.url,\n                        filename: part.filename!,\n                      }\n                    : {\n                        type: \"file\",\n                        filename: part.filename!,\n                        data: part.url,\n                        mimeType: part.mediaType,\n                      },\n                ],\n                contentType: part.mediaType ?? \"unknown/unknown\",\n                status: { type: \"complete\" as const },\n              };\n            }),\n        };\n\n      case \"system\":\n        return {\n          role: \"system\",\n          id: message.id,\n          createdAt,\n          content: convertParts(message, metadata),\n        };\n\n      case \"assistant\":\n        return {\n          role: \"assistant\",\n          id: message.id,\n          createdAt,\n          content: convertParts(message, metadata),\n          metadata: {\n            unstable_annotations: (message as any).annotations,\n            unstable_data: Array.isArray((message as any).data)\n              ? (message as any).data\n              : (message as any).data\n                ? [(message as any).data]\n                : undefined,\n            custom: {},\n          },\n        };\n\n      default:\n        console.warn(`Unsupported message role: ${message.role}`);\n        return [];\n    }\n  },\n);\n"],"mappings":";AAAA,SAAS,oBAA+B;AACxC;AAAA,EACE;AAAA,OAMK;AAEP,SAAS,uBAAuB,MAAc;AAC5C,SAAO,KAAK,QAAQ,YAAY,EAAE;AACpC;AAEA,IAAM,eAAe,CACnB,SACA,aACG;AACH,MAAI,CAAC,QAAQ,SAAS,QAAQ,MAAM,WAAW,GAAG;AAChD,WAAO,CAAC;AAAA,EACV;AAEA,SAAO,QAAQ,MACZ,OAAO,CAAC,MAAM,EAAE,SAAS,gBAAgB,EAAE,SAAS,MAAM,EAC1D,IAAI,CAAC,SAAS;AACb,UAAM,OAAO,KAAK;AAGlB,QAAI,SAAS,QAAQ;AACnB,aAAO;AAAA,QACL,MAAM;AAAA,QACN,MAAM,KAAK;AAAA,MACb;AAAA,IACF;AAGA,QAAI,SAAS,aAAa;AACxB,aAAO;AAAA,QACL,MAAM;AAAA,QACN,MAAM,KAAK;AAAA,MACb;AAAA,IACF;AAGA,QAAI,aAAa,IAAI,GAAG;AACtB,YAAM,WAAW,KAAK,QAAQ,SAAS,EAAE;AACzC,YAAM,aAAa,KAAK;AAGxB,UAAI,OAAY,CAAC;AACjB,UAAI,SAAc;AAClB,UAAI,UAAU;AAEd,UACE,KAAK,UAAU,qBACf,KAAK,UAAU,mBACf;AACA,eAAO,KAAK,SAAS,CAAC;AAAA,MACxB,WAAW,KAAK,UAAU,oBAAoB;AAC5C,eAAO,KAAK,SAAS,CAAC;AACtB,iBAAS,KAAK;AAAA,MAChB,WAAW,KAAK,UAAU,gBAAgB;AACxC,eAAO,KAAK,SAAS,CAAC;AACtB,kBAAU;AACV,iBAAS,EAAE,OAAO,KAAK,UAAU;AAAA,MACnC;AAEA,UAAI,WAAW,KAAK,UAAU,IAAI;AAClC,UAAI,KAAK,UAAU,mBAAmB;AAGpC,mBAAW,uBAAuB,QAAQ;AAAA,MAC5C;AAEA,YAAM,aAAa,SAAS,eAAe,UAAU;AACrD,aAAO;AAAA,QACL,MAAM;AAAA,QACN;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAI,YAAY,SAAS,eAAe;AAAA,UACtC,WAAW,WAAW;AAAA,UACtB,QAAQ;AAAA,YACN,MAAM;AAAA,YACN,QAAQ;AAAA,UACV;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAGA,QAAI,SAAS,gBAAgB;AAC3B,YAAM,WAAW,KAAK;AACtB,YAAM,aAAa,KAAK;AAGxB,UAAI,OAAY,CAAC;AACjB,UAAI,SAAc;AAClB,UAAI,UAAU;AAEd,UACE,KAAK,UAAU,qBACf,KAAK,UAAU,mBACf;AACA,eAAO,KAAK,SAAS,CAAC;AAAA,MACxB,WAAW,KAAK,UAAU,oBAAoB;AAC5C,eAAO,KAAK,SAAS,CAAC;AACtB,iBAAS,KAAK;AAAA,MAChB,WAAW,KAAK,UAAU,gBAAgB;AACxC,eAAO,KAAK,SAAS,CAAC;AACtB,kBAAU;AACV,iBAAS,EAAE,OAAO,KAAK,UAAU;AAAA,MACnC;AAEA,YAAM,aAAa,SAAS,eAAe,UAAU;AACrD,aAAO;AAAA,QACL,MAAM;AAAA,QACN;AAAA,QACA;AAAA,QACA,UAAU,KAAK,UAAU,IAAI;AAAA,QAC7B;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAI,YAAY,SAAS,eAAe;AAAA,UACtC,WAAW,WAAW;AAAA,UACtB,QAAQ;AAAA,YACN,MAAM;AAAA,YACN,QAAQ;AAAA,UACV;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAGA,QAAI,SAAS,cAAc;AACzB,aAAO;AAAA,QACL,MAAM;AAAA,QACN,YAAY;AAAA,QACZ,IAAI,KAAK;AAAA,QACT,KAAK,KAAK;AAAA,QACV,OAAO,KAAK,SAAS;AAAA,MACvB;AAAA,IACF;AAGA,QAAI,SAAS,mBAAmB;AAC9B,cAAQ;AAAA,QACN,6BAA6B,IAAI;AAAA,MACnC;AACA,aAAO;AAAA,IACT;AAGA,QAAI,KAAK,WAAW,OAAO,GAAG;AAI5B,cAAQ;AAAA,QACN,kBAAkB,IAAI;AAAA,MACxB;AACA,aAAO;AAAA,IACT;AAGA,YAAQ,KAAK,kCAAkC,IAAI,EAAE;AACrD,WAAO;AAAA,EACT,CAAC,EACA,OAAO,OAAO;AACnB;AAEO,IAAM,wBAAwB;AAAA,EACnC,CAAC,SAAoB,aAAmD;AAEtE,UAAM,YAAY,oBAAI,KAAK;AAC3B,YAAQ,QAAQ,MAAM;AAAA,MACpB,KAAK;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,IAAI,QAAQ;AAAA,UACZ;AAAA,UACA,SAAS,aAAa,SAAS,QAAQ;AAAA,UACvC,aAAa,QAAQ,OACjB,OAAO,CAAC,MAAM,EAAE,SAAS,MAAM,EAChC,IAAI,CAAC,MAAM,QAAQ;AAClB,mBAAO;AAAA,cACL,IAAI,IAAI,SAAS;AAAA,cACjB,MAAM,KAAK,UAAU,WAAW,QAAQ,IAAI,UAAU;AAAA,cACtD,MAAM,KAAK,YAAY;AAAA,cACvB,SAAS;AAAA,gBACP,KAAK,UAAU,WAAW,QAAQ,IAC9B;AAAA,kBACE,MAAM;AAAA,kBACN,OAAO,KAAK;AAAA,kBACZ,UAAU,KAAK;AAAA,gBACjB,IACA;AAAA,kBACE,MAAM;AAAA,kBACN,UAAU,KAAK;AAAA,kBACf,MAAM,KAAK;AAAA,kBACX,UAAU,KAAK;AAAA,gBACjB;AAAA,cACN;AAAA,cACA,aAAa,KAAK,aAAa;AAAA,cAC/B,QAAQ,EAAE,MAAM,WAAoB;AAAA,YACtC;AAAA,UACF,CAAC;AAAA,QACL;AAAA,MAEF,KAAK;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,IAAI,QAAQ;AAAA,UACZ;AAAA,UACA,SAAS,aAAa,SAAS,QAAQ;AAAA,QACzC;AAAA,MAEF,KAAK;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,IAAI,QAAQ;AAAA,UACZ;AAAA,UACA,SAAS,aAAa,SAAS,QAAQ;AAAA,UACvC,UAAU;AAAA,YACR,sBAAuB,QAAgB;AAAA,YACvC,eAAe,MAAM,QAAS,QAAgB,IAAI,IAC7C,QAAgB,OAChB,QAAgB,OACf,CAAE,QAAgB,IAAI,IACtB;AAAA,YACN,QAAQ,CAAC;AAAA,UACX;AAAA,QACF;AAAA,MAEF;AACE,gBAAQ,KAAK,6BAA6B,QAAQ,IAAI,EAAE;AACxD,eAAO,CAAC;AAAA,IACZ;AAAA,EACF;AACF;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-ai-sdk",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -23,13 +23,13 @@
     "ai": "^5.0.56",
     "@radix-ui/react-use-callback-ref": "^1.1.1",
     "@types/json-schema": "^7.0.15",
-    "assistant-stream": "^0.2.30",
+    "assistant-stream": "^0.2.32",
     "json-schema": "^0.4.0",
     "zod": "^4.1.11",
     "zustand": "^5.0.8"
   },
   "peerDependencies": {
-    "@assistant-ui/react": "^0.11.20",
+    "@assistant-ui/react": "^0.11.22",
     "@types/react": "*",
     "assistant-cloud": "*",
     "react": "^18 || ^19 || ^19.0.0-rc"
@@ -49,7 +49,7 @@
     "eslint-config-next": "15.5.4",
     "react": "19.1.1",
     "tsx": "^4.20.6",
-    "@assistant-ui/react": "0.11.20",
+    "@assistant-ui/react": "0.11.22",
     "@assistant-ui/x-buildutils": "0.0.1"
   },
   "publishConfig": {

package/src/ui/use-chat/useAISDKRuntime.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { useState, useMemo } from "react";
 import type { UIMessage, useChat } from "@ai-sdk/react";
 import {
   useExternalStoreRuntime,
@@ -9,6 +10,8 @@ import {
   ThreadMessage,
   MessageFormatAdapter,
   useRuntimeAdapters,
+  INTERNAL,
+  type ToolExecutionStatus,
 } from "@assistant-ui/react";
 import { sliceMessagesUntil } from "../utils/sliceMessagesUntil";
 import { toCreateMessage } from "../utils/toCreateMessage";
@@ -20,7 +23,6 @@ import {
   aiSDKV5FormatAdapter,
 } from "../adapters/aiSDKFormatAdapter";
 import { useExternalHistory } from "./useExternalHistory";
-import { useMemo } from "react";
 
 export type AISDKRuntimeAdapter = {
   adapters?:
@@ -35,22 +37,49 @@ export const useAISDKRuntime = <UI_MESSAGE extends UIMessage = UIMessage>(
   { adapters }: AISDKRuntimeAdapter = {},
 ) => {
   const contextAdapters = useRuntimeAdapters();
+  const isRunning =
+    chatHelpers.status === "submitted" || chatHelpers.status == "streaming";
+
+  const [toolStatuses, setToolStatuses] = useState<
+    Record<string, ToolExecutionStatus>
+  >({});
+
   const messages = AISDKMessageConverter.useThreadMessages({
-    isRunning:
-      chatHelpers.status === "submitted" || chatHelpers.status == "streaming",
+    isRunning,
     messages: chatHelpers.messages,
+    metadata: useMemo(() => ({ toolStatuses }), [toolStatuses]),
+  });
+
+  const runtimeRef = useMemo(
+    () => ({
+      get current(): AssistantRuntime {
+        return runtime;
+      },
+    }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [],
+  );
+
+  const toolInvocations = INTERNAL.useToolInvocations({
+    state: {
+      messages,
+      isRunning,
+    },
+    getTools: () => runtimeRef.current.thread.getModelContext().tools,
+    onResult: (command: any) => {
+      if (command.type === "add-tool-result") {
+        chatHelpers.addToolResult({
+          tool: command.toolName,
+          toolCallId: command.toolCallId,
+          output: command.result,
+        });
+      }
+    },
+    setToolStatuses,
   });
 
   const isLoading = useExternalHistory(
-    useMemo(
-      () => ({
-        get current(): AssistantRuntime {
-          return runtime;
-        },
-      }),
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      [],
-    ),
+    runtimeRef,
     adapters?.history ?? contextAdapters?.history,
     AISDKMessageConverter.toThreadMessages as (
       messages: UI_MESSAGE[],
@@ -65,8 +94,7 @@ export const useAISDKRuntime = <UI_MESSAGE extends UIMessage = UIMessage>(
   );
 
   const runtime = useExternalStoreRuntime({
-    isRunning:
-      chatHelpers.status === "submitted" || chatHelpers.status === "streaming",
+    isRunning,
     messages,
     setMessages: (messages) =>
       chatHelpers.setMessages(
@@ -82,7 +110,10 @@ export const useAISDKRuntime = <UI_MESSAGE extends UIMessage = UIMessage>(
           .filter(Boolean)
           .flat(),
       ),
-    onCancel: async () => chatHelpers.stop(),
+    onCancel: async () => {
+      chatHelpers.stop();
+      toolInvocations.abort();
+    },
     onNew: async (message) => {
       const createMessage = toCreateMessage<UI_MESSAGE>(message);
       await chatHelpers.sendMessage(createMessage, {
@@ -114,6 +145,8 @@ export const useAISDKRuntime = <UI_MESSAGE extends UIMessage = UIMessage>(
         output: result,
       });
     },
+    onResumeToolCall: (options) =>
+      toolInvocations.resume(options.toolCallId, options.payload),
     adapters: {
       attachments: vercelAttachmentAdapter,
       ...contextAdapters,

package/src/ui/use-chat/useChatRuntime.tsx

@@ -30,38 +30,12 @@ export const useChatThreadRuntime = <UI_MESSAGE extends UIMessage = UIMessage>(
   const chat = useChat({
     ...chatOptions,
     transport,
-    onToolCall: async ({ toolCall }) => {
-      await chatOptions.onToolCall?.({ toolCall });
-
-      const tools = runtime.thread.getModelContext().tools;
-      const tool = tools?.[toolCall.toolName];
-      if (tool) {
-        try {
-          const result = await tool.execute?.(toolCall.input, {
-            toolCallId: toolCall.toolCallId,
-            abortSignal: new AbortController().signal, // dummy signal for now
-          });
-          chat.addToolResult({
-            tool: toolCall.toolName,
-            toolCallId: toolCall.toolCallId,
-            output: result,
-          });
-        } catch (error) {
-          chat.addToolResult({
-            tool: toolCall.toolName,
-            toolCallId: toolCall.toolCallId,
-            output: {
-              error: error instanceof Error ? error.message : String(error),
-            },
-          });
-        }
-      }
-    },
   });
 
-  const runtime = useAISDKRuntime(chat as any, {
+  const runtime = useAISDKRuntime(chat, {
     adapters,
   });
+
   if (transport instanceof AssistantChatTransport) {
     transport.setRuntime(runtime);
   }

package/src/ui/use-chat/useExternalHistory.tsx

@@ -11,7 +11,7 @@ import {
   INTERNAL,
   useAssistantApi,
 } from "@assistant-ui/react";
-import { useRef, useEffect, useState, RefObject } from "react";
+import { useRef, useEffect, useState, RefObject, useCallback } from "react";
 
 const { MessageRepository } = INTERNAL;
 
@@ -41,9 +41,14 @@ export const useExternalHistory = <TMessage,>(
   const loadedRef = useRef(false);
 
   const api = useAssistantApi();
+  const optionalThreadListItem = useCallback(
+    () => (api.threadListItem.source ? api.threadListItem() : null),
+    [api],
+  );
+
   const [isLoading, setIsLoading] = useState(
     // we only load history if there is a remote id
-    () => api.threadListItem().getState().remoteId !== undefined,
+    () => optionalThreadListItem()?.getState().remoteId !== undefined,
   );
 
   const historyIds = useRef(new Set<string>());
@@ -88,14 +93,21 @@ export const useExternalHistory = <TMessage,>(
 
     if (!loadedRef.current) {
       loadedRef.current = true;
-      if (!api.threadListItem().getState().remoteId) {
+      if (!optionalThreadListItem()?.getState().remoteId) {
         setIsLoading(false);
         return;
       }
 
       loadHistory();
     }
-  }, [api, historyAdapter, storageFormatAdapter, toThreadMessages, runtimeRef]);
+  }, [
+    api,
+    historyAdapter,
+    storageFormatAdapter,
+    toThreadMessages,
+    runtimeRef,
+    optionalThreadListItem,
+  ]);
 
   useEffect(() => {
     return runtimeRef.current.thread.subscribe(async () => {

package/src/ui/utils/convertMessage.ts

@@ -5,9 +5,17 @@ import {
   type ToolCallMessagePart,
   type TextMessagePart,
   type SourceMessagePart,
+  type useExternalMessageConverter,
 } from "@assistant-ui/react";
 
-const convertParts = (message: UIMessage) => {
+function stripClosingDelimiters(json: string) {
+  return json.replace(/[}\]"]+$/, "");
+}
+
+const convertParts = (
+  message: UIMessage,
+  metadata: useExternalMessageConverter.Metadata,
+) => {
   if (!message.parts || message.parts.length === 0) {
     return [];
   }
@@ -57,14 +65,29 @@ const convertParts = (message: UIMessage) => {
           result = { error: part.errorText };
         }
 
+        let argsText = JSON.stringify(args);
+        if (part.state === "input-streaming") {
+          // the argsText is not complete, so we need to strip the closing delimiters
+          // these are added by the AI SDK in fix-json
+          argsText = stripClosingDelimiters(argsText);
+        }
+
+        const toolStatus = metadata.toolStatuses?.[toolCallId];
         return {
           type: "tool-call",
           toolName,
           toolCallId,
-          argsText: JSON.stringify(args),
+          argsText,
           args,
           result,
           isError,
+          ...(toolStatus?.type === "interrupt" && {
+            interrupt: toolStatus.payload,
+            status: {
+              type: "requires-action" as const,
+              reason: "interrupt",
+            },
+          }),
         } satisfies ToolCallMessagePart;
       }
 
@@ -92,6 +115,7 @@ const convertParts = (message: UIMessage) => {
           result = { error: part.errorText };
         }
 
+        const toolStatus = metadata.toolStatuses?.[toolCallId];
         return {
           type: "tool-call",
           toolName,
@@ -100,6 +124,13 @@ const convertParts = (message: UIMessage) => {
           args,
           result,
           isError,
+          ...(toolStatus?.type === "interrupt" && {
+            interrupt: toolStatus.payload,
+            status: {
+              type: "requires-action" as const,
+              reason: "interrupt",
+            },
+          }),
         } satisfies ToolCallMessagePart;
       }
 
@@ -141,7 +172,7 @@ const convertParts = (message: UIMessage) => {
 };
 
 export const AISDKMessageConverter = unstable_createMessageConverter(
-  (message: UIMessage) => {
+  (message: UIMessage, metadata: useExternalMessageConverter.Metadata) => {
     // UIMessage doesn't have createdAt, so we'll use current date or undefined
     const createdAt = new Date();
     switch (message.role) {
@@ -150,7 +181,7 @@ export const AISDKMessageConverter = unstable_createMessageConverter(
           role: "user",
           id: message.id,
           createdAt,
-          content: convertParts(message),
+          content: convertParts(message, metadata),
           attachments: message.parts
             ?.filter((p) => p.type === "file")
             .map((part, idx) => {
@@ -183,7 +214,7 @@ export const AISDKMessageConverter = unstable_createMessageConverter(
           role: "system",
           id: message.id,
           createdAt,
-          content: convertParts(message),
+          content: convertParts(message, metadata),
         };
 
       case "assistant":
@@ -191,7 +222,7 @@ export const AISDKMessageConverter = unstable_createMessageConverter(
           role: "assistant",
           id: message.id,
           createdAt,
-          content: convertParts(message),
+          content: convertParts(message, metadata),
           metadata: {
             unstable_annotations: (message as any).annotations,
             unstable_data: Array.isArray((message as any).data)