@assistant-ui/ai-sdk 0.0.3 → 0.0.5

package/dist/runtime/useChatThread.js.map

@@ -1 +1 @@
-{"version":3,"file":"useChatThread.js","names":["useChat","Chat","UIMessage","pickExternalStoreSharedOptions","AssistantRuntime","ExternalStoreSharedOptions","useAISDKRuntime","AISDKRuntimeAdapter","CustomToCreateMessageFunction","ChatInit","ChatTransport","AssistantChatTransport","InitializableThreadListItem","AssistantChatResumableOptions","ResumableClientStorage","useCallback","useEffect","useMemo","useRef","useSyncExternalStore","useResourceCleanup","ChatThreadOptions","UI_MESSAGE","throttle","adapters","toCreateMessage","onResume","onResumeToolCall","onResumeError","error","joinStrategy","messageRepository","unstable_onBranchChange","ChatThreadEnvironment","id","isMainThread","getThreadListItem","stopOnClientDestroy","chat","useDynamicChatTransport","transport","transportRef","current","dynamicTransport","Proxy","get","_","prop","res","bind","getResumableAdapter","candidate","undefined","call","getNoPendingStreamId","resumedStreamIdsByStorage","WeakMap","Set","getResumedStreamIds","storage","resumedStreamIds","set","splitChatThreadOptions","options","isDisabled","_isDisabled","isSendDisabled","_isSendDisabled","unstable_capabilities","_unstable_capabilities","suggestions","_suggestions","chatInit","useChatThread","env","transportOptions","chatOptions","externalChat","defaultTransport","sourceTransport","stop","catch","runtime","setRuntime","__internal_setGetThreadListItem","subscribeToRuntime","callback","thread","subscribe","getHistoryLoadingSnapshot","getState","isLoading","isLoadingHistory","resumableStorage","subscribeToResumableStorage","getPendingStreamId","getStreamId","pendingStreamId","isChatRunning","status","onResumeErrorRef","has","add","resumeStream","err","console","warn","callbackError","clear"],"sources":["../../src/runtime/useChatThread.ts"],"sourcesContent":["\"use client\";\n\nimport { useChat, type Chat, type UIMessage } from \"@ai-sdk/react\";\nimport {\n  pickExternalStoreSharedOptions,\n  type AssistantRuntime,\n  type ExternalStoreSharedOptions,\n} from \"@assistant-ui/core\";\nimport {\n  useAISDKRuntime,\n  type AISDKRuntimeAdapter,\n  type CustomToCreateMessageFunction,\n} from \"./useAISDKRuntime\";\nimport type { ChatInit, ChatTransport } from \"ai\";\nimport {\n  AssistantChatTransport,\n  type InitializableThreadListItem,\n} from \"../transport/AssistantChatTransport\";\nimport type {\n  AssistantChatResumableOptions,\n  ResumableClientStorage,\n} from \"../transport/resumable\";\nimport {\n  useCallback,\n  useEffect,\n  useMemo,\n  useRef,\n  useSyncExternalStore,\n} from \"react\";\nimport { useResourceCleanup } from \"./useResourceCleanup\";\n\nexport type ChatThreadOptions<UI_MESSAGE extends UIMessage = UIMessage> =\n  ChatInit<UI_MESSAGE> &\n    ExternalStoreSharedOptions & {\n      throttle?: number | undefined;\n      adapters?: AISDKRuntimeAdapter[\"adapters\"] | undefined;\n      toCreateMessage?: CustomToCreateMessageFunction;\n      onResume?: AISDKRuntimeAdapter[\"onResume\"];\n      onResumeToolCall?: AISDKRuntimeAdapter[\"onResumeToolCall\"];\n      /**\n       * Called when an automatic resumable stream reconnect fails. Use this to\n       * surface a toast, report telemetry, or mark the thread as needing a\n       * retry. The failed stream id is cleared after the callback unless a\n       * newer id has replaced it.\n       */\n      onResumeError?: ((error: unknown) => void) | undefined;\n      joinStrategy?: AISDKRuntimeAdapter[\"joinStrategy\"];\n      messageRepository?: AISDKRuntimeAdapter<UI_MESSAGE>[\"messageRepository\"];\n      unstable_onBranchChange?: AISDKRuntimeAdapter[\"unstable_onBranchChange\"];\n    };\n\nexport type ChatThreadEnvironment<UI_MESSAGE extends UIMessage = UIMessage> = {\n  id: string;\n  isMainThread: boolean;\n  getThreadListItem: () => InitializableThreadListItem | undefined;\n  stopOnClientDestroy?: boolean;\n  /**\n   * An externally owned chat instance. State lives on the instance, so it\n   * survives the hosting resource unmounting; construction options are read\n   * from the instance.\n   */\n  chat?: Chat<UI_MESSAGE> | undefined;\n};\n\nconst useDynamicChatTransport = <UI_MESSAGE extends UIMessage = UIMessage>(\n  transport: ChatTransport<UI_MESSAGE>,\n): ChatTransport<UI_MESSAGE> => {\n  const transportRef = useRef<ChatTransport<UI_MESSAGE>>(transport);\n  useEffect(() => {\n    transportRef.current = transport;\n  });\n  const dynamicTransport = useMemo(\n    () =>\n      new Proxy(transportRef.current, {\n        get(_, prop) {\n          const res =\n            transportRef.current[prop as keyof ChatTransport<UI_MESSAGE>];\n          return typeof res === \"function\"\n            ? res.bind(transportRef.current)\n            : res;\n        },\n      }),\n    [],\n  );\n  return dynamicTransport;\n};\n\nconst getResumableAdapter = <UI_MESSAGE extends UIMessage>(\n  transport: ChatTransport<UI_MESSAGE>,\n): AssistantChatResumableOptions | undefined => {\n  if (transport instanceof AssistantChatTransport) {\n    return transport.getResumableAdapter();\n  }\n  const candidate = (transport as { getResumableAdapter?: () => unknown })\n    .getResumableAdapter;\n  if (typeof candidate !== \"function\") return undefined;\n  return candidate.call(transport) as AssistantChatResumableOptions | undefined;\n};\n\nconst getNoPendingStreamId = () => null;\n\nconst resumedStreamIdsByStorage = new WeakMap<\n  ResumableClientStorage,\n  Set<string>\n>();\n\nconst getResumedStreamIds = (storage: ResumableClientStorage | undefined) => {\n  if (!storage) return new Set<string>();\n  let resumedStreamIds = resumedStreamIdsByStorage.get(storage);\n  if (!resumedStreamIds) {\n    resumedStreamIds = new Set();\n    resumedStreamIdsByStorage.set(storage, resumedStreamIds);\n  }\n  return resumedStreamIds;\n};\n\n/**\n * Splits the combined options into the assistant-ui side and the `ChatInit`\n * remainder the AI SDK consumes, so external `Chat` construction forwards the\n * same fields `useChat` would.\n */\nexport const splitChatThreadOptions = <UI_MESSAGE extends UIMessage>(\n  options: ChatThreadOptions<UI_MESSAGE> | undefined,\n) => {\n  const {\n    adapters,\n    transport,\n    throttle,\n    toCreateMessage,\n    isDisabled: _isDisabled,\n    isSendDisabled: _isSendDisabled,\n    unstable_capabilities: _unstable_capabilities,\n    suggestions: _suggestions,\n    onResume,\n    onResumeToolCall,\n    onResumeError,\n    joinStrategy,\n    messageRepository,\n    unstable_onBranchChange,\n    ...chatInit\n  } = options ?? {};\n  // peel guard: any shared key left in `chatInit` collapses this to `never`\n  true satisfies keyof typeof chatInit &\n    keyof ExternalStoreSharedOptions extends never\n    ? true\n    : never;\n  return {\n    adapters,\n    transport,\n    throttle,\n    toCreateMessage,\n    onResume,\n    onResumeToolCall,\n    onResumeError,\n    joinStrategy,\n    messageRepository,\n    unstable_onBranchChange,\n    chatInit,\n  };\n};\n\nexport const useChatThread = <UI_MESSAGE extends UIMessage = UIMessage>(\n  options: ChatThreadOptions<UI_MESSAGE> | undefined,\n  env: ChatThreadEnvironment<UI_MESSAGE>,\n): AssistantRuntime => {\n  const {\n    adapters,\n    transport: transportOptions,\n    throttle,\n    toCreateMessage,\n    onResume,\n    onResumeToolCall,\n    onResumeError,\n    joinStrategy,\n    messageRepository,\n    unstable_onBranchChange,\n    chatInit: chatOptions,\n  } = splitChatThreadOptions(options);\n\n  const {\n    id,\n    isMainThread,\n    getThreadListItem,\n    stopOnClientDestroy = false,\n    chat: externalChat,\n  } = env;\n\n  const defaultTransport = useMemo(() => new AssistantChatTransport(), []);\n  const sourceTransport = transportOptions ?? defaultTransport;\n  const transport = useDynamicChatTransport(sourceTransport);\n\n  const chat = useChat({\n    ...chatOptions,\n    id,\n    transport,\n    ...(throttle !== undefined && { throttle }),\n    ...(externalChat !== undefined && { chat: externalChat }),\n  });\n\n  useResourceCleanup(stopOnClientDestroy, () => {\n    void chat.stop().catch(() => {});\n  });\n\n  const runtime = useAISDKRuntime(chat, {\n    adapters,\n    ...pickExternalStoreSharedOptions(options ?? {}),\n    ...(toCreateMessage && { toCreateMessage }),\n    ...(onResume && { onResume }),\n    ...(onResumeToolCall && { onResumeToolCall }),\n    ...(joinStrategy && { joinStrategy }),\n    ...(messageRepository && { messageRepository }),\n    ...(unstable_onBranchChange && { unstable_onBranchChange }),\n  });\n\n  if (sourceTransport instanceof AssistantChatTransport) {\n    sourceTransport.setRuntime(runtime);\n    sourceTransport.__internal_setGetThreadListItem(getThreadListItem);\n  }\n\n  const subscribeToRuntime = useCallback(\n    (callback: () => void) => runtime.thread.subscribe(callback),\n    [runtime],\n  );\n  const getHistoryLoadingSnapshot = useCallback(\n    () => runtime.thread.getState().isLoading,\n    [runtime],\n  );\n  const isLoadingHistory = useSyncExternalStore(\n    subscribeToRuntime,\n    getHistoryLoadingSnapshot,\n    getHistoryLoadingSnapshot,\n  );\n\n  const resumableStorage = useMemo(\n    () => getResumableAdapter(sourceTransport)?.storage,\n    [sourceTransport],\n  );\n  const subscribeToResumableStorage = useCallback(\n    (callback: () => void) =>\n      isMainThread\n        ? (resumableStorage?.subscribe?.(callback, id) ?? (() => {}))\n        : () => {},\n    [id, isMainThread, resumableStorage],\n  );\n  const getPendingStreamId = useCallback(\n    () => (isMainThread ? (resumableStorage?.getStreamId(id) ?? null) : null),\n    [id, isMainThread, resumableStorage],\n  );\n  const pendingStreamId = useSyncExternalStore(\n    subscribeToResumableStorage,\n    getPendingStreamId,\n    getNoPendingStreamId,\n  );\n  const isChatRunning =\n    chat.status === \"submitted\" || chat.status === \"streaming\";\n\n  const resumedStreamIds = useMemo(\n    () => getResumedStreamIds(resumableStorage),\n    [resumableStorage],\n  );\n  const onResumeErrorRef = useRef(onResumeError);\n  useEffect(() => {\n    onResumeErrorRef.current = onResumeError;\n  });\n  useEffect(() => {\n    if (!pendingStreamId || resumedStreamIds.has(pendingStreamId)) {\n      return;\n    }\n    if (isChatRunning) {\n      resumedStreamIds.add(pendingStreamId);\n      return;\n    }\n    if (isLoadingHistory) return;\n    resumedStreamIds.add(pendingStreamId);\n    chat.resumeStream().catch((err: unknown) => {\n      console.warn(\"[assistant-ui] resumable: resume failed\", err);\n      try {\n        onResumeErrorRef.current?.(err);\n      } catch (callbackError) {\n        console.error(\n          \"[assistant-ui] resumable: onResumeError callback failed\",\n          callbackError,\n        );\n      } finally {\n        if (resumableStorage?.getStreamId(id) === pendingStreamId) {\n          resumableStorage.clear(id);\n        }\n      }\n    });\n  }, [\n    chat,\n    id,\n    isChatRunning,\n    isLoadingHistory,\n    pendingStreamId,\n    resumableStorage,\n    resumedStreamIds,\n  ]);\n\n  return runtime;\n};\n"],"mappings":"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"}
+{"version":3,"file":"useChatThread.js","names":["useChat","Chat","UIMessage","MessageRepository","pickExternalStoreSharedOptions","AssistantRuntime","ExternalStoreSharedOptions","useAISDKRuntime","AISDKRuntimeAdapter","CustomToCreateMessageFunction","ChatInit","ChatTransport","AssistantChatTransport","InitializableThreadListItem","AssistantChatResumableOptions","ResumableClientStorage","useCallback","useEffect","useMemo","useRef","useSyncExternalStore","useResourceCleanup","ChatThreadOptions","UI_MESSAGE","throttle","adapters","toCreateMessage","onResume","onResumeToolCall","onResumeError","error","joinStrategy","messageRepository","unstable_onBranchChange","ChatThreadEnvironment","id","isMainThread","getThreadListItem","stopOnClientDestroy","chat","messageRepositoryInstance","useDynamicChatTransport","transport","transportRef","current","dynamicTransport","Proxy","get","_","prop","res","bind","getResumableAdapter","candidate","undefined","call","getNoPendingStreamId","resumedStreamIdsByStorage","WeakMap","Set","getResumedStreamIds","storage","resumedStreamIds","set","splitChatThreadOptions","options","isDisabled","_isDisabled","isSendDisabled","_isSendDisabled","unstable_capabilities","_unstable_capabilities","suggestions","_suggestions","chatInit","useChatThread","env","transportOptions","chatOptions","externalChat","defaultTransport","sourceTransport","stop","catch","runtime","unstable_messageRepositoryInstance","setRuntime","__internal_setGetThreadListItem","subscribeToRuntime","callback","thread","subscribe","getHistoryLoadingSnapshot","getState","isLoading","isLoadingHistory","resumableStorage","subscribeToResumableStorage","getPendingStreamId","getStreamId","pendingStreamId","isChatRunning","status","onResumeErrorRef","has","add","resumeStream","err","console","warn","callbackError","clear"],"sources":["../../src/runtime/useChatThread.ts"],"sourcesContent":["\"use client\";\n\nimport { useChat, type Chat, type UIMessage } from \"@ai-sdk/react\";\nimport type { MessageRepository } from \"@assistant-ui/core/internal\";\nimport {\n  pickExternalStoreSharedOptions,\n  type AssistantRuntime,\n  type ExternalStoreSharedOptions,\n} from \"@assistant-ui/core\";\nimport {\n  useAISDKRuntime,\n  type AISDKRuntimeAdapter,\n  type CustomToCreateMessageFunction,\n} from \"./useAISDKRuntime\";\nimport type { ChatInit, ChatTransport } from \"ai\";\nimport {\n  AssistantChatTransport,\n  type InitializableThreadListItem,\n} from \"../transport/AssistantChatTransport\";\nimport type {\n  AssistantChatResumableOptions,\n  ResumableClientStorage,\n} from \"../transport/resumable\";\nimport {\n  useCallback,\n  useEffect,\n  useMemo,\n  useRef,\n  useSyncExternalStore,\n} from \"react\";\nimport { useResourceCleanup } from \"./useResourceCleanup\";\n\nexport type ChatThreadOptions<UI_MESSAGE extends UIMessage = UIMessage> =\n  ChatInit<UI_MESSAGE> &\n    ExternalStoreSharedOptions & {\n      throttle?: number | undefined;\n      adapters?: AISDKRuntimeAdapter[\"adapters\"] | undefined;\n      toCreateMessage?: CustomToCreateMessageFunction;\n      onResume?: AISDKRuntimeAdapter[\"onResume\"];\n      onResumeToolCall?: AISDKRuntimeAdapter[\"onResumeToolCall\"];\n      /**\n       * Called when an automatic resumable stream reconnect fails. Use this to\n       * surface a toast, report telemetry, or mark the thread as needing a\n       * retry. The failed stream id is cleared after the callback unless a\n       * newer id has replaced it.\n       */\n      onResumeError?: ((error: unknown) => void) | undefined;\n      joinStrategy?: AISDKRuntimeAdapter[\"joinStrategy\"];\n      messageRepository?: AISDKRuntimeAdapter<UI_MESSAGE>[\"messageRepository\"];\n      unstable_onBranchChange?: AISDKRuntimeAdapter[\"unstable_onBranchChange\"];\n    };\n\nexport type ChatThreadEnvironment<UI_MESSAGE extends UIMessage = UIMessage> = {\n  id: string;\n  isMainThread: boolean;\n  getThreadListItem: () => InitializableThreadListItem | undefined;\n  stopOnClientDestroy?: boolean;\n  /**\n   * An externally owned chat instance. State lives on the instance, so it\n   * survives the hosting resource unmounting; construction options are read\n   * from the instance.\n   */\n  chat?: Chat<UI_MESSAGE> | undefined;\n  /**\n   * An externally owned per-thread message repository. Hosts that route\n   * multiple threads through one mounting pass a distinct instance per\n   * thread so histories and branches stay isolated.\n   */\n  messageRepositoryInstance?: MessageRepository | undefined;\n};\n\nconst useDynamicChatTransport = <UI_MESSAGE extends UIMessage = UIMessage>(\n  transport: ChatTransport<UI_MESSAGE>,\n): ChatTransport<UI_MESSAGE> => {\n  const transportRef = useRef<ChatTransport<UI_MESSAGE>>(transport);\n  useEffect(() => {\n    transportRef.current = transport;\n  });\n  const dynamicTransport = useMemo(\n    () =>\n      new Proxy(transportRef.current, {\n        get(_, prop) {\n          const res =\n            transportRef.current[prop as keyof ChatTransport<UI_MESSAGE>];\n          return typeof res === \"function\"\n            ? res.bind(transportRef.current)\n            : res;\n        },\n      }),\n    [],\n  );\n  return dynamicTransport;\n};\n\nconst getResumableAdapter = <UI_MESSAGE extends UIMessage>(\n  transport: ChatTransport<UI_MESSAGE>,\n): AssistantChatResumableOptions | undefined => {\n  if (transport instanceof AssistantChatTransport) {\n    return transport.getResumableAdapter();\n  }\n  const candidate = (transport as { getResumableAdapter?: () => unknown })\n    .getResumableAdapter;\n  if (typeof candidate !== \"function\") return undefined;\n  return candidate.call(transport) as AssistantChatResumableOptions | undefined;\n};\n\nconst getNoPendingStreamId = () => null;\n\nconst resumedStreamIdsByStorage = new WeakMap<\n  ResumableClientStorage,\n  Set<string>\n>();\n\nconst getResumedStreamIds = (storage: ResumableClientStorage | undefined) => {\n  if (!storage) return new Set<string>();\n  let resumedStreamIds = resumedStreamIdsByStorage.get(storage);\n  if (!resumedStreamIds) {\n    resumedStreamIds = new Set();\n    resumedStreamIdsByStorage.set(storage, resumedStreamIds);\n  }\n  return resumedStreamIds;\n};\n\n/**\n * Splits the combined options into the assistant-ui side and the `ChatInit`\n * remainder the AI SDK consumes, so external `Chat` construction forwards the\n * same fields `useChat` would.\n */\nexport const splitChatThreadOptions = <UI_MESSAGE extends UIMessage>(\n  options: ChatThreadOptions<UI_MESSAGE> | undefined,\n) => {\n  const {\n    adapters,\n    transport,\n    throttle,\n    toCreateMessage,\n    isDisabled: _isDisabled,\n    isSendDisabled: _isSendDisabled,\n    unstable_capabilities: _unstable_capabilities,\n    suggestions: _suggestions,\n    onResume,\n    onResumeToolCall,\n    onResumeError,\n    joinStrategy,\n    messageRepository,\n    unstable_onBranchChange,\n    ...chatInit\n  } = options ?? {};\n  // peel guard: any shared key left in `chatInit` collapses this to `never`\n  true satisfies keyof typeof chatInit &\n    keyof ExternalStoreSharedOptions extends never\n    ? true\n    : never;\n  return {\n    adapters,\n    transport,\n    throttle,\n    toCreateMessage,\n    onResume,\n    onResumeToolCall,\n    onResumeError,\n    joinStrategy,\n    messageRepository,\n    unstable_onBranchChange,\n    chatInit,\n  };\n};\n\nexport const useChatThread = <UI_MESSAGE extends UIMessage = UIMessage>(\n  options: ChatThreadOptions<UI_MESSAGE> | undefined,\n  env: ChatThreadEnvironment<UI_MESSAGE>,\n): AssistantRuntime => {\n  const {\n    adapters,\n    transport: transportOptions,\n    throttle,\n    toCreateMessage,\n    onResume,\n    onResumeToolCall,\n    onResumeError,\n    joinStrategy,\n    messageRepository,\n    unstable_onBranchChange,\n    chatInit: chatOptions,\n  } = splitChatThreadOptions(options);\n\n  const {\n    id,\n    isMainThread,\n    getThreadListItem,\n    stopOnClientDestroy = false,\n    chat: externalChat,\n    messageRepositoryInstance,\n  } = env;\n\n  const defaultTransport = useMemo(() => new AssistantChatTransport(), []);\n  const sourceTransport = transportOptions ?? defaultTransport;\n  const transport = useDynamicChatTransport(sourceTransport);\n\n  const chat = useChat({\n    ...chatOptions,\n    id,\n    transport,\n    ...(throttle !== undefined && { throttle }),\n    ...(externalChat !== undefined && { chat: externalChat }),\n  });\n\n  useResourceCleanup(stopOnClientDestroy, () => {\n    void chat.stop().catch(() => {});\n  });\n\n  const runtime = useAISDKRuntime(chat, {\n    adapters,\n    ...pickExternalStoreSharedOptions(options ?? {}),\n    ...(toCreateMessage && { toCreateMessage }),\n    ...(onResume && { onResume }),\n    ...(onResumeToolCall && { onResumeToolCall }),\n    ...(joinStrategy && { joinStrategy }),\n    ...(messageRepository && { messageRepository }),\n    ...(messageRepositoryInstance && {\n      unstable_messageRepositoryInstance: messageRepositoryInstance,\n    }),\n    ...(unstable_onBranchChange && { unstable_onBranchChange }),\n  });\n\n  if (sourceTransport instanceof AssistantChatTransport) {\n    sourceTransport.setRuntime(runtime);\n    sourceTransport.__internal_setGetThreadListItem(getThreadListItem);\n  }\n\n  const subscribeToRuntime = useCallback(\n    (callback: () => void) => runtime.thread.subscribe(callback),\n    [runtime],\n  );\n  const getHistoryLoadingSnapshot = useCallback(\n    () => runtime.thread.getState().isLoading,\n    [runtime],\n  );\n  const isLoadingHistory = useSyncExternalStore(\n    subscribeToRuntime,\n    getHistoryLoadingSnapshot,\n    getHistoryLoadingSnapshot,\n  );\n\n  const resumableStorage = useMemo(\n    () => getResumableAdapter(sourceTransport)?.storage,\n    [sourceTransport],\n  );\n  const subscribeToResumableStorage = useCallback(\n    (callback: () => void) =>\n      isMainThread\n        ? (resumableStorage?.subscribe?.(callback, id) ?? (() => {}))\n        : () => {},\n    [id, isMainThread, resumableStorage],\n  );\n  const getPendingStreamId = useCallback(\n    () => (isMainThread ? (resumableStorage?.getStreamId(id) ?? null) : null),\n    [id, isMainThread, resumableStorage],\n  );\n  const pendingStreamId = useSyncExternalStore(\n    subscribeToResumableStorage,\n    getPendingStreamId,\n    getNoPendingStreamId,\n  );\n  const isChatRunning =\n    chat.status === \"submitted\" || chat.status === \"streaming\";\n\n  const resumedStreamIds = useMemo(\n    () => getResumedStreamIds(resumableStorage),\n    [resumableStorage],\n  );\n  const onResumeErrorRef = useRef(onResumeError);\n  useEffect(() => {\n    onResumeErrorRef.current = onResumeError;\n  });\n  useEffect(() => {\n    if (!pendingStreamId || resumedStreamIds.has(pendingStreamId)) {\n      return;\n    }\n    if (isChatRunning) {\n      resumedStreamIds.add(pendingStreamId);\n      return;\n    }\n    if (isLoadingHistory) return;\n    resumedStreamIds.add(pendingStreamId);\n    chat.resumeStream().catch((err: unknown) => {\n      console.warn(\"[assistant-ui] resumable: resume failed\", err);\n      try {\n        onResumeErrorRef.current?.(err);\n      } catch (callbackError) {\n        console.error(\n          \"[assistant-ui] resumable: onResumeError callback failed\",\n          callbackError,\n        );\n      } finally {\n        if (resumableStorage?.getStreamId(id) === pendingStreamId) {\n          resumableStorage.clear(id);\n        }\n      }\n    });\n  }, [\n    chat,\n    id,\n    isChatRunning,\n    isLoadingHistory,\n    pendingStreamId,\n    resumableStorage,\n    resumedStreamIds,\n  ]);\n\n  return runtime;\n};\n"],"mappings":"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"}

