@assistant-ui/core 0.3.13 → 0.3.14

package/dist/subscribable/subscribable.js

@@ -1,6 +1,19 @@
 import { notifyEventListeners } from "../utils/notify-event-listeners.js";
 //#region src/subscribable/subscribable.ts
 const SKIP_UPDATE = Symbol("skip-update");
+const notifySubscribers = (subscribers, ...args) => {
+	const errors = [];
+	for (const callback of subscribers) try {
+		callback(...args);
+	} catch (error) {
+		errors.push(error);
+	}
+	if (errors.length === 1) throw errors[0];
+	if (errors.length > 1) {
+		for (const error of errors) console.error(error);
+		throw new AggregateError(errors);
+	}
+};
 function shallowEqual(objA, objB) {
 	if (objA === void 0 && objB === void 0) return true;
 	if (objA === void 0) return false;
@@ -29,19 +42,7 @@ var BaseSubscribable = class {
 		});
 	}
 	_notifySubscribers() {
-		const errors = [];
-		for (const callback of this._subscribers) try {
-			callback();
-		} catch (error) {
-			errors.push(error);
-		}
-		if (errors.length > 0) {
-			if (errors.length === 1) throw errors[0];
-			else {
-				for (const error of errors) console.error(error);
-				throw new AggregateError(errors);
-			}
-		}
+		notifySubscribers(this._subscribers);
 	}
 };
 var BaseSubject = class {
@@ -55,7 +56,7 @@ var BaseSubject = class {
 			notifyEventListeners(this._subscriptions, payload, errorContext);
 			return;
 		}
-		for (const callback of this._subscriptions) callback(payload);
+		notifySubscribers(this._subscriptions, payload);
 	}
 	_updateConnection() {
 		if (this._subscriptions.size > 0) {
@@ -103,7 +104,9 @@ var ShallowMemoizeSubject = class extends BaseSubject {
 		const callback = () => {
 			if (this._syncState()) this.notifySubscribers();
 		};
-		return this.binding.subscribe(callback);
+		const unsubscribe = this.binding.subscribe(callback);
+		this._syncState();
+		return unsubscribe;
 	}
 };
 var LazyMemoizeSubject = class extends BaseSubject {
@@ -120,7 +123,7 @@ var LazyMemoizeSubject = class extends BaseSubject {
 	getState = () => {
 		if (!this.isConnected || this._previousStateDirty) {
 			const newState = this.binding.getState();
-			if (newState !== SKIP_UPDATE) this._previousState = newState;
+			if (newState !== SKIP_UPDATE && (this._previousState === void 0 || !shallowEqual(newState, this._previousState))) this._previousState = newState;
 			this._previousStateDirty = false;
 		}
 		if (this._previousState === void 0) throw new Error("Entry not available in the store");
@@ -131,7 +134,9 @@ var LazyMemoizeSubject = class extends BaseSubject {
 			this._previousStateDirty = true;
 			this.notifySubscribers();
 		};
-		return this.binding.subscribe(callback);
+		const unsubscribe = this.binding.subscribe(callback);
+		this._previousStateDirty = true;
+		return unsubscribe;
 	}
 };
 var NestedSubscriptionSubject = class extends BaseSubject {
@@ -204,6 +209,6 @@ var EventSubscriptionSubject = class extends BaseSubject {
 	}
 };
 //#endregion
-export { BaseSubject, BaseSubscribable, EventSubscriptionSubject, LazyMemoizeSubject, NestedSubscriptionSubject, SKIP_UPDATE, ShallowMemoizeSubject };
+export { BaseSubject, BaseSubscribable, EventSubscriptionSubject, LazyMemoizeSubject, NestedSubscriptionSubject, SKIP_UPDATE, ShallowMemoizeSubject, notifySubscribers };
 
 //# sourceMappingURL=subscribable.js.map

package/dist/subscribable/subscribable.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscribable.js","names":["Unsubscribe","notifyEventListeners","SKIP_UPDATE","Symbol","Subscribable","subscribe","callback","SubscribableWithState","path","TPath","getState","TState","NestedSubscribable","EventSubscribable","event","TEvent","binding","unstable_on","payload","shallowEqual","objA","T","objB","undefined","keysA","Object","keys","length","key","valueA","valueB","is","BaseSubscribable","_subscribers","Set","add","delete","waitForUpdate","Promise","resolve","unsubscribe","_notifySubscribers","errors","error","push","console","AggregateError","BaseSubject","_subscriptions","_connection","isConnected","_connect","notifySubscribers","errorContext","_updateConnection","size","ShallowMemoizeSubject","constructor","state","Error","_previousState","_syncState","LazyMemoizeSubject","_previousStateDirty","newState","NestedSubscriptionSubject","outerSubscribe","lastState","innerUnsubscribe","onRuntimeUpdate","outerUnsubscribe","EventSubscriptionSubject","config"],"sources":["../../src/subscribable/subscribable.ts"],"sourcesContent":["import type { Unsubscribe } from \"../types/unsubscribe\";\nimport { notifyEventListeners } from \"../utils/notify-event-listeners\";\n\nexport const SKIP_UPDATE = Symbol(\"skip-update\");\nexport type SKIP_UPDATE = typeof SKIP_UPDATE;\n\nexport type Subscribable = {\n  subscribe: (callback: () => void) => Unsubscribe;\n};\n\nexport type SubscribableWithState<TState, TPath> = Subscribable & {\n  path: TPath;\n  getState: () => TState;\n};\n\nexport type NestedSubscribable<\n  TState extends Subscribable | undefined,\n  TPath,\n> = SubscribableWithState<TState, TPath>;\n\nexport type EventSubscribable<TEvent extends string> = {\n  event: TEvent;\n  binding: SubscribableWithState<\n    | {\n        unstable_on: (\n          event: TEvent,\n          callback: (payload?: unknown) => void,\n        ) => Unsubscribe;\n      }\n    | undefined,\n    unknown\n  >;\n};\n\nfunction shallowEqual<T extends object>(\n  objA: T | undefined,\n  objB: T | undefined,\n) {\n  if (objA === undefined && objB === undefined) return true;\n  if (objA === undefined) return false;\n  if (objB === undefined) return false;\n\n  const keysA = Object.keys(objA);\n  if (keysA.length !== Object.keys(objB).length) return false;\n\n  for (const key of keysA) {\n    const valueA = objA[key as keyof T];\n    const valueB = objB[key as keyof T];\n    if (!Object.is(valueA, valueB)) return false;\n  }\n\n  return true;\n}\n\nexport class BaseSubscribable {\n  private _subscribers = new Set<() => void>();\n\n  public subscribe(callback: () => void): Unsubscribe {\n    this._subscribers.add(callback);\n    return () => this._subscribers.delete(callback);\n  }\n\n  public waitForUpdate() {\n    return new Promise<void>((resolve) => {\n      const unsubscribe = this.subscribe(() => {\n        unsubscribe();\n        resolve();\n      });\n    });\n  }\n\n  protected _notifySubscribers() {\n    const errors = [];\n    for (const callback of this._subscribers) {\n      try {\n        callback();\n      } catch (error) {\n        errors.push(error);\n      }\n    }\n\n    if (errors.length > 0) {\n      if (errors.length === 1) {\n        throw errors[0];\n      } else {\n        for (const error of errors) {\n          console.error(error);\n        }\n        throw new AggregateError(errors);\n      }\n    }\n  }\n}\n\n// lazy connect/disconnect: only opens upstream subscription while it has subscribers\nexport abstract class BaseSubject {\n  private _subscriptions = new Set<(payload?: unknown) => void>();\n  private _connection: Unsubscribe | undefined;\n\n  protected get isConnected() {\n    return !!this._connection;\n  }\n\n  protected abstract _connect(): Unsubscribe;\n\n  protected notifySubscribers(payload?: unknown, errorContext?: string) {\n    if (errorContext) {\n      notifyEventListeners(this._subscriptions, payload, errorContext);\n      return;\n    }\n\n    for (const callback of this._subscriptions) callback(payload);\n  }\n\n  private _updateConnection() {\n    if (this._subscriptions.size > 0) {\n      if (this._connection) return;\n      this._connection = this._connect();\n    } else {\n      this._connection?.();\n      this._connection = undefined;\n    }\n  }\n\n  public subscribe(callback: (payload?: unknown) => void) {\n    this._subscriptions.add(callback);\n    this._updateConnection();\n\n    return () => {\n      this._subscriptions.delete(callback);\n      this._updateConnection();\n    };\n  }\n}\n\nexport class ShallowMemoizeSubject<TState extends object, TPath>\n  extends BaseSubject\n  implements SubscribableWithState<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>;\n\n  constructor(binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>) {\n    super();\n    this.binding = binding;\n    const state = binding.getState();\n    if (state === SKIP_UPDATE)\n      throw new Error(\"Entry not available in the store\");\n    this._previousState = state;\n  }\n\n  private _previousState: TState;\n  public getState = () => {\n    if (!this.isConnected) this._syncState();\n    return this._previousState;\n  };\n\n  private _syncState() {\n    const state = this.binding.getState();\n    if (state === SKIP_UPDATE) return false;\n    if (shallowEqual(state, this._previousState)) return false;\n    this._previousState = state;\n    return true;\n  }\n\n  protected _connect() {\n    const callback = () => {\n      if (this._syncState()) {\n        this.notifySubscribers();\n      }\n    };\n\n    return this.binding.subscribe(callback);\n  }\n}\n\nexport class LazyMemoizeSubject<TState extends object, TPath>\n  extends BaseSubject\n  implements SubscribableWithState<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>;\n\n  constructor(binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>) {\n    super();\n    this.binding = binding;\n  }\n\n  private _previousStateDirty = true;\n  private _previousState: TState | undefined;\n  public getState = () => {\n    if (!this.isConnected || this._previousStateDirty) {\n      const newState = this.binding.getState();\n      if (newState !== SKIP_UPDATE) {\n        this._previousState = newState;\n      }\n      this._previousStateDirty = false;\n    }\n    if (this._previousState === undefined)\n      throw new Error(\"Entry not available in the store\");\n    return this._previousState;\n  };\n\n  protected _connect() {\n    const callback = () => {\n      this._previousStateDirty = true;\n      this.notifySubscribers();\n    };\n\n    return this.binding.subscribe(callback);\n  }\n}\n\nexport class NestedSubscriptionSubject<\n  TState extends Subscribable | undefined,\n  TPath,\n>\n  extends BaseSubject\n  implements\n    SubscribableWithState<TState, TPath>,\n    NestedSubscribable<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: NestedSubscribable<TState, TPath>;\n\n  constructor(binding: NestedSubscribable<TState, TPath>) {\n    super();\n    this.binding = binding;\n  }\n\n  public getState() {\n    return this.binding.getState();\n  }\n\n  public outerSubscribe(callback: () => void) {\n    return this.binding.subscribe(callback);\n  }\n\n  protected _connect(): Unsubscribe {\n    const callback = () => {\n      this.notifySubscribers();\n    };\n\n    let lastState = this.binding.getState();\n    let innerUnsubscribe = lastState?.subscribe(callback);\n    const onRuntimeUpdate = () => {\n      const newState = this.binding.getState();\n      if (newState === lastState) return;\n      lastState = newState;\n\n      innerUnsubscribe?.();\n      innerUnsubscribe = newState?.subscribe(callback);\n\n      callback();\n    };\n\n    const outerUnsubscribe = this.outerSubscribe(onRuntimeUpdate);\n    return () => {\n      outerUnsubscribe?.();\n      innerUnsubscribe?.();\n    };\n  }\n}\n\nexport class EventSubscriptionSubject<\n  TEvent extends string,\n> extends BaseSubject {\n  private config: EventSubscribable<TEvent>;\n\n  constructor(config: EventSubscribable<TEvent>) {\n    super();\n    this.config = config;\n  }\n\n  public getState() {\n    return this.config.binding.getState();\n  }\n\n  public outerSubscribe(callback: () => void) {\n    return this.config.binding.subscribe(callback);\n  }\n\n  protected _connect(): Unsubscribe {\n    const errorContext = `Runtime event \"${this.config.event}\"`;\n    const callback = (payload?: unknown) => {\n      this.notifySubscribers(payload, errorContext);\n    };\n\n    let lastState = this.config.binding.getState();\n    let innerUnsubscribe = lastState?.unstable_on(this.config.event, callback);\n    const onRuntimeUpdate = () => {\n      const newState = this.config.binding.getState();\n      if (newState === lastState) return;\n      lastState = newState;\n\n      innerUnsubscribe?.();\n      innerUnsubscribe = newState?.unstable_on(this.config.event, callback);\n    };\n\n    const outerUnsubscribe = this.outerSubscribe(onRuntimeUpdate);\n    return () => {\n      outerUnsubscribe?.();\n      innerUnsubscribe?.();\n    };\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"subscribable.js","names":["Unsubscribe","notifyEventListeners","SKIP_UPDATE","Symbol","Subscribable","subscribe","callback","SubscribableWithState","path","TPath","getState","TState","NestedSubscribable","EventSubscribable","event","TEvent","binding","unstable_on","payload","notifySubscribers","subscribers","Iterable","args","TArgs","errors","error","push","length","console","AggregateError","shallowEqual","objA","T","objB","undefined","keysA","Object","keys","key","valueA","valueB","is","BaseSubscribable","_subscribers","Set","add","delete","waitForUpdate","Promise","resolve","unsubscribe","_notifySubscribers","BaseSubject","_subscriptions","_connection","isConnected","_connect","errorContext","_updateConnection","size","ShallowMemoizeSubject","constructor","state","Error","_previousState","_syncState","LazyMemoizeSubject","_previousStateDirty","newState","NestedSubscriptionSubject","outerSubscribe","lastState","innerUnsubscribe","onRuntimeUpdate","outerUnsubscribe","EventSubscriptionSubject","config"],"sources":["../../src/subscribable/subscribable.ts"],"sourcesContent":["import type { Unsubscribe } from \"../types/unsubscribe\";\nimport { notifyEventListeners } from \"../utils/notify-event-listeners\";\n\nexport const SKIP_UPDATE = Symbol(\"skip-update\");\nexport type SKIP_UPDATE = typeof SKIP_UPDATE;\n\nexport type Subscribable = {\n  subscribe: (callback: () => void) => Unsubscribe;\n};\n\nexport type SubscribableWithState<TState, TPath> = Subscribable & {\n  path: TPath;\n  getState: () => TState;\n};\n\nexport type NestedSubscribable<\n  TState extends Subscribable | undefined,\n  TPath,\n> = SubscribableWithState<TState, TPath>;\n\nexport type EventSubscribable<TEvent extends string> = {\n  event: TEvent;\n  binding: SubscribableWithState<\n    | {\n        unstable_on: (\n          event: TEvent,\n          callback: (payload?: unknown) => void,\n        ) => Unsubscribe;\n      }\n    | undefined,\n    unknown\n  >;\n};\n\nexport const notifySubscribers = <TArgs extends unknown[]>(\n  subscribers: Iterable<(...args: TArgs) => void>,\n  ...args: TArgs\n): void => {\n  const errors: unknown[] = [];\n  for (const callback of subscribers) {\n    try {\n      callback(...args);\n    } catch (error) {\n      errors.push(error);\n    }\n  }\n\n  if (errors.length === 1) {\n    throw errors[0];\n  }\n\n  if (errors.length > 1) {\n    for (const error of errors) {\n      console.error(error);\n    }\n    throw new AggregateError(errors);\n  }\n};\n\nfunction shallowEqual<T extends object>(\n  objA: T | undefined,\n  objB: T | undefined,\n) {\n  if (objA === undefined && objB === undefined) return true;\n  if (objA === undefined) return false;\n  if (objB === undefined) return false;\n\n  const keysA = Object.keys(objA);\n  if (keysA.length !== Object.keys(objB).length) return false;\n\n  for (const key of keysA) {\n    const valueA = objA[key as keyof T];\n    const valueB = objB[key as keyof T];\n    if (!Object.is(valueA, valueB)) return false;\n  }\n\n  return true;\n}\n\nexport class BaseSubscribable {\n  private _subscribers = new Set<() => void>();\n\n  public subscribe(callback: () => void): Unsubscribe {\n    this._subscribers.add(callback);\n    return () => this._subscribers.delete(callback);\n  }\n\n  public waitForUpdate() {\n    return new Promise<void>((resolve) => {\n      const unsubscribe = this.subscribe(() => {\n        unsubscribe();\n        resolve();\n      });\n    });\n  }\n\n  protected _notifySubscribers() {\n    notifySubscribers(this._subscribers);\n  }\n}\n\n// lazy connect/disconnect: only opens upstream subscription while it has subscribers\nexport abstract class BaseSubject {\n  private _subscriptions = new Set<(payload?: unknown) => void>();\n  private _connection: Unsubscribe | undefined;\n\n  protected get isConnected() {\n    return !!this._connection;\n  }\n\n  protected abstract _connect(): Unsubscribe;\n\n  protected notifySubscribers(payload?: unknown, errorContext?: string) {\n    if (errorContext) {\n      notifyEventListeners(this._subscriptions, payload, errorContext);\n      return;\n    }\n\n    notifySubscribers(this._subscriptions, payload);\n  }\n\n  private _updateConnection() {\n    if (this._subscriptions.size > 0) {\n      if (this._connection) return;\n      this._connection = this._connect();\n    } else {\n      this._connection?.();\n      this._connection = undefined;\n    }\n  }\n\n  public subscribe(callback: (payload?: unknown) => void) {\n    this._subscriptions.add(callback);\n    this._updateConnection();\n\n    return () => {\n      this._subscriptions.delete(callback);\n      this._updateConnection();\n    };\n  }\n}\n\nexport class ShallowMemoizeSubject<TState extends object, TPath>\n  extends BaseSubject\n  implements SubscribableWithState<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>;\n\n  constructor(binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>) {\n    super();\n    this.binding = binding;\n    const state = binding.getState();\n    if (state === SKIP_UPDATE)\n      throw new Error(\"Entry not available in the store\");\n    this._previousState = state;\n  }\n\n  private _previousState: TState;\n  public getState = () => {\n    if (!this.isConnected) this._syncState();\n    return this._previousState;\n  };\n\n  private _syncState() {\n    const state = this.binding.getState();\n    if (state === SKIP_UPDATE) return false;\n    if (shallowEqual(state, this._previousState)) return false;\n    this._previousState = state;\n    return true;\n  }\n\n  protected _connect() {\n    const callback = () => {\n      if (this._syncState()) {\n        this.notifySubscribers();\n      }\n    };\n\n    const unsubscribe = this.binding.subscribe(callback);\n    this._syncState();\n    return unsubscribe;\n  }\n}\n\nexport class LazyMemoizeSubject<TState extends object, TPath>\n  extends BaseSubject\n  implements SubscribableWithState<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>;\n\n  constructor(binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>) {\n    super();\n    this.binding = binding;\n  }\n\n  private _previousStateDirty = true;\n  private _previousState: TState | undefined;\n  public getState = () => {\n    if (!this.isConnected || this._previousStateDirty) {\n      const newState = this.binding.getState();\n      if (\n        newState !== SKIP_UPDATE &&\n        (this._previousState === undefined ||\n          !shallowEqual(newState, this._previousState))\n      ) {\n        this._previousState = newState;\n      }\n      this._previousStateDirty = false;\n    }\n    if (this._previousState === undefined)\n      throw new Error(\"Entry not available in the store\");\n    return this._previousState;\n  };\n\n  protected _connect() {\n    const callback = () => {\n      this._previousStateDirty = true;\n      this.notifySubscribers();\n    };\n\n    const unsubscribe = this.binding.subscribe(callback);\n    this._previousStateDirty = true;\n    return unsubscribe;\n  }\n}\n\nexport class NestedSubscriptionSubject<\n  TState extends Subscribable | undefined,\n  TPath,\n>\n  extends BaseSubject\n  implements\n    SubscribableWithState<TState, TPath>,\n    NestedSubscribable<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: NestedSubscribable<TState, TPath>;\n\n  constructor(binding: NestedSubscribable<TState, TPath>) {\n    super();\n    this.binding = binding;\n  }\n\n  public getState() {\n    return this.binding.getState();\n  }\n\n  public outerSubscribe(callback: () => void) {\n    return this.binding.subscribe(callback);\n  }\n\n  protected _connect(): Unsubscribe {\n    const callback = () => {\n      this.notifySubscribers();\n    };\n\n    let lastState = this.binding.getState();\n    let innerUnsubscribe = lastState?.subscribe(callback);\n    const onRuntimeUpdate = () => {\n      const newState = this.binding.getState();\n      if (newState === lastState) return;\n      lastState = newState;\n\n      innerUnsubscribe?.();\n      innerUnsubscribe = newState?.subscribe(callback);\n\n      callback();\n    };\n\n    const outerUnsubscribe = this.outerSubscribe(onRuntimeUpdate);\n    return () => {\n      outerUnsubscribe?.();\n      innerUnsubscribe?.();\n    };\n  }\n}\n\nexport class EventSubscriptionSubject<\n  TEvent extends string,\n> extends BaseSubject {\n  private config: EventSubscribable<TEvent>;\n\n  constructor(config: EventSubscribable<TEvent>) {\n    super();\n    this.config = config;\n  }\n\n  public getState() {\n    return this.config.binding.getState();\n  }\n\n  public outerSubscribe(callback: () => void) {\n    return this.config.binding.subscribe(callback);\n  }\n\n  protected _connect(): Unsubscribe {\n    const errorContext = `Runtime event \"${this.config.event}\"`;\n    const callback = (payload?: unknown) => {\n      this.notifySubscribers(payload, errorContext);\n    };\n\n    let lastState = this.config.binding.getState();\n    let innerUnsubscribe = lastState?.unstable_on(this.config.event, callback);\n    const onRuntimeUpdate = () => {\n      const newState = this.config.binding.getState();\n      if (newState === lastState) return;\n      lastState = newState;\n\n      innerUnsubscribe?.();\n      innerUnsubscribe = newState?.unstable_on(this.config.event, callback);\n    };\n\n    const outerUnsubscribe = this.outerSubscribe(onRuntimeUpdate);\n    return () => {\n      outerUnsubscribe?.();\n      innerUnsubscribe?.();\n    };\n  }\n}\n"],"mappings":"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"}

