@assistant-ui/core 0.3.16 → 0.3.18

package/dist/runtimes/external-store/external-store-thread-list-runtime-core.js

@@ -1,3 +1,4 @@
+import { nullProtoRecord } from "../../utils/record.js";
 import { BaseSubscribable } from "../../subscribable/subscribable.js";
 import { invalidateThreadRuntime } from "../../runtime/utils/thread-runtime-lifecycle.js";
 //#region src/runtimes/external-store/external-store-thread-list-runtime-core.ts
@@ -11,7 +12,7 @@ const DEFAULT_THREAD = Object.freeze({
 	status: "regular"
 });
 const RESOLVED_PROMISE = Promise.resolve();
-const DEFAULT_THREAD_DATA = Object.freeze({ [DEFAULT_THREAD_ID]: DEFAULT_THREAD });
+const DEFAULT_THREAD_DATA = Object.freeze(nullProtoRecord({ [DEFAULT_THREAD_ID]: DEFAULT_THREAD }));
 var ExternalStoreThreadListRuntimeCore = class extends BaseSubscribable {
 	_mainThreadId = DEFAULT_THREAD_ID;
 	_threads = DEFAULT_THREADS;
@@ -51,7 +52,7 @@ var ExternalStoreThreadListRuntimeCore = class extends BaseSubscribable {
 		throw new Error("Method not implemented.");
 	}
 	getItemById(threadId) {
-		return this._threadData[threadId];
+		return Object.hasOwn(this._threadData, threadId) ? this._threadData[threadId] : void 0;
 	}
 	__internal_setAdapter(adapter, initialLoad = false) {
 		const previousAdapter = this.adapter;
@@ -62,22 +63,18 @@ var ExternalStoreThreadListRuntimeCore = class extends BaseSubscribable {
 		const previousThreadId = previousAdapter.threadId ?? DEFAULT_THREAD_ID;
 		const previousThreads = previousAdapter.threads ?? EMPTY_ARRAY;
 		const previousArchivedThreads = previousAdapter.archivedThreads ?? EMPTY_ARRAY;
-		if (!initialLoad && previousThreadId === newThreadId && previousThreads === newThreads && previousArchivedThreads === newArchivedThreads) return;
-		if (previousThreads !== newThreads || previousArchivedThreads !== newArchivedThreads || previousThreadId !== newThreadId) this._threadData = {
-			...DEFAULT_THREAD_DATA,
-			...Object.fromEntries(adapter.threads?.map((t) => [t.id, {
-				...t,
-				remoteId: t.remoteId,
-				externalId: t.externalId,
-				status: "regular"
-			}]) ?? []),
-			...Object.fromEntries(adapter.archivedThreads?.map((t) => [t.id, {
-				...t,
-				remoteId: t.remoteId,
-				externalId: t.externalId,
-				status: "archived"
-			}]) ?? [])
-		};
+		if (!initialLoad && (previousAdapter.isLoading ?? false) === (adapter.isLoading ?? false) && previousThreadId === newThreadId && previousThreads === newThreads && previousArchivedThreads === newArchivedThreads) return;
+		if (previousThreads !== newThreads || previousArchivedThreads !== newArchivedThreads || previousThreadId !== newThreadId) this._threadData = nullProtoRecord(DEFAULT_THREAD_DATA, Object.fromEntries(adapter.threads?.map((t) => [t.id, {
+			...t,
+			remoteId: t.remoteId,
+			externalId: t.externalId,
+			status: "regular"
+		}]) ?? []), Object.fromEntries(adapter.archivedThreads?.map((t) => [t.id, {
+			...t,
+			remoteId: t.remoteId,
+			externalId: t.externalId,
+			status: "archived"
+		}]) ?? []));
 		if (previousThreads !== newThreads) this._threads = this.adapter.threads?.map((t) => t.id) ?? EMPTY_ARRAY;
 		if (previousArchivedThreads !== newArchivedThreads) this._archivedThreads = this.adapter.archivedThreads?.map((t) => t.id) ?? EMPTY_ARRAY;
 		if (initialLoad || previousThreadId !== newThreadId) {
@@ -85,15 +82,12 @@ var ExternalStoreThreadListRuntimeCore = class extends BaseSubscribable {
 			this._mainThreadId = newThreadId;
 			this._mainThread = this.threadFactory();
 		}
-		if (!this._threadData[this._mainThreadId]) this._threadData = {
-			...this._threadData,
-			[this._mainThreadId]: {
-				id: this._mainThreadId,
-				remoteId: void 0,
-				externalId: void 0,
-				status: "regular"
-			}
-		};
+		if (!Object.hasOwn(this._threadData, this._mainThreadId)) this._threadData = nullProtoRecord(this._threadData, { [this._mainThreadId]: {
+			id: this._mainThreadId,
+			remoteId: void 0,
+			externalId: void 0,
+			status: "regular"
+		} });
 		this._notifySubscribers();
 	}
 	async reloadMainThread() {

package/dist/runtimes/external-store/external-store-thread-list-runtime-core.js.map

@@ -1 +1 @@
-{"version":3,"file":"external-store-thread-list-runtime-core.js","names":["ExternalStoreThreadRuntimeCore","ThreadListItemCoreState","ThreadListRuntimeCore","ExternalStoreThreadListAdapter","invalidateThreadRuntime","BaseSubscribable","ExternalStoreThreadFactory","EMPTY_ARRAY","Object","freeze","DEFAULT_THREAD_ID","DEFAULT_THREADS","DEFAULT_THREAD","id","remoteId","undefined","externalId","status","RESOLVED_PROMISE","Promise","resolve","DEFAULT_THREAD_DATA","ExternalStoreThreadListRuntimeCore","_mainThreadId","_threads","_archivedThreads","_threadData","Readonly","Record","adapter","isLoading","newThreadId","threadIds","archivedThreadIds","threadItems","getLoadThreadsPromise","_mainThread","mainThreadId","threadFactory","constructor","__internal_setAdapter","getMainThreadRuntimeCore","getThreadRuntimeCore","Error","getItemById","threadId","initialLoad","previousAdapter","newThreads","threads","newArchivedThreads","archivedThreads","previousThreadId","previousThreads","previousArchivedThreads","fromEntries","map","t","_notifySubscribers","reloadMainThread","unstable_refetchThread","switchToThread","_options","unarchive","onSwitchToThread","switchToNewThread","onSwitchToNewThread","rename","newTitle","onRename","updateCustom","custom","onUpdateCustom","detach","archive","onArchive","onUnarchive","delete","onDelete","initialize","generateTitle"],"sources":["../../../src/runtimes/external-store/external-store-thread-list-runtime-core.ts"],"sourcesContent":["import type { ExternalStoreThreadRuntimeCore } from \"./external-store-thread-runtime-core\";\nimport type {\n  ThreadListItemCoreState,\n  ThreadListRuntimeCore,\n} from \"../../runtime/interfaces/thread-list-runtime-core\";\nimport type { ExternalStoreThreadListAdapter } from \"./external-store-adapter\";\nimport { invalidateThreadRuntime } from \"../../runtime/utils/thread-runtime-lifecycle\";\nimport { BaseSubscribable } from \"../../subscribable/subscribable\";\n\nexport type ExternalStoreThreadFactory = () => ExternalStoreThreadRuntimeCore;\n\nconst EMPTY_ARRAY = Object.freeze([]);\nconst DEFAULT_THREAD_ID = \"DEFAULT_THREAD_ID\";\nconst DEFAULT_THREADS = Object.freeze([DEFAULT_THREAD_ID]);\nconst DEFAULT_THREAD = Object.freeze({\n  id: DEFAULT_THREAD_ID,\n  remoteId: undefined,\n  externalId: undefined,\n  status: \"regular\",\n});\nconst RESOLVED_PROMISE = Promise.resolve();\nconst DEFAULT_THREAD_DATA = Object.freeze({\n  [DEFAULT_THREAD_ID]: DEFAULT_THREAD,\n});\n\nexport class ExternalStoreThreadListRuntimeCore\n  extends BaseSubscribable\n  implements ThreadListRuntimeCore\n{\n  private _mainThreadId: string = DEFAULT_THREAD_ID;\n  private _threads: readonly string[] = DEFAULT_THREADS;\n  private _archivedThreads: readonly string[] = EMPTY_ARRAY;\n  private _threadData: Readonly<Record<string, ThreadListItemCoreState>> =\n    DEFAULT_THREAD_DATA;\n  private adapter: ExternalStoreThreadListAdapter = {};\n\n  public get isLoading() {\n    return this.adapter.isLoading ?? false;\n  }\n\n  public get newThreadId() {\n    return undefined;\n  }\n\n  public get threadIds() {\n    return this._threads;\n  }\n\n  public get archivedThreadIds() {\n    return this._archivedThreads;\n  }\n\n  public get threadItems() {\n    return this._threadData;\n  }\n\n  public getLoadThreadsPromise() {\n    return RESOLVED_PROMISE;\n  }\n\n  private _mainThread!: ExternalStoreThreadRuntimeCore;\n\n  public get mainThreadId() {\n    return this._mainThreadId;\n  }\n\n  private threadFactory: ExternalStoreThreadFactory;\n\n  constructor(\n    adapter: ExternalStoreThreadListAdapter = {},\n    threadFactory: ExternalStoreThreadFactory,\n  ) {\n    super();\n    this.threadFactory = threadFactory;\n    this.__internal_setAdapter(adapter, true);\n  }\n\n  public getMainThreadRuntimeCore() {\n    return this._mainThread;\n  }\n\n  public getThreadRuntimeCore(): never {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  public getItemById(threadId: string) {\n    return this._threadData[threadId];\n  }\n\n  public __internal_setAdapter(\n    adapter: ExternalStoreThreadListAdapter,\n    initialLoad = false,\n  ) {\n    const previousAdapter = this.adapter;\n    this.adapter = adapter;\n\n    const newThreadId = adapter.threadId ?? DEFAULT_THREAD_ID;\n    const newThreads = adapter.threads ?? EMPTY_ARRAY;\n    const newArchivedThreads = adapter.archivedThreads ?? EMPTY_ARRAY;\n\n    const previousThreadId = previousAdapter.threadId ?? DEFAULT_THREAD_ID;\n    const previousThreads = previousAdapter.threads ?? EMPTY_ARRAY;\n    const previousArchivedThreads =\n      previousAdapter.archivedThreads ?? EMPTY_ARRAY;\n\n    if (\n      !initialLoad &&\n      previousThreadId === newThreadId &&\n      previousThreads === newThreads &&\n      previousArchivedThreads === newArchivedThreads\n    ) {\n      return;\n    }\n\n    if (\n      previousThreads !== newThreads ||\n      previousArchivedThreads !== newArchivedThreads ||\n      previousThreadId !== newThreadId\n    ) {\n      this._threadData = {\n        ...DEFAULT_THREAD_DATA,\n        ...Object.fromEntries(\n          adapter.threads?.map((t) => [\n            t.id,\n            {\n              ...t,\n              remoteId: t.remoteId,\n              externalId: t.externalId,\n              status: \"regular\",\n            },\n          ]) ?? [],\n        ),\n        ...Object.fromEntries(\n          adapter.archivedThreads?.map((t) => [\n            t.id,\n            {\n              ...t,\n              remoteId: t.remoteId,\n              externalId: t.externalId,\n              status: \"archived\",\n            },\n          ]) ?? [],\n        ),\n      };\n    }\n\n    if (previousThreads !== newThreads) {\n      this._threads = this.adapter.threads?.map((t) => t.id) ?? EMPTY_ARRAY;\n    }\n\n    if (previousArchivedThreads !== newArchivedThreads) {\n      this._archivedThreads =\n        this.adapter.archivedThreads?.map((t) => t.id) ?? EMPTY_ARRAY;\n    }\n\n    // `initialLoad ||`: `_mainThread!` must be assigned on construction.\n    if (initialLoad || previousThreadId !== newThreadId) {\n      if (!initialLoad) invalidateThreadRuntime(this._mainThread);\n      this._mainThreadId = newThreadId;\n      this._mainThread = this.threadFactory();\n    }\n\n    if (!this._threadData[this._mainThreadId]) {\n      this._threadData = {\n        ...this._threadData,\n        [this._mainThreadId]: {\n          id: this._mainThreadId,\n          remoteId: undefined,\n          externalId: undefined,\n          status: \"regular\",\n        },\n      };\n    }\n\n    this._notifySubscribers();\n  }\n\n  public async reloadMainThread(): Promise<void> {\n    // There is no runtime hook to remount here, so the capability is the only\n    // path and an adapter without it has nothing to refetch with.\n    if (!this._mainThread.unstable_refetchThread) return;\n    // No unsent-thread guard: every entry here is regular or archived, so the\n    // \"new\" status the remote thread list has to exclude cannot occur.\n    await this._mainThread.unstable_refetchThread();\n  }\n\n  public async switchToThread(\n    threadId: string,\n    _options?: { unarchive?: boolean },\n  ): Promise<void> {\n    if (this._mainThreadId === threadId) return;\n    const onSwitchToThread = this.adapter.onSwitchToThread;\n    if (!onSwitchToThread)\n      throw new Error(\n        \"External store adapter does not support switching to thread\",\n      );\n    await onSwitchToThread(threadId);\n  }\n\n  public async switchToNewThread(): Promise<void> {\n    const onSwitchToNewThread = this.adapter.onSwitchToNewThread;\n    if (!onSwitchToNewThread)\n      throw new Error(\n        \"External store adapter does not support switching to new thread\",\n      );\n\n    await onSwitchToNewThread();\n  }\n\n  public async rename(threadId: string, newTitle: string): Promise<void> {\n    const onRename = this.adapter.onRename;\n    if (!onRename)\n      throw new Error(\"External store adapter does not support renaming\");\n\n    await onRename(threadId, newTitle);\n  }\n\n  public async updateCustom(\n    threadId: string,\n    custom: Record<string, unknown> | undefined,\n  ): Promise<void> {\n    const onUpdateCustom = this.adapter.onUpdateCustom;\n    if (!onUpdateCustom)\n      throw new Error(\n        \"External store adapter does not support updating custom metadata\",\n      );\n\n    await onUpdateCustom(threadId, custom);\n  }\n\n  public async detach(): Promise<void> {\n    // no-op\n  }\n\n  public async archive(threadId: string): Promise<void> {\n    const onArchive = this.adapter.onArchive;\n    if (!onArchive)\n      throw new Error(\"External store adapter does not support archiving\");\n\n    await onArchive(threadId);\n  }\n\n  public async unarchive(threadId: string): Promise<void> {\n    const onUnarchive = this.adapter.onUnarchive;\n    if (!onUnarchive)\n      throw new Error(\"External store adapter does not support unarchiving\");\n\n    await onUnarchive(threadId);\n  }\n\n  public async delete(threadId: string): Promise<void> {\n    const onDelete = this.adapter.onDelete;\n    if (!onDelete)\n      throw new Error(\"External store adapter does not support deleting\");\n\n    await onDelete(threadId);\n  }\n\n  public initialize(\n    threadId: string,\n  ): Promise<{ remoteId: string; externalId: string | undefined }> {\n    return Promise.resolve({ remoteId: threadId, externalId: undefined });\n  }\n\n  public generateTitle(): never {\n    throw new Error(\"Method not implemented.\");\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"external-store-thread-list-runtime-core.js","names":["ExternalStoreThreadRuntimeCore","ThreadListItemCoreState","ThreadListRuntimeCore","ExternalStoreThreadListAdapter","invalidateThreadRuntime","BaseSubscribable","nullProtoRecord","ExternalStoreThreadFactory","EMPTY_ARRAY","Object","freeze","DEFAULT_THREAD_ID","DEFAULT_THREADS","DEFAULT_THREAD","id","remoteId","undefined","externalId","status","RESOLVED_PROMISE","Promise","resolve","DEFAULT_THREAD_DATA","ExternalStoreThreadListRuntimeCore","_mainThreadId","_threads","_archivedThreads","_threadData","Readonly","Record","adapter","isLoading","newThreadId","threadIds","archivedThreadIds","threadItems","getLoadThreadsPromise","_mainThread","mainThreadId","threadFactory","constructor","__internal_setAdapter","getMainThreadRuntimeCore","getThreadRuntimeCore","Error","getItemById","threadId","hasOwn","initialLoad","previousAdapter","newThreads","threads","newArchivedThreads","archivedThreads","previousThreadId","previousThreads","previousArchivedThreads","fromEntries","map","t","_notifySubscribers","reloadMainThread","unstable_refetchThread","switchToThread","_options","unarchive","onSwitchToThread","switchToNewThread","onSwitchToNewThread","rename","newTitle","onRename","updateCustom","custom","onUpdateCustom","detach","archive","onArchive","onUnarchive","delete","onDelete","initialize","generateTitle"],"sources":["../../../src/runtimes/external-store/external-store-thread-list-runtime-core.ts"],"sourcesContent":["import type { ExternalStoreThreadRuntimeCore } from \"./external-store-thread-runtime-core\";\nimport type {\n  ThreadListItemCoreState,\n  ThreadListRuntimeCore,\n} from \"../../runtime/interfaces/thread-list-runtime-core\";\nimport type { ExternalStoreThreadListAdapter } from \"./external-store-adapter\";\nimport { invalidateThreadRuntime } from \"../../runtime/utils/thread-runtime-lifecycle\";\nimport { BaseSubscribable } from \"../../subscribable/subscribable\";\nimport { nullProtoRecord } from \"../../utils/record\";\n\nexport type ExternalStoreThreadFactory = () => ExternalStoreThreadRuntimeCore;\n\nconst EMPTY_ARRAY = Object.freeze([]);\nconst DEFAULT_THREAD_ID = \"DEFAULT_THREAD_ID\";\nconst DEFAULT_THREADS = Object.freeze([DEFAULT_THREAD_ID]);\nconst DEFAULT_THREAD = Object.freeze({\n  id: DEFAULT_THREAD_ID,\n  remoteId: undefined,\n  externalId: undefined,\n  status: \"regular\",\n});\nconst RESOLVED_PROMISE = Promise.resolve();\nconst DEFAULT_THREAD_DATA = Object.freeze(\n  nullProtoRecord<ThreadListItemCoreState>({\n    [DEFAULT_THREAD_ID]: DEFAULT_THREAD,\n  }),\n);\n\nexport class ExternalStoreThreadListRuntimeCore\n  extends BaseSubscribable\n  implements ThreadListRuntimeCore\n{\n  private _mainThreadId: string = DEFAULT_THREAD_ID;\n  private _threads: readonly string[] = DEFAULT_THREADS;\n  private _archivedThreads: readonly string[] = EMPTY_ARRAY;\n  private _threadData: Readonly<Record<string, ThreadListItemCoreState>> =\n    DEFAULT_THREAD_DATA;\n  private adapter: ExternalStoreThreadListAdapter = {};\n\n  public get isLoading() {\n    return this.adapter.isLoading ?? false;\n  }\n\n  public get newThreadId() {\n    return undefined;\n  }\n\n  public get threadIds() {\n    return this._threads;\n  }\n\n  public get archivedThreadIds() {\n    return this._archivedThreads;\n  }\n\n  public get threadItems() {\n    return this._threadData;\n  }\n\n  public getLoadThreadsPromise() {\n    return RESOLVED_PROMISE;\n  }\n\n  private _mainThread!: ExternalStoreThreadRuntimeCore;\n\n  public get mainThreadId() {\n    return this._mainThreadId;\n  }\n\n  private threadFactory: ExternalStoreThreadFactory;\n\n  constructor(\n    adapter: ExternalStoreThreadListAdapter = {},\n    threadFactory: ExternalStoreThreadFactory,\n  ) {\n    super();\n    this.threadFactory = threadFactory;\n    this.__internal_setAdapter(adapter, true);\n  }\n\n  public getMainThreadRuntimeCore() {\n    return this._mainThread;\n  }\n\n  public getThreadRuntimeCore(): never {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  public getItemById(threadId: string) {\n    return Object.hasOwn(this._threadData, threadId)\n      ? this._threadData[threadId]\n      : undefined;\n  }\n\n  public __internal_setAdapter(\n    adapter: ExternalStoreThreadListAdapter,\n    initialLoad = false,\n  ) {\n    const previousAdapter = this.adapter;\n    this.adapter = adapter;\n\n    const newThreadId = adapter.threadId ?? DEFAULT_THREAD_ID;\n    const newThreads = adapter.threads ?? EMPTY_ARRAY;\n    const newArchivedThreads = adapter.archivedThreads ?? EMPTY_ARRAY;\n\n    const previousThreadId = previousAdapter.threadId ?? DEFAULT_THREAD_ID;\n    const previousThreads = previousAdapter.threads ?? EMPTY_ARRAY;\n    const previousArchivedThreads =\n      previousAdapter.archivedThreads ?? EMPTY_ARRAY;\n\n    if (\n      !initialLoad &&\n      (previousAdapter.isLoading ?? false) === (adapter.isLoading ?? false) &&\n      previousThreadId === newThreadId &&\n      previousThreads === newThreads &&\n      previousArchivedThreads === newArchivedThreads\n    ) {\n      return;\n    }\n\n    if (\n      previousThreads !== newThreads ||\n      previousArchivedThreads !== newArchivedThreads ||\n      previousThreadId !== newThreadId\n    ) {\n      this._threadData = nullProtoRecord(\n        DEFAULT_THREAD_DATA,\n        Object.fromEntries(\n          adapter.threads?.map((t) => [\n            t.id,\n            {\n              ...t,\n              remoteId: t.remoteId,\n              externalId: t.externalId,\n              status: \"regular\",\n            },\n          ]) ?? [],\n        ),\n        Object.fromEntries(\n          adapter.archivedThreads?.map((t) => [\n            t.id,\n            {\n              ...t,\n              remoteId: t.remoteId,\n              externalId: t.externalId,\n              status: \"archived\",\n            },\n          ]) ?? [],\n        ),\n      );\n    }\n\n    if (previousThreads !== newThreads) {\n      this._threads = this.adapter.threads?.map((t) => t.id) ?? EMPTY_ARRAY;\n    }\n\n    if (previousArchivedThreads !== newArchivedThreads) {\n      this._archivedThreads =\n        this.adapter.archivedThreads?.map((t) => t.id) ?? EMPTY_ARRAY;\n    }\n\n    // `initialLoad ||`: `_mainThread!` must be assigned on construction.\n    if (initialLoad || previousThreadId !== newThreadId) {\n      if (!initialLoad) invalidateThreadRuntime(this._mainThread);\n      this._mainThreadId = newThreadId;\n      this._mainThread = this.threadFactory();\n    }\n\n    if (!Object.hasOwn(this._threadData, this._mainThreadId)) {\n      this._threadData = nullProtoRecord(this._threadData, {\n        [this._mainThreadId]: {\n          id: this._mainThreadId,\n          remoteId: undefined,\n          externalId: undefined,\n          status: \"regular\",\n        },\n      });\n    }\n\n    this._notifySubscribers();\n  }\n\n  public async reloadMainThread(): Promise<void> {\n    // There is no runtime hook to remount here, so the capability is the only\n    // path and an adapter without it has nothing to refetch with.\n    if (!this._mainThread.unstable_refetchThread) return;\n    // No unsent-thread guard: every entry here is regular or archived, so the\n    // \"new\" status the remote thread list has to exclude cannot occur.\n    await this._mainThread.unstable_refetchThread();\n  }\n\n  public async switchToThread(\n    threadId: string,\n    _options?: { unarchive?: boolean },\n  ): Promise<void> {\n    if (this._mainThreadId === threadId) return;\n    const onSwitchToThread = this.adapter.onSwitchToThread;\n    if (!onSwitchToThread)\n      throw new Error(\n        \"External store adapter does not support switching to thread\",\n      );\n    await onSwitchToThread(threadId);\n  }\n\n  public async switchToNewThread(): Promise<void> {\n    const onSwitchToNewThread = this.adapter.onSwitchToNewThread;\n    if (!onSwitchToNewThread)\n      throw new Error(\n        \"External store adapter does not support switching to new thread\",\n      );\n\n    await onSwitchToNewThread();\n  }\n\n  public async rename(threadId: string, newTitle: string): Promise<void> {\n    const onRename = this.adapter.onRename;\n    if (!onRename)\n      throw new Error(\"External store adapter does not support renaming\");\n\n    await onRename(threadId, newTitle);\n  }\n\n  public async updateCustom(\n    threadId: string,\n    custom: Record<string, unknown> | undefined,\n  ): Promise<void> {\n    const onUpdateCustom = this.adapter.onUpdateCustom;\n    if (!onUpdateCustom)\n      throw new Error(\n        \"External store adapter does not support updating custom metadata\",\n      );\n\n    await onUpdateCustom(threadId, custom);\n  }\n\n  public async detach(): Promise<void> {\n    // no-op\n  }\n\n  public async archive(threadId: string): Promise<void> {\n    const onArchive = this.adapter.onArchive;\n    if (!onArchive)\n      throw new Error(\"External store adapter does not support archiving\");\n\n    await onArchive(threadId);\n  }\n\n  public async unarchive(threadId: string): Promise<void> {\n    const onUnarchive = this.adapter.onUnarchive;\n    if (!onUnarchive)\n      throw new Error(\"External store adapter does not support unarchiving\");\n\n    await onUnarchive(threadId);\n  }\n\n  public async delete(threadId: string): Promise<void> {\n    const onDelete = this.adapter.onDelete;\n    if (!onDelete)\n      throw new Error(\"External store adapter does not support deleting\");\n\n    await onDelete(threadId);\n  }\n\n  public initialize(\n    threadId: string,\n  ): Promise<{ remoteId: string; externalId: string | undefined }> {\n    return Promise.resolve({ remoteId: threadId, externalId: undefined });\n  }\n\n  public generateTitle(): never {\n    throw new Error(\"Method not implemented.\");\n  }\n}\n"],"mappings":"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"}

package/dist/runtimes/external-store/external-store-thread-runtime-core.d.ts

@@ -38,6 +38,7 @@ declare class ExternalStoreThreadRuntimeCore extends BaseThreadRuntimeCore imple
   extras: unknown;
   private _converter;
   private _pendingDeleteEvictions;
+  private _optimistic;
   private _store;
   private _getInitializePromise?;
   __internal_setGetInitializePromise(getPromise: () => Promise<unknown> | undefined): void;
@@ -117,7 +118,7 @@ declare class ExternalStoreThreadRuntimeCore extends BaseThreadRuntimeCore imple
   private dropEmptyOptimisticHead;
   addToolResult(options: AddToolResultOptions): void;
   resumeToolCall(options: ResumeToolCallOptions): void;
-  respondToToolApproval(options: RespondToToolApprovalOptions): void;
+  respondToToolApproval(options: RespondToToolApprovalOptions): Promise<void>;
   reset(initialMessages?: readonly ThreadMessageLike[]): void;
   import(data: ExportedMessageRepository): void;
   private updateMessages;

package/dist/runtimes/external-store/external-store-thread-runtime-core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"external-store-thread-runtime-core.d.ts","names":[],"sources":["../../../src/runtimes/external-store/external-store-thread-runtime-core.ts"],"mappings":";;;;;;;;;;;;;;;;cA+Ea,qBACX,oBACA,mBAAmB;cAKR,uCACH,iCACG;UAEH;MAiBG,gBAAY;UAIf;EACD;EACA;MACI;MAIA;YAKQ,6BAA6B;MAI5B,sEAAK,sDAAA;MAId;kBARqC;;;;;;;MAarC,iCAAiC;EAKrC,sBAAsB;EACtB;UAEC;UAUA;UAEA;UAEA;EAED,mCACL,kBAAkB;UAKZ;;;;;UAMA;UACA;UACA;UACA;UACA;;;;;;;;UASA;UAaA;UAQA;UASA;EAIQ,UAAU;EAQxB,YAAA,iBAAiB,sBACjB,OAAO;EAMF,sBAAsB,OAAO;UAM5B;;;;;;;UAgOA;;;;;UAmFA;UACA;;;;;;;UAQA;EAmBQ,eAAe;;;;;;;;;UA8BvB;EAaK,OAAO,YAAY,gBAAgB;EAqEnC,cAAc,oBAAoB;UA0CvC;EAkBD,0BA5DwC;EAkExC,+BANa;EAUb,cAAc,qBAAqB,WAAW;EAI9C,gBAAgB;EAIV,SAAS,QAAQ,iBAAiB;EAclC,UAAU,QAAQ,kBAAkB;EAO1C;EAOA,oBAAoB;;;;;;EAqBpB;EAKA;UAmFC;EAOD,cAAc,SAAS;EASvB,eAAe,SAAS;EAoBxB,sBAAsB,SAAS;EAStB,MAAM,2BAA2B;EAMjC,OAAO,MAAM;UAQrB"}
+{"version":3,"file":"external-store-thread-runtime-core.d.ts","names":[],"sources":["../../../src/runtimes/external-store/external-store-thread-runtime-core.ts"],"mappings":";;;;;;;;;;;;;;;;cAyEa,qBACX,oBACA,mBAAmB;cAKR,uCACH,iCACG;UAEH;MAiBG,gBAAY;UAIf;EACD;EACA;MACI;MAIA;YAKQ,6BAA6B;MAI5B,sEAAK,sDAAA;MAId;kBARqC;;;;;;;MAarC,iCAAiC;EAKrC,sBAAsB;EACtB;UAEC;UAUA;UAKA;UAEA;UAEA;EAED,mCACL,kBAAkB;UAKZ;;;;;UAMA;UACA;UACA;UACA;UACA;;;;;;;;UASA;UAaA;UAQA;UASA;EAIQ,UAAU;EAQxB,YAAA,iBAAiB,sBACjB,OAAO;EAMF,sBAAsB,OAAO;UAM5B;;;;;;;UA4PA;;;;;UAoFA;UACA;;;;;;;UAQA;EAWQ,eAAe;;;;;;;;;UA8BvB;EAaK,OAAO,YAAY,gBAAgB;EAqEnC,cAAc,oBAAoB;UA0CvC;EAkBD,0BA5DwC;EAkExC,+BANa;EAUb,cAAc,qBAAqB,WAAW;EAI9C,gBAAgB;EAIV,SAAS,QAAQ,iBAAiB;EAclC,UAAU,QAAQ,kBAAkB;EAO1C;EAOA,oBAAoB;;;;;;EAqBpB;EAKA;UAmFC;EAOD,cAAc,SAAS;EASvB,eAAe,SAAS;EAoBxB,sBACL,SAAS,+BACR;EAUa,MAAM,2BAA2B;EAMjC,OAAO,MAAM;UAQrB"}

package/dist/runtimes/external-store/external-store-thread-runtime-core.js

@@ -5,10 +5,13 @@ import { FALLBACK_ID_PREFIX, bindExternalStoreMessage, getExternalStoreMessages
 import { getContentAutoStatus, isAutoStatus } from "../../runtime/utils/auto-status.js";
 import { ExportedMessageRepository, MessageRepository } from "../../runtime/utils/message-repository.js";
 import { EMPTY_QUEUE_ITEMS } from "../../runtime/queue/queue-item.js";
+import { walkToolCallTree } from "../../runtime/utils/tool-call-tree.js";
 import { BaseThreadRuntimeCore } from "../../runtime/base/base-thread-runtime-core.js";
 import { captureThreadRuntimeGeneration, isThreadRuntimeGenerationCurrent } from "../../runtime/utils/thread-runtime-lifecycle.js";
 import { ThreadMessageConverter } from "./thread-message-converter.js";
+import { shallowArrayEqual } from "../../runtime/utils/external-message-conversion.js";
 import { ToolInvocationTracker } from "../tool-invocations/ToolInvocationTracker.js";
+import { shallowEqual } from "@assistant-ui/store/client";
 //#region src/runtimes/external-store/external-store-thread-runtime-core.ts
 const EMPTY_ARRAY = Object.freeze([]);
 const observeAdapterCallback = (name, result) => {
@@ -16,12 +19,6 @@ const observeAdapterCallback = (name, result) => {
 		console.error(`[ExternalStoreThreadRuntimeCore] ${name} callback rejected`, error);
 	});
 };
-const shallowEqual = (a, b) => {
-	const aKeys = Object.keys(a);
-	if (aKeys.length !== Object.keys(b).length) return false;
-	for (const key of aKeys) if (a[key] !== b[key]) return false;
-	return true;
-};
 const hasUpcomingMessage = (isRunning, messages) => {
 	return isRunning && messages[messages.length - 1]?.role !== "assistant";
 };
@@ -72,6 +69,7 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 	extras = void 0;
 	_converter = new ThreadMessageConverter();
 	_pendingDeleteEvictions = /* @__PURE__ */ new Set();
+	_optimistic = null;
 	_store;
 	_getInitializePromise;
 	__internal_setGetInitializePromise(getPromise) {
@@ -141,6 +139,12 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		const oldStore = this._store;
 		this._store = store;
 		const isRunning = this._getEffectiveIsRunning(store);
+		const repositoryInstance = store.unstable_messageRepositoryInstance;
+		const repositoryChanged = repositoryInstance !== void 0 && repositoryInstance !== this.repository;
+		if (repositoryChanged) {
+			this.repository = repositoryInstance;
+			this._pendingDeleteEvictions.clear();
+		}
 		if (oldStore?.queue !== store.queue) {
 			this._transformedQueue = void 0;
 			store.queue?.__internal_setDispatchTransform?.((message) => {
@@ -174,13 +178,13 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		if (!shallowEqual(this._capabilities, newCapabilities)) this._capabilities = newCapabilities;
 		let messages;
 		if (store.messageRepository) {
-			if (oldStore && oldStore.isRunning === store.isRunning && oldStore.messageRepository === store.messageRepository && previousIsRunning === isRunning) {
+			if (oldStore && !repositoryChanged && oldStore.isRunning === store.isRunning && oldStore.messageRepository === store.messageRepository && previousIsRunning === isRunning) {
 				this._notifySubscribers();
 				return;
 			}
 			const incoming = store.messageRepository.messages;
 			const headId = store.messageRepository.headId ?? incoming.at(-1)?.message.id ?? null;
-			if (oldStore && oldStore.messageRepository === store.messageRepository) {
+			if (oldStore && !repositoryChanged && oldStore.messageRepository === store.messageRepository) {
 				this.repository.resetHead(headId);
 				messages = this.repository.getMessages();
 			} else {
@@ -194,7 +198,7 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		} else if (store.messages) {
 			if (oldStore) {
 				if (oldStore.convertMessage !== store.convertMessage) this._converter = new ThreadMessageConverter();
-				else if (oldStore.isRunning === store.isRunning && oldStore.messages === store.messages && previousIsRunning === isRunning) {
+				else if (!repositoryChanged && oldStore.isRunning === store.isRunning && oldStore.messages === store.messages && previousIsRunning === isRunning) {
 					this._notifySubscribers();
 					return;
 				}
@@ -258,15 +262,23 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		}
 		let optimisticId = null;
 		if (hasUpcomingMessage(isRunning, messages)) {
-			optimisticId = generateId();
-			this.repository.addOrUpdateMessage(messages.at(-1)?.id ?? null, fromThreadMessageLike({
+			const parentId = messages.at(-1)?.id ?? null;
+			if (this._optimistic?.parentId !== parentId) this._optimistic = {
+				id: generateId(),
+				parentId
+			};
+			optimisticId = this._optimistic.id;
+			this.repository.addOrUpdateMessage(parentId, fromThreadMessageLike({
 				role: "assistant",
 				content: [],
 				metadata: { isOptimistic: true }
 			}, optimisticId, { type: "running" }));
 		}
+		if (optimisticId === null) this._optimistic = null;
 		this.repository.resetHead(optimisticId ?? messages.at(-1)?.id ?? null);
-		this._messages = this.repository.getMessages();
+		const messagesSnapshot = this.repository.getMessages();
+		if (!this._messages || !shallowArrayEqual(this._messages, messagesSnapshot)) this._messages = messagesSnapshot;
+		if (repositoryChanged) this._runTrackerUpdate(() => this._toolInvocations?.reset());
 		this._runTrackerUpdate(() => this._driveToolInvocations());
 		this._notifySubscribers();
 	}
@@ -316,7 +328,7 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 					}
 				}
 			}
-		});
+		}, (toolCall) => this._store.unstable_isClientToolCall?.(toolCall));
 		this._toolInvocations.setState({
 			messages: this._messages,
 			isRunning: this._getEffectiveIsRunning(this._store),
@@ -338,17 +350,7 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 	_findMessageIdForToolCall(toolCallId) {
 		if (this._messagesForToolCallIndex !== this._messages) {
 			this._toolCallToMessageId.clear();
-			const visit = (messages) => {
-				for (const message of messages) {
-					if (!Array.isArray(message.content)) continue;
-					for (const part of message.content) {
-						if (!part || part.type !== "tool-call") continue;
-						this._toolCallToMessageId.set(part.toolCallId, message.id);
-						if (part.messages) visit(part.messages);
-					}
-				}
-			};
-			visit(this._messages);
+			for (const { part, messageId } of walkToolCallTree(this._messages)) this._toolCallToMessageId.set(part.toolCallId, messageId);
 			this._messagesForToolCallIndex = this._messages;
 		}
 		return this._toolCallToMessageId.get(toolCallId);
@@ -393,7 +395,7 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 			return;
 		}
 		initPromise?.catch(() => {});
-		if (message.startRun ?? message.role === "user") await this._toolInvocations?.abort();
+		if (message.startRun ?? message.role === "user") await this._toolInvocations?.abort({ discardPending: true });
 		if (!isThreadRuntimeGenerationCurrent(this, generation)) return;
 		if (isEdit) {
 			if (!this._store.onEdit) throw new Error("Runtime does not support editing messages.");
@@ -446,7 +448,7 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 	async startRun(config) {
 		if (!this._store.onReload) throw new Error("Runtime does not support reloading messages.");
 		this._pendingDeleteEvictions.clear();
-		await this._toolInvocations?.abort();
+		await this._toolInvocations?.abort({ discardPending: true });
 		await this._store.onReload(config.parentId, config);
 	}
 	async resumeRun(config) {
@@ -474,7 +476,7 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 	cancelRun() {
 		if (!this._store.onCancel) throw new Error("Runtime does not support cancelling runs.");
 		const generation = captureThreadRuntimeGeneration(this);
-		this._toolInvocations?.abort();
+		this._toolInvocations?.abort({ discardPending: true });
 		this._store.queue?.__internal_notifyCancelled?.();
 		observeAdapterCallback("onCancel", this._store.onCancel());
 		this.dropEmptyOptimisticHead();
@@ -526,7 +528,11 @@ var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 	}
 	respondToToolApproval(options) {
 		if (!this._store.onRespondToToolApproval) throw new Error("Runtime does not support tool approvals.");
-		observeAdapterCallback("onRespondToToolApproval", this._store.onRespondToToolApproval(options));
+		try {
+			return Promise.resolve(this._store.onRespondToToolApproval(options));
+		} catch (error) {
+			return Promise.reject(error);
+		}
 	}
 	reset(initialMessages) {
 		const repo = new MessageRepository();