package/dist/runtime/useExternalHistory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useExternalHistory.d.ts","names":[],"sources":["../../src/runtime/useExternalHistory.ts"],"mappings":";;;cAsBa,8BAA+B,UAC1C,mBAAmB,UAAU,eAAe,iBAC5C,UAAU,wBAAwB,cACjC;cAoCU,qBAAsB,UACjC,YAAY,UAAU,mBACtB,gBAAgB,kCAChB,mBAAmB,UAAU,eAAe,iBAC5C,sBAAsB,qBAAqB,gBAC3C,gBAAgB,UAAU;;EAmVN,gBAAA,sBAAM"}
+{"version":3,"file":"useExternalHistory.d.ts","names":[],"sources":["../../src/runtime/useExternalHistory.ts"],"mappings":";;;cAuBa,8BAA+B,UAC1C,mBAAmB,UAAU,eAAe,iBAC5C,UAAU,wBAAwB,cACjC;cA+BU,qBAAsB,UACjC,YAAY,UAAU,mBACtB,gBAAgB,kCAChB,mBAAmB,UAAU,eAAe,iBAC5C,sBAAsB,qBAAqB,gBAC3C,gBAAgB,UAAU;;EA2UN,gBAAA,sBAAM"}

package/dist/runtime/useExternalHistory.js

@@ -25,7 +25,7 @@ const toExportedMessageRepository = (toThreadMessages, messages) => {
 	};
 };
 const isAwaitingToolApproval = (message) => message.status?.type === "requires-action" && message.status.reason === "tool-calls";