package/dist/utils/composite-context-provider.d.ts

@@ -3,6 +3,7 @@ import "../index.js";
 //#region src/utils/composite-context-provider.d.ts
 declare class CompositeContextProvider implements ModelContextProvider {
   private _providers;
+  private _providerUnsubscribes;
   getModelContext(): ModelContext;
   registerModelContextProvider(provider: ModelContextProvider): () => void;
   private _subscribers;

package/dist/utils/composite-context-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"composite-context-provider.d.ts","names":[],"sources":["../../src/utils/composite-context-provider.ts"],"mappings":";;;cAKa,oCAAoC;UACvC;EAER,mBAHW;EAOX,6BAA6B,UAAU;UAa/B;EAER;EAIA,UAAU"}
+{"version":3,"file":"composite-context-provider.d.ts","names":[],"sources":["../../src/utils/composite-context-provider.ts"],"mappings":";;;cAOa,oCAAoC;UACvC;UACA;EAER,mBAJW;EAQX,6BAA6B,UAAU;UA4B/B;EAER;EAIA,UAAU"}

package/dist/utils/composite-context-provider.js

@@ -1,25 +1,41 @@
 import { mergeModelContexts } from "../model-context/types.js";
+import { notifySubscribers } from "../subscribable/subscribable.js";
 //#region src/utils/composite-context-provider.ts
 var CompositeContextProvider = class {
-	_providers = /* @__PURE__ */ new Set();
+	_providers = /* @__PURE__ */ new Map();
+	_providerUnsubscribes = /* @__PURE__ */ new Map();
 	getModelContext() {
-		return mergeModelContexts(this._providers);
+		return mergeModelContexts(new Set(this._providers.values()));
 	}
 	registerModelContextProvider(provider) {
-		this._providers.add(provider);
-		const unsubscribe = provider.subscribe?.(() => {
-			this.notifySubscribers();
-		});
+		const id = Symbol();
+		this._providers.set(id, provider);
+		let unsubscribe;
+		try {
+			unsubscribe = provider.subscribe?.(() => {
+				this.notifySubscribers();
+			});
+		} catch (error) {
+			this._providers.delete(id);
+			try {
+				this.notifySubscribers();
+			} catch (notifyError) {
+				console.error(notifyError);
+			}
+			throw error;
+		}
+		this._providerUnsubscribes.set(id, unsubscribe);
 		this.notifySubscribers();
 		return () => {
-			this._providers.delete(provider);
-			unsubscribe?.();
+			this._providers.delete(id);
+			this._providerUnsubscribes.get(id)?.();
+			this._providerUnsubscribes.delete(id);
 			this.notifySubscribers();
 		};
 	}
 	_subscribers = /* @__PURE__ */ new Set();
 	notifySubscribers() {
-		for (const callback of this._subscribers) callback();
+		notifySubscribers(this._subscribers);
 	}
 	subscribe(callback) {
 		this._subscribers.add(callback);

package/dist/utils/composite-context-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"composite-context-provider.js","names":["ModelContextProvider","mergeModelContexts","CompositeContextProvider","_providers","Set","getModelContext","registerModelContextProvider","provider","add","unsubscribe","subscribe","notifySubscribers","delete","_subscribers","callback"],"sources":["../../src/utils/composite-context-provider.ts"],"sourcesContent":["import {\n  type ModelContextProvider,\n  mergeModelContexts,\n} from \"../model-context/types\";\n\nexport class CompositeContextProvider implements ModelContextProvider {\n  private _providers = new Set<ModelContextProvider>();\n\n  getModelContext() {\n    return mergeModelContexts(this._providers);\n  }\n\n  registerModelContextProvider(provider: ModelContextProvider) {\n    this._providers.add(provider);\n    const unsubscribe = provider.subscribe?.(() => {\n      this.notifySubscribers();\n    });\n    this.notifySubscribers();\n    return () => {\n      this._providers.delete(provider);\n      unsubscribe?.();\n      this.notifySubscribers();\n    };\n  }\n\n  private _subscribers = new Set<() => void>();\n\n  notifySubscribers() {\n    for (const callback of this._subscribers) callback();\n  }\n\n  subscribe(callback: () => void) {\n    this._subscribers.add(callback);\n    return () => {\n      this._subscribers.delete(callback);\n    };\n  }\n}\n"],"mappings":";;AAKA,IAAaE,2BAAb,MAAsE;CACpE,6BAAqB,IAAIE,IAA0B;CAEnDC,kBAAkB;EAChB,OAAOJ,mBAAmB,KAAKE,UAAU;CAC3C;CAEAG,6BAA6BC,UAAgC;EAC3D,KAAKJ,WAAWK,IAAID,QAAQ;EAC5B,MAAME,cAAcF,SAASG,kBAAkB;GAC7C,KAAKC,kBAAkB;EACzB,CAAC;EACD,KAAKA,kBAAkB;EACvB,aAAa;GACX,KAAKR,WAAWS,OAAOL,QAAQ;GAC/BE,cAAc;GACd,KAAKE,kBAAkB;EACzB;CACF;CAEA,+BAAuB,IAAIP,IAAgB;CAE3CO,oBAAoB;EAClB,KAAK,MAAMG,YAAY,KAAKD,cAAcC,SAAS;CACrD;CAEAJ,UAAUI,UAAsB;EAC9B,KAAKD,aAAaL,IAAIM,QAAQ;EAC9B,aAAa;GACX,KAAKD,aAAaD,OAAOE,QAAQ;EACnC;CACF;AACF"}
+{"version":3,"file":"composite-context-provider.js","names":["ModelContextProvider","mergeModelContexts","notifySubscribers","notifyStateSubscribers","Unsubscribe","CompositeContextProvider","_providers","Map","_providerUnsubscribes","getModelContext","Set","values","registerModelContextProvider","provider","id","Symbol","set","unsubscribe","subscribe","error","delete","notifyError","console","get","_subscribers","callback","add"],"sources":["../../src/utils/composite-context-provider.ts"],"sourcesContent":["import {\n  type ModelContextProvider,\n  mergeModelContexts,\n} from \"../model-context/types\";\nimport { notifySubscribers as notifyStateSubscribers } from \"../subscribable/subscribable\";\nimport type { Unsubscribe } from \"../types/unsubscribe\";\n\nexport class CompositeContextProvider implements ModelContextProvider {\n  private _providers = new Map<symbol, ModelContextProvider>();\n  private _providerUnsubscribes = new Map<symbol, Unsubscribe | undefined>();\n\n  getModelContext() {\n    return mergeModelContexts(new Set(this._providers.values()));\n  }\n\n  registerModelContextProvider(provider: ModelContextProvider) {\n    const id = Symbol();\n    this._providers.set(id, provider);\n    let unsubscribe: Unsubscribe | undefined;\n    try {\n      unsubscribe = provider.subscribe?.(() => {\n        this.notifySubscribers();\n      });\n    } catch (error) {\n      this._providers.delete(id);\n      try {\n        this.notifySubscribers();\n      } catch (notifyError) {\n        console.error(notifyError);\n      }\n      throw error;\n    }\n    this._providerUnsubscribes.set(id, unsubscribe);\n    this.notifySubscribers();\n    return () => {\n      this._providers.delete(id);\n      const unsubscribe = this._providerUnsubscribes.get(id);\n      unsubscribe?.();\n      this._providerUnsubscribes.delete(id);\n      this.notifySubscribers();\n    };\n  }\n\n  private _subscribers = new Set<() => void>();\n\n  notifySubscribers() {\n    notifyStateSubscribers(this._subscribers);\n  }\n\n  subscribe(callback: () => void) {\n    this._subscribers.add(callback);\n    return () => {\n      this._subscribers.delete(callback);\n    };\n  }\n}\n"],"mappings":";;;AAOA,IAAaK,2BAAb,MAAsE;CACpE,6BAAqB,IAAIE,IAAkC;CAC3D,wCAAgC,IAAIA,IAAqC;CAEzEE,kBAAkB;EAChB,OAAOR,mBAAmB,IAAIS,IAAI,KAAKJ,WAAWK,OAAO,CAAC,CAAC;CAC7D;CAEAC,6BAA6BC,UAAgC;EAC3D,MAAMC,KAAKC,OAAO;EAClB,KAAKT,WAAWU,IAAIF,IAAID,QAAQ;EAChC,IAAII;EACJ,IAAI;GACFA,cAAcJ,SAASK,kBAAkB;IACvC,KAAKhB,kBAAkB;GACzB,CAAC;EACH,SAASiB,OAAO;GACd,KAAKb,WAAWc,OAAON,EAAE;GACzB,IAAI;IACF,KAAKZ,kBAAkB;GACzB,SAASmB,aAAa;IACpBC,QAAQH,MAAME,WAAW;GAC3B;GACA,MAAMF;EACR;EACA,KAAKX,sBAAsBQ,IAAIF,IAAIG,WAAW;EAC9C,KAAKf,kBAAkB;EACvB,aAAa;GACX,KAAKI,WAAWc,OAAON,EAAE;GAEzBG,KADyBT,sBAAsBe,IAAIT,EACnDG,CAAW,GAAG;GACd,KAAKT,sBAAsBY,OAAON,EAAE;GACpC,KAAKZ,kBAAkB;EACzB;CACF;CAEA,+BAAuB,IAAIQ,IAAgB;CAE3CR,oBAAoB;EAClBC,kBAAuB,KAAKqB,YAAY;CAC1C;CAEAN,UAAUO,UAAsB;EAC9B,KAAKD,aAAaE,IAAID,QAAQ;EAC9B,aAAa;GACX,KAAKD,aAAaJ,OAAOK,QAAQ;EACnC;CACF;AACF"}

package/dist/utils/notify-event-listeners.d.ts

@@ -1,6 +1,6 @@
 //#region src/utils/notify-event-listeners.d.ts
-type EventListener = (payload?: unknown) => void;
-declare const notifyEventListeners: (listeners: Iterable<EventListener>, payload: unknown, errorContext: string) => void;
+type EventListener<T> = (payload: T) => unknown;
+declare const notifyEventListeners: <T>(listeners: Iterable<EventListener<T>>, payloadOrFactory: T | (() => T), errorContext: string) => void;
 //#endregion
 export { notifyEventListeners };
 //# sourceMappingURL=notify-event-listeners.d.ts.map

package/dist/utils/notify-event-listeners.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notify-event-listeners.d.ts","names":[],"sources":["../../src/utils/notify-event-listeners.ts"],"mappings":";KAAK,iBAAiB;cAET,uBACX,WAAW,SAAS,gBACpB,kBACA"}
+{"version":3,"file":"notify-event-listeners.d.ts","names":[],"sources":["../../src/utils/notify-event-listeners.ts"],"mappings":";KAAK,cAAc,MAAM,SAAS;cAGrB,uBAAwB,GACnC,WAAW,SAAS,cAAc,KAClC,kBAAkB,WAAW,IAC7B"}

package/dist/utils/notify-event-listeners.js

@@ -1,10 +1,10 @@
 //#region src/utils/notify-event-listeners.ts
-const notifyEventListeners = (listeners, payload, errorContext) => {
+const notifyEventListeners = (listeners, payloadOrFactory, errorContext) => {
 	const reportError = (error) => {
 		console.error(`[assistant-ui] ${errorContext} listener threw an error`, error);
 	};
 	for (const listener of listeners) try {
-		const result = listener(payload);
+		const result = listener(typeof payloadOrFactory === "function" ? payloadOrFactory() : payloadOrFactory);
 		if (result !== null && (typeof result === "object" || typeof result === "function") && "then" in result && typeof result.then === "function") Promise.resolve(result).catch(reportError);
 	} catch (error) {
 		reportError(error);

package/dist/utils/notify-event-listeners.js.map

@@ -1 +1 @@
-{"version":3,"file":"notify-event-listeners.js","names":["EventListener","payload","notifyEventListeners","listeners","Iterable","errorContext","reportError","error","console","listener","result","then","Promise","resolve","catch"],"sources":["../../src/utils/notify-event-listeners.ts"],"sourcesContent":["type EventListener = (payload?: unknown) => void;\n\nexport const notifyEventListeners = (\n  listeners: Iterable<EventListener>,\n  payload: unknown,\n  errorContext: string,\n) => {\n  const reportError = (error: unknown) => {\n    console.error(\n      `[assistant-ui] ${errorContext} listener threw an error`,\n      error,\n    );\n  };\n\n  for (const listener of listeners) {\n    try {\n      const result = listener(payload) as unknown;\n      if (\n        result !== null &&\n        (typeof result === \"object\" || typeof result === \"function\") &&\n        \"then\" in result &&\n        typeof result.then === \"function\"\n      ) {\n        void Promise.resolve(result).catch(reportError);\n      }\n    } catch (error) {\n      reportError(error);\n    }\n  }\n};\n"],"mappings":";AAEA,MAAaE,wBACXC,WACAF,SACAI,iBACG;CACH,MAAMC,eAAeC,UAAmB;EACtCC,QAAQD,MACN,kBAAkBF,aAAY,2BAC9BE,KACF;CACF;CAEA,KAAK,MAAME,YAAYN,WACrB,IAAI;EACF,MAAMO,SAASD,SAASR,OAAO;EAC/B,IACES,WAAW,SACV,OAAOA,WAAW,YAAY,OAAOA,WAAW,eACjD,UAAUA,UACV,OAAOA,OAAOC,SAAS,YAEvB,QAAaE,QAAQH,MAAM,CAAC,CAACI,MAAMR,WAAW;CAElD,SAASC,OAAO;EACdD,YAAYC,KAAK;CACnB;AAEJ"}
+{"version":3,"file":"notify-event-listeners.js","names":["EventListener","payload","T","notifyEventListeners","listeners","Iterable","payloadOrFactory","errorContext","reportError","error","console","listener","result","then","Promise","resolve","catch"],"sources":["../../src/utils/notify-event-listeners.ts"],"sourcesContent":["type EventListener<T> = (payload: T) => unknown;\n\n// A function payload is indistinguishable from a factory and gets invoked; wrap a function-typed payload in a factory.\nexport const notifyEventListeners = <T>(\n  listeners: Iterable<EventListener<T>>,\n  payloadOrFactory: T | (() => T),\n  errorContext: string,\n) => {\n  const reportError = (error: unknown) => {\n    console.error(\n      `[assistant-ui] ${errorContext} listener threw an error`,\n      error,\n    );\n  };\n\n  for (const listener of listeners) {\n    try {\n      const result = listener(\n        typeof payloadOrFactory === \"function\"\n          ? (payloadOrFactory as () => T)()\n          : payloadOrFactory,\n      );\n      if (\n        result !== null &&\n        (typeof result === \"object\" || typeof result === \"function\") &&\n        \"then\" in result &&\n        typeof result.then === \"function\"\n      ) {\n        void Promise.resolve(result).catch(reportError);\n      }\n    } catch (error) {\n      reportError(error);\n    }\n  }\n};\n"],"mappings":";AAGA,MAAaG,wBACXC,WACAE,kBACAC,iBACG;CACH,MAAMC,eAAeC,UAAmB;EACtCC,QAAQD,MACN,kBAAkBF,aAAY,2BAC9BE,KACF;CACF;CAEA,KAAK,MAAME,YAAYP,WACrB,IAAI;EACF,MAAMQ,SAASD,SACb,OAAOL,qBAAqB,aACvBA,iBAA6B,IAC9BA,gBACN;EACA,IACEM,WAAW,SACV,OAAOA,WAAW,YAAY,OAAOA,WAAW,eACjD,UAAUA,UACV,OAAOA,OAAOC,SAAS,YAEvB,QAAaE,QAAQH,MAAM,CAAC,CAACI,MAAMR,WAAW;CAElD,SAASC,OAAO;EACdD,YAAYC,KAAK;CACnB;AAEJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/core",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "Framework-agnostic core runtime for assistant-ui",
   "keywords": [
     "assistant",
@@ -59,7 +59,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "assistant-stream": "^0.3.37",
+    "assistant-stream": "^0.3.38",
     "nanoid": "^6.0.1"
   },
   "optionalDevDependencies": {
@@ -95,11 +95,11 @@
     "react-dom": "^19.2.8",
     "vitest": "^4.1.10",
     "zustand": "^5.0.14",
-    "@assistant-ui/tap": "0.9.12",
-    "@assistant-ui/vite": "0.0.12",
-    "assistant-cloud": "0.1.40",
-    "@assistant-ui/store": "0.3.9",
-    "@assistant-ui/x-buildutils": "0.0.22"
+    "@assistant-ui/store": "0.3.10",
+    "@assistant-ui/tap": "0.9.13",
+    "@assistant-ui/vite": "0.0.14",
+    "@assistant-ui/x-buildutils": "0.0.23",
+    "assistant-cloud": "0.1.41"
   },
   "publishConfig": {
     "access": "public",

package/src/adapters/speech.test.ts

@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { WebSpeechSynthesisAdapter } from "./speech";
+import { WebSpeechDictationAdapter, WebSpeechSynthesisAdapter } from "./speech";
 
 afterEach(() => {
   vi.restoreAllMocks();
@@ -86,3 +86,120 @@ describe("WebSpeechSynthesisAdapter", () => {
     );
   });
 });
+
+describe("WebSpeechDictationAdapter", () => {
+  const stubSpeechRecognition = () => {
+    const listeners = new Map<string, EventListener>();
+    class MockSpeechRecognition {
+      lang = "";
+      continuous = false;
+      interimResults = false;
+
+      addEventListener(type: string, listener: EventListener) {
+        listeners.set(type, listener);
+      }
+
+      start() {}
+      stop() {}
+      abort() {}
+    }
+    vi.stubGlobal("window", {
+      SpeechRecognition: MockSpeechRecognition,
+    });
+    return listeners;
+  };
+
+  it("continues notifying dictation listeners when one throws", () => {
+    const listeners = stubSpeechRecognition();
+    const listenerError = new Error("listener failed");
+    const consoleError = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => {});
+    const session = new WebSpeechDictationAdapter().listen();
+    const laterStartListener = vi.fn();
+    const laterSpeechListener = vi.fn();
+    const laterEndListener = vi.fn();
+
+    session.onSpeechStart(() => {
+      throw listenerError;
+    });
+    session.onSpeechStart(laterStartListener);
+    session.onSpeech(() => {
+      throw listenerError;
+    });
+    session.onSpeech(laterSpeechListener);
+    session.onSpeechEnd(() => {
+      throw listenerError;
+    });
+    session.onSpeechEnd(laterEndListener);
+
+    const event = {
+      resultIndex: 0,
+      results: [
+        {
+          0: { transcript: "Hello" },
+          isFinal: true,
+        },
+      ],
+    } as unknown as Event;
+
+    expect(() =>
+      listeners.get("speechstart")?.(new Event("speechstart")),
+    ).not.toThrow();
+    expect(() => listeners.get("result")?.(event)).not.toThrow();
+    expect(() => listeners.get("end")?.(new Event("end"))).not.toThrow();
+
+    expect(laterStartListener).toHaveBeenCalledOnce();
+    expect(laterSpeechListener).toHaveBeenCalledWith({
+      transcript: "Hello",
+      isFinal: true,
+    });
+    expect(laterEndListener).toHaveBeenCalledWith({
+      transcript: "Hello",
+    });
+    expect(consoleError).toHaveBeenCalledTimes(3);
+    expect(consoleError).toHaveBeenCalledWith(
+      "[assistant-ui] Dictation listener threw an error",
+      listenerError,
+    );
+  });
+
+  it("isolates async failures and payload mutations", async () => {
+    const listeners = stubSpeechRecognition();
+    const listenerError = new Error("async listener failed");
+    const consoleError = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => {});
+    const session = new WebSpeechDictationAdapter().listen();
+    const laterListener = vi.fn();
+
+    session.onSpeech(async (result) => {
+      result.transcript = "Changed";
+      result.isFinal = false;
+      throw listenerError;
+    });
+    session.onSpeech(laterListener);
+
+    const event = {
+      resultIndex: 0,
+      results: [
+        {
+          0: { transcript: "Hello" },
+          isFinal: true,
+        },
+      ],
+    } as unknown as Event;
+
+    expect(() => listeners.get("result")?.(event)).not.toThrow();
+    expect(laterListener).toHaveBeenCalledWith({
+      transcript: "Hello",
+      isFinal: true,
+    });
+    await vi.waitFor(() => {
+      expect(consoleError).toHaveBeenCalledWith(
+        "[assistant-ui] Dictation listener threw an error",
+        listenerError,
+      );
+    });
+  });
+});

package/src/adapters/speech.ts

@@ -1,4 +1,5 @@
 import type { Unsubscribe } from "../types/unsubscribe";
+import { notifyEventListeners } from "../utils/notify-event-listeners";
 
 export namespace SpeechSynthesisAdapter {
   export type Status =
@@ -22,21 +23,6 @@ export type SpeechSynthesisAdapter = {
   speak: (text: string) => SpeechSynthesisAdapter.Utterance;
 };
 
-const notifySpeechSynthesisListeners = (
-  listeners: Iterable<() => void>,
-): void => {
-  for (const listener of listeners) {
-    try {
-      listener();
-    } catch (error) {
-      console.error(
-        "[assistant-ui] Speech synthesis listener threw an error",
-        error,
-      );
-    }
-  }
-};
-
 export namespace DictationAdapter {
   export type Status =
     | {
@@ -79,7 +65,7 @@ export class WebSpeechSynthesisAdapter implements SpeechSynthesisAdapter {
       if (res.status.type === "ended") return;
 
       res.status = { type: "ended", reason, error };
-      notifySpeechSynthesisListeners(subscribers);
+      notifyEventListeners(subscribers, undefined, "Speech synthesis");
     };
 
     utterance.addEventListener("end", () => handleEnd("finished"));
@@ -97,7 +83,9 @@ export class WebSpeechSynthesisAdapter implements SpeechSynthesisAdapter {
         if (res.status.type === "ended") {
           let cancelled = false;
           queueMicrotask(() => {
-            if (!cancelled) notifySpeechSynthesisListeners([callback]);
+            if (!cancelled) {
+              notifyEventListeners([callback], undefined, "Speech synthesis");
+            }
           });
           return () => {
             cancelled = true;
@@ -270,7 +258,7 @@ export class WebSpeechDictationAdapter implements DictationAdapter {
     };
 
     recognition.addEventListener("speechstart", () => {
-      for (const cb of speechStartCallbacks) cb();
+      notifyEventListeners(speechStartCallbacks, undefined, "Dictation");
     });
 
     recognition.addEventListener("start", () => {
@@ -292,9 +280,17 @@ export class WebSpeechDictationAdapter implements DictationAdapter {
 
         if (result.isFinal) {
           finalTranscript += transcript;
-          for (const cb of speechCallbacks) cb({ transcript, isFinal: true });
+          notifyEventListeners(
+            speechCallbacks,
+            () => ({ transcript, isFinal: true }),
+            "Dictation",
+          );
         } else {
-          for (const cb of speechCallbacks) cb({ transcript, isFinal: false });
+          notifyEventListeners(
+            speechCallbacks,
+            () => ({ transcript, isFinal: false }),
+            "Dictation",
+          );
         }
       }
     });
@@ -309,8 +305,11 @@ export class WebSpeechDictationAdapter implements DictationAdapter {
         updateStatus({ type: "ended", reason: "stopped" });
       }
       if (finalTranscript) {
-        for (const cb of speechEndCallbacks)
-          cb({ transcript: finalTranscript });
+        notifyEventListeners(
+          speechEndCallbacks,
+          () => ({ transcript: finalTranscript }),
+          "Dictation",
+        );
         finalTranscript = "";
       }
     });

package/src/adapters/thread-history.ts

@@ -39,6 +39,8 @@ export interface MessageFormatAdapter<
 
 export type GenericThreadHistoryAdapter<TMessage> = {
   load(): Promise<MessageFormatRepository<TMessage>>;
+  /** Snapshot the current thread so later writes survive a switch. */
+  pin?(): void;
   append(item: MessageFormatItem<TMessage>): Promise<void>;
   update?(
     item: MessageFormatItem<TMessage>,

package/src/adapters/voice.test.ts

@@ -73,6 +73,75 @@ describe("createVoiceSession", () => {
     expect(controls.mute).not.toHaveBeenCalled();
   });
 
+  it("removes the abort listener after disconnecting", async () => {
+    const abortController = new AbortController();
+    const controls = {
+      disconnect: vi.fn(),
+      mute: vi.fn(),
+      unmute: vi.fn(),
+    };
+    const session = createVoiceSession(
+      { abortSignal: abortController.signal },
+      async () => controls,
+    );
+    await Promise.resolve();
+
+    session.disconnect();
+    session.disconnect();
+    abortController.abort();
+
+    expect(controls.disconnect).toHaveBeenCalledOnce();
+  });
+
+  it("keeps abort teardown available after the session ends", async () => {
+    const abortController = new AbortController();
+    const controls = {
+      disconnect: vi.fn(),
+      mute: vi.fn(),
+      unmute: vi.fn(),
+    };
+    let helpers: VoiceSessionHelpers | undefined;
+    createVoiceSession(
+      { abortSignal: abortController.signal },
+      async (sessionHelpers) => {
+        helpers = sessionHelpers;
+        return controls;
+      },
+    );
+    await Promise.resolve();
+    if (!helpers) throw new Error("Voice session setup did not start");
+
+    helpers.end("error");
+    abortController.abort();
+
+    expect(controls.disconnect).toHaveBeenCalledOnce();
+  });
+
+  it("cleans up when the adapter disconnect throws", async () => {
+    const disconnectError = new Error("disconnect failed");
+    let helpers: VoiceSessionHelpers | undefined;
+    const session = createVoiceSession({}, async (sessionHelpers) => {
+      helpers = sessionHelpers;
+      return {
+        disconnect: () => {
+          throw disconnectError;
+        },
+        mute: vi.fn(),
+        unmute: vi.fn(),
+      };
+    });
+    await Promise.resolve();
+    if (!helpers) throw new Error("Voice session setup did not start");
+    const transcriptListener = vi.fn();
+    session.onTranscript(transcriptListener);
+
+    expect(() => session.disconnect()).toThrow(disconnectError);
+    expect(helpers.isDisposed()).toBe(true);
+
+    helpers.emitTranscript({ role: "assistant", text: "stale" });
+    expect(transcriptListener).not.toHaveBeenCalled();
+  });
+
   it("continues notifying listeners when one throws", () => {
     const listenerError = new Error("listener failed");
     const consoleError = vi