@assistant-ui/ai-sdk 0.0.6 → 0.0.8

package/dist/runtime/useChatThread.js

@@ -2,9 +2,9 @@
 import { useAISDKRuntime } from "./useAISDKRuntime.js";
 import { AssistantChatTransport } from "../transport/AssistantChatTransport.js";
 import { useResourceCleanup } from "./useResourceCleanup.js";
-import { useCallback, useEffect, useMemo, useRef, useSyncExternalStore } from "@assistant-ui/tap/react-shim";
 import { pickExternalStoreSharedOptions } from "@assistant-ui/core";
-import { useChat } from "@ai-sdk/react";
+import { useCallback, useEffect, useMemo, useRef, useState, useSyncExternalStore } from "@assistant-ui/tap/react-shim";
+import { Chat, useChat } from "@ai-sdk/react";
 //#region src/runtime/useChatThread.ts
 const useDynamicChatTransport = (transport) => {
 	const transportRef = useRef(transport);
@@ -39,7 +39,7 @@ const getResumedStreamIds = (storage) => {
 * same fields `useChat` would.
 */
 const splitChatThreadOptions = (options) => {
-	const { adapters, transport, throttle, toCreateMessage, isDisabled: _isDisabled, isSendDisabled: _isSendDisabled, unstable_capabilities: _unstable_capabilities, suggestions: _suggestions, onResume, onResumeToolCall, onResumeError, joinStrategy, messageRepository, unstable_onBranchChange, ...chatInit } = options ?? {};
+	const { adapters, transport, throttle, toCreateMessage, isDisabled: _isDisabled, isSendDisabled: _isSendDisabled, unstable_capabilities: _unstable_capabilities, suggestions: _suggestions, onResume, onResumeToolCall, onRespondToToolApproval, onResumeError, joinStrategy, messageRepository, unstable_onBranchChange, ...chatInit } = options ?? {};
 	return {
 		adapters,
 		transport,
@@ -47,6 +47,7 @@ const splitChatThreadOptions = (options) => {
 		toCreateMessage,
 		onResume,
 		onResumeToolCall,
+		onRespondToToolApproval,
 		onResumeError,
 		joinStrategy,
 		messageRepository,
@@ -54,28 +55,47 @@ const splitChatThreadOptions = (options) => {
 		chatInit
 	};
 };
+/**
+* Constructs a `Chat` whose callbacks read the latest options through
+* `callbacksRef`, the forwarding `useChat` applies only to a chat it
+* constructs itself.
+*/
+const createChat = (init, callbacksRef) => new Chat({
+	...init,
+	onToolCall: (arg) => callbacksRef.current?.onToolCall?.(arg),
+	onData: (arg) => callbacksRef.current?.onData?.(arg),
+	onFinish: (arg) => callbacksRef.current?.onFinish?.(arg),
+	onError: (arg) => callbacksRef.current?.onError?.(arg),
+	sendAutomaticallyWhen: (arg) => callbacksRef.current?.sendAutomaticallyWhen?.(arg) ?? false
+});
 const useChatThread = (options, env) => {
-	const { adapters, transport: transportOptions, throttle, toCreateMessage, onResume, onResumeToolCall, onResumeError, joinStrategy, messageRepository, unstable_onBranchChange, chatInit: chatOptions } = splitChatThreadOptions(options);
-	const { id, isMainThread, getThreadListItem, stopOnClientDestroy = true, chat: externalChat, messageRepositoryInstance } = env;
-	const defaultTransport = useMemo(() => new AssistantChatTransport(), []);
-	const sourceTransport = transportOptions ?? defaultTransport;
+	const { adapters, transport: transportOptions, throttle, toCreateMessage, onResume, onResumeToolCall, onRespondToToolApproval, onResumeError, joinStrategy, messageRepository, unstable_onBranchChange, chatInit: chatOptions } = splitChatThreadOptions(options);
+	const { id, isMainThread, getThreadListItem, stopOnClientDestroy = true, hostDestroySignal, chat: externalChat, messageRepositoryInstance } = env;
+	const sourceTransport = useMemo(() => transportOptions === void 0 ? new AssistantChatTransport() : externalChat === void 0 && transportOptions instanceof AssistantChatTransport ? transportOptions.__internal_clone() : transportOptions, [transportOptions, externalChat]);
 	const transport = useDynamicChatTransport(sourceTransport);
-	const chat = useChat({
+	const latestChatOptionsRef = useRef(chatOptions);
+	useEffect(() => {
+		latestChatOptionsRef.current = chatOptions;
+	});
+	const [ownedChat] = useState(() => externalChat ?? createChat({
 		...chatOptions,
 		id,
-		transport,
-		...throttle !== void 0 && { throttle },
-		...externalChat !== void 0 && { chat: externalChat }
+		transport
+	}, latestChatOptionsRef));
+	const chat = useChat({
+		chat: externalChat ?? ownedChat,
+		...throttle !== void 0 && { throttle }
 	});
 	useResourceCleanup(stopOnClientDestroy, () => {
 		chat.stop().catch(() => {});
-	});
+	}, hostDestroySignal);
 	const runtime = useAISDKRuntime(chat, {
 		adapters,
 		...pickExternalStoreSharedOptions(options ?? {}),
 		...toCreateMessage && { toCreateMessage },
 		...onResume && { onResume },
 		...onResumeToolCall && { onResumeToolCall },
+		...onRespondToToolApproval && { onRespondToToolApproval },
 		...joinStrategy && { joinStrategy },
 		...messageRepository && { messageRepository },
 		...messageRepositoryInstance && { unstable_messageRepositoryInstance: messageRepositoryInstance },
@@ -136,6 +156,6 @@ const useChatThread = (options, env) => {
 	return runtime;
 };
 //#endregion
-export { splitChatThreadOptions, useChatThread };
+export { createChat, splitChatThreadOptions, useChatThread };
 
 //# sourceMappingURL=useChatThread.js.map

package/dist/runtime/useChatThread.js.map

@@ -1 +1 @@
-{"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 = true,\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":";;;;;;;;AAuEA,MAAMyC,2BACJC,cAC8B;CAC9B,MAAMC,eAAexB,OAAkCuB,SAAS;CAChEzB,gBAAgB;EACd0B,aAAaC,UAAUF;CACzB,CAAC;CAcD,OAbyBxB,cAErB,IAAI4B,MAAMH,aAAaC,SAAS,EAC9BG,IAAIC,GAAGC,MAAM;EACX,MAAMC,MACJP,aAAaC,QAAQK;EACvB,OAAO,OAAOC,QAAQ,aAClBA,IAAIC,KAAKR,aAAaC,OAAO,IAC7BM;CACN,EACF,CAAC,GACH,CAAA,CAEKL;AACT;AAEA,MAAMO,uBACJV,cAC8C;CAC9C,IAAIA,qBAAqB9B,wBACvB,OAAO8B,UAAUU,oBAAoB;CAEvC,MAAMC,YAAaX,UAChBU;CACH,IAAI,OAAOC,cAAc,YAAY,OAAOC,KAAAA;CAC5C,OAAOD,UAAUE,KAAKb,SAAS;AACjC;AAEA,MAAMc,6BAA6B;AAEnC,MAAMC,4CAA4B,IAAIC,QAGpC;AAEF,MAAME,uBAAuBC,YAAgD;CAC3E,IAAI,CAACA,SAAS,uBAAO,IAAIF,IAAY;CACrC,IAAIG,mBAAmBL,0BAA0BV,IAAIc,OAAO;CAC5D,IAAI,CAACC,kBAAkB;EACrBA,mCAAmB,IAAIH,IAAI;EAC3BF,0BAA0BM,IAAIF,SAASC,gBAAgB;CACzD;CACA,OAAOA;AACT;;;;;;AAOA,MAAaE,0BACXC,YACG;CACH,MAAM,EACJxC,UACAiB,WACAlB,UACAE,iBACAwC,YAAYC,aACZC,gBAAgBC,iBAChBC,uBAAuBC,wBACvBC,aAAaC,cACb9C,UACAC,kBACAC,eACAE,cACAC,mBACAC,yBACA,GAAGyC,aACDT,WAAW,CAAC;CAMhB,OAAO;EACLxC;EACAiB;EACAlB;EACAE;EACAC;EACAC;EACAC;EACAE;EACAC;EACAC;EACAyC;CACF;AACF;AAEA,MAAaC,iBACXV,SACAW,QACqB;CACrB,MAAM,EACJnD,UACAiB,WAAWmC,kBACXrD,UACAE,iBACAC,UACAC,kBACAC,eACAE,cACAC,mBACAC,yBACAyC,UAAUI,gBACRd,uBAAuBC,OAAO;CAElC,MAAM,EACJ9B,IACAC,cACAC,mBACAC,sBAAsB,MACtBC,MAAMwC,cACNvC,8BACEoC;CAEJ,MAAMI,mBAAmB9D,cAAc,IAAIN,uBAAuB,GAAG,CAAA,CAAE;CACvE,MAAMqE,kBAAkBJ,oBAAoBG;CAC5C,MAAMtC,YAAYD,wBAAwBwC,eAAe;CAEzD,MAAM1C,OAAOvC,QAAQ;EACnB,GAAG8E;EACH3C;EACAO;EACA,GAAIlB,aAAa8B,KAAAA,KAAa,EAAE9B,SAAS;EACzC,GAAIuD,iBAAiBzB,KAAAA,KAAa,EAAEf,MAAMwC,aAAa;CACzD,CAAC;CAED1D,mBAAmBiB,2BAA2B;EAC5C,KAAU4C,KAAK,CAAC,CAACC,YAAY,CAAC,CAAC;CACjC,CAAC;CAED,MAAMC,UAAU7E,gBAAgBgC,MAAM;EACpCd;EACA,GAAGrB,+BAA+B6D,WAAW,CAAC,CAAC;EAC/C,GAAIvC,mBAAmB,EAAEA,gBAAgB;EACzC,GAAIC,YAAY,EAAEA,SAAS;EAC3B,GAAIC,oBAAoB,EAAEA,iBAAiB;EAC3C,GAAIG,gBAAgB,EAAEA,aAAa;EACnC,GAAIC,qBAAqB,EAAEA,kBAAkB;EAC7C,GAAIQ,6BAA6B,EAC/B6C,oCAAoC7C,0BACtC;EACA,GAAIP,2BAA2B,EAAEA,wBAAwB;CAC3D,CAAC;CAED,IAAIgD,2BAA2BrE,wBAAwB;EACrDqE,gBAAgBK,WAAWF,OAAO;EAClCH,gBAAgBM,gCAAgClD,iBAAiB;CACnE;CAEA,MAAMmD,qBAAqBxE,aACxByE,aAAyBL,QAAQM,OAAOC,UAAUF,QAAQ,GAC3D,CAACL,OAAO,CACV;CACA,MAAMQ,4BAA4B5E,kBAC1BoE,QAAQM,OAAOG,SAAS,CAAC,CAACC,WAChC,CAACV,OAAO,CACV;CACA,MAAMW,mBAAmB3E,qBACvBoE,oBACAI,2BACAA,yBACF;CAEA,MAAMI,mBAAmB9E,cACjBkC,oBAAoB6B,eAAe,CAAC,EAAEpB,SAC5C,CAACoB,eAAe,CAClB;CACA,MAAMgB,8BAA8BjF,aACjCyE,eACCrD,eACK4D,kBAAkBL,YAAYF,YAAUtD,EAAE,YAAY,CAAC,WAClD,CAAC,GACb;EAACA;EAAIC;EAAc4D;CAAgB,CACrC;CACA,MAAME,qBAAqBlF,kBAClBoB,eAAgB4D,kBAAkBG,YAAYhE,EAAE,KAAK,OAAQ,MACpE;EAACA;EAAIC;EAAc4D;CAAgB,CACrC;CACA,MAAMI,kBAAkBhF,qBACtB6E,6BACAC,oBACA1C,oBACF;CACA,MAAM6C,gBACJ9D,KAAK+D,WAAW,eAAe/D,KAAK+D,WAAW;CAEjD,MAAMxC,mBAAmB5C,cACjB0C,oBAAoBoC,gBAAgB,GAC1C,CAACA,gBAAgB,CACnB;CACA,MAAMO,mBAAmBpF,OAAOU,aAAa;CAC7CZ,gBAAgB;EACdsF,iBAAiB3D,UAAUf;CAC7B,CAAC;CACDZ,gBAAgB;EACd,IAAI,CAACmF,mBAAmBtC,iBAAiB0C,IAAIJ,eAAe,GAC1D;EAEF,IAAIC,eAAe;GACjBvC,iBAAiB2C,IAAIL,eAAe;GACpC;EACF;EACA,IAAIL,kBAAkB;EACtBjC,iBAAiB2C,IAAIL,eAAe;EACpC7D,KAAKmE,aAAa,CAAC,CAACvB,OAAOwB,QAAiB;GAC1CC,QAAQC,KAAK,2CAA2CF,GAAG;GAC3D,IAAI;IACFJ,iBAAiB3D,UAAU+D,GAAG;GAChC,SAASG,eAAe;IACtBF,QAAQ9E,MACN,2DACAgF,aACF;GACF,UAAU;IACR,IAAId,kBAAkBG,YAAYhE,EAAE,MAAMiE,iBACxCJ,iBAAiBe,MAAM5E,EAAE;GAE7B;EACF,CAAC;CACH,GAAG;EACDI;EACAJ;EACAkE;EACAN;EACAK;EACAJ;EACAlC;CAAgB,CACjB;CAED,OAAOsB;AACT"}
+{"version":3,"file":"useChatThread.js","names":["Chat","useChat","UIMessage","MessageRepository","pickExternalStoreSharedOptions","AssistantRuntime","ExternalStoreSharedOptions","useAISDKRuntime","AISDKRuntimeAdapter","CustomToCreateMessageFunction","ChatInit","ChatTransport","AssistantChatTransport","InitializableThreadListItem","AssistantChatResumableOptions","ResumableClientStorage","useCallback","useEffect","useMemo","useRef","useState","useSyncExternalStore","useResourceCleanup","ChatThreadOptions","UI_MESSAGE","throttle","adapters","toCreateMessage","onResume","onResumeToolCall","onRespondToToolApproval","onResumeError","error","joinStrategy","messageRepository","unstable_onBranchChange","ChatThreadEnvironment","id","isMainThread","getThreadListItem","stopOnClientDestroy","hostDestroySignal","AbortSignal","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","ChatCallbacks","Pick","createChat","init","callbacksRef","onToolCall","arg","onData","onFinish","onError","sendAutomaticallyWhen","useChatThread","env","transportOptions","chatOptions","externalChat","sourceTransport","__internal_clone","latestChatOptionsRef","ownedChat","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 { Chat, useChat, 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  useState,\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      onRespondToToolApproval?: AISDKRuntimeAdapter[\"onRespondToToolApproval\"];\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   * Aborts when the React component hosting the runtime is deleted. A nested\n   * runtime resolves the destroy signal of the provider above it, which\n   * outlives the nested component, so this stops the chat on its own unmount.\n   */\n  hostDestroySignal?: AbortSignal | undefined;\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    onRespondToToolApproval,\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    onRespondToToolApproval,\n    onResumeError,\n    joinStrategy,\n    messageRepository,\n    unstable_onBranchChange,\n    chatInit,\n  };\n};\n\ntype ChatCallbacks<UI_MESSAGE extends UIMessage> = Pick<\n  ChatInit<UI_MESSAGE>,\n  \"onToolCall\" | \"onData\" | \"onFinish\" | \"onError\" | \"sendAutomaticallyWhen\"\n>;\n\n/**\n * Constructs a `Chat` whose callbacks read the latest options through\n * `callbacksRef`, the forwarding `useChat` applies only to a chat it\n * constructs itself.\n */\nexport const createChat = <UI_MESSAGE extends UIMessage>(\n  init: ChatInit<UI_MESSAGE>,\n  callbacksRef: { readonly current: ChatCallbacks<UI_MESSAGE> | undefined },\n): Chat<UI_MESSAGE> =>\n  new Chat<UI_MESSAGE>({\n    ...init,\n    onToolCall: (arg) => callbacksRef.current?.onToolCall?.(arg),\n    onData: (arg) => callbacksRef.current?.onData?.(arg),\n    onFinish: (arg) => callbacksRef.current?.onFinish?.(arg),\n    onError: (arg) => callbacksRef.current?.onError?.(arg),\n    sendAutomaticallyWhen: (arg) =>\n      callbacksRef.current?.sendAutomaticallyWhen?.(arg) ?? false,\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    onRespondToToolApproval,\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 = true,\n    hostDestroySignal,\n    chat: externalChat,\n    messageRepositoryInstance,\n  } = env;\n\n  // Wiring below is per thread and mutated on the instance, so a transport\n  // shared across simultaneously mounted threads is last-writer-wins. A\n  // caller-owned chat is already bound to its own clone, so cloning again\n  // here would wire a copy the chat never sends through.\n  const sourceTransport = useMemo(\n    () =>\n      transportOptions === undefined\n        ? new AssistantChatTransport()\n        : externalChat === undefined &&\n            transportOptions instanceof AssistantChatTransport\n          ? transportOptions.__internal_clone()\n          : transportOptions,\n    [transportOptions, externalChat],\n  );\n  const transport = useDynamicChatTransport(sourceTransport);\n\n  const latestChatOptionsRef = useRef(chatOptions);\n  useEffect(() => {\n    latestChatOptionsRef.current = chatOptions;\n  });\n  // `useChat` stops a chat it constructs whenever it unmounts, and a\n  // resource's soft unmount runs that cleanup, so the thread owns its chat.\n  const [ownedChat] = useState(\n    () =>\n      externalChat ??\n      createChat({ ...chatOptions, id, transport }, latestChatOptionsRef),\n  );\n\n  const chat = useChat({\n    chat: externalChat ?? ownedChat,\n    ...(throttle !== undefined && { throttle }),\n  });\n\n  useResourceCleanup(\n    stopOnClientDestroy,\n    () => {\n      void chat.stop().catch(() => {});\n    },\n    hostDestroySignal,\n  );\n\n  const runtime = useAISDKRuntime(chat, {\n    adapters,\n    ...pickExternalStoreSharedOptions(options ?? {}),\n    ...(toCreateMessage && { toCreateMessage }),\n    ...(onResume && { onResume }),\n    ...(onResumeToolCall && { onResumeToolCall }),\n    ...(onRespondToToolApproval && { onRespondToToolApproval }),\n    ...(joinStrategy && { joinStrategy }),\n    ...(messageRepository && { messageRepository }),\n    ...(messageRepositoryInstance && {\n      unstable_messageRepositoryInstance: messageRepositoryInstance,\n    }),\n    ...(unstable_onBranchChange && { unstable_onBranchChange }),\n  });\n\n  // Wire in render, not an effect: a send from a descendant's mount effect\n  // runs before this hook's effect would (effects fire child-first), and must\n  // see a wired transport. The clone is per thread, so a discarded render's\n  // wiring is discarded with it and the committed render re-wires the same\n  // instance.\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

@@ -1,11 +1,10 @@
-import { RefObject } from "react";
-import { AssistantRuntime, ExportedMessageRepository, MessageFormatAdapter, MessageFormatRepository, ThreadHistoryAdapter, ThreadMessage } from "@assistant-ui/core";
-//#region src/runtime/useExternalHistory.d.ts
-declare const toExportedMessageRepository: <TMessage>(toThreadMessages: (messages: TMessage[]) => ThreadMessage[], messages: MessageFormatRepository<TMessage>) => ExportedMessageRepository;
-declare const useExternalHistory: <TMessage>(runtimeRef: RefObject<AssistantRuntime>, historyAdapter: ThreadHistoryAdapter | undefined, toThreadMessages: (messages: TMessage[]) => ThreadMessage[], storageFormatAdapter: MessageFormatAdapter<TMessage, any>, onSetMessages: (messages: TMessage[]) => void) => {
-  isLoading: boolean;
-  deleteMessage: (messageId: string) => Promise<void>;
+import type { AssistantRuntime, ThreadHistoryAdapter, ThreadMessage, MessageFormatAdapter, MessageFormatRepository, ExportedMessageRepository, RespondToToolApprovalOptions, Unstable_ToolInteractionLog } from "@assistant-ui/core";
+import { type RefObject } from "react";
+export declare const toExportedMessageRepository: <TMessage>(toThreadMessages: (messages: TMessage[]) => ThreadMessage[], messages: MessageFormatRepository<TMessage>) => ExportedMessageRepository;
+export declare const useExternalHistory: <TMessage>(runtimeRef: RefObject<AssistantRuntime>, historyAdapter: ThreadHistoryAdapter | undefined, toThreadMessages: (messages: TMessage[]) => ThreadMessage[], storageFormatAdapter: MessageFormatAdapter<TMessage, any>, onSetMessages: (messages: TMessage[]) => void, toolArtifacts?: Map<string, unknown>, onToolArtifactsRestored?: () => void, toolInteractions?: Map<string, Unstable_ToolInteractionLog>, onToolInteractionsRestored?: () => void, toolApprovalResponses?: Map<string, RespondToToolApprovalOptions>, onToolApprovalResponsesRestored?: () => void) => {
+    isLoading: boolean;
+    deleteMessage: (messageId: string) => Promise<void>;
+    persistToolInteractions: (messageId: string) => Promise<void>;
+    persistToolApprovalResponses: (messageId: string) => Promise<void>;
 };
-//#endregion
-export { toExportedMessageRepository, useExternalHistory };
 //# sourceMappingURL=useExternalHistory.d.ts.map

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

@@ -1 +1 @@
-{"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;;EA8UN,gBAAA,sBAAM"}
+{"version":3,"file":"useExternalHistory.d.ts","sourceRoot":"","sources":["../../src/runtime/useExternalHistory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,oBAAoB,EACpB,aAAa,EACb,oBAAoB,EAEpB,uBAAuB,EACvB,yBAAyB,EACzB,4BAA4B,EAC5B,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAIL,KAAK,SAAS,EAGf,MAAM,OAAO,CAAC;AAEf,eAAO,MAAM,2BAA2B,GAAI,QAAQ,EAClD,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,aAAa,EAAE,EAC3D,UAAU,uBAAuB,CAAC,QAAQ,CAAC,KAC1C,yBAoBF,CAAC;AAwNF,eAAO,MAAM,kBAAkB,GAAI,QAAQ,EACzC,YAAY,SAAS,CAAC,gBAAgB,CAAC,EACvC,gBAAgB,oBAAoB,GAAG,SAAS,EAChD,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,aAAa,EAAE,EAC3D,sBAAsB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,EACzD,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,IAAI,EAC7C,gBAAgB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,0BAA0B,MAAM,IAAI,EACpC,mBAAmB,GAAG,CAAC,MAAM,EAAE,2BAA2B,CAAC,EAC3D,6BAA6B,MAAM,IAAI,EACvC,wBAAwB,GAAG,CAAC,MAAM,EAAE,4BAA4B,CAAC,EACjE,kCAAkC,MAAM,IAAI;;+BA+dxB,MAAM;yCA3UZ,MAAM;8CAAN,MAAM;CAyXrB,CAAC"}

package/dist/runtime/useExternalHistory.js

@@ -1,7 +1,7 @@
 "use client";
-import { useCallback, useEffect, useMemo, useRef, useState } from "@assistant-ui/tap/react-shim";
+import { MessageRepository, readToolInteractionLog } from "@assistant-ui/core/internal";
 import { getExternalStoreMessages } from "@assistant-ui/core";
-import { MessageRepository } from "@assistant-ui/core/internal";
+import { useCallback, useEffect, useMemo, useRef, useState } from "@assistant-ui/tap/react-shim";
 import { useAui } from "@assistant-ui/store";
 //#region src/runtime/useExternalHistory.ts
 const toExportedMessageRepository = (toThreadMessages, messages) => {
@@ -25,8 +25,107 @@ const toExportedMessageRepository = (toThreadMessages, messages) => {
 	};
 };
 const isAwaitingToolApproval = (message) => message.status?.type === "requires-action" && message.status.reason === "tool-calls";
+const isTerminalMessage = (message) => message.status === void 0 || message.status.type === "complete" || message.status.type === "incomplete";
+const TOOL_ARTIFACTS_METADATA_KEY = "__aui_toolArtifacts";
+const TOOL_INTERACTIONS_METADATA_KEY = "__aui_toolInteractions";
+const TOOL_APPROVAL_RESPONSES_METADATA_KEY = "__aui_toolApprovalResponses";
+const isRecord = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+const collectToolArtifacts = (message, toolArtifacts) => {
+	if (!toolArtifacts) return void 0;
+	const entries = message.content.flatMap((part) => {
+		if (part.type !== "tool-call") return [];
+		const artifact = toolArtifacts.get(part.toolCallId);
+		return artifact === void 0 ? [] : [[part.toolCallId, artifact]];
+	});
+	return entries.length > 0 ? Object.fromEntries(entries) : void 0;
+};
+const collectToolInteractions = (message, toolInteractions) => {
+	if (!toolInteractions) return void 0;
+	const entries = message.content.flatMap((part) => {
+		if (part.type !== "tool-call") return [];
+		const interactions = toolInteractions.get(part.toolCallId);
+		return interactions === void 0 ? [] : [[part.toolCallId, interactions]];
+	});
+	return entries.length > 0 ? Object.fromEntries(entries) : void 0;
+};
+const collectToolApprovalResponses = (message, toolApprovalResponses) => {
+	if (!toolApprovalResponses) return void 0;
+	const entries = message.content.flatMap((part) => {
+		if (part.type !== "tool-call" || !part.approval) return [];
+		const response = toolApprovalResponses.get(part.approval.id);
+		if (!response) return [];
+		return [[part.approval.id, {
+			approved: response.approved,
+			...response.optionId != null && { optionId: response.optionId },
+			...response.text != null && { text: response.text },
+			...response.reason != null && { reason: response.reason }
+		}]];
+	});
+	return entries.length > 0 ? Object.fromEntries(entries) : void 0;
+};
+const addToolData = (message, toolArtifacts, toolInteractions, toolApprovalResponses) => {
+	if (!toolArtifacts && !toolInteractions && !toolApprovalResponses || !isRecord(message) || !Array.isArray(message.parts)) return message;
+	const toolCallIds = message.parts.flatMap((part) => {
+		if (!isRecord(part) || typeof part.toolCallId !== "string") return [];
+		return [part.toolCallId];
+	});
+	const artifacts = toolArtifacts ? Object.fromEntries(toolCallIds.flatMap((toolCallId) => Object.hasOwn(toolArtifacts, toolCallId) ? [[toolCallId, toolArtifacts[toolCallId]]] : [])) : void 0;
+	const interactions = toolInteractions ? Object.fromEntries(toolCallIds.flatMap((toolCallId) => Object.hasOwn(toolInteractions, toolCallId) ? [[toolCallId, toolInteractions[toolCallId]]] : [])) : void 0;
+	const approvalIds = message.parts.flatMap((part) => {
+		if (!isRecord(part) || !isRecord(part.approval)) return [];
+		const approvalId = part.approval.id;
+		return typeof approvalId === "string" ? [approvalId] : [];
+	});
+	const approvalResponses = toolApprovalResponses ? Object.fromEntries(approvalIds.flatMap((approvalId) => Object.hasOwn(toolApprovalResponses, approvalId) ? [[approvalId, toolApprovalResponses[approvalId]]] : [])) : void 0;
+	const hasArtifacts = !!artifacts && Object.keys(artifacts).length > 0;
+	const hasInteractions = !!interactions && Object.keys(interactions).length > 0;
+	const hasApprovalResponses = !!approvalResponses && Object.keys(approvalResponses).length > 0;
+	if (!hasArtifacts && !hasInteractions && !hasApprovalResponses) return message;
+	const metadata = isRecord(message.metadata) ? message.metadata : {};
+	return {
+		...message,
+		metadata: {
+			...metadata,
+			...hasArtifacts && { [TOOL_ARTIFACTS_METADATA_KEY]: artifacts },
+			...hasInteractions && { [TOOL_INTERACTIONS_METADATA_KEY]: interactions },
+			...hasApprovalResponses && { [TOOL_APPROVAL_RESPONSES_METADATA_KEY]: approvalResponses }
+		}
+	};
+};
+const restoreToolData = (message, toolArtifacts, toolInteractions, toolApprovalResponses) => {
+	if (!isRecord(message) || !isRecord(message.metadata)) return message;
+	const metadata = message.metadata;
+	const hasArtifacts = Object.hasOwn(metadata, TOOL_ARTIFACTS_METADATA_KEY);
+	const hasInteractions = Object.hasOwn(metadata, TOOL_INTERACTIONS_METADATA_KEY);
+	const hasApprovalResponses = Object.hasOwn(metadata, TOOL_APPROVAL_RESPONSES_METADATA_KEY);
+	if (!hasArtifacts && !hasInteractions && !hasApprovalResponses) return message;
+	const artifacts = metadata[TOOL_ARTIFACTS_METADATA_KEY];
+	if (toolArtifacts && isRecord(artifacts)) for (const [toolCallId, artifact] of Object.entries(artifacts)) toolArtifacts.set(toolCallId, artifact);
+	const interactions = metadata[TOOL_INTERACTIONS_METADATA_KEY];
+	if (toolInteractions && isRecord(interactions)) for (const [toolCallId, value] of Object.entries(interactions)) {
+		const log = readToolInteractionLog(value);
+		if (log) toolInteractions.set(toolCallId, log);
+	}
+	const approvalResponses = metadata[TOOL_APPROVAL_RESPONSES_METADATA_KEY];
+	if (toolApprovalResponses && isRecord(approvalResponses)) for (const [approvalId, value] of Object.entries(approvalResponses)) {
+		if (!isRecord(value) || typeof value.approved !== "boolean") continue;
+		toolApprovalResponses.set(approvalId, {
+			approvalId,
+			approved: value.approved,
+			...typeof value.optionId === "string" && { optionId: value.optionId },
+			...typeof value.text === "string" && { text: value.text },
+			...typeof value.reason === "string" && { reason: value.reason }
+		});
+	}
+	const { [TOOL_ARTIFACTS_METADATA_KEY]: _, [TOOL_INTERACTIONS_METADATA_KEY]: __, [TOOL_APPROVAL_RESPONSES_METADATA_KEY]: ___, ...restMetadata } = metadata;
+	const { metadata: _metadata, ...restMessage } = message;
+	return Object.keys(restMetadata).length === 0 ? restMessage : {
+		...restMessage,
+		metadata: restMetadata
+	};
+};
 const encodeContent = (storageFormatAdapter, item) => JSON.stringify(storageFormatAdapter.encode(item));
-const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storageFormatAdapter, onSetMessages) => {
+const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storageFormatAdapter, onSetMessages, toolArtifacts, onToolArtifactsRestored, toolInteractions, onToolInteractionsRestored, toolApprovalResponses, onToolApprovalResponsesRestored) => {
 	const loadedRef = useRef(false);
 	const [itemEpoch, setItemEpoch] = useState(0);
 	const aui = useAui();
@@ -50,12 +149,26 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 		const loadHistory = async () => {
 			try {
 				const repo = await formatAdapter.load();
-				if (repo && repo.messages.length > 0) {
-					for (const m of repo.messages) persistedInnerMessages.current.set(storageFormatAdapter.getId(m.message), {
-						source: m.message,
+				toolArtifacts?.clear();
+				toolInteractions?.clear();
+				toolApprovalResponses?.clear();
+				const restoredMessages = repo?.messages.map((item) => ({
+					...item,
+					message: restoreToolData(item.message, toolArtifacts, toolInteractions, toolApprovalResponses)
+				})) ?? [];
+				onToolArtifactsRestored?.();
+				onToolInteractionsRestored?.();
+				onToolApprovalResponsesRestored?.();
+				if (repo && restoredMessages.length > 0) {
+					const restoredRepo = {
+						...repo,
+						messages: restoredMessages
+					};
+					for (const [index, m] of repo.messages.entries()) persistedInnerMessages.current.set(storageFormatAdapter.getId(m.message), {
+						source: restoredMessages[index].message,
 						content: encodeContent(storageFormatAdapter, m)
 					});
-					const converted = toExportedMessageRepository(toThreadMessages, repo);
+					const converted = toExportedMessageRepository(toThreadMessages, restoredRepo);
 					runtimeRef.current.thread.import(converted);
 					const tempRepo = new MessageRepository();
 					tempRepo.import(converted);
@@ -95,7 +208,13 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 		optionalThreadListItem,
 		aui,
 		itemEpoch,
-		storageFormatAdapter
+		storageFormatAdapter,
+		toolArtifacts,
+		onToolArtifactsRestored,
+		toolInteractions,
+		onToolInteractionsRestored,
+		toolApprovalResponses,
+		onToolApprovalResponsesRestored
 	]);
 	const runStartRef = useRef(null);
 	const persistTimerRef = useRef(null);
@@ -103,9 +222,55 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 	const stepBoundariesRef = useRef([]);
 	const wasRunningRef = useRef(false);
 	const toolCallCountRef = useRef(0);
+	const persistToolInteractions = useCallback((messageId) => {
+		const persistence = persistInFlightRef.current.then(async () => {
+			if (!formatAdapter?.update) return;
+			const messages_0 = runtimeRef.current.thread.getState().messages;
+			const message = messages_0.find((item_0) => item_0.id === messageId || getExternalStoreMessages(item_0).some((innerMessage) => storageFormatAdapter.getId(innerMessage) === messageId));
+			if (!message) return;
+			const previousMessages = messages_0.slice(0, messages_0.indexOf(message)).flatMap(getExternalStoreMessages);
+			let parentId = previousMessages.at(-1) ? storageFormatAdapter.getId(previousMessages.at(-1)) : null;
+			const storedToolArtifacts = collectToolArtifacts(message, toolArtifacts);
+			const storedToolInteractions = collectToolInteractions(message, toolInteractions);
+			const storedToolApprovalResponses = collectToolApprovalResponses(message, toolApprovalResponses);
+			for (const innerMessage_0 of getExternalStoreMessages(message)) {
+				const item_1 = {
+					parentId,
+					message: addToolData(innerMessage_0, storedToolArtifacts, storedToolInteractions, storedToolApprovalResponses)
+				};
+				const innerId = storageFormatAdapter.getId(item_1.message);
+				const persisted = persistedInnerMessages.current.get(innerId);
+				if (persisted) {
+					const content = encodeContent(storageFormatAdapter, item_1);
+					if (content === persisted.content) persisted.source = item_1.message;
+					else {
+						await formatAdapter.update(item_1, innerId);
+						persistedInnerMessages.current.set(innerId, {
+							source: item_1.message,
+							content
+						});
+					}
+				}
+				parentId = innerId;
+			}
+		});
+		persistInFlightRef.current = persistence.catch(() => {});
+		return persistence.catch((error_0) => {
+			console.error("Failed to persist tool data:", error_0);
+		});
+	}, [
+		formatAdapter,
+		runtimeRef,
+		storageFormatAdapter,
+		toolArtifacts,
+		toolInteractions,
+		toolApprovalResponses
+	]);
 	useEffect(() => {
 		if (!formatAdapter) return;
 		const adapter = formatAdapter;
+		const idleScheduledInnerIds = /* @__PURE__ */ new Set();
+		const unpersistedInnerIds = (message_0) => isTerminalMessage(message_0) ? getExternalStoreMessages(message_0).map((innerMessage_1) => storageFormatAdapter.getId(innerMessage_1)).filter((innerId_0) => !persistedInnerMessages.current.has(innerId_0)) : [];
 		const unsubscribe = runtimeRef.current.thread.subscribe(() => {
 			const threadState_0 = runtimeRef.current.thread.getState();
 			const { isRunning } = threadState_0;
@@ -134,8 +299,13 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 				}
 				return;
 			}
-			if (!wasRunning) return;
-			if (runStartRef.current != null) stepBoundariesRef.current.push(Date.now() - runStartRef.current);
+			if (wasRunning) {
+				if (runStartRef.current != null) stepBoundariesRef.current.push(Date.now() - runStartRef.current);
+			} else {
+				const pending = threadState_0.messages.flatMap(unpersistedInnerIds);
+				if (pending.every((innerId_1) => idleScheduledInnerIds.has(innerId_1))) return;
+				for (const innerId_2 of pending) idleScheduledInnerIds.add(innerId_2);
+			}
 			if (persistTimerRef.current) clearTimeout(persistTimerRef.current);
 			persistTimerRef.current = setTimeout(() => {
 				persistSettled(false);
@@ -180,58 +350,61 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 				...stepTimestamps != null ? { stepTimestamps } : void 0
 			};
 			persistInFlightRef.current = persistInFlightRef.current.then(async () => {
-				const { messages: messages_0 } = latest;
+				const { messages: messages_1 } = latest;
 				let lastInnerMessageId = null;
 				const getLastInnerId = (msgs) => msgs.length > 0 ? storageFormatAdapter.getId(msgs.at(-1)) : null;
-				const toBatchItems = (msgs_0) => msgs_0.map((msg, idx) => ({
+				const toBatchItems = (msgs_0, toolArtifacts_0, toolInteractions_0, toolApprovalResponses_0) => msgs_0.map((msg, idx) => ({
 					parentId: idx === 0 ? lastInnerMessageId : storageFormatAdapter.getId(msgs_0[idx - 1]),
-					message: msg
+					message: addToolData(msg, toolArtifacts_0, toolInteractions_0, toolApprovalResponses_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);
+				for (const message_1 of messages_1) {
+					const innerMessages = getExternalStoreMessages(message_1);
+					const isTerminal = isTerminalMessage(message_1);
+					const isAwaitingToolCalls = isAwaitingToolApproval(message_1);
 					if (!(isTerminal || isAwaitingToolCalls && adapter.update !== void 0)) {
 						lastInnerMessageId = getLastInnerId(innerMessages) ?? lastInnerMessageId;
 						continue;
 					}
-					if (!historyIds.current.has(message.id)) {
-						historyIds.current.add(message.id);
-						deferredTelemetryIds.current.add(message.id);
+					if (!historyIds.current.has(message_1.id)) {
+						historyIds.current.add(message_1.id);
+						deferredTelemetryIds.current.add(message_1.id);
 					}
-					const batchItems = toBatchItems(innerMessages);
-					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)
+					const batchItems = toBatchItems(innerMessages, collectToolArtifacts(message_1, toolArtifacts), collectToolInteractions(message_1, toolInteractions), collectToolApprovalResponses(message_1, toolApprovalResponses));
+					for (const item_2 of batchItems) {
+						const innerId_3 = storageFormatAdapter.getId(item_2.message);
+						const persisted_0 = persistedInnerMessages.current.get(innerId_3);
+						if (!persisted_0) {
+							await adapter.append(item_2);
+							persistedInnerMessages.current.set(innerId_3, {
+								source: item_2.message,
+								content: encodeContent(storageFormatAdapter, item_2)
 							});
-						} 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 if (persisted_0.source !== item_2.message && durationMs !== void 0 && adapter.update) {
+							const content_0 = encodeContent(storageFormatAdapter, item_2);
+							if (content_0 === persisted_0.content) persisted_0.source = item_2.message;
 							else try {
-								await adapter.update(item, innerId);
-								persistedInnerMessages.current.set(innerId, {
-									source: item.message,
-									content
+								await adapter.update(item_2, innerId_3);
+								persistedInnerMessages.current.set(innerId_3, {
+									source: item_2.message,
+									content: content_0
 								});
 							} catch {}
 						}
 					}
 					lastInnerMessageId = getLastInnerId(innerMessages) ?? lastInnerMessageId;
-					if (deferredTelemetryIds.current.has(message.id) && isTerminal) {
-						deferredTelemetryIds.current.delete(message.id);
-						adapter.reportTelemetry?.(batchItems, {
+					if (deferredTelemetryIds.current.has(message_1.id) && isTerminal) {
+						deferredTelemetryIds.current.delete(message_1.id);
+						adapter.reportTelemetry?.(batchItems.map((item_3, index_0) => ({
+							...item_3,
+							message: innerMessages[index_0]
+						})), {
 							...telemetryOptions,
-							message
+							message: message_1
 						});
 					}
 				}
-			}).catch((error_0) => {
-				console.error("Failed to persist message history:", error_0);
+			}).catch((error_1) => {
+				console.error("Failed to persist message history:", error_1);
 			});
 		}
 		return () => {
@@ -245,31 +418,34 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 	}, [
 		formatAdapter,
 		storageFormatAdapter,
-		runtimeRef
+		runtimeRef,
+		toolArtifacts,
+		toolInteractions,
+		toolApprovalResponses
 	]);
 	return {
 		isLoading,
-		deleteMessage: useCallback(async (messageId) => {
+		deleteMessage: useCallback(async (messageId_0) => {
 			const deleteMessages = formatAdapter?.delete?.bind(formatAdapter);
 			if (!deleteMessages) return;
-			const messages_1 = runtimeRef.current.thread.getState().messages;
-			const messageIndex = messages_1.findIndex((m_2) => m_2.id === messageId);
+			const messages_2 = runtimeRef.current.thread.getState().messages;
+			const messageIndex = messages_2.findIndex((m_2) => m_2.id === messageId_0);
 			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_0) => {
-				const item_0 = {
-					parentId,
-					message: message_0
+			const previousInnerMessages = messages_2.slice(0, messageIndex).flatMap(getExternalStoreMessages);
+			let parentId_0 = previousInnerMessages.at(-1) ? storageFormatAdapter.getId(previousInnerMessages.at(-1)) : null;
+			const itemsToDelete = getExternalStoreMessages(messages_2[messageIndex]).map((message_2) => {
+				const item_4 = {
+					parentId: parentId_0,
+					message: message_2
 				};
-				parentId = storageFormatAdapter.getId(message_0);
-				return item_0;
+				parentId_0 = storageFormatAdapter.getId(message_2);
+				return item_4;
 			});
 			const deletion = persistInFlightRef.current.then(async () => {
 				await deleteMessages(itemsToDelete);
-				historyIds.current.delete(messageId);
-				deferredTelemetryIds.current.delete(messageId);
-				for (const item_1 of itemsToDelete) persistedInnerMessages.current.delete(storageFormatAdapter.getId(item_1.message));
+				historyIds.current.delete(messageId_0);
+				deferredTelemetryIds.current.delete(messageId_0);
+				for (const item_5 of itemsToDelete) persistedInnerMessages.current.delete(storageFormatAdapter.getId(item_5.message));
 			});
 			persistInFlightRef.current = deletion.catch(() => {});
 			await deletion;
@@ -277,7 +453,9 @@ const useExternalHistory = (runtimeRef, historyAdapter, toThreadMessages, storag
 			formatAdapter,
 			runtimeRef,
 			storageFormatAdapter
-		])
+		]),
+		persistToolInteractions,
+		persistToolApprovalResponses: persistToolInteractions
 	};
 };
 //#endregion