-const snapshotExternalMessages = (messages) => new Map(messages.map((message) => [message.id, [...getExternalStoreMessages(message)]]));
+const encodeContent = (storageFormatAdapter, item) => JSON.stringify(storageFormatAdapter.encode(item));
 const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storageFormatAdapter, onSetMessages) => {
 	const loadedRef = useRef(false);
 	const [itemEpoch, setItemEpoch] = useState(0);
@@ -33,9 +33,8 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 	const optionalThreadListItem = useCallback(() => aui.threadListItem.source ? aui.threadListItem : null, [aui]);
 	const [hasLoaded, setHasLoaded] = useState(false);
 	const historyIds = useRef(/* @__PURE__ */ new Set());
-	const persistedInnerIds = useRef(/* @__PURE__ */ new Set());
 	const deferredTelemetryIds = useRef(/* @__PURE__ */ new Set());
-	const persistedExternalMessages = useRef(/* @__PURE__ */ new Map());
+	const persistedInnerMessages = useRef(/* @__PURE__ */ new Map());
 	const onSetMessagesRef = useRef(onSetMessages);
 	useEffect(() => {
 		onSetMessagesRef.current = onSetMessages;
@@ -52,7 +51,10 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 			try {
 				const repo = await formatAdapter.load();
 				if (repo && repo.messages.length > 0) {
-					for (const m of repo.messages) persistedInnerIds.current.add(storageFormatAdapter.getId(m.message));
+					for (const m of repo.messages) persistedInnerMessages.current.set(storageFormatAdapter.getId(m.message), {
+						source: m.message,
+						content: encodeContent(storageFormatAdapter, m)
+					});
 					const converted = toExportedMessageRepository(toThreadMessages, repo);
 					runtimeRef.current.thread.import(converted);
 					const tempRepo = new MessageRepository();
@@ -64,7 +66,6 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 						historyIds.current.add(m_0.message.id);
 						if (isAwaitingToolApproval(m_0.message)) deferredTelemetryIds.current.add(m_0.message.id);
 					}
-					persistedExternalMessages.current = snapshotExternalMessages(converted.messages.map((m_1) => m_1.message));
 				}
 			} catch (error) {
 				console.error("Failed to load message history:", error);
@@ -157,7 +158,7 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 			const boundaries = stepBoundariesRef.current;
 			const durationMs = boundaries.length > 0 ? boundaries.at(-1) : void 0;
 			if (boundaries.length === 1 && durationMs != null) {
-				const lastAssistant = latest.messages.findLast((m_2) => m_2.role === "assistant");
+				const lastAssistant = latest.messages.findLast((m_1) => m_1.role === "assistant");
 				if (lastAssistant) {
 					const tcCount = lastAssistant.content.filter((p_0) => p_0.type === "tool-call").length;
 					if (tcCount > 0) {
@@ -179,58 +180,53 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 				...stepTimestamps != null ? { stepTimestamps } : void 0
 			};
 			persistInFlightRef.current = persistInFlightRef.current.then(async () => {
-				const changedRunMessageIds = /* @__PURE__ */ new Set();
-				for (const message of latest.messages) {
-					const externalMessages = getExternalStoreMessages(message);
-					const previous = persistedExternalMessages.current.get(message.id);
-					if (previous === void 0 || previous.length !== externalMessages.length || externalMessages.some((item, index) => item !== previous[index])) changedRunMessageIds.add(message.id);
-				}
 				const { messages: messages_0 } = latest;
 				let lastInnerMessageId = null;
-				const failedUpdateIds = /* @__PURE__ */ new Set();
 				const getLastInnerId = (msgs) => msgs.length > 0 ? storageFormatAdapter.getId(msgs.at(-1)) : null;
 				const toBatchItems = (msgs_0) => msgs_0.map((msg, idx) => ({
 					parentId: idx === 0 ? lastInnerMessageId : storageFormatAdapter.getId(msgs_0[idx - 1]),
 					message: msg
 				}));
-				for (const message_0 of messages_0) {
-					const innerMessages = getExternalStoreMessages(message_0);
-					const isTerminal = message_0.status === void 0 || message_0.status.type === "complete" || message_0.status.type === "incomplete";
-					const isAwaitingToolCalls = isAwaitingToolApproval(message_0);
+				for (const message of messages_0) {
+					const innerMessages = getExternalStoreMessages(message);
+					const isTerminal = message.status === void 0 || message.status.type === "complete" || message.status.type === "incomplete";
+					const isAwaitingToolCalls = isAwaitingToolApproval(message);
 					if (!(isTerminal || isAwaitingToolCalls && adapter.update !== void 0)) {
 						lastInnerMessageId = getLastInnerId(innerMessages) ?? lastInnerMessageId;
 						continue;
 					}
-					const isPersistedMessage = historyIds.current.has(message_0.id);
-					if (isPersistedMessage && !changedRunMessageIds.has(message_0.id)) {
-						lastInnerMessageId = getLastInnerId(innerMessages) ?? lastInnerMessageId;
-						continue;
-					}
-					if (!isPersistedMessage) {
-						historyIds.current.add(message_0.id);
-						deferredTelemetryIds.current.add(message_0.id);
+					if (!historyIds.current.has(message.id)) {
+						historyIds.current.add(message.id);
+						deferredTelemetryIds.current.add(message.id);
 					}
 					const batchItems = toBatchItems(innerMessages);
-					for (const item_0 of batchItems) {
-						const innerId = storageFormatAdapter.getId(item_0.message);
-						if (!persistedInnerIds.current.has(innerId)) {
-							await adapter.append(item_0);
-							persistedInnerIds.current.add(innerId);
-						} else if (durationMs !== void 0) try {
-							await adapter.update?.(item_0, innerId);
-						} catch {
-							failedUpdateIds.add(message_0.id);
+					for (const item of batchItems) {
+						const innerId = storageFormatAdapter.getId(item.message);
+						const persisted = persistedInnerMessages.current.get(innerId);
+						if (!persisted) {
+							await adapter.append(item);
+							persistedInnerMessages.current.set(innerId, {
+								source: item.message,
+								content: encodeContent(storageFormatAdapter, item)
+							});
+						} else if (persisted.source !== item.message && durationMs !== void 0 && adapter.update) {
+							const content = encodeContent(storageFormatAdapter, item);
+							if (content === persisted.content) persisted.source = item.message;
+							else try {
+								await adapter.update(item, innerId);
+								persistedInnerMessages.current.set(innerId, {
+									source: item.message,
+									content
+								});
+							} catch {}
 						}
 					}
 					lastInnerMessageId = getLastInnerId(innerMessages) ?? lastInnerMessageId;
-					if (deferredTelemetryIds.current.has(message_0.id) && isTerminal) {
-						deferredTelemetryIds.current.delete(message_0.id);
+					if (deferredTelemetryIds.current.has(message.id) && isTerminal) {
+						deferredTelemetryIds.current.delete(message.id);
 						adapter.reportTelemetry?.(batchItems, telemetryOptions);
 					}
 				}
-				const nextSnapshot = snapshotExternalMessages(latest.messages);
-				for (const id of failedUpdateIds) nextSnapshot.delete(id);
-				persistedExternalMessages.current = nextSnapshot;
 			}).catch((error_0) => {
 				console.error("Failed to persist message history:", error_0);
 			});
@@ -254,24 +250,23 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 			const deleteMessages = formatAdapter?.delete?.bind(formatAdapter);
 			if (!deleteMessages) return;
 			const messages_1 = runtimeRef.current.thread.getState().messages;
-			const messageIndex = messages_1.findIndex((m_3) => m_3.id === messageId);
+			const messageIndex = messages_1.findIndex((m_2) => m_2.id === messageId);
 			if (messageIndex === -1) return;
 			const previousInnerMessages = messages_1.slice(0, messageIndex).flatMap(getExternalStoreMessages);
 			let parentId = previousInnerMessages.at(-1) ? storageFormatAdapter.getId(previousInnerMessages.at(-1)) : null;
-			const itemsToDelete = getExternalStoreMessages(messages_1[messageIndex]).map((message_1) => {
-				const item_1 = {
+			const itemsToDelete = getExternalStoreMessages(messages_1[messageIndex]).map((message_0) => {
+				const item_0 = {
 					parentId,
-					message: message_1
+					message: message_0
 				};
-				parentId = storageFormatAdapter.getId(message_1);
-				return item_1;
+				parentId = storageFormatAdapter.getId(message_0);
+				return item_0;
 			});
 			const deletion = persistInFlightRef.current.then(async () => {
 				await deleteMessages(itemsToDelete);
 				historyIds.current.delete(messageId);
 				deferredTelemetryIds.current.delete(messageId);
-				persistedExternalMessages.current.delete(messageId);
-				for (const item_2 of itemsToDelete) persistedInnerIds.current.delete(storageFormatAdapter.getId(item_2.message));
+				for (const item_1 of itemsToDelete) persistedInnerMessages.current.delete(storageFormatAdapter.getId(item_1.message));
 			});
 			persistInFlightRef.current = deletion.catch(() => {});
 			await deletion;

package/dist/runtime/useExternalHistory.js.map

@@ -1 +1 @@
-{"version":3,"file":"useExternalHistory.js","names":["AssistantRuntime","ThreadHistoryAdapter","ThreadMessage","MessageFormatAdapter","MessageFormatRepository","ExportedMessageRepository","getExternalStoreMessages","MessageRepository","useAui","useRef","useEffect","useState","RefObject","useCallback","useMemo","toExportedMessageRepository","toThreadMessages","messages","TMessage","survivingIds","Set","survivors","flatMap","m","message","console","warn","parentId","has","add","id","headId","isAwaitingToolApproval","status","type","reason","snapshotExternalMessages","Map","map","useExternalHistory","runtimeRef","historyAdapter","storageFormatAdapter","onSetMessages","loadedRef","itemEpoch","setItemEpoch","aui","optionalThreadListItem","threadListItem","source","hasLoaded","setHasLoaded","historyIds","persistedInnerIds","deferredTelemetryIds","persistedExternalMessages","onSetMessagesRef","current","formatAdapter","undefined","withFormat","Error","isLoading","loadHistory","repo","load","length","getId","converted","thread","import","tempRepo","getMessages","error","pin","remoteId","getState","subscribe","n","threadState","isRunning","runStartRef","persistTimerRef","ReturnType","setTimeout","persistInFlightRef","Promise","resolve","stepBoundariesRef","wasRunningRef","toolCallCountRef","adapter","unsubscribe","wasRunning","lastMsg","at","role","currentToolCallCount","content","filter","p","push","Date","now","clearTimeout","persistSettled","initialThreadState","ignoreRunning","latest","boundaries","durationMs","lastAssistant","findLast","tcCount","totalSteps","stepDur","i","Math","round","stepTimestamps","endMs","start_ms","end_ms","telemetryOptions","then","changedRunMessageIds","externalMessages","previous","get","some","item","index","lastInnerMessageId","failedUpdateIds","getLastInnerId","msgs","toBatchItems","msg","idx","innerMessages","isTerminal","isAwaitingToolCalls","isReady","update","isPersistedMessage","batchItems","innerId","append","delete","reportTelemetry","nextSnapshot","catch","deleteMessage","messageId","deleteMessages","bind","messageIndex","findIndex","previousInnerMessages","slice","itemsToDelete","deletion"],"sources":["../../src/runtime/useExternalHistory.ts"],"sourcesContent":["\"use client\";\n\nimport type {\n  AssistantRuntime,\n  ThreadHistoryAdapter,\n  ThreadMessage,\n  MessageFormatAdapter,\n  MessageFormatRepository,\n  ExportedMessageRepository,\n} from \"@assistant-ui/core\";\nimport { getExternalStoreMessages } from \"@assistant-ui/core\";\nimport { MessageRepository } from \"@assistant-ui/core/internal\";\nimport { useAui } from \"@assistant-ui/store\";\nimport {\n  useRef,\n  useEffect,\n  useState,\n  type RefObject,\n  useCallback,\n  useMemo,\n} from \"react\";\n\nexport const toExportedMessageRepository = <TMessage>(\n  toThreadMessages: (messages: TMessage[]) => ThreadMessage[],\n  messages: MessageFormatRepository<TMessage>,\n): ExportedMessageRepository => {\n  const survivingIds = new Set<string>();\n  const survivors = messages.messages.flatMap((m) => {\n    const message = toThreadMessages([m.message])[0];\n    if (!message) {\n      console.warn(\"Skipping a stored message that could not be loaded.\");\n      return [];\n    }\n    if (m.parentId && !survivingIds.has(m.parentId)) return [];\n    survivingIds.add(message.id);\n    return [{ ...m, message }];\n  });\n\n  return {\n    headId:\n      messages.headId && survivingIds.has(messages.headId)\n        ? messages.headId\n        : null,\n    messages: survivors,\n  };\n};\n\nconst isAwaitingToolApproval = (message: ThreadMessage) =>\n  message.status?.type === \"requires-action\" &&\n  message.status.reason === \"tool-calls\";\n\nconst snapshotExternalMessages = <TMessage>(\n  messages: readonly ThreadMessage[],\n) =>\n  new Map<string, TMessage[]>(\n    messages.map((message) => [\n      message.id,\n      [...getExternalStoreMessages<TMessage>(message)],\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  const [itemEpoch, setItemEpoch] = useState(0);\n\n  const aui = useAui();\n  const optionalThreadListItem = useCallback(\n    () => (aui.threadListItem.source ? aui.threadListItem : null),\n    [aui],\n  );\n\n  const [hasLoaded, setHasLoaded] = useState(false);\n\n  const historyIds = useRef(new Set<string>());\n  const persistedInnerIds = useRef(new Set<string>());\n  const deferredTelemetryIds = useRef(new Set<string>());\n  const persistedExternalMessages = useRef(new Map<string, TMessage[]>());\n\n  const onSetMessagesRef = useRef(onSetMessages);\n  useEffect(() => {\n    onSetMessagesRef.current = onSetMessages;\n  });\n\n  const formatAdapter = useMemo(() => {\n    if (!historyAdapter) return undefined;\n    if (!historyAdapter.withFormat) {\n      throw new Error(\n        \"useAISDKRuntime: ThreadHistoryAdapter is missing the required `withFormat` method.\",\n      );\n    }\n    return historyAdapter.withFormat<TMessage, any>(storageFormatAdapter);\n  }, [historyAdapter, storageFormatAdapter]);\n\n  const isLoading = formatAdapter != null && !hasLoaded;\n\n  useEffect(() => {\n    if (!formatAdapter || loadedRef.current) return undefined;\n\n    const loadHistory = async () => {\n      try {\n        const repo = await formatAdapter.load();\n        if (repo && repo.messages.length > 0) {\n          for (const m of repo.messages) {\n            persistedInnerIds.current.add(\n              storageFormatAdapter.getId(m.message),\n            );\n          }\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.flatMap(getExternalStoreMessages<TMessage>),\n          );\n\n          historyIds.current = new Set();\n          for (const m of converted.messages) {\n            historyIds.current.add(m.message.id);\n            if (isAwaitingToolApproval(m.message)) {\n              deferredTelemetryIds.current.add(m.message.id);\n            }\n          }\n          persistedExternalMessages.current =\n            snapshotExternalMessages<TMessage>(\n              converted.messages.map((m) => m.message),\n            );\n        }\n      } catch (error) {\n        console.error(\"Failed to load message history:\", error);\n      } finally {\n        setHasLoaded(true);\n      }\n    };\n\n    formatAdapter.pin?.();\n\n    const remoteId = optionalThreadListItem()?.getState().remoteId;\n    if (!remoteId) {\n      setHasLoaded(true);\n      return aui.subscribe(() => {\n        if (optionalThreadListItem()?.getState().remoteId) {\n          setItemEpoch((n) => n + 1);\n        }\n      });\n    }\n\n    const threadState = runtimeRef.current.thread.getState();\n    if (threadState.isRunning || threadState.messages.length > 0) {\n      loadedRef.current = true;\n      setHasLoaded(true);\n      return undefined;\n    }\n\n    loadedRef.current = true;\n    void loadHistory();\n    return undefined;\n  }, [\n    formatAdapter,\n    toThreadMessages,\n    runtimeRef,\n    optionalThreadListItem,\n    aui,\n    itemEpoch,\n    storageFormatAdapter,\n  ]);\n\n  const runStartRef = useRef<number | null>(null);\n  const persistTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);\n  const persistInFlightRef = useRef<Promise<void>>(Promise.resolve());\n  const stepBoundariesRef = useRef<number[]>([]);\n  const wasRunningRef = useRef(false);\n  const toolCallCountRef = useRef(0);\n\n  useEffect(() => {\n    if (!formatAdapter) return;\n    const adapter = formatAdapter;\n\n    const unsubscribe = runtimeRef.current.thread.subscribe(() => {\n      const threadState = runtimeRef.current.thread.getState();\n      const { isRunning } = threadState;\n      const wasRunning = wasRunningRef.current;\n      wasRunningRef.current = isRunning;\n\n      // Track step boundaries by content changes (more reliable than isRunning)\n      if (runStartRef.current != null) {\n        const lastMsg = threadState.messages.at(-1);\n        if (lastMsg?.role === \"assistant\") {\n          const currentToolCallCount = lastMsg.content.filter(\n            (p) => p.type === \"tool-call\",\n          ).length;\n          while (toolCallCountRef.current < currentToolCallCount) {\n            stepBoundariesRef.current.push(Date.now() - runStartRef.current);\n            toolCallCountRef.current++;\n          }\n        }\n      }\n\n      if (isRunning) {\n        if (runStartRef.current == null) {\n          runStartRef.current = Date.now();\n          stepBoundariesRef.current = [];\n          toolCallCountRef.current = 0;\n          adapter.pin?.();\n        }\n        // Cancel any pending persist — isRunning went back to true\n        if (persistTimerRef.current) {\n          clearTimeout(persistTimerRef.current);\n          persistTimerRef.current = null;\n        }\n        return;\n      }\n\n      // Only act on the true→false transition\n      if (!wasRunning) return;\n\n      // Record step boundary offset (synchronous for accuracy)\n      if (runStartRef.current != null) {\n        stepBoundariesRef.current.push(Date.now() - runStartRef.current);\n      }\n\n      // Debounce: wait one macrotask so agentic step flickers are absorbed\n      if (persistTimerRef.current) clearTimeout(persistTimerRef.current);\n      persistTimerRef.current = setTimeout(() => {\n        persistSettled(false);\n      }, 0);\n    });\n\n    const initialThreadState = runtimeRef.current.thread.getState();\n    wasRunningRef.current = initialThreadState.isRunning;\n    if (initialThreadState.isRunning) {\n      if (runStartRef.current == null) {\n        runStartRef.current = Date.now();\n        stepBoundariesRef.current = [];\n        toolCallCountRef.current = 0;\n        adapter.pin?.();\n      }\n    } else if (initialThreadState.messages.length > 0) {\n      persistSettled(true);\n    }\n\n    function persistSettled(ignoreRunning: boolean) {\n      persistTimerRef.current = null;\n      const latest = runtimeRef.current.thread.getState();\n      if (!ignoreRunning && latest.isRunning) return;\n\n      const boundaries = stepBoundariesRef.current;\n      const durationMs = boundaries.length > 0 ? boundaries.at(-1) : undefined;\n\n      // Fallback: if only 1 boundary but message has multiple steps, distribute evenly\n      if (boundaries.length === 1 && durationMs != null) {\n        const lastAssistant = latest.messages.findLast(\n          (m) => m.role === \"assistant\",\n        );\n        if (lastAssistant) {\n          const tcCount = lastAssistant.content.filter(\n            (p) => p.type === \"tool-call\",\n          ).length;\n          if (tcCount > 0) {\n            const totalSteps = tcCount + 1;\n            const stepDur = durationMs / totalSteps;\n            boundaries.length = 0;\n            for (let i = 0; i < totalSteps; i++) {\n              boundaries.push(Math.round((i + 1) * stepDur));\n            }\n          }\n        }\n      }\n\n      // Build per-step timestamps when there are multiple steps\n      const stepTimestamps =\n        boundaries.length > 1\n          ? boundaries.map((endMs, i) => ({\n              start_ms: i === 0 ? 0 : boundaries[i - 1]!,\n              end_ms: endMs,\n            }))\n          : undefined;\n\n      runStartRef.current = null;\n      stepBoundariesRef.current = [];\n\n      const telemetryOptions = {\n        ...(durationMs != null ? { durationMs } : undefined),\n        ...(stepTimestamps != null ? { stepTimestamps } : undefined),\n      };\n\n      persistInFlightRef.current = persistInFlightRef.current\n        .then(async () => {\n          const changedRunMessageIds = new Set<string>();\n          for (const message of latest.messages) {\n            const externalMessages =\n              getExternalStoreMessages<TMessage>(message);\n            const previous = persistedExternalMessages.current.get(message.id);\n            if (\n              previous === undefined ||\n              previous.length !== externalMessages.length ||\n              externalMessages.some((item, index) => item !== previous[index])\n            ) {\n              changedRunMessageIds.add(message.id);\n            }\n          }\n\n          const { messages } = latest;\n          let lastInnerMessageId: string | null = null;\n          const failedUpdateIds = new Set<string>();\n\n          const getLastInnerId = (msgs: TMessage[]): string | null =>\n            msgs.length > 0 ? storageFormatAdapter.getId(msgs.at(-1)!) : null;\n\n          const toBatchItems = (msgs: TMessage[]) =>\n            msgs.map((msg, idx) => ({\n              parentId:\n                idx === 0\n                  ? lastInnerMessageId\n                  : storageFormatAdapter.getId(msgs[idx - 1]!),\n              message: msg,\n            }));\n\n          for (const message of messages) {\n            const innerMessages = getExternalStoreMessages<TMessage>(message);\n\n            const isTerminal =\n              message.status === undefined ||\n              message.status.type === \"complete\" ||\n              message.status.type === \"incomplete\";\n            const isAwaitingToolCalls = isAwaitingToolApproval(message);\n            // A paused message's later content can only reach storage via update, so it is persisted early only when the adapter supports update.\n            const isReady =\n              isTerminal ||\n              (isAwaitingToolCalls && adapter.update !== undefined);\n\n            if (!isReady) {\n              lastInnerMessageId =\n                getLastInnerId(innerMessages) ?? lastInnerMessageId;\n              continue;\n            }\n\n            const isPersistedMessage = historyIds.current.has(message.id);\n            if (isPersistedMessage && !changedRunMessageIds.has(message.id)) {\n              lastInnerMessageId =\n                getLastInnerId(innerMessages) ?? lastInnerMessageId;\n              continue;\n            }\n            if (!isPersistedMessage) {\n              historyIds.current.add(message.id);\n              deferredTelemetryIds.current.add(message.id);\n            }\n\n            const batchItems = toBatchItems(innerMessages);\n            for (const item of batchItems) {\n              const innerId = storageFormatAdapter.getId(item.message);\n              if (!persistedInnerIds.current.has(innerId)) {\n                await adapter.append(item);\n                persistedInnerIds.current.add(innerId);\n              } else if (durationMs !== undefined) {\n                try {\n                  await adapter.update?.(item, innerId);\n                } catch {\n                  // A failed update drops the message from the refreshed baseline so it retries on the next run stop.\n                  failedUpdateIds.add(message.id);\n                }\n              }\n            }\n\n            lastInnerMessageId =\n              getLastInnerId(innerMessages) ?? lastInnerMessageId;\n\n            if (deferredTelemetryIds.current.has(message.id) && isTerminal) {\n              deferredTelemetryIds.current.delete(message.id);\n              adapter.reportTelemetry?.(batchItems, telemetryOptions);\n            }\n          }\n\n          const nextSnapshot = snapshotExternalMessages<TMessage>(\n            latest.messages,\n          );\n          for (const id of failedUpdateIds) {\n            nextSnapshot.delete(id);\n          }\n          persistedExternalMessages.current = nextSnapshot;\n        })\n        .catch((error) => {\n          console.error(\"Failed to persist message history:\", error);\n        });\n    }\n\n    return () => {\n      unsubscribe();\n      if (persistTimerRef.current) {\n        clearTimeout(persistTimerRef.current);\n        persistTimerRef.current = null;\n        persistSettled(false);\n      }\n    };\n  }, [formatAdapter, storageFormatAdapter, runtimeRef]);\n\n  const deleteMessage = useCallback(\n    async (messageId: string) => {\n      const deleteMessages = formatAdapter?.delete?.bind(formatAdapter);\n      if (!deleteMessages) return;\n\n      const messages = runtimeRef.current.thread.getState().messages;\n      const messageIndex = messages.findIndex((m) => m.id === messageId);\n      if (messageIndex === -1) return;\n\n      const previousInnerMessages = messages\n        .slice(0, messageIndex)\n        .flatMap(getExternalStoreMessages<TMessage>);\n      let parentId = previousInnerMessages.at(-1)\n        ? storageFormatAdapter.getId(previousInnerMessages.at(-1)!)\n        : null;\n      const itemsToDelete = getExternalStoreMessages<TMessage>(\n        messages[messageIndex]!,\n      ).map((message) => {\n        const item = { parentId, message };\n        parentId = storageFormatAdapter.getId(message);\n        return item;\n      });\n\n      const deletion = persistInFlightRef.current.then(async () => {\n        await deleteMessages(itemsToDelete);\n\n        historyIds.current.delete(messageId);\n        deferredTelemetryIds.current.delete(messageId);\n        persistedExternalMessages.current.delete(messageId);\n        for (const item of itemsToDelete) {\n          persistedInnerIds.current.delete(\n            storageFormatAdapter.getId(item.message),\n          );\n        }\n      });\n\n      persistInFlightRef.current = deletion.catch(() => {});\n      await deletion;\n    },\n    [formatAdapter, runtimeRef, storageFormatAdapter],\n  );\n\n  return { isLoading, deleteMessage };\n};\n"],"mappings":"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"}
+{"version":3,"file":"useExternalHistory.js","names":["AssistantRuntime","ThreadHistoryAdapter","ThreadMessage","MessageFormatAdapter","MessageFormatItem","MessageFormatRepository","ExportedMessageRepository","getExternalStoreMessages","MessageRepository","useAui","useRef","useEffect","useState","RefObject","useCallback","useMemo","toExportedMessageRepository","toThreadMessages","messages","TMessage","survivingIds","Set","survivors","flatMap","m","message","console","warn","parentId","has","add","id","headId","isAwaitingToolApproval","status","type","reason","encodeContent","storageFormatAdapter","item","JSON","stringify","encode","useExternalHistory","runtimeRef","historyAdapter","onSetMessages","loadedRef","itemEpoch","setItemEpoch","aui","optionalThreadListItem","threadListItem","source","hasLoaded","setHasLoaded","historyIds","deferredTelemetryIds","persistedInnerMessages","Map","content","onSetMessagesRef","current","formatAdapter","undefined","withFormat","Error","isLoading","loadHistory","repo","load","length","set","getId","converted","thread","import","tempRepo","getMessages","error","pin","remoteId","getState","subscribe","n","threadState","isRunning","runStartRef","persistTimerRef","ReturnType","setTimeout","persistInFlightRef","Promise","resolve","stepBoundariesRef","wasRunningRef","toolCallCountRef","adapter","unsubscribe","wasRunning","lastMsg","at","role","currentToolCallCount","filter","p","push","Date","now","clearTimeout","persistSettled","initialThreadState","ignoreRunning","latest","boundaries","durationMs","lastAssistant","findLast","tcCount","totalSteps","stepDur","i","Math","round","stepTimestamps","map","endMs","start_ms","end_ms","telemetryOptions","then","lastInnerMessageId","getLastInnerId","msgs","toBatchItems","msg","idx","innerMessages","isTerminal","isAwaitingToolCalls","isReady","update","batchItems","innerId","persisted","get","append","delete","reportTelemetry","catch","deleteMessage","messageId","deleteMessages","bind","messageIndex","findIndex","previousInnerMessages","slice","itemsToDelete","deletion"],"sources":["../../src/runtime/useExternalHistory.ts"],"sourcesContent":["\"use client\";\n\nimport type {\n  AssistantRuntime,\n  ThreadHistoryAdapter,\n  ThreadMessage,\n  MessageFormatAdapter,\n  MessageFormatItem,\n  MessageFormatRepository,\n  ExportedMessageRepository,\n} from \"@assistant-ui/core\";\nimport { getExternalStoreMessages } from \"@assistant-ui/core\";\nimport { MessageRepository } from \"@assistant-ui/core/internal\";\nimport { useAui } from \"@assistant-ui/store\";\nimport {\n  useRef,\n  useEffect,\n  useState,\n  type RefObject,\n  useCallback,\n  useMemo,\n} from \"react\";\n\nexport const toExportedMessageRepository = <TMessage>(\n  toThreadMessages: (messages: TMessage[]) => ThreadMessage[],\n  messages: MessageFormatRepository<TMessage>,\n): ExportedMessageRepository => {\n  const survivingIds = new Set<string>();\n  const survivors = messages.messages.flatMap((m) => {\n    const message = toThreadMessages([m.message])[0];\n    if (!message) {\n      console.warn(\"Skipping a stored message that could not be loaded.\");\n      return [];\n    }\n    if (m.parentId && !survivingIds.has(m.parentId)) return [];\n    survivingIds.add(message.id);\n    return [{ ...m, message }];\n  });\n\n  return {\n    headId:\n      messages.headId && survivingIds.has(messages.headId)\n        ? messages.headId\n        : null,\n    messages: survivors,\n  };\n};\n\nconst isAwaitingToolApproval = (message: ThreadMessage) =>\n  message.status?.type === \"requires-action\" &&\n  message.status.reason === \"tool-calls\";\n\nconst encodeContent = <TMessage>(\n  storageFormatAdapter: MessageFormatAdapter<TMessage, any>,\n  item: MessageFormatItem<TMessage>,\n) => JSON.stringify(storageFormatAdapter.encode(item));\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  const [itemEpoch, setItemEpoch] = useState(0);\n\n  const aui = useAui();\n  const optionalThreadListItem = useCallback(\n    () => (aui.threadListItem.source ? aui.threadListItem : null),\n    [aui],\n  );\n\n  const [hasLoaded, setHasLoaded] = useState(false);\n\n  const historyIds = useRef(new Set<string>());\n  const deferredTelemetryIds = useRef(new Set<string>());\n  // `content` is a snapshot taken at write time rather than a re-encode of `source`, because a retained message object can be mutated in place by the runtime that produced it.\n  const persistedInnerMessages = useRef(\n    new Map<string, { source: TMessage; content: string }>(),\n  );\n\n  const onSetMessagesRef = useRef(onSetMessages);\n  useEffect(() => {\n    onSetMessagesRef.current = onSetMessages;\n  });\n\n  const formatAdapter = useMemo(() => {\n    if (!historyAdapter) return undefined;\n    if (!historyAdapter.withFormat) {\n      throw new Error(\n        \"useAISDKRuntime: ThreadHistoryAdapter is missing the required `withFormat` method.\",\n      );\n    }\n    return historyAdapter.withFormat<TMessage, any>(storageFormatAdapter);\n  }, [historyAdapter, storageFormatAdapter]);\n\n  const isLoading = formatAdapter != null && !hasLoaded;\n\n  useEffect(() => {\n    if (!formatAdapter || loadedRef.current) return undefined;\n\n    const loadHistory = async () => {\n      try {\n        const repo = await formatAdapter.load();\n        if (repo && repo.messages.length > 0) {\n          for (const m of repo.messages) {\n            persistedInnerMessages.current.set(\n              storageFormatAdapter.getId(m.message),\n              {\n                source: m.message,\n                content: encodeContent(storageFormatAdapter, m),\n              },\n            );\n          }\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.flatMap(getExternalStoreMessages<TMessage>),\n          );\n\n          historyIds.current = new Set();\n          for (const m of converted.messages) {\n            historyIds.current.add(m.message.id);\n            if (isAwaitingToolApproval(m.message)) {\n              deferredTelemetryIds.current.add(m.message.id);\n            }\n          }\n        }\n      } catch (error) {\n        console.error(\"Failed to load message history:\", error);\n      } finally {\n        setHasLoaded(true);\n      }\n    };\n\n    formatAdapter.pin?.();\n\n    const remoteId = optionalThreadListItem()?.getState().remoteId;\n    if (!remoteId) {\n      // History loads asynchronously against the thread list item; without a\n      // remote id there is nothing to await, so the flag settles here.\n      // eslint-disable-next-line react-hooks/set-state-in-effect\n      setHasLoaded(true);\n      return aui.subscribe(() => {\n        if (optionalThreadListItem()?.getState().remoteId) {\n          setItemEpoch((n) => n + 1);\n        }\n      });\n    }\n\n    const threadState = runtimeRef.current.thread.getState();\n    if (threadState.isRunning || threadState.messages.length > 0) {\n      loadedRef.current = true;\n      setHasLoaded(true);\n      return undefined;\n    }\n\n    loadedRef.current = true;\n    void loadHistory();\n    return undefined;\n  }, [\n    formatAdapter,\n    toThreadMessages,\n    runtimeRef,\n    optionalThreadListItem,\n    aui,\n    itemEpoch,\n    storageFormatAdapter,\n  ]);\n\n  const runStartRef = useRef<number | null>(null);\n  const persistTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);\n  const persistInFlightRef = useRef<Promise<void>>(Promise.resolve());\n  const stepBoundariesRef = useRef<number[]>([]);\n  const wasRunningRef = useRef(false);\n  const toolCallCountRef = useRef(0);\n\n  useEffect(() => {\n    if (!formatAdapter) return;\n    const adapter = formatAdapter;\n\n    const unsubscribe = runtimeRef.current.thread.subscribe(() => {\n      const threadState = runtimeRef.current.thread.getState();\n      const { isRunning } = threadState;\n      const wasRunning = wasRunningRef.current;\n      wasRunningRef.current = isRunning;\n\n      // Track step boundaries by content changes (more reliable than isRunning)\n      if (runStartRef.current != null) {\n        const lastMsg = threadState.messages.at(-1);\n        if (lastMsg?.role === \"assistant\") {\n          const currentToolCallCount = lastMsg.content.filter(\n            (p) => p.type === \"tool-call\",\n          ).length;\n          while (toolCallCountRef.current < currentToolCallCount) {\n            stepBoundariesRef.current.push(Date.now() - runStartRef.current);\n            toolCallCountRef.current++;\n          }\n        }\n      }\n\n      if (isRunning) {\n        if (runStartRef.current == null) {\n          runStartRef.current = Date.now();\n          stepBoundariesRef.current = [];\n          toolCallCountRef.current = 0;\n          adapter.pin?.();\n        }\n        // Cancel any pending persist — isRunning went back to true\n        if (persistTimerRef.current) {\n          clearTimeout(persistTimerRef.current);\n          persistTimerRef.current = null;\n        }\n        return;\n      }\n\n      // Only act on the true→false transition\n      if (!wasRunning) return;\n\n      // Record step boundary offset (synchronous for accuracy)\n      if (runStartRef.current != null) {\n        stepBoundariesRef.current.push(Date.now() - runStartRef.current);\n      }\n\n      // Debounce: wait one macrotask so agentic step flickers are absorbed\n      if (persistTimerRef.current) clearTimeout(persistTimerRef.current);\n      persistTimerRef.current = setTimeout(() => {\n        persistSettled(false);\n      }, 0);\n    });\n\n    const initialThreadState = runtimeRef.current.thread.getState();\n    wasRunningRef.current = initialThreadState.isRunning;\n    if (initialThreadState.isRunning) {\n      if (runStartRef.current == null) {\n        runStartRef.current = Date.now();\n        stepBoundariesRef.current = [];\n        toolCallCountRef.current = 0;\n        adapter.pin?.();\n      }\n    } else if (initialThreadState.messages.length > 0) {\n      persistSettled(true);\n    }\n\n    function persistSettled(ignoreRunning: boolean) {\n      persistTimerRef.current = null;\n      const latest = runtimeRef.current.thread.getState();\n      if (!ignoreRunning && latest.isRunning) return;\n\n      const boundaries = stepBoundariesRef.current;\n      const durationMs = boundaries.length > 0 ? boundaries.at(-1) : undefined;\n\n      // Fallback: if only 1 boundary but message has multiple steps, distribute evenly\n      if (boundaries.length === 1 && durationMs != null) {\n        const lastAssistant = latest.messages.findLast(\n          (m) => m.role === \"assistant\",\n        );\n        if (lastAssistant) {\n          const tcCount = lastAssistant.content.filter(\n            (p) => p.type === \"tool-call\",\n          ).length;\n          if (tcCount > 0) {\n            const totalSteps = tcCount + 1;\n            const stepDur = durationMs / totalSteps;\n            boundaries.length = 0;\n            for (let i = 0; i < totalSteps; i++) {\n              boundaries.push(Math.round((i + 1) * stepDur));\n            }\n          }\n        }\n      }\n\n      // Build per-step timestamps when there are multiple steps\n      const stepTimestamps =\n        boundaries.length > 1\n          ? boundaries.map((endMs, i) => ({\n              start_ms: i === 0 ? 0 : boundaries[i - 1]!,\n              end_ms: endMs,\n            }))\n          : undefined;\n\n      runStartRef.current = null;\n      stepBoundariesRef.current = [];\n\n      const telemetryOptions = {\n        ...(durationMs != null ? { durationMs } : undefined),\n        ...(stepTimestamps != null ? { stepTimestamps } : undefined),\n      };\n\n      persistInFlightRef.current = persistInFlightRef.current\n        .then(async () => {\n          const { messages } = latest;\n          let lastInnerMessageId: string | null = null;\n\n          const getLastInnerId = (msgs: TMessage[]): string | null =>\n            msgs.length > 0 ? storageFormatAdapter.getId(msgs.at(-1)!) : null;\n\n          const toBatchItems = (msgs: TMessage[]) =>\n            msgs.map((msg, idx) => ({\n              parentId:\n                idx === 0\n                  ? lastInnerMessageId\n                  : storageFormatAdapter.getId(msgs[idx - 1]!),\n              message: msg,\n            }));\n\n          for (const message of messages) {\n            const innerMessages = getExternalStoreMessages<TMessage>(message);\n\n            const isTerminal =\n              message.status === undefined ||\n              message.status.type === \"complete\" ||\n              message.status.type === \"incomplete\";\n            const isAwaitingToolCalls = isAwaitingToolApproval(message);\n            // A paused message's later content can only reach storage via update, so it is persisted early only when the adapter supports update.\n            const isReady =\n              isTerminal ||\n              (isAwaitingToolCalls && adapter.update !== undefined);\n\n            if (!isReady) {\n              lastInnerMessageId =\n                getLastInnerId(innerMessages) ?? lastInnerMessageId;\n              continue;\n            }\n\n            if (!historyIds.current.has(message.id)) {\n              historyIds.current.add(message.id);\n              deferredTelemetryIds.current.add(message.id);\n            }\n\n            const batchItems = toBatchItems(innerMessages);\n            for (const item of batchItems) {\n              const innerId = storageFormatAdapter.getId(item.message);\n              const persisted = persistedInnerMessages.current.get(innerId);\n              if (!persisted) {\n                await adapter.append(item);\n                persistedInnerMessages.current.set(innerId, {\n                  source: item.message,\n                  content: encodeContent(storageFormatAdapter, item),\n                });\n              } else if (\n                persisted.source !== item.message &&\n                durationMs !== undefined &&\n                adapter.update\n              ) {\n                const content = encodeContent(storageFormatAdapter, item);\n                if (content === persisted.content) {\n                  persisted.source = item.message;\n                } else {\n                  try {\n                    await adapter.update(item, innerId);\n                    persistedInnerMessages.current.set(innerId, {\n                      source: item.message,\n                      content,\n                    });\n                  } catch {\n                    // A failed update leaves the stale baseline behind so the next run stop retries it.\n                  }\n                }\n              }\n            }\n\n            lastInnerMessageId =\n              getLastInnerId(innerMessages) ?? lastInnerMessageId;\n\n            if (deferredTelemetryIds.current.has(message.id) && isTerminal) {\n              deferredTelemetryIds.current.delete(message.id);\n              adapter.reportTelemetry?.(batchItems, telemetryOptions);\n            }\n          }\n        })\n        .catch((error) => {\n          console.error(\"Failed to persist message history:\", error);\n        });\n    }\n\n    return () => {\n      unsubscribe();\n      if (persistTimerRef.current) {\n        clearTimeout(persistTimerRef.current);\n        persistTimerRef.current = null;\n        persistSettled(false);\n      }\n    };\n  }, [formatAdapter, storageFormatAdapter, runtimeRef]);\n\n  const deleteMessage = useCallback(\n    async (messageId: string) => {\n      const deleteMessages = formatAdapter?.delete?.bind(formatAdapter);\n      if (!deleteMessages) return;\n\n      const messages = runtimeRef.current.thread.getState().messages;\n      const messageIndex = messages.findIndex((m) => m.id === messageId);\n      if (messageIndex === -1) return;\n\n      const previousInnerMessages = messages\n        .slice(0, messageIndex)\n        .flatMap(getExternalStoreMessages<TMessage>);\n      let parentId = previousInnerMessages.at(-1)\n        ? storageFormatAdapter.getId(previousInnerMessages.at(-1)!)\n        : null;\n      const itemsToDelete = getExternalStoreMessages<TMessage>(\n        messages[messageIndex]!,\n      ).map((message) => {\n        const item = { parentId, message };\n        parentId = storageFormatAdapter.getId(message);\n        return item;\n      });\n\n      const deletion = persistInFlightRef.current.then(async () => {\n        await deleteMessages(itemsToDelete);\n\n        historyIds.current.delete(messageId);\n        deferredTelemetryIds.current.delete(messageId);\n        for (const item of itemsToDelete) {\n          persistedInnerMessages.current.delete(\n            storageFormatAdapter.getId(item.message),\n          );\n        }\n      });\n\n      persistInFlightRef.current = deletion.catch(() => {});\n      await deletion;\n    },\n    [formatAdapter, runtimeRef, storageFormatAdapter],\n  );\n\n  return { isLoading, deleteMessage };\n};\n"],"mappings":"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"}

package/dist/runtime/useResourceCleanup.js

@@ -1,5 +1,5 @@
-import { useEffect, useRef } from "@assistant-ui/tap/react-shim";
 import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
+import { useEffect, useRef } from "@assistant-ui/tap/react-shim";
 import { useAssistantClientDestroySignal } from "@assistant-ui/store/internal";
 //#region src/runtime/useResourceCleanup.ts
 const useResourceCleanup = (enabled, cleanup) => {

package/dist/tools/generativeTools.js

@@ -117,7 +117,8 @@ var AISDKToolkit = class {
 	async #mcpTools() {
 		const toolSets = await Promise.all(Object.entries(this.#toolkit).filter((entry) => isMcpToolkitTool(entry[1])).map(async ([name, tool]) => {
 			const startedAt = Date.now();
-			const client = await this.#mcpClient(name, tool.server, startedAt).catch((error) => {
+			const clientPromise = this.#mcpClient(name, tool.server, startedAt);
+			const client = await clientPromise.catch((error) => {
 				if (error instanceof MCPConnectionTimeoutError) throw error;
 				throw toMcpToolkitError(name, "connect", error);
 			});
@@ -134,14 +135,16 @@ var AISDKToolkit = class {
 				];
 			} catch (error) {
 				if (error instanceof MCPConnectionTimeoutError) {
-					this.#mcpClients.delete(name);
-					client.close().catch(() => {});
+					if (this.#mcpClients.get(name) === clientPromise) {
+						this.#mcpClients.delete(name);
+						client.close().catch(() => {});
+					}
 					throw error;
 				}
 				throw toMcpToolkitError(name, "list tools", error);
 			}
 		}));
-		const tools = {};
+		const tools = Object.create(null);
 		const toolSources = /* @__PURE__ */ new Map();
 		for (const [serverName, mcpTool, toolSet] of toolSets) for (const [toolName, tool] of Object.entries(toolSet)) {
 			if (isDisabledMcpTool(mcpTool.tools?.[toolName])) continue;

package/dist/tools/generativeTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"generativeTools.js","names":["jsonSchema","ToolSet","MCPClient","MCPClientConfig","createMCPClient","Experimental_StdioMCPTransport","toJSONSchema","Tool","McpServerConfig","ToolModelOutputFunction","McpToolkitToolConfig","Toolkit","ToolkitDefinition","frontendTools","FrontendTools","toAISDKContent","toAISDKDefaultOutput","unwrapModelContentEnvelope","ModelContentEnvelope","EMPTY_SCHEMA","type","const","properties","humanNotSupported","Error","neverAbort","AbortController","signal","MCPConnectionTimeoutPhase","MCPConnectionTimeoutError","createMcpConnectionTimeoutError","name","phase","timeoutMs","withMcpConnectionTimeout","promise","Promise","T","options","config","startedAt","connectionTimeout","undefined","remainingMs","Date","now","timeoutError","timeout","ReturnType","setTimeout","race","_","reject","clearTimeout","parametersToInputSchema","parameters","GenerativeToolsOptions","toolkit","AISDKToolkitOptions","AISDKToolkitToolsOptions","frontend","generativeTools","assertNoMcpToolkitTools","toProviderToolSet","toServerToolSet","AISDKToolkit","mcpClients","Map","constructor","tools","frontendToolSet","mcpToolSet","mcpTools","providerToolSet","serverToolSet","assertNoMcpToolNameCollisions","source","close","clientEntries","entries","clientNames","map","clear","clientResults","allSettled","clientPromise","clients","flatMap","result","index","status","value","closeResults","client","errors","toMcpToolkitError","reason","length","AggregateError","#mcpTools","McpToolSet","toolSets","all","Object","filter","entry","McpToolkitTool","isMcpToolkitTool","tool","mcpClient","server","catch","error","delete","toolSources","serverName","mcpTool","toolSet","toolName","isDisabledMcpTool","exposedName","prefix","existingServerName","get","set","sources","#mcpClient","existing","createPromise","toMCPClientConfig","next","then","transport","command","args","env","cwd","url","headers","redirect","ToolkitTool","Record","mcp","prototype","hasOwnProperty","call","disabled","getErrorMessage","message","String","entryName","action","cause","mcpToolName","find","AISDKToModelOutputOptions","Omit","Parameters","TArgs","TResult","output","toAISDKToModelOutput","toModelOutput","modelContent","parts","fromEntries","t","execute","description","inputSchema","providerOptions","callOptions","toolCallId","abortSignal","AbortSignal","human","ProviderToolkitTool","isProviderToolkitTool","id","providerId","supportsDeferredResults","Extract"],"sources":["../../src/tools/generativeTools.ts"],"sourcesContent":["import { jsonSchema, type ToolSet } from \"ai\";\nimport type { MCPClient, MCPClientConfig } from \"@ai-sdk/mcp\";\nimport { createMCPClient } from \"@ai-sdk/mcp\";\nimport { Experimental_StdioMCPTransport } from \"#mcp-stdio\";\nimport {\n  toJSONSchema,\n  type Tool,\n  type McpServerConfig,\n  type ToolModelOutputFunction,\n} from \"assistant-stream\";\nimport type {\n  McpToolkitToolConfig,\n  Toolkit,\n  ToolkitDefinition,\n} from \"@assistant-ui/core/react\";\nimport { frontendTools, type FrontendTools } from \"./frontendTools\";\nimport {\n  toAISDKContent,\n  toAISDKDefaultOutput,\n} from \"../converters/toolOutputConversion\";\nimport {\n  unwrapModelContentEnvelope,\n  type ModelContentEnvelope,\n} from \"../converters/modelContentEnvelope\";\n\nconst EMPTY_SCHEMA = { type: \"object\" as const, properties: {} };\n\nconst humanNotSupported = (): never => {\n  throw new Error(\n    \"`human()` is not available during server-side tool execution.\",\n  );\n};\n\n// AI SDK leaves `abortSignal` optional; assistant-ui's execute requires one.\nconst neverAbort = new AbortController().signal;\n\ntype MCPConnectionTimeoutPhase = \"connecting\" | \"listing tools\";\n\nclass MCPConnectionTimeoutError extends Error {}\n\nconst createMcpConnectionTimeoutError = (\n  name: string,\n  phase: MCPConnectionTimeoutPhase,\n  timeoutMs: number,\n) =>\n  new MCPConnectionTimeoutError(\n    `MCP toolkit entry \"${name}\" timed out while ${phase} after ${timeoutMs}ms.`,\n  );\n\nconst withMcpConnectionTimeout = async <T>(\n  promise: Promise<T>,\n  options: {\n    name: string;\n    config: McpServerConfig;\n    phase: MCPConnectionTimeoutPhase;\n    startedAt: number;\n  },\n): Promise<T> => {\n  const timeoutMs = options.config.connectionTimeout;\n  if (timeoutMs === undefined) return await promise;\n  const remainingMs = timeoutMs - (Date.now() - options.startedAt);\n  const timeoutError = () =>\n    createMcpConnectionTimeoutError(options.name, options.phase, timeoutMs);\n  if (remainingMs <= 0) throw timeoutError();\n\n  let timeout: ReturnType<typeof setTimeout> | undefined;\n  try {\n    return await Promise.race([\n      promise,\n      new Promise<never>((_, reject) => {\n        timeout = setTimeout(() => reject(timeoutError()), remainingMs);\n      }),\n    ]);\n  } finally {\n    if (timeout !== undefined) clearTimeout(timeout);\n  }\n};\n\nconst parametersToInputSchema = (parameters: Tool[\"parameters\"] | undefined) =>\n  jsonSchema(parameters ? toJSONSchema(parameters) : EMPTY_SCHEMA);\n\n/**\n * @deprecated Options for the deprecated {@link generativeTools}. Use\n * {@link AISDKToolkit} with {@link AISDKToolkitOptions} /\n * {@link AISDKToolkitToolsOptions} instead.\n */\nexport interface GenerativeToolsOptions {\n  /**\n   * The server build of a generative toolkit (schema + server `execute`). Typed\n   * as the canonical {@link Toolkit} so callers don't need to cast; the server\n   * build carries `execute`, recovered internally as {@link ToolkitDefinition}.\n   */\n  toolkit: Toolkit;\n  /**\n   * Tools uploaded by the frontend (the request body's `tools`). Merged in\n   * alongside the `toolkit`; a server `execute` from `toolkit` takes precedence\n   * over an uploaded entry of the same name.\n   */\n  frontendTools?: FrontendTools;\n}\n\nexport type AISDKToolkitOptions = {\n  toolkit: Toolkit;\n};\n\nexport type AISDKToolkitToolsOptions = {\n  /**\n   * Tools uploaded by the frontend request body.\n   */\n  frontend?: FrontendTools;\n};\n\n/**\n * Builds an AI SDK `ToolSet` for server-side use with `streamText` /\n * `generateText` from a generative `toolkit` and the frontend-uploaded tools.\n *\n * Each toolkit tool's `execute` runs on the server. Pair this with the\n * `\"use generative\"` compiler: import the toolkit in a server route (where it\n * resolves to the server build — schema + `execute`, with `render` stripped) and\n * pass it here. Tools without an `execute` are still exposed to the model but\n * left for the client to fulfill. `frontendTools` lets the client contribute\n * tools that aren't in the static toolkit.\n *\n * @deprecated Use {@link AISDKToolkit} instead:\n * `new AISDKToolkit({ toolkit }).tools({ frontend })`. It is a strict superset\n * (it also opens MCP server connections), so it replaces `generativeTools`\n * everywhere. The `frontendTools` option is named `frontend` on `.tools()`, and\n * `.tools()` is async. `generativeTools` will be removed in a future version.\n *\n * @example\n * ```ts\n * // Define once at module scope so any MCP connections pool across requests.\n * const aiToolkit = new AISDKToolkit({ toolkit: docsToolkit });\n *\n * // In your route handler:\n * const { tools } = await req.json();\n * streamText({\n *   model,\n *   messages,\n *   tools: await aiToolkit.tools({ frontend: tools }),\n * });\n * ```\n */\nexport const generativeTools = (options: GenerativeToolsOptions): ToolSet => {\n  assertNoMcpToolkitTools(options.toolkit);\n  return {\n    ...(options.frontendTools ? frontendTools(options.frontendTools) : {}),\n    // `toolkit` last so its server-side `execute` wins over an uploaded entry of\n    // the same name. The cast recovers the declaration shape — the server build\n    // carries `execute`, which the canonical `Toolkit` type erases.\n    ...toProviderToolSet(options.toolkit),\n    ...toServerToolSet(options.toolkit as ToolkitDefinition),\n  };\n};\n\nexport class AISDKToolkit {\n  readonly #toolkit: Toolkit;\n  readonly #mcpClients = new Map<string, Promise<MCPClient>>();\n\n  constructor(options: AISDKToolkitOptions) {\n    this.#toolkit = options.toolkit;\n  }\n\n  async tools(options: AISDKToolkitToolsOptions = {}): Promise<ToolSet> {\n    const frontendToolSet = options.frontend\n      ? frontendTools(options.frontend)\n      : {};\n    const mcpToolSet = await this.#mcpTools();\n    const providerToolSet = toProviderToolSet(this.#toolkit);\n    const serverToolSet = toServerToolSet(this.#toolkit as ToolkitDefinition);\n\n    assertNoMcpToolNameCollisions(mcpToolSet, [\n      { source: \"frontend\", tools: frontendToolSet },\n      { source: \"provider\", tools: providerToolSet },\n      { source: \"toolkit\", tools: serverToolSet },\n    ]);\n\n    return {\n      ...frontendToolSet,\n      ...mcpToolSet.tools,\n      ...providerToolSet,\n      ...serverToolSet,\n    };\n  }\n\n  async close(): Promise<void> {\n    const clientEntries = [...this.#mcpClients.entries()];\n    const clientNames = clientEntries.map(([name]) => name);\n    this.#mcpClients.clear();\n    const clientResults = await Promise.allSettled(\n      clientEntries.map(([, clientPromise]) => clientPromise),\n    );\n    const clients = clientResults.flatMap((result, index) =>\n      result.status === \"fulfilled\"\n        ? [[clientNames[index]!, result.value] as const]\n        : [],\n    );\n    const closeResults = await Promise.allSettled(\n      clients.map(([, client]) => client.close()),\n    );\n    const errors = [\n      ...clientResults.flatMap((result, index) =>\n        result.status === \"rejected\"\n          ? [toMcpToolkitError(clientNames[index]!, \"connect\", result.reason)]\n          : [],\n      ),\n      ...closeResults.flatMap((result, index) =>\n        result.status === \"rejected\"\n          ? [toMcpToolkitError(clients[index]![0], \"close\", result.reason)]\n          : [],\n      ),\n    ];\n    if (errors.length === 1) throw errors[0];\n    if (errors.length > 1) {\n      throw new AggregateError(\n        errors,\n        \"Failed to close one or more MCP clients\",\n      );\n    }\n  }\n\n  async #mcpTools(): Promise<McpToolSet> {\n    const toolSets = await Promise.all(\n      Object.entries(this.#toolkit)\n        .filter((entry): entry is [string, McpToolkitTool] =>\n          isMcpToolkitTool(entry[1]),\n        )\n        .map(async ([name, tool]) => {\n          const startedAt = Date.now();\n          const client = await this.#mcpClient(\n            name,\n            tool.server,\n            startedAt,\n          ).catch((error: unknown) => {\n            if (error instanceof MCPConnectionTimeoutError) throw error;\n            throw toMcpToolkitError(name, \"connect\", error);\n          });\n          try {\n            const tools = await withMcpConnectionTimeout(client.tools(), {\n              name,\n              config: tool.server,\n              phase: \"listing tools\",\n              startedAt,\n            });\n            return [name, tool, tools] as const;\n          } catch (error) {\n            if (error instanceof MCPConnectionTimeoutError) {\n              this.#mcpClients.delete(name);\n              void client.close().catch(() => {});\n              throw error;\n            }\n            throw toMcpToolkitError(name, \"list tools\", error);\n          }\n        }),\n    );\n\n    const tools: ToolSet = {};\n    const toolSources = new Map<string, string>();\n    for (const [serverName, mcpTool, toolSet] of toolSets) {\n      for (const [toolName, tool] of Object.entries(toolSet)) {\n        if (isDisabledMcpTool(mcpTool.tools?.[toolName])) continue;\n        const exposedName = `${mcpTool.prefix ?? \"\"}${toolName}`;\n        const existingServerName = toolSources.get(exposedName);\n        if (existingServerName) {\n          throw new Error(\n            `MCP tool name collision: \"${exposedName}\" is exposed by both \"${existingServerName}\" and \"${serverName}\". Rename one of the toolkit entries or expose distinct MCP tool names.`,\n          );\n        }\n        toolSources.set(exposedName, serverName);\n        tools[exposedName] = tool as ToolSet[string];\n      }\n    }\n    return { tools, sources: toolSources };\n  }\n\n  #mcpClient(\n    name: string,\n    config: McpServerConfig,\n    startedAt: number,\n  ): Promise<MCPClient> {\n    const existing = this.#mcpClients.get(name);\n    if (existing) return existing;\n    const createPromise = createMCPClient(toMCPClientConfig(config));\n    let next: Promise<MCPClient>;\n    next = withMcpConnectionTimeout(createPromise, {\n      name,\n      config,\n      phase: \"connecting\",\n      startedAt,\n    }).catch((error) => {\n      if (this.#mcpClients.get(name) === next) {\n        this.#mcpClients.delete(name);\n      }\n      if (error instanceof MCPConnectionTimeoutError) {\n        void createPromise.then((client) => client.close()).catch(() => {});\n      }\n      throw error;\n    });\n    this.#mcpClients.set(name, next);\n    return next;\n  }\n}\n\nconst toMCPClientConfig = (config: McpServerConfig): MCPClientConfig => {\n  if (config.type === \"stdio\") {\n    return {\n      transport: new Experimental_StdioMCPTransport({\n        command: config.command,\n        ...(config.args && { args: [...config.args] }),\n        ...(config.env && { env: config.env }),\n        ...(config.cwd && { cwd: config.cwd }),\n      }),\n    };\n  }\n\n  return {\n    transport: {\n      type: config.type,\n      url: config.url,\n      ...(config.headers && { headers: config.headers }),\n      ...(config.redirect && { redirect: config.redirect }),\n    },\n  };\n};\n\ntype ToolkitTool = Toolkit[string];\n\ntype McpToolkitTool = ToolkitTool & {\n  type: \"mcp\";\n  server: McpServerConfig;\n  prefix?: string | undefined;\n  tools?: Record<string, McpToolkitToolConfig> | undefined;\n};\n\ntype McpToolSet = {\n  tools: ToolSet;\n  sources: Map<string, string>;\n};\n\nconst assertNoMcpToolNameCollisions = (\n  mcp: McpToolSet,\n  toolSets: readonly { source: string; tools: ToolSet }[],\n): void => {\n  for (const [toolName, serverName] of mcp.sources) {\n    for (const { source, tools } of toolSets) {\n      if (!Object.prototype.hasOwnProperty.call(tools, toolName)) continue;\n      throw new Error(\n        `MCP tool \"${toolName}\" from \"${serverName}\" conflicts with ${source} tool \"${toolName}\". Rename one of the tools so each model-visible tool name is unique.`,\n      );\n    }\n  }\n};\n\nconst isMcpToolkitTool = (tool: ToolkitTool): tool is McpToolkitTool =>\n  tool.type === \"mcp\" && !tool.disabled;\n\nconst getErrorMessage = (error: unknown): string =>\n  error instanceof Error ? error.message || error.name : String(error);\n\nconst toMcpToolkitError = (\n  entryName: string,\n  action: \"connect\" | \"list tools\" | \"close\",\n  error: unknown,\n): Error => {\n  return new Error(\n    `MCP toolkit entry \"${entryName}\" failed to ${action}: ${getErrorMessage(error)}`,\n    { cause: error },\n  );\n};\n\nconst isDisabledMcpTool = (config: McpToolkitToolConfig | undefined): boolean =>\n  config?.disabled === true;\n\nconst assertNoMcpToolkitTools = (toolkit: Toolkit): void => {\n  const mcpToolName = Object.entries(toolkit).find(([, tool]) =>\n    isMcpToolkitTool(tool),\n  )?.[0];\n  if (!mcpToolName) return;\n\n  throw new Error(\n    `MCP toolkit entry \"${mcpToolName}\" requires AISDKToolkit. Use new AISDKToolkit({ toolkit }).tools(...) instead of generativeTools(...).`,\n  );\n};\n\ntype AISDKToModelOutputOptions<TArgs, TResult> = Omit<\n  Parameters<ToolModelOutputFunction<TArgs, TResult>>[0],\n  \"output\"\n> & {\n  output: TResult | ModelContentEnvelope<TResult>;\n};\n\nconst toAISDKToModelOutput =\n  <TArgs, TResult>(toModelOutput?: ToolModelOutputFunction<TArgs, TResult>) =>\n  async (options: AISDKToModelOutputOptions<TArgs, TResult>) => {\n    const { result, modelContent } = unwrapModelContentEnvelope(options.output);\n\n    if (modelContent !== undefined) {\n      return toAISDKContent(modelContent);\n    }\n\n    if (!toModelOutput) {\n      return toAISDKDefaultOutput(result);\n    }\n\n    const parts = await toModelOutput({\n      ...options,\n      output: result,\n    });\n    return toAISDKContent(parts);\n  };\n\nconst toServerToolSet = (toolkit: ToolkitDefinition): ToolSet =>\n  Object.fromEntries(\n    Object.entries(toolkit)\n      .filter(\n        ([, t]) => t.type !== \"mcp\" && t.type !== \"provider\" && !t.disabled,\n      )\n      .map(([name, t]) => {\n        const execute = t.execute;\n        return [\n          name,\n          {\n            ...(t.description !== undefined && { description: t.description }),\n            inputSchema: parametersToInputSchema(t.parameters),\n            toModelOutput: toAISDKToModelOutput(t.toModelOutput),\n            ...(t.providerOptions && { providerOptions: t.providerOptions }),\n            ...(execute && {\n              execute: (\n                args: unknown,\n                callOptions: { toolCallId: string; abortSignal?: AbortSignal },\n              ) =>\n                execute(args as never, {\n                  toolCallId: callOptions.toolCallId,\n                  abortSignal: callOptions.abortSignal ?? neverAbort,\n                  human: humanNotSupported,\n                }),\n            }),\n          },\n        ];\n      }),\n  ) as ToolSet;\n\nconst toProviderToolSet = (toolkit: Toolkit): ToolSet =>\n  Object.fromEntries(\n    Object.entries(toolkit)\n      .filter((entry): entry is [string, ProviderToolkitTool] =>\n        isProviderToolkitTool(entry[1]),\n      )\n      .map(([name, t]) => [\n        name,\n        {\n          type: \"provider\",\n          id: t.providerId,\n          args: t.args,\n          ...(t.parameters && {\n            inputSchema: parametersToInputSchema(t.parameters),\n          }),\n          ...(t.providerOptions && { providerOptions: t.providerOptions }),\n          ...(t.supportsDeferredResults !== undefined && {\n            supportsDeferredResults: t.supportsDeferredResults,\n          }),\n        },\n      ]),\n  ) as ToolSet;\n\ntype ProviderToolkitTool = Extract<Toolkit[string], { type: \"provider\" }>;\n\nconst isProviderToolkitTool = (\n  tool: Toolkit[string],\n): tool is ProviderToolkitTool => tool.type === \"provider\" && !tool.disabled;\n"],"mappings":"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"}
+{"version":3,"file":"generativeTools.js","names":["jsonSchema","ToolSet","MCPClient","MCPClientConfig","createMCPClient","Experimental_StdioMCPTransport","toJSONSchema","Tool","McpServerConfig","ToolModelOutputFunction","McpToolkitToolConfig","Toolkit","ToolkitDefinition","frontendTools","FrontendTools","toAISDKContent","toAISDKDefaultOutput","unwrapModelContentEnvelope","ModelContentEnvelope","EMPTY_SCHEMA","type","const","properties","humanNotSupported","Error","neverAbort","AbortController","signal","MCPConnectionTimeoutPhase","MCPConnectionTimeoutError","createMcpConnectionTimeoutError","name","phase","timeoutMs","withMcpConnectionTimeout","promise","Promise","T","options","config","startedAt","connectionTimeout","undefined","remainingMs","Date","now","timeoutError","timeout","ReturnType","setTimeout","race","_","reject","clearTimeout","parametersToInputSchema","parameters","GenerativeToolsOptions","toolkit","AISDKToolkitOptions","AISDKToolkitToolsOptions","frontend","generativeTools","assertNoMcpToolkitTools","toProviderToolSet","toServerToolSet","AISDKToolkit","mcpClients","Map","constructor","tools","frontendToolSet","mcpToolSet","mcpTools","providerToolSet","serverToolSet","assertNoMcpToolNameCollisions","source","close","clientEntries","entries","clientNames","map","clear","clientResults","allSettled","clientPromise","clients","flatMap","result","index","status","value","closeResults","client","errors","toMcpToolkitError","reason","length","AggregateError","#mcpTools","McpToolSet","toolSets","all","Object","filter","entry","McpToolkitTool","isMcpToolkitTool","tool","mcpClient","server","catch","error","get","delete","create","toolSources","serverName","mcpTool","toolSet","toolName","isDisabledMcpTool","exposedName","prefix","existingServerName","set","sources","#mcpClient","existing","createPromise","toMCPClientConfig","next","then","transport","command","args","env","cwd","url","headers","redirect","ToolkitTool","Record","mcp","prototype","hasOwnProperty","call","disabled","getErrorMessage","message","String","entryName","action","cause","mcpToolName","find","AISDKToModelOutputOptions","Omit","Parameters","TArgs","TResult","output","toAISDKToModelOutput","toModelOutput","modelContent","parts","fromEntries","t","execute","description","inputSchema","providerOptions","callOptions","toolCallId","abortSignal","AbortSignal","human","ProviderToolkitTool","isProviderToolkitTool","id","providerId","supportsDeferredResults","Extract"],"sources":["../../src/tools/generativeTools.ts"],"sourcesContent":["import { jsonSchema, type ToolSet } from \"ai\";\nimport type { MCPClient, MCPClientConfig } from \"@ai-sdk/mcp\";\nimport { createMCPClient } from \"@ai-sdk/mcp\";\nimport { Experimental_StdioMCPTransport } from \"#mcp-stdio\";\nimport {\n  toJSONSchema,\n  type Tool,\n  type McpServerConfig,\n  type ToolModelOutputFunction,\n} from \"assistant-stream\";\nimport type {\n  McpToolkitToolConfig,\n  Toolkit,\n  ToolkitDefinition,\n} from \"@assistant-ui/core/react\";\nimport { frontendTools, type FrontendTools } from \"./frontendTools\";\nimport {\n  toAISDKContent,\n  toAISDKDefaultOutput,\n} from \"../converters/toolOutputConversion\";\nimport {\n  unwrapModelContentEnvelope,\n  type ModelContentEnvelope,\n} from \"../converters/modelContentEnvelope\";\n\nconst EMPTY_SCHEMA = { type: \"object\" as const, properties: {} };\n\nconst humanNotSupported = (): never => {\n  throw new Error(\n    \"`human()` is not available during server-side tool execution.\",\n  );\n};\n\n// AI SDK leaves `abortSignal` optional; assistant-ui's execute requires one.\nconst neverAbort = new AbortController().signal;\n\ntype MCPConnectionTimeoutPhase = \"connecting\" | \"listing tools\";\n\nclass MCPConnectionTimeoutError extends Error {}\n\nconst createMcpConnectionTimeoutError = (\n  name: string,\n  phase: MCPConnectionTimeoutPhase,\n  timeoutMs: number,\n) =>\n  new MCPConnectionTimeoutError(\n    `MCP toolkit entry \"${name}\" timed out while ${phase} after ${timeoutMs}ms.`,\n  );\n\nconst withMcpConnectionTimeout = async <T>(\n  promise: Promise<T>,\n  options: {\n    name: string;\n    config: McpServerConfig;\n    phase: MCPConnectionTimeoutPhase;\n    startedAt: number;\n  },\n): Promise<T> => {\n  const timeoutMs = options.config.connectionTimeout;\n  if (timeoutMs === undefined) return await promise;\n  const remainingMs = timeoutMs - (Date.now() - options.startedAt);\n  const timeoutError = () =>\n    createMcpConnectionTimeoutError(options.name, options.phase, timeoutMs);\n  if (remainingMs <= 0) throw timeoutError();\n\n  let timeout: ReturnType<typeof setTimeout> | undefined;\n  try {\n    return await Promise.race([\n      promise,\n      new Promise<never>((_, reject) => {\n        timeout = setTimeout(() => reject(timeoutError()), remainingMs);\n      }),\n    ]);\n  } finally {\n    if (timeout !== undefined) clearTimeout(timeout);\n  }\n};\n\nconst parametersToInputSchema = (parameters: Tool[\"parameters\"] | undefined) =>\n  jsonSchema(parameters ? toJSONSchema(parameters) : EMPTY_SCHEMA);\n\n/**\n * @deprecated Options for the deprecated {@link generativeTools}. Use\n * {@link AISDKToolkit} with {@link AISDKToolkitOptions} /\n * {@link AISDKToolkitToolsOptions} instead.\n */\nexport interface GenerativeToolsOptions {\n  /**\n   * The server build of a generative toolkit (schema + server `execute`). Typed\n   * as the canonical {@link Toolkit} so callers don't need to cast; the server\n   * build carries `execute`, recovered internally as {@link ToolkitDefinition}.\n   */\n  toolkit: Toolkit;\n  /**\n   * Tools uploaded by the frontend (the request body's `tools`). Merged in\n   * alongside the `toolkit`; a server `execute` from `toolkit` takes precedence\n   * over an uploaded entry of the same name.\n   */\n  frontendTools?: FrontendTools;\n}\n\nexport type AISDKToolkitOptions = {\n  toolkit: Toolkit;\n};\n\nexport type AISDKToolkitToolsOptions = {\n  /**\n   * Tools uploaded by the frontend request body.\n   */\n  frontend?: FrontendTools;\n};\n\n/**\n * Builds an AI SDK `ToolSet` for server-side use with `streamText` /\n * `generateText` from a generative `toolkit` and the frontend-uploaded tools.\n *\n * Each toolkit tool's `execute` runs on the server. Pair this with the\n * `\"use generative\"` compiler: import the toolkit in a server route (where it\n * resolves to the server build — schema + `execute`, with `render` stripped) and\n * pass it here. Tools without an `execute` are still exposed to the model but\n * left for the client to fulfill. `frontendTools` lets the client contribute\n * tools that aren't in the static toolkit.\n *\n * @deprecated Use {@link AISDKToolkit} instead:\n * `new AISDKToolkit({ toolkit }).tools({ frontend })`. It is a strict superset\n * (it also opens MCP server connections), so it replaces `generativeTools`\n * everywhere. The `frontendTools` option is named `frontend` on `.tools()`, and\n * `.tools()` is async. `generativeTools` will be removed in a future version.\n *\n * @example\n * ```ts\n * // Define once at module scope so any MCP connections pool across requests.\n * const aiToolkit = new AISDKToolkit({ toolkit: docsToolkit });\n *\n * // In your route handler:\n * const { tools } = await req.json();\n * streamText({\n *   model,\n *   messages,\n *   tools: await aiToolkit.tools({ frontend: tools }),\n * });\n * ```\n */\nexport const generativeTools = (options: GenerativeToolsOptions): ToolSet => {\n  assertNoMcpToolkitTools(options.toolkit);\n  return {\n    ...(options.frontendTools ? frontendTools(options.frontendTools) : {}),\n    // `toolkit` last so its server-side `execute` wins over an uploaded entry of\n    // the same name. The cast recovers the declaration shape — the server build\n    // carries `execute`, which the canonical `Toolkit` type erases.\n    ...toProviderToolSet(options.toolkit),\n    ...toServerToolSet(options.toolkit as ToolkitDefinition),\n  };\n};\n\nexport class AISDKToolkit {\n  readonly #toolkit: Toolkit;\n  readonly #mcpClients = new Map<string, Promise<MCPClient>>();\n\n  constructor(options: AISDKToolkitOptions) {\n    this.#toolkit = options.toolkit;\n  }\n\n  async tools(options: AISDKToolkitToolsOptions = {}): Promise<ToolSet> {\n    const frontendToolSet = options.frontend\n      ? frontendTools(options.frontend)\n      : {};\n    const mcpToolSet = await this.#mcpTools();\n    const providerToolSet = toProviderToolSet(this.#toolkit);\n    const serverToolSet = toServerToolSet(this.#toolkit as ToolkitDefinition);\n\n    assertNoMcpToolNameCollisions(mcpToolSet, [\n      { source: \"frontend\", tools: frontendToolSet },\n      { source: \"provider\", tools: providerToolSet },\n      { source: \"toolkit\", tools: serverToolSet },\n    ]);\n\n    return {\n      ...frontendToolSet,\n      ...mcpToolSet.tools,\n      ...providerToolSet,\n      ...serverToolSet,\n    };\n  }\n\n  async close(): Promise<void> {\n    const clientEntries = [...this.#mcpClients.entries()];\n    const clientNames = clientEntries.map(([name]) => name);\n    this.#mcpClients.clear();\n    const clientResults = await Promise.allSettled(\n      clientEntries.map(([, clientPromise]) => clientPromise),\n    );\n    const clients = clientResults.flatMap((result, index) =>\n      result.status === \"fulfilled\"\n        ? [[clientNames[index]!, result.value] as const]\n        : [],\n    );\n    const closeResults = await Promise.allSettled(\n      clients.map(([, client]) => client.close()),\n    );\n    const errors = [\n      ...clientResults.flatMap((result, index) =>\n        result.status === \"rejected\"\n          ? [toMcpToolkitError(clientNames[index]!, \"connect\", result.reason)]\n          : [],\n      ),\n      ...closeResults.flatMap((result, index) =>\n        result.status === \"rejected\"\n          ? [toMcpToolkitError(clients[index]![0], \"close\", result.reason)]\n          : [],\n      ),\n    ];\n    if (errors.length === 1) throw errors[0];\n    if (errors.length > 1) {\n      throw new AggregateError(\n        errors,\n        \"Failed to close one or more MCP clients\",\n      );\n    }\n  }\n\n  async #mcpTools(): Promise<McpToolSet> {\n    const toolSets = await Promise.all(\n      Object.entries(this.#toolkit)\n        .filter((entry): entry is [string, McpToolkitTool] =>\n          isMcpToolkitTool(entry[1]),\n        )\n        .map(async ([name, tool]) => {\n          const startedAt = Date.now();\n          const clientPromise = this.#mcpClient(name, tool.server, startedAt);\n          const client = await clientPromise.catch((error: unknown) => {\n            if (error instanceof MCPConnectionTimeoutError) throw error;\n            throw toMcpToolkitError(name, \"connect\", error);\n          });\n          try {\n            const tools = await withMcpConnectionTimeout(client.tools(), {\n              name,\n              config: tool.server,\n              phase: \"listing tools\",\n              startedAt,\n            });\n            return [name, tool, tools] as const;\n          } catch (error) {\n            if (error instanceof MCPConnectionTimeoutError) {\n              if (this.#mcpClients.get(name) === clientPromise) {\n                this.#mcpClients.delete(name);\n                void client.close().catch(() => {});\n              }\n              throw error;\n            }\n            throw toMcpToolkitError(name, \"list tools\", error);\n          }\n        }),\n    );\n\n    const tools = Object.create(null) as ToolSet;\n    const toolSources = new Map<string, string>();\n    for (const [serverName, mcpTool, toolSet] of toolSets) {\n      for (const [toolName, tool] of Object.entries(toolSet)) {\n        if (isDisabledMcpTool(mcpTool.tools?.[toolName])) continue;\n        const exposedName = `${mcpTool.prefix ?? \"\"}${toolName}`;\n        const existingServerName = toolSources.get(exposedName);\n        if (existingServerName) {\n          throw new Error(\n            `MCP tool name collision: \"${exposedName}\" is exposed by both \"${existingServerName}\" and \"${serverName}\". Rename one of the toolkit entries or expose distinct MCP tool names.`,\n          );\n        }\n        toolSources.set(exposedName, serverName);\n        tools[exposedName] = tool as ToolSet[string];\n      }\n    }\n    return { tools, sources: toolSources };\n  }\n\n  #mcpClient(\n    name: string,\n    config: McpServerConfig,\n    startedAt: number,\n  ): Promise<MCPClient> {\n    const existing = this.#mcpClients.get(name);\n    if (existing) return existing;\n    const createPromise = createMCPClient(toMCPClientConfig(config));\n    let next: Promise<MCPClient>;\n    next = withMcpConnectionTimeout(createPromise, {\n      name,\n      config,\n      phase: \"connecting\",\n      startedAt,\n    }).catch((error) => {\n      if (this.#mcpClients.get(name) === next) {\n        this.#mcpClients.delete(name);\n      }\n      if (error instanceof MCPConnectionTimeoutError) {\n        void createPromise.then((client) => client.close()).catch(() => {});\n      }\n      throw error;\n    });\n    this.#mcpClients.set(name, next);\n    return next;\n  }\n}\n\nconst toMCPClientConfig = (config: McpServerConfig): MCPClientConfig => {\n  if (config.type === \"stdio\") {\n    return {\n      transport: new Experimental_StdioMCPTransport({\n        command: config.command,\n        ...(config.args && { args: [...config.args] }),\n        ...(config.env && { env: config.env }),\n        ...(config.cwd && { cwd: config.cwd }),\n      }),\n    };\n  }\n\n  return {\n    transport: {\n      type: config.type,\n      url: config.url,\n      ...(config.headers && { headers: config.headers }),\n      ...(config.redirect && { redirect: config.redirect }),\n    },\n  };\n};\n\ntype ToolkitTool = Toolkit[string];\n\ntype McpToolkitTool = ToolkitTool & {\n  type: \"mcp\";\n  server: McpServerConfig;\n  prefix?: string | undefined;\n  tools?: Record<string, McpToolkitToolConfig> | undefined;\n};\n\ntype McpToolSet = {\n  tools: ToolSet;\n  sources: Map<string, string>;\n};\n\nconst assertNoMcpToolNameCollisions = (\n  mcp: McpToolSet,\n  toolSets: readonly { source: string; tools: ToolSet }[],\n): void => {\n  for (const [toolName, serverName] of mcp.sources) {\n    for (const { source, tools } of toolSets) {\n      if (!Object.prototype.hasOwnProperty.call(tools, toolName)) continue;\n      throw new Error(\n        `MCP tool \"${toolName}\" from \"${serverName}\" conflicts with ${source} tool \"${toolName}\". Rename one of the tools so each model-visible tool name is unique.`,\n      );\n    }\n  }\n};\n\nconst isMcpToolkitTool = (tool: ToolkitTool): tool is McpToolkitTool =>\n  tool.type === \"mcp\" && !tool.disabled;\n\nconst getErrorMessage = (error: unknown): string =>\n  error instanceof Error ? error.message || error.name : String(error);\n\nconst toMcpToolkitError = (\n  entryName: string,\n  action: \"connect\" | \"list tools\" | \"close\",\n  error: unknown,\n): Error => {\n  return new Error(\n    `MCP toolkit entry \"${entryName}\" failed to ${action}: ${getErrorMessage(error)}`,\n    { cause: error },\n  );\n};\n\nconst isDisabledMcpTool = (config: McpToolkitToolConfig | undefined): boolean =>\n  config?.disabled === true;\n\nconst assertNoMcpToolkitTools = (toolkit: Toolkit): void => {\n  const mcpToolName = Object.entries(toolkit).find(([, tool]) =>\n    isMcpToolkitTool(tool),\n  )?.[0];\n  if (!mcpToolName) return;\n\n  throw new Error(\n    `MCP toolkit entry \"${mcpToolName}\" requires AISDKToolkit. Use new AISDKToolkit({ toolkit }).tools(...) instead of generativeTools(...).`,\n  );\n};\n\ntype AISDKToModelOutputOptions<TArgs, TResult> = Omit<\n  Parameters<ToolModelOutputFunction<TArgs, TResult>>[0],\n  \"output\"\n> & {\n  output: TResult | ModelContentEnvelope<TResult>;\n};\n\nconst toAISDKToModelOutput =\n  <TArgs, TResult>(toModelOutput?: ToolModelOutputFunction<TArgs, TResult>) =>\n  async (options: AISDKToModelOutputOptions<TArgs, TResult>) => {\n    const { result, modelContent } = unwrapModelContentEnvelope(options.output);\n\n    if (modelContent !== undefined) {\n      return toAISDKContent(modelContent);\n    }\n\n    if (!toModelOutput) {\n      return toAISDKDefaultOutput(result);\n    }\n\n    const parts = await toModelOutput({\n      ...options,\n      output: result,\n    });\n    return toAISDKContent(parts);\n  };\n\nconst toServerToolSet = (toolkit: ToolkitDefinition): ToolSet =>\n  Object.fromEntries(\n    Object.entries(toolkit)\n      .filter(\n        ([, t]) => t.type !== \"mcp\" && t.type !== \"provider\" && !t.disabled,\n      )\n      .map(([name, t]) => {\n        const execute = t.execute;\n        return [\n          name,\n          {\n            ...(t.description !== undefined && { description: t.description }),\n            inputSchema: parametersToInputSchema(t.parameters),\n            toModelOutput: toAISDKToModelOutput(t.toModelOutput),\n            ...(t.providerOptions && { providerOptions: t.providerOptions }),\n            ...(execute && {\n              execute: (\n                args: unknown,\n                callOptions: { toolCallId: string; abortSignal?: AbortSignal },\n              ) =>\n                execute(args as never, {\n                  toolCallId: callOptions.toolCallId,\n                  abortSignal: callOptions.abortSignal ?? neverAbort,\n                  human: humanNotSupported,\n                }),\n            }),\n          },\n        ];\n      }),\n  ) as ToolSet;\n\nconst toProviderToolSet = (toolkit: Toolkit): ToolSet =>\n  Object.fromEntries(\n    Object.entries(toolkit)\n      .filter((entry): entry is [string, ProviderToolkitTool] =>\n        isProviderToolkitTool(entry[1]),\n      )\n      .map(([name, t]) => [\n        name,\n        {\n          type: \"provider\",\n          id: t.providerId,\n          args: t.args,\n          ...(t.parameters && {\n            inputSchema: parametersToInputSchema(t.parameters),\n          }),\n          ...(t.providerOptions && { providerOptions: t.providerOptions }),\n          ...(t.supportsDeferredResults !== undefined && {\n            supportsDeferredResults: t.supportsDeferredResults,\n          }),\n        },\n      ]),\n  ) as ToolSet;\n\ntype ProviderToolkitTool = Extract<Toolkit[string], { type: \"provider\" }>;\n\nconst isProviderToolkitTool = (\n  tool: Toolkit[string],\n): tool is ProviderToolkitTool => tool.type === \"provider\" && !tool.disabled;\n"],"mappings":"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"}

package/dist/usage.d.ts

@@ -12,8 +12,15 @@ interface TokenUsageExtractableMessage {
   metadata?: unknown;
 }
 declare function getThreadMessageTokenUsage(message: TokenUsageExtractableMessage | undefined): ThreadTokenUsage | undefined;
-declare function getLatestThreadTokenUsage(messages: readonly TokenUsageExtractableMessage[] | undefined): ThreadTokenUsage | undefined;
+/**
+ * Reads token usage from the newest assistant message that reports any.
+ *
+ * A route attaches usage through the AI SDK's `messageMetadata` option. Because
+ * a thread message carries a fixed metadata shape, the converter moves every
+ * other key the route returns into `metadata.custom`, which is where this hook
+ * looks.
+ */
 declare function useThreadTokenUsage(): ThreadTokenUsage | undefined;
 //#endregion
-export { ThreadTokenUsage, TokenUsageExtractableMessage, getLatestThreadTokenUsage, getThreadMessageTokenUsage, useThreadTokenUsage };
+export { ThreadTokenUsage, TokenUsageExtractableMessage, getThreadMessageTokenUsage, useThreadTokenUsage };
 //# sourceMappingURL=usage.d.ts.map

package/dist/usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage.d.ts","names":[],"sources":["../src/usage.ts"],"mappings":";KAGY;EACV;EACA;EACA;EACA;EACA;;UAGe;EACf;EACA;;iBAuHc,2BACd,SAAS,2CACR;iBAea,0BACd,mBAAmB,6CAClB;iBAmBa,uBAAuB"}
+{"version":3,"file":"usage.d.ts","names":[],"sources":["../src/usage.ts"],"mappings":";KAIY;EACV;EACA;EACA;EACA;EACA;;UAGe;EACf;EACA;;iBAuHc,2BACd,SAAS,2CACR;;;;;;;;;iBAsCa,uBAAuB"}