@assistant-ui/core 0.3.13 → 0.3.15

package/dist/model-context/frame/host.js

@@ -1,3 +1,5 @@
+import { notifySubscribers } from "../../subscribable/subscribable.js";
+import { generateId } from "../../utils/id.js";
 import { FRAME_MESSAGE_CHANNEL } from "./types.js";
 //#region src/model-context/frame/host.ts
 /**
@@ -26,7 +28,6 @@ var AssistantFrameHost = class {
 	_context = {};
 	_subscribers = /* @__PURE__ */ new Set();
 	_pendingRequests = /* @__PURE__ */ new Map();
-	_requestCounter = 0;
 	_iframeWindow;
 	_targetOrigin;
 	_disposed = false;
@@ -71,7 +72,7 @@ var AssistantFrameHost = class {
 	callTool(toolName, args, abortSignal) {
 		return this.sendRequest({
 			type: "tool-call",
-			id: `tool-${this._requestCounter++}`,
+			id: `tool-${generateId()}`,
 			toolName,
 			args
 		}, 3e4, `Tool call "${toolName}" timed out`, abortSignal);
@@ -85,6 +86,7 @@ var AssistantFrameHost = class {
 				if (!abortSignal) return;
 				const pending = this._pendingRequests.get(message.id);
 				if (pending) {
+					this.cancelToolCall(message.id);
 					pending.reject(getAbortReason(abortSignal));
 					this._pendingRequests.delete(message.id);
 				}
@@ -106,6 +108,7 @@ var AssistantFrameHost = class {
 			timeoutId = setTimeout(() => {
 				const pending = this._pendingRequests.get(message.id);
 				if (pending) {
+					this.cancelToolCall(message.id);
 					pending.reject(new Error(timeoutMessage));
 					this._pendingRequests.delete(message.id);
 				}
@@ -117,6 +120,15 @@ var AssistantFrameHost = class {
 			}, this._targetOrigin);
 		});
 	}
+	cancelToolCall(id) {
+		this._iframeWindow.postMessage({
+			channel: FRAME_MESSAGE_CHANNEL,
+			message: {
+				type: "tool-cancel",
+				id
+			}
+		}, this._targetOrigin);
+	}
 	requestContext() {
 		this._iframeWindow.postMessage({
 			channel: FRAME_MESSAGE_CHANNEL,
@@ -124,7 +136,7 @@ var AssistantFrameHost = class {
 		}, this._targetOrigin);
 	}
 	notifySubscribers() {
-		this._subscribers.forEach((callback) => callback());
+		notifySubscribers(this._subscribers);
 	}
 	getModelContext() {
 		return this._context;
@@ -138,7 +150,10 @@ var AssistantFrameHost = class {
 		window.removeEventListener("message", this.handleMessage);
 		this._subscribers.clear();
 		const error = /* @__PURE__ */ new Error("AssistantFrameHost has been disposed");
-		for (const pending of this._pendingRequests.values()) pending.reject(error);
+		for (const [id, pending] of this._pendingRequests) {
+			this.cancelToolCall(id);
+			pending.reject(error);
+		}
 		this._pendingRequests.clear();
 	}
 };

package/dist/model-context/frame/host.js.map

@@ -1 +1 @@
-{"version":3,"file":"host.js","names":["ModelContextProvider","ModelContext","Unsubscribe","Tool","FrameMessage","FRAME_MESSAGE_CHANNEL","SerializedModelContext","SerializedTool","deserializeTool","serializedTool","parameters","description","disabled","undefined","type","deserializeModelContext","serialized","system","tools","Object","fromEntries","entries","map","name","tool","getAbortReason","signal","AbortSignal","reason","error","Error","AssistantFrameHost","_context","_subscribers","Set","_pendingRequests","Map","resolve","value","reject","_requestCounter","_iframeWindow","Window","_targetOrigin","_disposed","constructor","iframeWindow","targetOrigin","handleMessage","bind","window","addEventListener","requestContext","event","MessageEvent","origin","source","data","channel","message","updateContext","context","pending","get","id","result","delete","serializedContext","execute","args","abortSignal","callTool","notifySubscribers","toolName","Promise","sendRequest","T","timeout","timeoutMessage","aborted","timeoutId","ReturnType","setTimeout","onAbort","cleanup","clearTimeout","removeEventListener","set","once","postMessage","forEach","callback","getModelContext","subscribe","add","dispose","clear","values"],"sources":["../../../src/model-context/frame/host.ts"],"sourcesContent":["import type { ModelContextProvider, ModelContext } from \"../types\";\nimport type { Unsubscribe } from \"../../types/unsubscribe\";\nimport type { Tool } from \"assistant-stream\";\nimport {\n  type FrameMessage,\n  FRAME_MESSAGE_CHANNEL,\n  type SerializedModelContext,\n  type SerializedTool,\n} from \"./types\";\n\n/**\n * Deserializes tools from JSON Schema format back to Tool objects\n */\nconst deserializeTool = (serializedTool: SerializedTool): Tool<any, any> =>\n  ({\n    parameters: serializedTool.parameters,\n    ...(serializedTool.description && {\n      description: serializedTool.description,\n    }),\n    ...(serializedTool.disabled !== undefined && {\n      disabled: serializedTool.disabled,\n    }),\n    ...(serializedTool.type && { type: serializedTool.type }),\n  }) as Tool<any, any>;\n\n/**\n * Deserializes a ModelContext from transmission format\n */\nconst deserializeModelContext = (\n  serialized: SerializedModelContext,\n): ModelContext => ({\n  ...(serialized.system !== undefined && { system: serialized.system }),\n  ...(serialized.tools && {\n    tools: Object.fromEntries(\n      Object.entries(serialized.tools).map(([name, tool]) => [\n        name,\n        deserializeTool(tool),\n      ]),\n    ),\n  }),\n});\n\nconst getAbortReason = (signal: AbortSignal): unknown => {\n  if (signal.reason !== undefined) return signal.reason;\n  const error = new Error(\"Tool call was aborted\");\n  error.name = \"AbortError\";\n  return error;\n};\n\nexport class AssistantFrameHost implements ModelContextProvider {\n  private _context: ModelContext = {};\n  private _subscribers = new Set<() => void>();\n  private _pendingRequests = new Map<\n    string,\n    {\n      resolve: (value: any) => void;\n      reject: (error: any) => void;\n    }\n  >();\n  private _requestCounter = 0;\n  private _iframeWindow: Window;\n  private _targetOrigin: string;\n  private _disposed = false;\n\n  constructor(iframeWindow: Window, targetOrigin: string = \"*\") {\n    this._iframeWindow = iframeWindow;\n    this._targetOrigin = targetOrigin;\n\n    this.handleMessage = this.handleMessage.bind(this);\n    window.addEventListener(\"message\", this.handleMessage);\n\n    this.requestContext();\n  }\n\n  private handleMessage(event: MessageEvent) {\n    if (this._targetOrigin !== \"*\" && event.origin !== this._targetOrigin)\n      return;\n    if (event.source !== this._iframeWindow) return;\n    if (event.data?.channel !== FRAME_MESSAGE_CHANNEL) return;\n\n    const message = event.data.message as FrameMessage;\n\n    switch (message.type) {\n      case \"model-context-update\": {\n        this.updateContext(message.context);\n        break;\n      }\n\n      case \"tool-result\": {\n        const pending = this._pendingRequests.get(message.id);\n        if (pending) {\n          if (message.error) {\n            pending.reject(new Error(message.error));\n          } else {\n            pending.resolve(message.result);\n          }\n          this._pendingRequests.delete(message.id);\n        }\n        break;\n      }\n    }\n  }\n\n  private updateContext(serializedContext: SerializedModelContext) {\n    const context = deserializeModelContext(serializedContext);\n    this._context = {\n      ...context,\n      tools:\n        context.tools &&\n        Object.fromEntries(\n          Object.entries(context.tools).map(([name, tool]) => [\n            name,\n            {\n              ...tool,\n              execute: (args: any, context: { abortSignal: AbortSignal }) =>\n                this.callTool(name, args, context.abortSignal),\n            } as Tool<any, any>,\n          ]),\n        ),\n    };\n    this.notifySubscribers();\n  }\n\n  private callTool(\n    toolName: string,\n    args: any,\n    abortSignal: AbortSignal,\n  ): Promise<any> {\n    return this.sendRequest(\n      {\n        type: \"tool-call\",\n        id: `tool-${this._requestCounter++}`,\n        toolName,\n        args,\n      },\n      30000,\n      `Tool call \"${toolName}\" timed out`,\n      abortSignal,\n    );\n  }\n\n  private sendRequest<T extends FrameMessage & { id: string }>(\n    message: T,\n    timeout = 30000,\n    timeoutMessage = \"Request timed out\",\n    abortSignal?: AbortSignal,\n  ): Promise<any> {\n    if (this._disposed) {\n      return Promise.reject(new Error(\"AssistantFrameHost has been disposed\"));\n    }\n    if (abortSignal?.aborted) {\n      return Promise.reject(getAbortReason(abortSignal));\n    }\n\n    return new Promise((resolve, reject) => {\n      let timeoutId: ReturnType<typeof setTimeout> | undefined;\n      const onAbort = () => {\n        if (!abortSignal) return;\n        const pending = this._pendingRequests.get(message.id);\n        if (pending) {\n          pending.reject(getAbortReason(abortSignal));\n          this._pendingRequests.delete(message.id);\n        }\n      };\n      const cleanup = () => {\n        if (timeoutId !== undefined) clearTimeout(timeoutId);\n        abortSignal?.removeEventListener(\"abort\", onAbort);\n      };\n\n      this._pendingRequests.set(message.id, {\n        resolve: (value: any) => {\n          cleanup();\n          resolve(value);\n        },\n        reject: (error: any) => {\n          cleanup();\n          reject(error);\n        },\n      });\n\n      timeoutId = setTimeout(() => {\n        const pending = this._pendingRequests.get(message.id);\n        if (pending) {\n          pending.reject(new Error(timeoutMessage));\n          this._pendingRequests.delete(message.id);\n        }\n      }, timeout);\n      abortSignal?.addEventListener(\"abort\", onAbort, { once: true });\n\n      this._iframeWindow.postMessage(\n        { channel: FRAME_MESSAGE_CHANNEL, message },\n        this._targetOrigin,\n      );\n    });\n  }\n\n  private requestContext() {\n    this._iframeWindow.postMessage(\n      {\n        channel: FRAME_MESSAGE_CHANNEL,\n        message: {\n          type: \"model-context-request\",\n        } as FrameMessage,\n      },\n      this._targetOrigin,\n    );\n  }\n\n  private notifySubscribers() {\n    this._subscribers.forEach((callback) => callback());\n  }\n\n  getModelContext(): ModelContext {\n    return this._context;\n  }\n\n  subscribe(callback: () => void): Unsubscribe {\n    this._subscribers.add(callback);\n    return () => this._subscribers.delete(callback);\n  }\n\n  dispose() {\n    this._disposed = true;\n    window.removeEventListener(\"message\", this.handleMessage);\n    this._subscribers.clear();\n    const error = new Error(\"AssistantFrameHost has been disposed\");\n    for (const pending of this._pendingRequests.values()) {\n      pending.reject(error);\n    }\n    this._pendingRequests.clear();\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"host.js","names":["ModelContextProvider","ModelContext","Unsubscribe","Tool","notifySubscribers","notifyStateSubscribers","generateId","FrameMessage","FRAME_MESSAGE_CHANNEL","SerializedModelContext","SerializedTool","deserializeTool","serializedTool","parameters","description","disabled","undefined","type","deserializeModelContext","serialized","system","tools","Object","fromEntries","entries","map","name","tool","getAbortReason","signal","AbortSignal","reason","error","Error","AssistantFrameHost","_context","_subscribers","Set","_pendingRequests","Map","resolve","value","reject","_iframeWindow","Window","_targetOrigin","_disposed","constructor","iframeWindow","targetOrigin","handleMessage","bind","window","addEventListener","requestContext","event","MessageEvent","origin","source","data","channel","message","updateContext","context","pending","get","id","result","delete","serializedContext","execute","args","abortSignal","callTool","toolName","Promise","sendRequest","T","timeout","timeoutMessage","aborted","timeoutId","ReturnType","setTimeout","onAbort","cancelToolCall","cleanup","clearTimeout","removeEventListener","set","once","postMessage","getModelContext","subscribe","callback","add","dispose","clear"],"sources":["../../../src/model-context/frame/host.ts"],"sourcesContent":["import type { ModelContextProvider, ModelContext } from \"../types\";\nimport type { Unsubscribe } from \"../../types/unsubscribe\";\nimport type { Tool } from \"assistant-stream\";\nimport { notifySubscribers as notifyStateSubscribers } from \"../../subscribable/subscribable\";\nimport { generateId } from \"../../utils/id\";\nimport {\n  type FrameMessage,\n  FRAME_MESSAGE_CHANNEL,\n  type SerializedModelContext,\n  type SerializedTool,\n} from \"./types\";\n\n/**\n * Deserializes tools from JSON Schema format back to Tool objects\n */\nconst deserializeTool = (serializedTool: SerializedTool): Tool<any, any> =>\n  ({\n    parameters: serializedTool.parameters,\n    ...(serializedTool.description && {\n      description: serializedTool.description,\n    }),\n    ...(serializedTool.disabled !== undefined && {\n      disabled: serializedTool.disabled,\n    }),\n    ...(serializedTool.type && { type: serializedTool.type }),\n  }) as Tool<any, any>;\n\n/**\n * Deserializes a ModelContext from transmission format\n */\nconst deserializeModelContext = (\n  serialized: SerializedModelContext,\n): ModelContext => ({\n  ...(serialized.system !== undefined && { system: serialized.system }),\n  ...(serialized.tools && {\n    tools: Object.fromEntries(\n      Object.entries(serialized.tools).map(([name, tool]) => [\n        name,\n        deserializeTool(tool),\n      ]),\n    ),\n  }),\n});\n\nconst getAbortReason = (signal: AbortSignal): unknown => {\n  if (signal.reason !== undefined) return signal.reason;\n  const error = new Error(\"Tool call was aborted\");\n  error.name = \"AbortError\";\n  return error;\n};\n\nexport class AssistantFrameHost implements ModelContextProvider {\n  private _context: ModelContext = {};\n  private _subscribers = new Set<() => void>();\n  private _pendingRequests = new Map<\n    string,\n    {\n      resolve: (value: any) => void;\n      reject: (error: any) => void;\n    }\n  >();\n  private _iframeWindow: Window;\n  private _targetOrigin: string;\n  private _disposed = false;\n\n  constructor(iframeWindow: Window, targetOrigin: string = \"*\") {\n    this._iframeWindow = iframeWindow;\n    this._targetOrigin = targetOrigin;\n\n    this.handleMessage = this.handleMessage.bind(this);\n    window.addEventListener(\"message\", this.handleMessage);\n\n    this.requestContext();\n  }\n\n  private handleMessage(event: MessageEvent) {\n    if (this._targetOrigin !== \"*\" && event.origin !== this._targetOrigin)\n      return;\n    if (event.source !== this._iframeWindow) return;\n    if (event.data?.channel !== FRAME_MESSAGE_CHANNEL) return;\n\n    const message = event.data.message as FrameMessage;\n\n    switch (message.type) {\n      case \"model-context-update\": {\n        this.updateContext(message.context);\n        break;\n      }\n\n      case \"tool-result\": {\n        const pending = this._pendingRequests.get(message.id);\n        if (pending) {\n          if (message.error) {\n            pending.reject(new Error(message.error));\n          } else {\n            pending.resolve(message.result);\n          }\n          this._pendingRequests.delete(message.id);\n        }\n        break;\n      }\n    }\n  }\n\n  private updateContext(serializedContext: SerializedModelContext) {\n    const context = deserializeModelContext(serializedContext);\n    this._context = {\n      ...context,\n      tools:\n        context.tools &&\n        Object.fromEntries(\n          Object.entries(context.tools).map(([name, tool]) => [\n            name,\n            {\n              ...tool,\n              execute: (args: any, context: { abortSignal: AbortSignal }) =>\n                this.callTool(name, args, context.abortSignal),\n            } as Tool<any, any>,\n          ]),\n        ),\n    };\n    this.notifySubscribers();\n  }\n\n  private callTool(\n    toolName: string,\n    args: any,\n    abortSignal: AbortSignal,\n  ): Promise<any> {\n    return this.sendRequest(\n      {\n        type: \"tool-call\",\n        id: `tool-${generateId()}`,\n        toolName,\n        args,\n      },\n      30000,\n      `Tool call \"${toolName}\" timed out`,\n      abortSignal,\n    );\n  }\n\n  private sendRequest<T extends FrameMessage & { id: string }>(\n    message: T,\n    timeout = 30000,\n    timeoutMessage = \"Request timed out\",\n    abortSignal?: AbortSignal,\n  ): Promise<any> {\n    if (this._disposed) {\n      return Promise.reject(new Error(\"AssistantFrameHost has been disposed\"));\n    }\n    if (abortSignal?.aborted) {\n      return Promise.reject(getAbortReason(abortSignal));\n    }\n\n    return new Promise((resolve, reject) => {\n      let timeoutId: ReturnType<typeof setTimeout> | undefined;\n      const onAbort = () => {\n        if (!abortSignal) return;\n        const pending = this._pendingRequests.get(message.id);\n        if (pending) {\n          this.cancelToolCall(message.id);\n          pending.reject(getAbortReason(abortSignal));\n          this._pendingRequests.delete(message.id);\n        }\n      };\n      const cleanup = () => {\n        if (timeoutId !== undefined) clearTimeout(timeoutId);\n        abortSignal?.removeEventListener(\"abort\", onAbort);\n      };\n\n      this._pendingRequests.set(message.id, {\n        resolve: (value: any) => {\n          cleanup();\n          resolve(value);\n        },\n        reject: (error: any) => {\n          cleanup();\n          reject(error);\n        },\n      });\n\n      timeoutId = setTimeout(() => {\n        const pending = this._pendingRequests.get(message.id);\n        if (pending) {\n          this.cancelToolCall(message.id);\n          pending.reject(new Error(timeoutMessage));\n          this._pendingRequests.delete(message.id);\n        }\n      }, timeout);\n      abortSignal?.addEventListener(\"abort\", onAbort, { once: true });\n\n      this._iframeWindow.postMessage(\n        { channel: FRAME_MESSAGE_CHANNEL, message },\n        this._targetOrigin,\n      );\n    });\n  }\n\n  private cancelToolCall(id: string) {\n    this._iframeWindow.postMessage(\n      {\n        channel: FRAME_MESSAGE_CHANNEL,\n        message: { type: \"tool-cancel\", id } satisfies FrameMessage,\n      },\n      this._targetOrigin,\n    );\n  }\n\n  private requestContext() {\n    this._iframeWindow.postMessage(\n      {\n        channel: FRAME_MESSAGE_CHANNEL,\n        message: {\n          type: \"model-context-request\",\n        } as FrameMessage,\n      },\n      this._targetOrigin,\n    );\n  }\n\n  private notifySubscribers() {\n    notifyStateSubscribers(this._subscribers);\n  }\n\n  getModelContext(): ModelContext {\n    return this._context;\n  }\n\n  subscribe(callback: () => void): Unsubscribe {\n    this._subscribers.add(callback);\n    return () => this._subscribers.delete(callback);\n  }\n\n  dispose() {\n    this._disposed = true;\n    window.removeEventListener(\"message\", this.handleMessage);\n    this._subscribers.clear();\n    const error = new Error(\"AssistantFrameHost has been disposed\");\n    for (const [id, pending] of this._pendingRequests) {\n      this.cancelToolCall(id);\n      pending.reject(error);\n    }\n    this._pendingRequests.clear();\n  }\n}\n"],"mappings":";;;;;;;AAeA,MAAMW,mBAAmBC,oBACtB;CACCC,YAAYD,eAAeC;CAC3B,GAAID,eAAeE,eAAe,EAChCA,aAAaF,eAAeE,YAC9B;CACA,GAAIF,eAAeG,aAAaC,KAAAA,KAAa,EAC3CD,UAAUH,eAAeG,SAC3B;CACA,GAAIH,eAAeK,QAAQ,EAAEA,MAAML,eAAeK,KAAK;AACzD;;;;AAKF,MAAMC,2BACJC,gBACkB;CAClB,GAAIA,WAAWC,WAAWJ,KAAAA,KAAa,EAAEI,QAAQD,WAAWC,OAAO;CACnE,GAAID,WAAWE,SAAS,EACtBA,OAAOC,OAAOC,YACZD,OAAOE,QAAQL,WAAWE,KAAK,CAAC,CAACI,KAAK,CAACC,MAAMC,UAAU,CACrDD,MACAf,gBAAgBgB,IAAI,CAAC,CACtB,CACH,EACF;AACF;AAEA,MAAMC,kBAAkBC,WAAiC;CACvD,IAAIA,OAAOE,WAAWf,KAAAA,GAAW,OAAOa,OAAOE;CAC/C,MAAMC,wBAAQ,IAAIC,MAAM,uBAAuB;CAC/CD,MAAMN,OAAO;CACb,OAAOM;AACT;AAEA,IAAaE,qBAAb,MAAgE;CAC9D,WAAiC,CAAC;CAClC,+BAAuB,IAAIG,IAAgB;CAC3C,mCAA2B,IAAIE,IAM7B;CACF;CACA;CACA,YAAoB;CAEpBQ,YAAYC,cAAsBC,eAAuB,KAAK;EAC5D,KAAKN,gBAAgBK;EACrB,KAAKH,gBAAgBI;EAErB,KAAKC,gBAAgB,KAAKA,cAAcC,KAAK,IAAI;EACjDC,OAAOC,iBAAiB,WAAW,KAAKH,aAAa;EAErD,KAAKI,eAAe;CACtB;CAEA,cAAsBC,OAAqB;EACzC,IAAI,KAAKV,kBAAkB,OAAOU,MAAME,WAAW,KAAKZ,eACtD;EACF,IAAIU,MAAMG,WAAW,KAAKf,eAAe;EACzC,IAAIY,MAAMI,MAAMC,YAAAA,sBAAmC;EAEnD,MAAMC,UAAUN,MAAMI,KAAKE;EAE3B,QAAQA,QAAQ5C,MAAhB;GACE,KAAK;IACH,KAAK6C,cAAcD,QAAQE,OAAO;IAClC;GAGF,KAAK,eAAe;IAClB,MAAMC,UAAU,KAAK1B,iBAAiB2B,IAAIJ,QAAQK,EAAE;IACpD,IAAIF,SAAS;KACX,IAAIH,QAAQ7B,OACVgC,QAAQtB,OAAO,IAAIT,MAAM4B,QAAQ7B,KAAK,CAAC;UAEvCgC,QAAQxB,QAAQqB,QAAQM,MAAM;KAEhC,KAAK7B,iBAAiB8B,OAAOP,QAAQK,EAAE;IACzC;IACA;GACF;EACF;CACF;CAEA,cAAsBG,mBAA2C;EAC/D,MAAMN,UAAU7C,wBAAwBmD,iBAAiB;EACzD,KAAKlC,WAAW;GACd,GAAG4B;GACH1C,OACE0C,QAAQ1C,SACRC,OAAOC,YACLD,OAAOE,QAAQuC,QAAQ1C,KAAK,CAAC,CAACI,KAAK,CAACC,MAAMC,UAAU,CAClDD,MACA;IACE,GAAGC;IACH2C,UAAUC,MAAWR,YACnB,KAAKU,SAAS/C,MAAM6C,MAAMR,QAAQS,WAAW;GACjD,CAAmB,CACpB,CACH;EACJ;EACA,KAAKpE,kBAAkB;CACzB;CAEA,SACEsE,UACAH,MACAC,aACc;EACd,OAAO,KAAKI,YACV;GACE3D,MAAM;GACNiD,IAAI,QAAQ5D,WAAW;GACvBoE;GACAH;EACF,GACA,KACA,cAAcG,SAAQ,cACtBF,WACF;CACF;CAEA,YACEX,SACAiB,UAAU,KACVC,iBAAiB,qBACjBP,aACc;EACd,IAAI,KAAK1B,WACP,OAAO6B,QAAQjC,uBAAO,IAAIT,MAAM,sCAAsC,CAAC;EAEzE,IAAIuC,aAAaQ,SACf,OAAOL,QAAQjC,OAAOd,eAAe4C,WAAW,CAAC;EAGnD,OAAO,IAAIG,SAASnC,SAASE,WAAW;GACtC,IAAIuC;GACJ,MAAMG,gBAAgB;IACpB,IAAI,CAACZ,aAAa;IAClB,MAAMR,UAAU,KAAK1B,iBAAiB2B,IAAIJ,QAAQK,EAAE;IACpD,IAAIF,SAAS;KACX,KAAKqB,eAAexB,QAAQK,EAAE;KAC9BF,QAAQtB,OAAOd,eAAe4C,WAAW,CAAC;KAC1C,KAAKlC,iBAAiB8B,OAAOP,QAAQK,EAAE;IACzC;GACF;GACA,MAAMoB,gBAAgB;IACpB,IAAIL,cAAcjE,KAAAA,GAAWuE,aAAaN,SAAS;IACnDT,aAAagB,oBAAoB,SAASJ,OAAO;GACnD;GAEA,KAAK9C,iBAAiBmD,IAAI5B,QAAQK,IAAI;IACpC1B,UAAUC,UAAe;KACvB6C,QAAQ;KACR9C,QAAQC,KAAK;IACf;IACAC,SAASV,UAAe;KACtBsD,QAAQ;KACR5C,OAAOV,KAAK;IACd;GACF,CAAC;GAEDiD,YAAYE,iBAAiB;IAC3B,MAAMnB,UAAU,KAAK1B,iBAAiB2B,IAAIJ,QAAQK,EAAE;IACpD,IAAIF,SAAS;KACX,KAAKqB,eAAexB,QAAQK,EAAE;KAC9BF,QAAQtB,OAAO,IAAIT,MAAM8C,cAAc,CAAC;KACxC,KAAKzC,iBAAiB8B,OAAOP,QAAQK,EAAE;IACzC;GACF,GAAGY,OAAO;GACVN,aAAanB,iBAAiB,SAAS+B,SAAS,EAAEM,MAAM,KAAK,CAAC;GAE9D,KAAK/C,cAAcgD,YACjB;IAAE/B,SAASpD;IAAuBqD;GAAQ,GAC1C,KAAKhB,aACP;EACF,CAAC;CACH;CAEA,eAAuBqB,IAAY;EACjC,KAAKvB,cAAcgD,YACjB;GACE/B,SAASpD;GACTqD,SAAS;IAAE5C,MAAM;IAAeiD;GAAG;EACrC,GACA,KAAKrB,aACP;CACF;CAEA,iBAAyB;EACvB,KAAKF,cAAcgD,YACjB;GACE/B,SAASpD;GACTqD,SAAS,EACP5C,MAAM,wBACR;EACF,GACA,KAAK4B,aACP;CACF;CAEA,oBAA4B;EAC1BxC,kBAAuB,KAAK+B,YAAY;CAC1C;CAEAwD,kBAAgC;EAC9B,OAAO,KAAKzD;CACd;CAEA0D,UAAUC,UAAmC;EAC3C,KAAK1D,aAAa2D,IAAID,QAAQ;EAC9B,aAAa,KAAK1D,aAAagC,OAAO0B,QAAQ;CAChD;CAEAE,UAAU;EACR,KAAKlD,YAAY;EACjBM,OAAOoC,oBAAoB,WAAW,KAAKtC,aAAa;EACxD,KAAKd,aAAa6D,MAAM;EACxB,MAAMjE,wBAAQ,IAAIC,MAAM,sCAAsC;EAC9D,KAAK,MAAM,CAACiC,IAAIF,YAAY,KAAK1B,kBAAkB;GACjD,KAAK+C,eAAenB,EAAE;GACtBF,QAAQtB,OAAOV,KAAK;EACtB;EACA,KAAKM,iBAAiB2D,MAAM;CAC9B;AACF"}

package/dist/model-context/frame/provider.d.ts

@@ -5,11 +5,15 @@ declare class AssistantFrameProvider {
   private static _instance;
   private _providers;
   private _providerUnsubscribes;
+  private _activeToolCalls;
   private _targetOrigin;
+  private _strictRegistrations;
   private constructor();
   private static getInstance;
+  private reconcileTargetOrigin;
   private handleMessage;
   private handleToolCall;
+  private cancelToolCall;
   private sendMessage;
   private getModelContext;
   private broadcastUpdate;

package/dist/model-context/frame/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","names":[],"sources":["../../../src/model-context/frame/provider.ts"],"mappings":";;;cA+Ba;iBACI;UAEP;UACA;UAIA;UAED;iBAQQ;UASP;UAsBM;UAoCN;UAOA;UAkBA;SAcD,wBACL,UAAU,sBACV,wBACC;SAmBI"}
+{"version":3,"file":"provider.d.ts","names":[],"sources":["../../../src/model-context/frame/provider.ts"],"mappings":";;;cA+Ba;iBACI;UAEP;UACA;UAIA;UAIA;UACA;UAED;iBAQQ;UAWP;UAaA;UA0BM;UA2CN;UAOA;UAOA;UAkBA;SAcD,wBACL,UAAU,sBACV,wBACC;SA4BI"}

package/dist/model-context/frame/provider.js

@@ -15,7 +15,9 @@ var AssistantFrameProvider = class AssistantFrameProvider {
 	static _instance = null;
 	_providers = /* @__PURE__ */ new Set();
 	_providerUnsubscribes = /* @__PURE__ */ new Map();
+	_activeToolCalls = /* @__PURE__ */ new Map();
 	_targetOrigin;
+	_strictRegistrations = 0;
 	constructor(targetOrigin = "*") {
 		this._targetOrigin = targetOrigin;
 		this.handleMessage = this.handleMessage.bind(this);
@@ -24,8 +26,17 @@ var AssistantFrameProvider = class AssistantFrameProvider {
 	}
 	static getInstance(targetOrigin) {
 		if (!AssistantFrameProvider._instance) AssistantFrameProvider._instance = new AssistantFrameProvider(targetOrigin);
+		else AssistantFrameProvider._instance.reconcileTargetOrigin(targetOrigin);
 		return AssistantFrameProvider._instance;
 	}
+	reconcileTargetOrigin(targetOrigin = "*") {
+		if (targetOrigin === "*" || targetOrigin === this._targetOrigin) return;
+		if (this._targetOrigin === "*") {
+			this._targetOrigin = targetOrigin;
+			return;
+		}
+		throw new Error(`AssistantFrameProvider cannot register conflicting target origins: "${this._targetOrigin}" and "${targetOrigin}"`);
+	}
 	handleMessage(event) {
 		if (this._targetOrigin !== "*" && event.origin !== this._targetOrigin) return;
 		if (event.source !== window.parent) return;
@@ -38,18 +49,28 @@ var AssistantFrameProvider = class AssistantFrameProvider {
 					context: serializeModelContext(this.getModelContext())
 				});
 				break;
-			case "tool-call": this.handleToolCall(message, event);
+			case "tool-call":
+				this.handleToolCall(message, event);
+				break;
+			case "tool-cancel": this.cancelToolCall(message.id);
 		}
 	}
 	async handleToolCall(message, event) {
 		const tool = this.getModelContext().tools?.[message.toolName];
+		const abortController = new AbortController();
+		this._activeToolCalls.get(message.id)?.abortController.abort();
+		const activeCall = {
+			abortController,
+			event
+		};
+		this._activeToolCalls.set(message.id, activeCall);
 		let result;
 		let error;
 		if (!tool) error = `Tool "${message.toolName}" not found`;
 		else try {
 			result = tool.execute ? await tool.execute(message.args, {
 				toolCallId: message.id,
-				abortSignal: new AbortController().signal,
+				abortSignal: abortController.signal,
 				human: async () => {
 					throw new Error("Tool human input is not supported in frame context");
 				}
@@ -57,12 +78,20 @@ var AssistantFrameProvider = class AssistantFrameProvider {
 		} catch (e) {
 			error = e instanceof Error ? e.message : String(e);
 		}
+		if (this._activeToolCalls.get(message.id) !== activeCall) return;
+		this._activeToolCalls.delete(message.id);
 		this.sendMessage(event, {
 			type: "tool-result",
 			id: message.id,
 			...error ? { error } : { result }
 		});
 	}
+	cancelToolCall(id) {
+		const activeCall = this._activeToolCalls.get(id);
+		if (!activeCall) return;
+		this._activeToolCalls.delete(id);
+		activeCall.abortController.abort();
+	}
 	sendMessage(event, message) {
 		event.source?.postMessage({
 			channel: FRAME_MESSAGE_CHANNEL,
@@ -91,15 +120,24 @@ var AssistantFrameProvider = class AssistantFrameProvider {
 		}
 	}
 	static addModelContextProvider(provider, targetOrigin) {
-		const instance = AssistantFrameProvider.getInstance(targetOrigin);
+		const origin = targetOrigin ?? "*";
+		const instance = AssistantFrameProvider.getInstance(origin);
 		instance._providers.add(provider);
+		if (origin !== "*") instance._strictRegistrations += 1;
 		const unsubscribe = provider.subscribe?.(() => instance.broadcastUpdate());
 		if (unsubscribe) instance._providerUnsubscribes.set(provider, unsubscribe);
 		instance.broadcastUpdate();
+		let released = false;
 		return () => {
+			if (released) return;
+			released = true;
 			instance._providers.delete(provider);
 			instance._providerUnsubscribes.get(provider)?.();
 			instance._providerUnsubscribes.delete(provider);
+			if (origin !== "*") {
+				instance._strictRegistrations -= 1;
+				if (instance._strictRegistrations === 0) instance._targetOrigin = "*";
+			}
 			instance.broadcastUpdate();
 		};
 	}
@@ -110,6 +148,15 @@ var AssistantFrameProvider = class AssistantFrameProvider {
 			instance._providerUnsubscribes.forEach((unsubscribe) => unsubscribe?.());
 			instance._providerUnsubscribes.clear();
 			instance._providers.clear();
+			instance._activeToolCalls.forEach(({ abortController, event }, id) => {
+				abortController.abort();
+				instance.sendMessage(event, {
+					type: "tool-result",
+					id,
+					error: "AssistantFrameProvider has been disposed"
+				});
+			});
+			instance._activeToolCalls.clear();
 			AssistantFrameProvider._instance = null;
 		}
 	}

package/dist/model-context/frame/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","names":["ModelContextProvider","ModelContext","Unsubscribe","Tool","toJSONSchema","FrameMessage","FRAME_MESSAGE_CHANNEL","SerializedModelContext","SerializedTool","serializeTool","tool","description","parameters","undefined","disabled","type","serializeModelContext","context","system","tools","Object","fromEntries","entries","map","name","AssistantFrameProvider","_instance","_providers","Set","_providerUnsubscribes","Map","_targetOrigin","constructor","targetOrigin","handleMessage","bind","window","addEventListener","setTimeout","broadcastUpdate","getInstance","event","MessageEvent","origin","source","parent","data","channel","message","sendMessage","getModelContext","handleToolCall","Extract","toolName","result","error","execute","args","toolCallId","id","abortSignal","AbortController","signal","human","Error","e","String","postMessage","contexts","Array","from","p","reduce","merged","updateMessage","addModelContextProvider","provider","instance","add","unsubscribe","subscribe","set","delete","get","dispose","removeEventListener","forEach","clear"],"sources":["../../../src/model-context/frame/provider.ts"],"sourcesContent":["import type { ModelContextProvider, ModelContext } from \"../types\";\nimport type { Unsubscribe } from \"../../types/unsubscribe\";\nimport { type Tool, toJSONSchema } from \"assistant-stream\";\nimport {\n  type FrameMessage,\n  FRAME_MESSAGE_CHANNEL,\n  type SerializedModelContext,\n  type SerializedTool,\n} from \"./types\";\n\nconst serializeTool = (tool: Tool<any, any>): SerializedTool => ({\n  ...(tool.description && { description: tool.description }),\n  parameters: tool.parameters ? toJSONSchema(tool.parameters) : undefined,\n  ...(tool.disabled !== undefined && { disabled: tool.disabled }),\n  ...(tool.type && { type: tool.type }),\n});\n\nconst serializeModelContext = (\n  context: ModelContext,\n): SerializedModelContext => ({\n  ...(context.system !== undefined && { system: context.system }),\n  ...(context.tools && {\n    tools: Object.fromEntries(\n      Object.entries(context.tools).map(([name, tool]) => [\n        name,\n        serializeTool(tool),\n      ]),\n    ),\n  }),\n});\n\nexport class AssistantFrameProvider {\n  private static _instance: AssistantFrameProvider | null = null;\n\n  private _providers = new Set<ModelContextProvider>();\n  private _providerUnsubscribes = new Map<\n    ModelContextProvider,\n    Unsubscribe | undefined\n  >();\n  private _targetOrigin: string;\n\n  private constructor(targetOrigin: string = \"*\") {\n    this._targetOrigin = targetOrigin;\n    this.handleMessage = this.handleMessage.bind(this);\n    window.addEventListener(\"message\", this.handleMessage);\n\n    setTimeout(() => this.broadcastUpdate(), 0);\n  }\n\n  private static getInstance(targetOrigin?: string): AssistantFrameProvider {\n    if (!AssistantFrameProvider._instance) {\n      AssistantFrameProvider._instance = new AssistantFrameProvider(\n        targetOrigin,\n      );\n    }\n    return AssistantFrameProvider._instance;\n  }\n\n  private handleMessage(event: MessageEvent) {\n    if (this._targetOrigin !== \"*\" && event.origin !== this._targetOrigin)\n      return;\n    if (event.source !== window.parent) return;\n    if (event.data?.channel !== FRAME_MESSAGE_CHANNEL) return;\n\n    const message = event.data.message as FrameMessage;\n\n    switch (message.type) {\n      case \"model-context-request\":\n        this.sendMessage(event, {\n          type: \"model-context-update\",\n          context: serializeModelContext(this.getModelContext()),\n        });\n        break;\n\n      case \"tool-call\":\n        this.handleToolCall(message, event);\n        break;\n    }\n  }\n\n  private async handleToolCall(\n    message: Extract<FrameMessage, { type: \"tool-call\" }>,\n    event: MessageEvent,\n  ) {\n    const tool = this.getModelContext().tools?.[message.toolName];\n\n    let result: any;\n    let error: string | undefined;\n\n    if (!tool) {\n      error = `Tool \"${message.toolName}\" not found`;\n    } else {\n      try {\n        result = tool.execute\n          ? await tool.execute(message.args, {\n              toolCallId: message.id,\n              abortSignal: new AbortController().signal,\n              human: async () => {\n                throw new Error(\n                  \"Tool human input is not supported in frame context\",\n                );\n              },\n            })\n          : undefined;\n      } catch (e) {\n        error = e instanceof Error ? e.message : String(e);\n      }\n    }\n\n    this.sendMessage(event, {\n      type: \"tool-result\",\n      id: message.id,\n      ...(error ? { error } : { result }),\n    });\n  }\n\n  private sendMessage(event: MessageEvent, message: FrameMessage) {\n    event.source?.postMessage(\n      { channel: FRAME_MESSAGE_CHANNEL, message },\n      { targetOrigin: event.origin },\n    );\n  }\n\n  private getModelContext(): ModelContext {\n    const contexts = Array.from(this._providers).map((p) =>\n      p.getModelContext(),\n    );\n\n    return contexts.reduce(\n      (merged, context) => ({\n        system: context.system\n          ? merged.system\n            ? `${merged.system}\\n\\n${context.system}`\n            : context.system\n          : merged.system,\n        tools: { ...(merged.tools || {}), ...(context.tools || {}) },\n      }),\n      {} as ModelContext,\n    );\n  }\n\n  private broadcastUpdate() {\n    if (window.parent && window.parent !== window) {\n      const updateMessage: FrameMessage = {\n        type: \"model-context-update\",\n        context: serializeModelContext(this.getModelContext()),\n      };\n\n      window.parent.postMessage(\n        { channel: FRAME_MESSAGE_CHANNEL, message: updateMessage },\n        this._targetOrigin,\n      );\n    }\n  }\n\n  static addModelContextProvider(\n    provider: ModelContextProvider,\n    targetOrigin?: string,\n  ): Unsubscribe {\n    const instance = AssistantFrameProvider.getInstance(targetOrigin);\n    instance._providers.add(provider);\n\n    const unsubscribe = provider.subscribe?.(() => instance.broadcastUpdate());\n    if (unsubscribe) {\n      instance._providerUnsubscribes.set(provider, unsubscribe);\n    }\n\n    instance.broadcastUpdate();\n\n    return () => {\n      instance._providers.delete(provider);\n      instance._providerUnsubscribes.get(provider)?.();\n      instance._providerUnsubscribes.delete(provider);\n      instance.broadcastUpdate();\n    };\n  }\n\n  static dispose() {\n    if (AssistantFrameProvider._instance) {\n      const instance = AssistantFrameProvider._instance;\n      window.removeEventListener(\"message\", instance.handleMessage);\n\n      instance._providerUnsubscribes.forEach((unsubscribe) => unsubscribe?.());\n      instance._providerUnsubscribes.clear();\n      instance._providers.clear();\n\n      AssistantFrameProvider._instance = null;\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"provider.js","names":["ModelContextProvider","ModelContext","Unsubscribe","Tool","toJSONSchema","FrameMessage","FRAME_MESSAGE_CHANNEL","SerializedModelContext","SerializedTool","serializeTool","tool","description","parameters","undefined","disabled","type","serializeModelContext","context","system","tools","Object","fromEntries","entries","map","name","AssistantFrameProvider","_instance","_providers","Set","_providerUnsubscribes","Map","_activeToolCalls","abortController","AbortController","event","MessageEvent","_targetOrigin","_strictRegistrations","constructor","targetOrigin","handleMessage","bind","window","addEventListener","setTimeout","broadcastUpdate","getInstance","reconcileTargetOrigin","Error","origin","source","parent","data","channel","message","sendMessage","getModelContext","handleToolCall","cancelToolCall","id","Extract","toolName","get","abort","activeCall","set","result","error","execute","args","toolCallId","abortSignal","signal","human","e","String","delete","postMessage","contexts","Array","from","p","reduce","merged","updateMessage","addModelContextProvider","provider","instance","add","unsubscribe","subscribe","released","dispose","removeEventListener","forEach","clear"],"sources":["../../../src/model-context/frame/provider.ts"],"sourcesContent":["import type { ModelContextProvider, ModelContext } from \"../types\";\nimport type { Unsubscribe } from \"../../types/unsubscribe\";\nimport { type Tool, toJSONSchema } from \"assistant-stream\";\nimport {\n  type FrameMessage,\n  FRAME_MESSAGE_CHANNEL,\n  type SerializedModelContext,\n  type SerializedTool,\n} from \"./types\";\n\nconst serializeTool = (tool: Tool<any, any>): SerializedTool => ({\n  ...(tool.description && { description: tool.description }),\n  parameters: tool.parameters ? toJSONSchema(tool.parameters) : undefined,\n  ...(tool.disabled !== undefined && { disabled: tool.disabled }),\n  ...(tool.type && { type: tool.type }),\n});\n\nconst serializeModelContext = (\n  context: ModelContext,\n): SerializedModelContext => ({\n  ...(context.system !== undefined && { system: context.system }),\n  ...(context.tools && {\n    tools: Object.fromEntries(\n      Object.entries(context.tools).map(([name, tool]) => [\n        name,\n        serializeTool(tool),\n      ]),\n    ),\n  }),\n});\n\nexport class AssistantFrameProvider {\n  private static _instance: AssistantFrameProvider | null = null;\n\n  private _providers = new Set<ModelContextProvider>();\n  private _providerUnsubscribes = new Map<\n    ModelContextProvider,\n    Unsubscribe | undefined\n  >();\n  private _activeToolCalls = new Map<\n    string,\n    { abortController: AbortController; event: MessageEvent }\n  >();\n  private _targetOrigin: string;\n  private _strictRegistrations = 0;\n\n  private constructor(targetOrigin: string = \"*\") {\n    this._targetOrigin = targetOrigin;\n    this.handleMessage = this.handleMessage.bind(this);\n    window.addEventListener(\"message\", this.handleMessage);\n\n    setTimeout(() => this.broadcastUpdate(), 0);\n  }\n\n  private static getInstance(targetOrigin?: string): AssistantFrameProvider {\n    if (!AssistantFrameProvider._instance) {\n      AssistantFrameProvider._instance = new AssistantFrameProvider(\n        targetOrigin,\n      );\n    } else {\n      AssistantFrameProvider._instance.reconcileTargetOrigin(targetOrigin);\n    }\n    return AssistantFrameProvider._instance;\n  }\n\n  private reconcileTargetOrigin(targetOrigin: string = \"*\") {\n    if (targetOrigin === \"*\" || targetOrigin === this._targetOrigin) return;\n\n    if (this._targetOrigin === \"*\") {\n      this._targetOrigin = targetOrigin;\n      return;\n    }\n\n    throw new Error(\n      `AssistantFrameProvider cannot register conflicting target origins: \"${this._targetOrigin}\" and \"${targetOrigin}\"`,\n    );\n  }\n\n  private handleMessage(event: MessageEvent) {\n    if (this._targetOrigin !== \"*\" && event.origin !== this._targetOrigin)\n      return;\n    if (event.source !== window.parent) return;\n    if (event.data?.channel !== FRAME_MESSAGE_CHANNEL) return;\n\n    const message = event.data.message as FrameMessage;\n\n    switch (message.type) {\n      case \"model-context-request\":\n        this.sendMessage(event, {\n          type: \"model-context-update\",\n          context: serializeModelContext(this.getModelContext()),\n        });\n        break;\n\n      case \"tool-call\":\n        this.handleToolCall(message, event);\n        break;\n\n      case \"tool-cancel\":\n        this.cancelToolCall(message.id);\n        break;\n    }\n  }\n\n  private async handleToolCall(\n    message: Extract<FrameMessage, { type: \"tool-call\" }>,\n    event: MessageEvent,\n  ) {\n    const tool = this.getModelContext().tools?.[message.toolName];\n    const abortController = new AbortController();\n    this._activeToolCalls.get(message.id)?.abortController.abort();\n    const activeCall = { abortController, event };\n    this._activeToolCalls.set(message.id, activeCall);\n\n    let result: any;\n    let error: string | undefined;\n\n    if (!tool) {\n      error = `Tool \"${message.toolName}\" not found`;\n    } else {\n      try {\n        result = tool.execute\n          ? await tool.execute(message.args, {\n              toolCallId: message.id,\n              abortSignal: abortController.signal,\n              human: async () => {\n                throw new Error(\n                  \"Tool human input is not supported in frame context\",\n                );\n              },\n            })\n          : undefined;\n      } catch (e) {\n        error = e instanceof Error ? e.message : String(e);\n      }\n    }\n\n    if (this._activeToolCalls.get(message.id) !== activeCall) return;\n    this._activeToolCalls.delete(message.id);\n\n    this.sendMessage(event, {\n      type: \"tool-result\",\n      id: message.id,\n      ...(error ? { error } : { result }),\n    });\n  }\n\n  private cancelToolCall(id: string) {\n    const activeCall = this._activeToolCalls.get(id);\n    if (!activeCall) return;\n    this._activeToolCalls.delete(id);\n    activeCall.abortController.abort();\n  }\n\n  private sendMessage(event: MessageEvent, message: FrameMessage) {\n    event.source?.postMessage(\n      { channel: FRAME_MESSAGE_CHANNEL, message },\n      { targetOrigin: event.origin },\n    );\n  }\n\n  private getModelContext(): ModelContext {\n    const contexts = Array.from(this._providers).map((p) =>\n      p.getModelContext(),\n    );\n\n    return contexts.reduce(\n      (merged, context) => ({\n        system: context.system\n          ? merged.system\n            ? `${merged.system}\\n\\n${context.system}`\n            : context.system\n          : merged.system,\n        tools: { ...(merged.tools || {}), ...(context.tools || {}) },\n      }),\n      {} as ModelContext,\n    );\n  }\n\n  private broadcastUpdate() {\n    if (window.parent && window.parent !== window) {\n      const updateMessage: FrameMessage = {\n        type: \"model-context-update\",\n        context: serializeModelContext(this.getModelContext()),\n      };\n\n      window.parent.postMessage(\n        { channel: FRAME_MESSAGE_CHANNEL, message: updateMessage },\n        this._targetOrigin,\n      );\n    }\n  }\n\n  static addModelContextProvider(\n    provider: ModelContextProvider,\n    targetOrigin?: string,\n  ): Unsubscribe {\n    const origin = targetOrigin ?? \"*\";\n    const instance = AssistantFrameProvider.getInstance(origin);\n    instance._providers.add(provider);\n    if (origin !== \"*\") instance._strictRegistrations += 1;\n\n    const unsubscribe = provider.subscribe?.(() => instance.broadcastUpdate());\n    if (unsubscribe) {\n      instance._providerUnsubscribes.set(provider, unsubscribe);\n    }\n\n    instance.broadcastUpdate();\n\n    let released = false;\n    return () => {\n      if (released) return;\n      released = true;\n      instance._providers.delete(provider);\n      instance._providerUnsubscribes.get(provider)?.();\n      instance._providerUnsubscribes.delete(provider);\n      if (origin !== \"*\") {\n        instance._strictRegistrations -= 1;\n        if (instance._strictRegistrations === 0) instance._targetOrigin = \"*\";\n      }\n      instance.broadcastUpdate();\n    };\n  }\n\n  static dispose() {\n    if (AssistantFrameProvider._instance) {\n      const instance = AssistantFrameProvider._instance;\n      window.removeEventListener(\"message\", instance.handleMessage);\n\n      instance._providerUnsubscribes.forEach((unsubscribe) => unsubscribe?.());\n      instance._providerUnsubscribes.clear();\n      instance._providers.clear();\n      instance._activeToolCalls.forEach(({ abortController, event }, id) => {\n        abortController.abort();\n        instance.sendMessage(event, {\n          type: \"tool-result\",\n          id,\n          error: \"AssistantFrameProvider has been disposed\",\n        });\n      });\n      instance._activeToolCalls.clear();\n\n      AssistantFrameProvider._instance = null;\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/model-context/frame/types.d.ts

@@ -9,7 +9,7 @@ type SerializedModelContext = {
   system?: string;
   tools?: Record<string, SerializedTool>;
 };
-type FrameMessageType = "model-context-request" | "model-context-update" | "tool-call" | "tool-result";
+type FrameMessageType = "model-context-request" | "model-context-update" | "tool-call" | "tool-cancel" | "tool-result";
 type FrameMessage = {
   type: "model-context-request";
 } | {
@@ -20,6 +20,9 @@ type FrameMessage = {
   id: string;
   toolName: string;
   args: unknown;
+} | {
+  type: "tool-cancel";
+  id: string;
 } | {
   type: "tool-result";
   id: string;

package/dist/model-context/frame/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","names":[],"sources":["../../../src/model-context/frame/types.ts"],"mappings":";KAAY;EACV;EACA;EACA;EACA;;KAGU;EACV;EACA,QAAQ,eAAe;;KAGb;KAMA;EAEN;;EAGA;EACA,SAAS;;EAGT;EACA;EACA;EACA;;EAGA;EACA;EACA;EACA;;cAGO"}
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../../src/model-context/frame/types.ts"],"mappings":";KAAY;EACV;EACA;EACA;EACA;;KAGU;EACV;EACA,QAAQ,eAAe;;KAGb;KAOA;EAEN;;EAGA;EACA,SAAS;;EAGT;EACA;EACA;EACA;;EAGA;EACA;;EAGA;EACA;EACA;EACA;;cAGO"}

package/dist/model-context/frame/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":["SerializedTool","description","parameters","disabled","type","SerializedModelContext","system","tools","Record","FrameMessageType","FrameMessage","context","id","toolName","args","result","error","FRAME_MESSAGE_CHANNEL"],"sources":["../../../src/model-context/frame/types.ts"],"sourcesContent":["export type SerializedTool = {\n  description?: string;\n  parameters: any; // JSON Schema\n  disabled?: boolean;\n  type?: string;\n};\n\nexport type SerializedModelContext = {\n  system?: string;\n  tools?: Record<string, SerializedTool>;\n};\n\nexport type FrameMessageType =\n  | \"model-context-request\"\n  | \"model-context-update\"\n  | \"tool-call\"\n  | \"tool-result\";\n\nexport type FrameMessage =\n  | {\n      type: \"model-context-request\";\n    }\n  | {\n      type: \"model-context-update\";\n      context: SerializedModelContext;\n    }\n  | {\n      type: \"tool-call\";\n      id: string;\n      toolName: string;\n      args: unknown;\n    }\n  | {\n      type: \"tool-result\";\n      id: string;\n      result?: unknown;\n      error?: string;\n    };\n\nexport const FRAME_MESSAGE_CHANNEL = \"assistant-ui-frame\";\n"],"mappings":";AAuCA,MAAaiB,wBAAwB"}
+{"version":3,"file":"types.js","names":["SerializedTool","description","parameters","disabled","type","SerializedModelContext","system","tools","Record","FrameMessageType","FrameMessage","context","id","toolName","args","result","error","FRAME_MESSAGE_CHANNEL"],"sources":["../../../src/model-context/frame/types.ts"],"sourcesContent":["export type SerializedTool = {\n  description?: string;\n  parameters: any; // JSON Schema\n  disabled?: boolean;\n  type?: string;\n};\n\nexport type SerializedModelContext = {\n  system?: string;\n  tools?: Record<string, SerializedTool>;\n};\n\nexport type FrameMessageType =\n  | \"model-context-request\"\n  | \"model-context-update\"\n  | \"tool-call\"\n  | \"tool-cancel\"\n  | \"tool-result\";\n\nexport type FrameMessage =\n  | {\n      type: \"model-context-request\";\n    }\n  | {\n      type: \"model-context-update\";\n      context: SerializedModelContext;\n    }\n  | {\n      type: \"tool-call\";\n      id: string;\n      toolName: string;\n      args: unknown;\n    }\n  | {\n      type: \"tool-cancel\";\n      id: string;\n    }\n  | {\n      type: \"tool-result\";\n      id: string;\n      result?: unknown;\n      error?: string;\n    };\n\nexport const FRAME_MESSAGE_CHANNEL = \"assistant-ui-frame\";\n"],"mappings":";AA4CA,MAAaiB,wBAAwB"}

package/dist/model-context/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","names":[],"sources":["../../src/model-context/registry.ts"],"mappings":";;;;cAea,gCAAgC;UACnC;UACA;UACA;UACA;UACA;EAER,mBAAmB;EAiDnB,UAAU,uBAAuB;UAKzB;EAMR,QAAQ,cAAc,yBAAyB,SAC7C,MAAM,mBAAmB,OAAO,WAC/B,+BAA+B,OAAO;EAoBzC,eACE,iBAAiB,8BAChB;EAiCH,YACE,UAAU,uBACT"}
+{"version":3,"file":"registry.d.ts","names":[],"sources":["../../src/model-context/registry.ts"],"mappings":";;;;cAgBa,gCAAgC;UACnC;UACA;UACA;UACA;UACA;EAER,mBAAmB;EAiDnB,UAAU,uBAAuB;UAKzB;EAIR,QAAQ,cAAc,yBAAyB,SAC7C,MAAM,mBAAmB,OAAO,WAC/B,+BAA+B,OAAO;EAoBzC,eACE,iBAAiB,8BAChB;EAiCH,YACE,UAAU,uBACT"}

package/dist/model-context/registry.js

@@ -1,4 +1,5 @@
 import { mergeModelContexts } from "./types.js";
+import { notifySubscribers } from "../subscribable/subscribable.js";
 //#region src/model-context/registry.ts
 var ModelContextRegistry = class {
 	_tools = /* @__PURE__ */ new Map();
@@ -34,7 +35,7 @@ var ModelContextRegistry = class {
 		return () => this._subscribers.delete(callback);
 	}
 	notifySubscribers() {
-		for (const callback of this._subscribers) callback();
+		notifySubscribers(this._subscribers);
 	}
 	addTool(tool) {
 		const id = Symbol();
@@ -76,9 +77,20 @@ var ModelContextRegistry = class {
 	addProvider(provider) {
 		const id = Symbol();
 		this._providers.set(id, provider);
-		const unsubscribe = provider.subscribe?.(() => {
-			this.notifySubscribers();
-		});
+		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 { remove: () => {

package/dist/model-context/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","names":["Tool","ModelContext","ModelContextProvider","mergeModelContexts","AssistantToolProps","AssistantInstructionsConfig","Unsubscribe","ModelContextRegistryToolHandle","ModelContextRegistryInstructionHandle","ModelContextRegistryProviderHandle","ModelContextRegistry","_tools","Map","_instructions","_providers","_subscribers","Set","_providerUnsubscribes","getModelContext","instructions","Array","from","values","filter","Boolean","system","length","join","undefined","tools","Record","toolProps","toolName","render","tool","providerContexts","context","Object","keys","callSettings","config","unstable_composerMetadata","subscribe","callback","add","delete","notifySubscribers","addTool","TArgs","TResult","id","Symbol","set","update","newTool","has","remove","addInstruction","instruction","disabled","newConfig","newInstruction","newDisabled","addProvider","provider","unsubscribe","get"],"sources":["../../src/model-context/registry.ts"],"sourcesContent":["import type { Tool } from \"assistant-stream\";\nimport {\n  type ModelContext,\n  type ModelContextProvider,\n  mergeModelContexts,\n  type AssistantToolProps,\n  type AssistantInstructionsConfig,\n} from \"./types\";\nimport type { Unsubscribe } from \"../types/unsubscribe\";\nimport type {\n  ModelContextRegistryToolHandle,\n  ModelContextRegistryInstructionHandle,\n  ModelContextRegistryProviderHandle,\n} from \"./registry-handles\";\n\nexport class ModelContextRegistry implements ModelContextProvider {\n  private _tools = new Map<symbol, AssistantToolProps<any, any>>();\n  private _instructions = new Map<symbol, string>();\n  private _providers = new Map<symbol, ModelContextProvider>();\n  private _subscribers = new Set<() => void>();\n  private _providerUnsubscribes = new Map<symbol, Unsubscribe | undefined>();\n\n  getModelContext(): ModelContext {\n    const instructions = Array.from(this._instructions.values()).filter(\n      Boolean,\n    );\n\n    const system =\n      instructions.length > 0 ? instructions.join(\"\\n\\n\") : undefined;\n\n    const tools: Record<string, Tool<any, any>> = {};\n    for (const toolProps of this._tools.values()) {\n      const { toolName, render, ...tool } = toolProps;\n      tools[toolName] = tool;\n    }\n\n    const providerContexts = mergeModelContexts(\n      new Set(this._providers.values()),\n    );\n\n    const context: ModelContext = {\n      system,\n      tools: Object.keys(tools).length > 0 ? tools : undefined,\n    };\n\n    if (providerContexts.system) {\n      context.system = context.system\n        ? `${context.system}\\n\\n${providerContexts.system}`\n        : providerContexts.system;\n    }\n\n    if (providerContexts.tools) {\n      context.tools = { ...(context.tools || {}), ...providerContexts.tools };\n    }\n\n    if (providerContexts.callSettings) {\n      context.callSettings = providerContexts.callSettings;\n    }\n\n    if (providerContexts.config) {\n      context.config = providerContexts.config;\n    }\n\n    if (providerContexts.unstable_composerMetadata) {\n      context.unstable_composerMetadata =\n        providerContexts.unstable_composerMetadata;\n    }\n\n    return context;\n  }\n\n  subscribe(callback: () => void): Unsubscribe {\n    this._subscribers.add(callback);\n    return () => this._subscribers.delete(callback);\n  }\n\n  private notifySubscribers(): void {\n    for (const callback of this._subscribers) {\n      callback();\n    }\n  }\n\n  addTool<TArgs extends Record<string, unknown>, TResult>(\n    tool: AssistantToolProps<TArgs, TResult>,\n  ): ModelContextRegistryToolHandle<TArgs, TResult> {\n    const id = Symbol();\n\n    this._tools.set(id, tool);\n    this.notifySubscribers();\n\n    return {\n      update: (newTool: AssistantToolProps<TArgs, TResult>) => {\n        if (this._tools.has(id)) {\n          this._tools.set(id, newTool);\n          this.notifySubscribers();\n        }\n      },\n      remove: () => {\n        this._tools.delete(id);\n        this.notifySubscribers();\n      },\n    };\n  }\n\n  addInstruction(\n    config: string | AssistantInstructionsConfig,\n  ): ModelContextRegistryInstructionHandle {\n    const id = Symbol();\n\n    const instruction =\n      typeof config === \"string\" ? config : config.instruction;\n    const disabled = typeof config === \"object\" ? config.disabled : false;\n\n    if (!disabled) {\n      this._instructions.set(id, instruction);\n      this.notifySubscribers();\n    }\n\n    return {\n      update: (newConfig: string | AssistantInstructionsConfig) => {\n        const newInstruction =\n          typeof newConfig === \"string\" ? newConfig : newConfig.instruction;\n        const newDisabled =\n          typeof newConfig === \"object\" ? newConfig.disabled : false;\n\n        if (newDisabled) {\n          this._instructions.delete(id);\n        } else {\n          this._instructions.set(id, newInstruction);\n        }\n        this.notifySubscribers();\n      },\n      remove: () => {\n        this._instructions.delete(id);\n        this.notifySubscribers();\n      },\n    };\n  }\n\n  addProvider(\n    provider: ModelContextProvider,\n  ): ModelContextRegistryProviderHandle {\n    const id = Symbol();\n\n    this._providers.set(id, provider);\n\n    const unsubscribe = provider.subscribe?.(() => {\n      this.notifySubscribers();\n    });\n    this._providerUnsubscribes.set(id, unsubscribe);\n\n    this.notifySubscribers();\n\n    return {\n      remove: () => {\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}\n"],"mappings":";;AAeA,IAAaU,uBAAb,MAAkE;CAChE,yBAAiB,IAAIE,IAA0C;CAC/D,gCAAwB,IAAIA,IAAoB;CAChD,6BAAqB,IAAIA,IAAkC;CAC3D,+BAAuB,IAAII,IAAgB;CAC3C,wCAAgC,IAAIJ,IAAqC;CAEzEM,kBAAgC;EAC9B,MAAMC,eAAeC,MAAMC,KAAK,KAAKR,cAAcS,OAAO,CAAC,CAAC,CAACC,OAC3DC,OACF;EAEA,MAAMC,SACJN,aAAaO,SAAS,IAAIP,aAAaQ,KAAK,MAAM,IAAIC,KAAAA;EAExD,MAAMC,QAAwC,CAAC;EAC/C,KAAK,MAAME,aAAa,KAAKpB,OAAOW,OAAO,GAAG;GAC5C,MAAM,EAAEU,UAAUC,QAAQ,GAAGC,SAASH;GACtCF,MAAMG,YAAYE;EACpB;EAEA,MAAMC,mBAAmBhC,mBACvB,IAAIa,IAAI,KAAKF,WAAWQ,OAAO,CAAC,CAClC;EAEA,MAAMc,UAAwB;GAC5BX;GACAI,OAAOQ,OAAOC,KAAKT,KAAK,CAAC,CAACH,SAAS,IAAIG,QAAQD,KAAAA;EACjD;EAEA,IAAIO,iBAAiBV,QACnBW,QAAQX,SAASW,QAAQX,SACrB,GAAGW,QAAQX,OAAM,MAAOU,iBAAiBV,WACzCU,iBAAiBV;EAGvB,IAAIU,iBAAiBN,OACnBO,QAAQP,QAAQ;GAAE,GAAIO,QAAQP,SAAS,CAAC;GAAI,GAAGM,iBAAiBN;EAAM;EAGxE,IAAIM,iBAAiBI,cACnBH,QAAQG,eAAeJ,iBAAiBI;EAG1C,IAAIJ,iBAAiBK,QACnBJ,QAAQI,SAASL,iBAAiBK;EAGpC,IAAIL,iBAAiBM,2BACnBL,QAAQK,4BACNN,iBAAiBM;EAGrB,OAAOL;CACT;CAEAM,UAAUC,UAAmC;EAC3C,KAAK5B,aAAa6B,IAAID,QAAQ;EAC9B,aAAa,KAAK5B,aAAa8B,OAAOF,QAAQ;CAChD;CAEA,oBAAkC;EAChC,KAAK,MAAMA,YAAY,KAAK5B,cAC1B4B,SAAS;CAEb;CAEAI,QACEb,MACgD;EAChD,MAAMgB,KAAKC,OAAO;EAElB,KAAKxC,OAAOyC,IAAIF,IAAIhB,IAAI;EACxB,KAAKY,kBAAkB;EAEvB,OAAO;GACLO,SAASC,YAAgD;IACvD,IAAI,KAAK3C,OAAO4C,IAAIL,EAAE,GAAG;KACvB,KAAKvC,OAAOyC,IAAIF,IAAII,OAAO;KAC3B,KAAKR,kBAAkB;IACzB;GACF;GACAU,cAAc;IACZ,KAAK7C,OAAOkC,OAAOK,EAAE;IACrB,KAAKJ,kBAAkB;GACzB;EACF;CACF;CAEAW,eACEjB,QACuC;EACvC,MAAMU,KAAKC,OAAO;EAElB,MAAMO,cACJ,OAAOlB,WAAW,WAAWA,SAASA,OAAOkB;EAG/C,IAAI,EAFa,OAAOlB,WAAW,WAAWA,OAAOmB,WAAW,QAEjD;GACb,KAAK9C,cAAcuC,IAAIF,IAAIQ,WAAW;GACtC,KAAKZ,kBAAkB;EACzB;EAEA,OAAO;GACLO,SAASO,cAAoD;IAC3D,MAAMC,iBACJ,OAAOD,cAAc,WAAWA,YAAYA,UAAUF;IAIxD,IAFE,OAAOE,cAAc,WAAWA,UAAUD,WAAW,OAGrD,KAAK9C,cAAcgC,OAAOK,EAAE;SAE5B,KAAKrC,cAAcuC,IAAIF,IAAIW,cAAc;IAE3C,KAAKf,kBAAkB;GACzB;GACAU,cAAc;IACZ,KAAK3C,cAAcgC,OAAOK,EAAE;IAC5B,KAAKJ,kBAAkB;GACzB;EACF;CACF;CAEAiB,YACEC,UACoC;EACpC,MAAMd,KAAKC,OAAO;EAElB,KAAKrC,WAAWsC,IAAIF,IAAIc,QAAQ;EAEhC,MAAMC,cAAcD,SAAStB,kBAAkB;GAC7C,KAAKI,kBAAkB;EACzB,CAAC;EACD,KAAK7B,sBAAsBmC,IAAIF,IAAIe,WAAW;EAE9C,KAAKnB,kBAAkB;EAEvB,OAAO,EACLU,cAAc;GACZ,KAAK1C,WAAW+B,OAAOK,EAAE;GAEzBe,KADyBhD,sBAAsBiD,IAAIhB,EACnDe,CAAW,GAAG;GACd,KAAKhD,sBAAsB4B,OAAOK,EAAE;GACpC,KAAKJ,kBAAkB;EACzB,EACF;CACF;AACF"}
+{"version":3,"file":"registry.js","names":["Tool","ModelContext","ModelContextProvider","mergeModelContexts","AssistantToolProps","AssistantInstructionsConfig","Unsubscribe","notifySubscribers","notifyStateSubscribers","ModelContextRegistryToolHandle","ModelContextRegistryInstructionHandle","ModelContextRegistryProviderHandle","ModelContextRegistry","_tools","Map","_instructions","_providers","_subscribers","Set","_providerUnsubscribes","getModelContext","instructions","Array","from","values","filter","Boolean","system","length","join","undefined","tools","Record","toolProps","toolName","render","tool","providerContexts","context","Object","keys","callSettings","config","unstable_composerMetadata","subscribe","callback","add","delete","addTool","TArgs","TResult","id","Symbol","set","update","newTool","has","remove","addInstruction","instruction","disabled","newConfig","newInstruction","newDisabled","addProvider","provider","unsubscribe","error","notifyError","console","get"],"sources":["../../src/model-context/registry.ts"],"sourcesContent":["import type { Tool } from \"assistant-stream\";\nimport {\n  type ModelContext,\n  type ModelContextProvider,\n  mergeModelContexts,\n  type AssistantToolProps,\n  type AssistantInstructionsConfig,\n} from \"./types\";\nimport type { Unsubscribe } from \"../types/unsubscribe\";\nimport { notifySubscribers as notifyStateSubscribers } from \"../subscribable/subscribable\";\nimport type {\n  ModelContextRegistryToolHandle,\n  ModelContextRegistryInstructionHandle,\n  ModelContextRegistryProviderHandle,\n} from \"./registry-handles\";\n\nexport class ModelContextRegistry implements ModelContextProvider {\n  private _tools = new Map<symbol, AssistantToolProps<any, any>>();\n  private _instructions = new Map<symbol, string>();\n  private _providers = new Map<symbol, ModelContextProvider>();\n  private _subscribers = new Set<() => void>();\n  private _providerUnsubscribes = new Map<symbol, Unsubscribe | undefined>();\n\n  getModelContext(): ModelContext {\n    const instructions = Array.from(this._instructions.values()).filter(\n      Boolean,\n    );\n\n    const system =\n      instructions.length > 0 ? instructions.join(\"\\n\\n\") : undefined;\n\n    const tools: Record<string, Tool<any, any>> = {};\n    for (const toolProps of this._tools.values()) {\n      const { toolName, render, ...tool } = toolProps;\n      tools[toolName] = tool;\n    }\n\n    const providerContexts = mergeModelContexts(\n      new Set(this._providers.values()),\n    );\n\n    const context: ModelContext = {\n      system,\n      tools: Object.keys(tools).length > 0 ? tools : undefined,\n    };\n\n    if (providerContexts.system) {\n      context.system = context.system\n        ? `${context.system}\\n\\n${providerContexts.system}`\n        : providerContexts.system;\n    }\n\n    if (providerContexts.tools) {\n      context.tools = { ...(context.tools || {}), ...providerContexts.tools };\n    }\n\n    if (providerContexts.callSettings) {\n      context.callSettings = providerContexts.callSettings;\n    }\n\n    if (providerContexts.config) {\n      context.config = providerContexts.config;\n    }\n\n    if (providerContexts.unstable_composerMetadata) {\n      context.unstable_composerMetadata =\n        providerContexts.unstable_composerMetadata;\n    }\n\n    return context;\n  }\n\n  subscribe(callback: () => void): Unsubscribe {\n    this._subscribers.add(callback);\n    return () => this._subscribers.delete(callback);\n  }\n\n  private notifySubscribers(): void {\n    notifyStateSubscribers(this._subscribers);\n  }\n\n  addTool<TArgs extends Record<string, unknown>, TResult>(\n    tool: AssistantToolProps<TArgs, TResult>,\n  ): ModelContextRegistryToolHandle<TArgs, TResult> {\n    const id = Symbol();\n\n    this._tools.set(id, tool);\n    this.notifySubscribers();\n\n    return {\n      update: (newTool: AssistantToolProps<TArgs, TResult>) => {\n        if (this._tools.has(id)) {\n          this._tools.set(id, newTool);\n          this.notifySubscribers();\n        }\n      },\n      remove: () => {\n        this._tools.delete(id);\n        this.notifySubscribers();\n      },\n    };\n  }\n\n  addInstruction(\n    config: string | AssistantInstructionsConfig,\n  ): ModelContextRegistryInstructionHandle {\n    const id = Symbol();\n\n    const instruction =\n      typeof config === \"string\" ? config : config.instruction;\n    const disabled = typeof config === \"object\" ? config.disabled : false;\n\n    if (!disabled) {\n      this._instructions.set(id, instruction);\n      this.notifySubscribers();\n    }\n\n    return {\n      update: (newConfig: string | AssistantInstructionsConfig) => {\n        const newInstruction =\n          typeof newConfig === \"string\" ? newConfig : newConfig.instruction;\n        const newDisabled =\n          typeof newConfig === \"object\" ? newConfig.disabled : false;\n\n        if (newDisabled) {\n          this._instructions.delete(id);\n        } else {\n          this._instructions.set(id, newInstruction);\n        }\n        this.notifySubscribers();\n      },\n      remove: () => {\n        this._instructions.delete(id);\n        this.notifySubscribers();\n      },\n    };\n  }\n\n  addProvider(\n    provider: ModelContextProvider,\n  ): ModelContextRegistryProviderHandle {\n    const id = Symbol();\n\n    this._providers.set(id, provider);\n\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\n    this.notifySubscribers();\n\n    return {\n      remove: () => {\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}\n"],"mappings":"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"}

package/dist/react/RuntimeAdapter.d.ts

@@ -1,7 +1,14 @@
 import { AssistantRuntime } from "../runtime/api/assistant-runtime.js";
 import "../index.js";
+import { AssistantClient, ScopesConfig } from "@assistant-ui/store";
 //#region src/react/RuntimeAdapter.d.ts
 declare const RuntimeAdapter: import("@assistant-ui/tap").Resource<import("@assistant-ui/store").ClientOutput<"threads">, [runtime: AssistantRuntime]>;
+/**
+ * The scope defaults `RuntimeAdapter` installs when it is used as the `threads`
+ * config entry. Adapter packages that wrap a runtime in their own config entry
+ * attach this to the wrapping resource for scope parity with `RuntimeAdapter`.
+ */
+declare const runtimeAdapterTransformScopes: (scopes: ScopesConfig, parent: AssistantClient) => void;
 //#endregion
-export { RuntimeAdapter };
+export { RuntimeAdapter, runtimeAdapterTransformScopes };
 //# sourceMappingURL=RuntimeAdapter.d.ts.map

package/dist/react/RuntimeAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RuntimeAdapter.d.ts","names":[],"sources":["../../src/react/RuntimeAdapter.ts"],"mappings":";;;cA+Ba,4CAAc,uCAAA,0BAAA,SAAA"}
+{"version":3,"file":"RuntimeAdapter.d.ts","names":[],"sources":["../../src/react/RuntimeAdapter.ts"],"mappings":";;;;cAiCa,4CAAc,uCAAA,0BAAA,SAAA;;;;;;cAOd,gCACX,QAAQ,cACR,QAAQ"}

package/dist/react/RuntimeAdapter.js

@@ -3,45 +3,50 @@ import { baseRuntimeAdapterTransformScopes } from "../store/clients/runtime-adap
 import { DataRenderers } from "./client/DataRenderers.js";
 import { Tools } from "./client/Tools.js";
 import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
-import { useEffect } from "@assistant-ui/tap/react-shim";
 import { resource, useResource } from "@assistant-ui/tap";
-import { attachTransformScopes, useAssistantClientRef } from "@assistant-ui/store/client";
+import { attachTransformScopes, useAssistantClientRef, useAssistantScopeEffect } from "@assistant-ui/store/client";
 //#region src/react/RuntimeAdapter.ts
 const useRuntimeAdapter = (runtime) => {
-	const $ = c(6);
+	const $ = c(7);
 	const clientRef = useAssistantClientRef();
 	let t0;
-	let t1;
 	if ($[0] !== clientRef || $[1] !== runtime) {
 		t0 = () => runtime.registerModelContextProvider(clientRef.current.modelContext());
-		t1 = [runtime, clientRef];
 		$[0] = clientRef;
 		$[1] = runtime;
 		$[2] = t0;
-		$[3] = t1;
-	} else {
-		t0 = $[2];
-		t1 = $[3];
-	}
-	useEffect(t0, t1);
+	} else t0 = $[2];
+	let t1;
+	if ($[3] !== runtime) {
+		t1 = [runtime];
+		$[3] = runtime;
+		$[4] = t1;
+	} else t1 = $[4];
+	useAssistantScopeEffect("modelContext", t0, t1);
 	let t2;
-	if ($[4] !== runtime) {
+	if ($[5] !== runtime) {
 		t2 = ThreadListClient({
 			runtime: runtime.threads,
 			__internal_assistantRuntime: runtime
 		});
-		$[4] = runtime;
-		$[5] = t2;
-	} else t2 = $[5];
+		$[5] = runtime;
+		$[6] = t2;
+	} else t2 = $[6];
 	return useResource(t2);
 };
 const RuntimeAdapter = resource(useRuntimeAdapter);
-attachTransformScopes(useRuntimeAdapter, (scopes, parent) => {
+/**
+* The scope defaults `RuntimeAdapter` installs when it is used as the `threads`
+* config entry. Adapter packages that wrap a runtime in their own config entry
+* attach this to the wrapping resource for scope parity with `RuntimeAdapter`.
+*/
+const runtimeAdapterTransformScopes = (scopes, parent) => {
 	baseRuntimeAdapterTransformScopes(scopes, parent);
 	if (!scopes.tools && parent.tools.source === null) scopes.tools = Tools({});
 	if (!scopes.dataRenderers && parent.dataRenderers.source === null) scopes.dataRenderers = DataRenderers();
-});
+};
+attachTransformScopes(useRuntimeAdapter, runtimeAdapterTransformScopes);
 //#endregion
-export { RuntimeAdapter };
+export { RuntimeAdapter, runtimeAdapterTransformScopes };
 
 //# sourceMappingURL=RuntimeAdapter.js.map

package/dist/react/RuntimeAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"RuntimeAdapter.js","names":["useEffect","useResource","resource","AssistantRuntime","baseRuntimeAdapterTransformScopes","ThreadListClient","attachTransformScopes","useAssistantClientRef","DataRenderers","Tools","useRuntimeAdapter","runtime","$","_c","clientRef","t0","t1","registerModelContextProvider","current","modelContext","t2","threads","__internal_assistantRuntime","RuntimeAdapter","scopes","parent","tools","source","dataRenderers"],"sources":["../../src/react/RuntimeAdapter.ts"],"sourcesContent":["import { useEffect } from \"react\";\nimport { useResource, resource } from \"@assistant-ui/tap\";\nimport type { AssistantRuntime } from \"..\";\nimport {\n  baseRuntimeAdapterTransformScopes,\n  ThreadListClient,\n} from \"../store/internal\";\nimport {\n  attachTransformScopes,\n  useAssistantClientRef,\n} from \"@assistant-ui/store/client\";\nimport { DataRenderers } from \"./client/DataRenderers\";\nimport { Tools } from \"./client/Tools\";\n\nconst useRuntimeAdapter = (runtime: AssistantRuntime) => {\n  const clientRef = useAssistantClientRef();\n\n  useEffect(() => {\n    return runtime.registerModelContextProvider(\n      clientRef.current!.modelContext(),\n    );\n  }, [runtime, clientRef]);\n\n  return useResource(\n    ThreadListClient({\n      runtime: runtime.threads,\n      __internal_assistantRuntime: runtime,\n    }),\n  );\n};\n\nexport const RuntimeAdapter = resource(useRuntimeAdapter);\n\nattachTransformScopes(useRuntimeAdapter, (scopes, parent) => {\n  baseRuntimeAdapterTransformScopes(scopes, parent);\n\n  if (!scopes.tools && parent.tools.source === null) {\n    scopes.tools = Tools({});\n  }\n\n  if (!scopes.dataRenderers && parent.dataRenderers.source === null) {\n    scopes.dataRenderers = DataRenderers();\n  }\n});\n"],"mappings":";;;;;;;;;AAcA,MAAMU,qBAAoBC,YAAA;CAAA,MAAAC,IAAAC,EAAA,CAAA;CACxB,MAAAC,YAAkBP,sBAAsB;CAAE,IAAAQ;CAAA,IAAAC;CAAA,IAAAJ,EAAA,OAAAE,aAAAF,EAAA,OAAAD,SAAA;EAEhCI,WACDJ,QAAOM,6BACZH,UAASI,QAAQC,aAAe,CAClC;EACCH,KAAA,CAACL,SAASG,SAAS;EAACF,EAAA,KAAAE;EAAAF,EAAA,KAAAD;EAAAC,EAAA,KAAAG;EAAAH,EAAA,KAAAI;CAAA,OAAA;EAAAD,KAAAH,EAAA;EAAAI,KAAAJ,EAAA;CAAA;CAJvBZ,UAAUe,IAIPC,EAAoB;CAAC,IAAAI;CAAA,IAAAR,EAAA,OAAAD,SAAA;EAGtBS,KAAAf,iBAAiB;GAAAM,SACNA,QAAOU;GAAQC,6BACKX;EAC/B,CAAC;EAACC,EAAA,KAAAD;EAAAC,EAAA,KAAAQ;CAAA,OAAAA,KAAAR,EAAA;CAAA,OAJGX,YACLmB,EAIF;AAAC;AAGH,MAAaG,iBAAiBrB,SAASQ,iBAAiB;AAExDJ,sBAAsBI,oBAAoBc,QAAQC,WAAW;CAC3DrB,kCAAkCoB,QAAQC,MAAM;CAEhD,IAAI,CAACD,OAAOE,SAASD,OAAOC,MAAMC,WAAW,MAC3CH,OAAOE,QAAQjB,MAAM,CAAC,CAAC;CAGzB,IAAI,CAACe,OAAOI,iBAAiBH,OAAOG,cAAcD,WAAW,MAC3DH,OAAOI,gBAAgBpB,cAAc;AAEzC,CAAC"}
+{"version":3,"file":"RuntimeAdapter.js","names":["useResource","resource","AssistantClient","ScopesConfig","AssistantRuntime","baseRuntimeAdapterTransformScopes","ThreadListClient","attachTransformScopes","useAssistantClientRef","useAssistantScopeEffect","DataRenderers","Tools","useRuntimeAdapter","runtime","$","_c","clientRef","t0","registerModelContextProvider","current","modelContext","t1","t2","threads","__internal_assistantRuntime","RuntimeAdapter","runtimeAdapterTransformScopes","scopes","parent","tools","source","dataRenderers"],"sources":["../../src/react/RuntimeAdapter.ts"],"sourcesContent":["import { useResource, resource } from \"@assistant-ui/tap\";\nimport type { AssistantClient, ScopesConfig } from \"@assistant-ui/store\";\nimport type { AssistantRuntime } from \"..\";\nimport {\n  baseRuntimeAdapterTransformScopes,\n  ThreadListClient,\n} from \"../store/internal\";\nimport {\n  attachTransformScopes,\n  useAssistantClientRef,\n  useAssistantScopeEffect,\n} from \"@assistant-ui/store/client\";\nimport { DataRenderers } from \"./client/DataRenderers\";\nimport { Tools } from \"./client/Tools\";\n\nconst useRuntimeAdapter = (runtime: AssistantRuntime) => {\n  const clientRef = useAssistantClientRef();\n\n  useAssistantScopeEffect(\n    \"modelContext\",\n    () =>\n      runtime.registerModelContextProvider(clientRef.current!.modelContext()),\n    [runtime],\n  );\n\n  return useResource(\n    ThreadListClient({\n      runtime: runtime.threads,\n      __internal_assistantRuntime: runtime,\n    }),\n  );\n};\n\nexport const RuntimeAdapter = resource(useRuntimeAdapter);\n\n/**\n * The scope defaults `RuntimeAdapter` installs when it is used as the `threads`\n * config entry. Adapter packages that wrap a runtime in their own config entry\n * attach this to the wrapping resource for scope parity with `RuntimeAdapter`.\n */\nexport const runtimeAdapterTransformScopes = (\n  scopes: ScopesConfig,\n  parent: AssistantClient,\n): void => {\n  baseRuntimeAdapterTransformScopes(scopes, parent);\n\n  if (!scopes.tools && parent.tools.source === null) {\n    scopes.tools = Tools({});\n  }\n\n  if (!scopes.dataRenderers && parent.dataRenderers.source === null) {\n    scopes.dataRenderers = DataRenderers();\n  }\n};\n\nattachTransformScopes(useRuntimeAdapter, runtimeAdapterTransformScopes);\n"],"mappings":";;;;;;;;AAeA,MAAMY,qBAAoBC,YAAA;CAAA,MAAAC,IAAAC,EAAA,CAAA;CACxB,MAAAC,YAAkBR,sBAAsB;CAAE,IAAAS;CAAA,IAAAH,EAAA,OAAAE,aAAAF,EAAA,OAAAD,SAAA;EAIxCI,WACEJ,QAAOK,6BAA8BF,UAASG,QAAQC,aAAe,CAAC;EAACN,EAAA,KAAAE;EAAAF,EAAA,KAAAD;EAAAC,EAAA,KAAAG;CAAA,OAAAA,KAAAH,EAAA;CAAA,IAAAO;CAAA,IAAAP,EAAA,OAAAD,SAAA;EACzEQ,KAAA,CAACR,OAAO;EAACC,EAAA,KAAAD;EAAAC,EAAA,KAAAO;CAAA,OAAAA,KAAAP,EAAA;CAJXL,wBACE,gBACAQ,IAEAI,EACF;CAAC,IAAAC;CAAA,IAAAR,EAAA,OAAAD,SAAA;EAGCS,KAAAhB,iBAAiB;GAAAO,SACNA,QAAOU;GAAQC,6BACKX;EAC/B,CAAC;EAACC,EAAA,KAAAD;EAAAC,EAAA,KAAAQ;CAAA,OAAAA,KAAAR,EAAA;CAAA,OAJGd,YACLsB,EAIF;AAAC;AAGH,MAAaG,iBAAiBxB,SAASW,iBAAiB;;;;;;AAOxD,MAAac,iCACXC,QACAC,WACS;CACTvB,kCAAkCsB,QAAQC,MAAM;CAEhD,IAAI,CAACD,OAAOE,SAASD,OAAOC,MAAMC,WAAW,MAC3CH,OAAOE,QAAQlB,MAAM,CAAC,CAAC;CAGzB,IAAI,CAACgB,OAAOI,iBAAiBH,OAAOG,cAAcD,WAAW,MAC3DH,OAAOI,gBAAgBrB,cAAc;AAEzC;AAEAH,sBAAsBK,mBAAmBc,6BAA6B"}

package/dist/react/adapters/LocalStorageThreadListAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LocalStorageThreadListAdapter.d.ts","names":[],"sources":["../../../src/react/adapters/LocalStorageThreadListAdapter.tsx"],"mappings":";;;;;;KA0BY;EACV,QAAQ,cAAc;EACtB,QAAQ,aAAa,gBAAgB;EACrC,WAAW,cAAc;;KAkCtB;EACH,SAAS;EACT;EACA,iBAAiB;;KAGd;EACH;EACA;EACA;EACA;EACA,SAAS;;cAwIE,4BACX,uBACC;cAoCU,+BACX,uBACC;cA0HU,4BACX,SAAS,+BACR"}
+{"version":3,"file":"LocalStorageThreadListAdapter.d.ts","names":[],"sources":["../../../src/react/adapters/LocalStorageThreadListAdapter.tsx"],"mappings":";;;;;;KA6BY;EACV,QAAQ,cAAc;EACtB,QAAQ,aAAa,gBAAgB;EACrC,WAAW,cAAc;;KAkCtB;EACH,SAAS;EACT;EACA,iBAAiB;;KAGd;EACH;EACA;EACA;EACA;EACA,SAAS;;cAwIE,4BACX,uBACC;cAoCU,+BACX,uBACC;cAqIU,4BACX,SAAS,+BACR"}