@assistant-ui/core 0.2.18 → 0.2.19

package/dist/model-context/registry.js

@@ -26,6 +26,7 @@ var ModelContextRegistry = class {
 		};
 		if (providerContexts.callSettings) context.callSettings = providerContexts.callSettings;
 		if (providerContexts.config) context.config = providerContexts.config;
+		if (providerContexts.unstable_composerMetadata) context.unstable_composerMetadata = providerContexts.unstable_composerMetadata;
 		return context;
 	}
 	subscribe(callback) {

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","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    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":"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"}
+{"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"}

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

@@ -23,6 +23,12 @@ type ModelContext = {
   tools?: Record<string, Tool<any, any>> | undefined;
   callSettings?: LanguageModelV1CallSettings | undefined;
   config?: LanguageModelConfig | undefined;
+  /**
+   * Persisted message metadata pulled at send time and merged into the outgoing
+   * user message's `metadata.custom` (not forwarded to the model directly).
+   * Ignored by the transport, which only reads system/tools/callSettings/config.
+   */
+  unstable_composerMetadata?: Record<string, unknown> | undefined;
 };
 type ModelContextProvider = {
   getModelContext: () => ModelContext;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/model-context/types.ts"],"mappings":";;;;KAGY,2BAAA;EACV,SAAA;EACA,WAAA;EACA,IAAA;EACA,eAAA;EACA,gBAAA;EACA,IAAA;EACA,OAAA,GAAU,MAAM;AAAA;AAAA,KAGN,mBAAA;EACV,MAAA;EACA,OAAA;EACA,SAAA;EACA,eAAA;AAAA;AAAA,KAGU,YAAA;EACV,QAAA;EACA,MAAA;EACA,KAAA,GAAQ,MAAA,SAAe,IAAA;EACvB,YAAA,GAAe,2BAAA;EACf,MAAA,GAAS,mBAAA;AAAA;AAAA,KAGC,oBAAA;EACV,eAAA,QAAuB,YAAA;EACvB,SAAA,IAAa,QAAA,iBAAyB,WAAW;AAAA;AAAA,KAGvC,kBAAA,eACI,MAAA,8BAEZ,IAAA,CAAK,KAAA,EAAO,OAAA;EACd,QAAA;EACA,MAAA;AAAA;AAAA,KAGU,2BAAA;EACV,QAAA;EACA,WAAW;AAAA;AAAA,KAGD,sBAAA;EACV,UAAA;EACA,QAAQ;AAAA;AAAA,cAGG,kBAAA,GACX,SAAA,EAAW,GAAA,CAAI,oBAAA,MACd,YAAA"}
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/model-context/types.ts"],"mappings":";;;;KAGY,2BAAA;EACV,SAAA;EACA,WAAA;EACA,IAAA;EACA,eAAA;EACA,gBAAA;EACA,IAAA;EACA,OAAA,GAAU,MAAM;AAAA;AAAA,KAGN,mBAAA;EACV,MAAA;EACA,OAAA;EACA,SAAA;EACA,eAAA;AAAA;AAAA,KAGU,YAAA;EACV,QAAA;EACA,MAAA;EACA,KAAA,GAAQ,MAAA,SAAe,IAAA;EACvB,YAAA,GAAe,2BAAA;EACf,MAAA,GAAS,mBAAA;EAVT;;;;AAEe;EAcf,yBAAA,GAA4B,MAAA;AAAA;AAAA,KAGlB,oBAAA;EACV,eAAA,QAAuB,YAAA;EACvB,SAAA,IAAa,QAAA,iBAAyB,WAAW;AAAA;AAAA,KAGvC,kBAAA,eACI,MAAA,8BAEZ,IAAA,CAAK,KAAA,EAAO,OAAA;EACd,QAAA;EACA,MAAA;AAAA;AAAA,KAGU,2BAAA;EACV,QAAA;EACA,WAAW;AAAA;AAAA,KAGD,sBAAA;EACV,UAAA;EACA,QAAQ;AAAA;AAAA,cAGG,kBAAA,GACX,SAAA,EAAW,GAAA,CAAI,oBAAA,MACd,YAAA"}

package/dist/model-context/types.js

@@ -32,6 +32,10 @@ const mergeModelContexts = (configSet) => {
 			...acc.callSettings,
 			...config.callSettings
 		};
+		if (config.unstable_composerMetadata) acc.unstable_composerMetadata = {
+			...acc.unstable_composerMetadata,
+			...config.unstable_composerMetadata
+		};
 		return acc;
 	}, {});
 };

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":["Unsubscribe","Tool","LanguageModelV1CallSettings","maxTokens","temperature","topP","presencePenalty","frequencyPenalty","seed","headers","Record","LanguageModelConfig","apiKey","baseUrl","modelName","reasoningEffort","ModelContext","priority","system","tools","callSettings","config","ModelContextProvider","getModelContext","subscribe","callback","AssistantToolProps","TArgs","TResult","toolName","render","AssistantInstructionsConfig","disabled","instruction","AssistantContextConfig","getContext","mergeModelContexts","configSet","Set","configs","Array","from","map","c","sort","a","b","toolPriorities","reduce","acc","name","tool","Object","entries","existing","existingPriority","Error","higherPriorityTool","lowerPriorityTool","Math","max"],"sources":["../../src/model-context/types.ts"],"sourcesContent":["import type { Unsubscribe } from \"../types/unsubscribe\";\nimport type { Tool } from \"assistant-stream\";\n\nexport type LanguageModelV1CallSettings = {\n  maxTokens?: number;\n  temperature?: number;\n  topP?: number;\n  presencePenalty?: number;\n  frequencyPenalty?: number;\n  seed?: number;\n  headers?: Record<string, string | undefined>;\n};\n\nexport type LanguageModelConfig = {\n  apiKey?: string;\n  baseUrl?: string;\n  modelName?: string;\n  reasoningEffort?: string;\n};\n\nexport type ModelContext = {\n  priority?: number | undefined;\n  system?: string | undefined;\n  tools?: Record<string, Tool<any, any>> | undefined;\n  callSettings?: LanguageModelV1CallSettings | undefined;\n  config?: LanguageModelConfig | undefined;\n};\n\nexport type ModelContextProvider = {\n  getModelContext: () => ModelContext;\n  subscribe?: (callback: () => void) => Unsubscribe;\n};\n\nexport type AssistantToolProps<\n  TArgs extends Record<string, unknown>,\n  TResult,\n> = Tool<TArgs, TResult> & {\n  toolName: string;\n  render?: unknown;\n};\n\nexport type AssistantInstructionsConfig = {\n  disabled?: boolean | undefined;\n  instruction: string;\n};\n\nexport type AssistantContextConfig = {\n  getContext: () => string;\n  disabled?: boolean | undefined;\n};\n\nexport const mergeModelContexts = (\n  configSet: Set<ModelContextProvider>,\n): ModelContext => {\n  const configs = Array.from(configSet)\n    .map((c) => c.getModelContext())\n    .sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));\n\n  const toolPriorities: Record<string, number> = {};\n\n  return configs.reduce((acc, config) => {\n    const priority = config.priority ?? 0;\n    if (config.system) {\n      if (acc.system) {\n        acc.system += `\\n\\n${config.system}`;\n      } else {\n        acc.system = config.system;\n      }\n    }\n    if (config.tools) {\n      for (const [name, tool] of Object.entries(config.tools)) {\n        const existing = acc.tools?.[name];\n        if (existing && existing !== tool) {\n          const existingPriority = toolPriorities[name]!;\n          if (existingPriority === priority) {\n            throw new Error(\n              `You tried to define a tool with the name ${name}, but it already exists.`,\n            );\n          }\n\n          const higherPriorityTool =\n            existingPriority > priority ? existing : tool;\n          const lowerPriorityTool =\n            existingPriority > priority ? tool : existing;\n          acc.tools![name] = {\n            ...lowerPriorityTool,\n            ...higherPriorityTool,\n          } as Tool<any, any>;\n          toolPriorities[name] = Math.max(existingPriority, priority);\n          continue;\n        }\n\n        if (!acc.tools) acc.tools = {};\n        acc.tools[name] = tool;\n        toolPriorities[name] ??= priority;\n      }\n    }\n    if (config.config) {\n      acc.config = {\n        ...acc.config,\n        ...config.config,\n      };\n    }\n    if (config.callSettings) {\n      acc.callSettings = {\n        ...acc.callSettings,\n        ...config.callSettings,\n      };\n    }\n    return acc;\n  }, {} as ModelContext);\n};\n"],"mappings":";AAmDA,MAAaoC,sBACXC,cACiB;CACjB,MAAME,UAAUC,MAAMC,KAAKJ,SAAS,CAAC,CAClCK,KAAKC,MAAMA,EAAEpB,gBAAgB,CAAC,CAAC,CAC/BqB,MAAMC,GAAGC,OAAOA,EAAE7B,YAAY,MAAM4B,EAAE5B,YAAY,EAAE;CAEvD,MAAM8B,iBAAyC,CAAC;CAEhD,OAAOR,QAAQS,QAAQC,KAAK5B,WAAW;EACrC,MAAMJ,WAAWI,OAAOJ,YAAY;EACpC,IAAII,OAAOH,QACT,IAAI+B,IAAI/B,QACN+B,IAAI/B,UAAU,OAAOG,OAAOH;OAE5B+B,IAAI/B,SAASG,OAAOH;EAGxB,IAAIG,OAAOF,OACT,KAAK,MAAM,CAAC+B,MAAMC,SAASC,OAAOC,QAAQhC,OAAOF,KAAK,GAAG;GACvD,MAAMmC,WAAWL,IAAI9B,QAAQ+B;GAC7B,IAAII,YAAYA,aAAaH,MAAM;IACjC,MAAMI,mBAAmBR,eAAeG;IACxC,IAAIK,qBAAqBtC,UACvB,MAAM,IAAIuC,MACR,4CAA4CN,KAAI,yBAClD;IAGF,MAAMO,qBACJF,mBAAmBtC,WAAWqC,WAAWH;IAC3C,MAAMO,oBACJH,mBAAmBtC,WAAWkC,OAAOG;IACvCL,IAAI9B,MAAO+B,QAAQ;KACjB,GAAGQ;KACH,GAAGD;IACL;IACAV,eAAeG,QAAQS,KAAKC,IAAIL,kBAAkBtC,QAAQ;IAC1D;GACF;GAEA,IAAI,CAACgC,IAAI9B,OAAO8B,IAAI9B,QAAQ,CAAC;GAC7B8B,IAAI9B,MAAM+B,QAAQC;GAClBJ,eAAeG,UAAUjC;EAC3B;EAEF,IAAII,OAAOA,QACT4B,IAAI5B,SAAS;GACX,GAAG4B,IAAI5B;GACP,GAAGA,OAAOA;EACZ;EAEF,IAAIA,OAAOD,cACT6B,IAAI7B,eAAe;GACjB,GAAG6B,IAAI7B;GACP,GAAGC,OAAOD;EACZ;EAEF,OAAO6B;CACT,GAAG,CAAC,CAAiB;AACvB"}
+{"version":3,"file":"types.js","names":["Unsubscribe","Tool","LanguageModelV1CallSettings","maxTokens","temperature","topP","presencePenalty","frequencyPenalty","seed","headers","Record","LanguageModelConfig","apiKey","baseUrl","modelName","reasoningEffort","ModelContext","priority","system","tools","callSettings","config","unstable_composerMetadata","ModelContextProvider","getModelContext","subscribe","callback","AssistantToolProps","TArgs","TResult","toolName","render","AssistantInstructionsConfig","disabled","instruction","AssistantContextConfig","getContext","mergeModelContexts","configSet","Set","configs","Array","from","map","c","sort","a","b","toolPriorities","reduce","acc","name","tool","Object","entries","existing","existingPriority","Error","higherPriorityTool","lowerPriorityTool","Math","max"],"sources":["../../src/model-context/types.ts"],"sourcesContent":["import type { Unsubscribe } from \"../types/unsubscribe\";\nimport type { Tool } from \"assistant-stream\";\n\nexport type LanguageModelV1CallSettings = {\n  maxTokens?: number;\n  temperature?: number;\n  topP?: number;\n  presencePenalty?: number;\n  frequencyPenalty?: number;\n  seed?: number;\n  headers?: Record<string, string | undefined>;\n};\n\nexport type LanguageModelConfig = {\n  apiKey?: string;\n  baseUrl?: string;\n  modelName?: string;\n  reasoningEffort?: string;\n};\n\nexport type ModelContext = {\n  priority?: number | undefined;\n  system?: string | undefined;\n  tools?: Record<string, Tool<any, any>> | undefined;\n  callSettings?: LanguageModelV1CallSettings | undefined;\n  config?: LanguageModelConfig | undefined;\n  /**\n   * Persisted message metadata pulled at send time and merged into the outgoing\n   * user message's `metadata.custom` (not forwarded to the model directly).\n   * Ignored by the transport, which only reads system/tools/callSettings/config.\n   */\n  unstable_composerMetadata?: Record<string, unknown> | undefined;\n};\n\nexport type ModelContextProvider = {\n  getModelContext: () => ModelContext;\n  subscribe?: (callback: () => void) => Unsubscribe;\n};\n\nexport type AssistantToolProps<\n  TArgs extends Record<string, unknown>,\n  TResult,\n> = Tool<TArgs, TResult> & {\n  toolName: string;\n  render?: unknown;\n};\n\nexport type AssistantInstructionsConfig = {\n  disabled?: boolean | undefined;\n  instruction: string;\n};\n\nexport type AssistantContextConfig = {\n  getContext: () => string;\n  disabled?: boolean | undefined;\n};\n\nexport const mergeModelContexts = (\n  configSet: Set<ModelContextProvider>,\n): ModelContext => {\n  const configs = Array.from(configSet)\n    .map((c) => c.getModelContext())\n    .sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));\n\n  const toolPriorities: Record<string, number> = {};\n\n  return configs.reduce((acc, config) => {\n    const priority = config.priority ?? 0;\n    if (config.system) {\n      if (acc.system) {\n        acc.system += `\\n\\n${config.system}`;\n      } else {\n        acc.system = config.system;\n      }\n    }\n    if (config.tools) {\n      for (const [name, tool] of Object.entries(config.tools)) {\n        const existing = acc.tools?.[name];\n        if (existing && existing !== tool) {\n          const existingPriority = toolPriorities[name]!;\n          if (existingPriority === priority) {\n            throw new Error(\n              `You tried to define a tool with the name ${name}, but it already exists.`,\n            );\n          }\n\n          const higherPriorityTool =\n            existingPriority > priority ? existing : tool;\n          const lowerPriorityTool =\n            existingPriority > priority ? tool : existing;\n          acc.tools![name] = {\n            ...lowerPriorityTool,\n            ...higherPriorityTool,\n          } as Tool<any, any>;\n          toolPriorities[name] = Math.max(existingPriority, priority);\n          continue;\n        }\n\n        if (!acc.tools) acc.tools = {};\n        acc.tools[name] = tool;\n        toolPriorities[name] ??= priority;\n      }\n    }\n    if (config.config) {\n      acc.config = {\n        ...acc.config,\n        ...config.config,\n      };\n    }\n    if (config.callSettings) {\n      acc.callSettings = {\n        ...acc.callSettings,\n        ...config.callSettings,\n      };\n    }\n    if (config.unstable_composerMetadata) {\n      acc.unstable_composerMetadata = {\n        ...acc.unstable_composerMetadata,\n        ...config.unstable_composerMetadata,\n      };\n    }\n    return acc;\n  }, {} as ModelContext);\n};\n"],"mappings":";AAyDA,MAAaqC,sBACXC,cACiB;CACjB,MAAME,UAAUC,MAAMC,KAAKJ,SAAS,CAAC,CAClCK,KAAKC,MAAMA,EAAEpB,gBAAgB,CAAC,CAAC,CAC/BqB,MAAMC,GAAGC,OAAOA,EAAE9B,YAAY,MAAM6B,EAAE7B,YAAY,EAAE;CAEvD,MAAM+B,iBAAyC,CAAC;CAEhD,OAAOR,QAAQS,QAAQC,KAAK7B,WAAW;EACrC,MAAMJ,WAAWI,OAAOJ,YAAY;EACpC,IAAII,OAAOH,QACT,IAAIgC,IAAIhC,QACNgC,IAAIhC,UAAU,OAAOG,OAAOH;OAE5BgC,IAAIhC,SAASG,OAAOH;EAGxB,IAAIG,OAAOF,OACT,KAAK,MAAM,CAACgC,MAAMC,SAASC,OAAOC,QAAQjC,OAAOF,KAAK,GAAG;GACvD,MAAMoC,WAAWL,IAAI/B,QAAQgC;GAC7B,IAAII,YAAYA,aAAaH,MAAM;IACjC,MAAMI,mBAAmBR,eAAeG;IACxC,IAAIK,qBAAqBvC,UACvB,MAAM,IAAIwC,MACR,4CAA4CN,KAAI,yBAClD;IAGF,MAAMO,qBACJF,mBAAmBvC,WAAWsC,WAAWH;IAC3C,MAAMO,oBACJH,mBAAmBvC,WAAWmC,OAAOG;IACvCL,IAAI/B,MAAOgC,QAAQ;KACjB,GAAGQ;KACH,GAAGD;IACL;IACAV,eAAeG,QAAQS,KAAKC,IAAIL,kBAAkBvC,QAAQ;IAC1D;GACF;GAEA,IAAI,CAACiC,IAAI/B,OAAO+B,IAAI/B,QAAQ,CAAC;GAC7B+B,IAAI/B,MAAMgC,QAAQC;GAClBJ,eAAeG,UAAUlC;EAC3B;EAEF,IAAII,OAAOA,QACT6B,IAAI7B,SAAS;GACX,GAAG6B,IAAI7B;GACP,GAAGA,OAAOA;EACZ;EAEF,IAAIA,OAAOD,cACT8B,IAAI9B,eAAe;GACjB,GAAG8B,IAAI9B;GACP,GAAGC,OAAOD;EACZ;EAEF,IAAIC,OAAOC,2BACT4B,IAAI5B,4BAA4B;GAC9B,GAAG4B,IAAI5B;GACP,GAAGD,OAAOC;EACZ;EAEF,OAAO4B;CACT,GAAG,CAAC,CAAiB;AACvB"}

package/dist/react/AssistantProvider.d.ts

@@ -1,6 +1,6 @@
 import { AssistantRuntime } from "../runtime/api/assistant-runtime.js";
-import { ComponentType, FC, PropsWithChildren } from "react";
 import { AssistantClient } from "@assistant-ui/store";
+import { ComponentType, FC, PropsWithChildren } from "react";
 
 //#region src/react/AssistantProvider.d.ts
 declare const getRenderComponent: (runtime: AssistantRuntime) => ComponentType | undefined;

package/dist/react/AssistantProvider.js

@@ -1,6 +1,6 @@
 import { RuntimeAdapter } from "./RuntimeAdapter.js";
-import { memo } from "@assistant-ui/tap/react-shim";
 import { AuiProvider, useAui } from "@assistant-ui/store";
+import { memo } from "@assistant-ui/tap/react-shim";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region src/react/AssistantProvider.tsx
 const getRenderComponent = (runtime) => {

package/dist/react/AssistantRuntimeProvider.d.ts

@@ -1,6 +1,6 @@
 import { AssistantRuntime } from "../runtime/api/assistant-runtime.js";
-import { ReactNode } from "react";
 import { AssistantClient } from "@assistant-ui/store";
+import { ReactNode } from "react";
 
 //#region src/react/AssistantRuntimeProvider.d.ts
 /**

package/dist/react/RuntimeAdapter.js

@@ -2,8 +2,8 @@ import { ThreadListClient } from "../store/runtime-clients/thread-list-runtime-c
 import { baseRuntimeAdapterTransformScopes } from "../store/clients/runtime-adapter.js";
 import { DataRenderers } from "./client/DataRenderers.js";
 import { Tools } from "./client/Tools.js";
-import { useEffect } from "@assistant-ui/tap/react-shim";
 import { attachTransformScopes, useAssistantClientRef } from "@assistant-ui/store";
+import { useEffect } from "@assistant-ui/tap/react-shim";
 import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
 import { resource, useResource } from "@assistant-ui/tap";
 //#region src/react/RuntimeAdapter.ts

package/dist/react/client/Interactables.d.ts

@@ -1,7 +1,13 @@
+import { Unstable_InteractablesConfig } from "../types/scopes/interactables.js";
 import { ClientOutput } from "@assistant-ui/store";
 
 //#region src/react/client/Interactables.d.ts
-declare const Interactables: import("@assistant-ui/tap").Resource<ClientOutput<"interactables">, []>;
+/**
+ * Registers the unstable interactables store scope.
+ *
+ * @deprecated Unstable / Experimental (not actually removed).
+ */
+declare const unstable_Interactables: import("@assistant-ui/tap").Resource<ClientOutput<"unstable_interactables">, [(Unstable_InteractablesConfig | undefined)?]>;
 //#endregion
-export { Interactables };
+export { unstable_Interactables };
 //# sourceMappingURL=Interactables.d.ts.map

package/dist/react/client/Interactables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Interactables.d.ts","names":[],"sources":["../../../src/react/client/Interactables.ts"],"mappings":";;;cAgUa,aAAA,8BAAa,QAAA,CAAA,YAAA"}
+{"version":3,"file":"Interactables.d.ts","names":[],"sources":["../../../src/react/client/Interactables.ts"],"mappings":";;;;;;AA6jBA;;;cAAa,sBAAA,8BAAsB,QAAA,CAAA,YAAA,8BAAA,4BAAA"}

package/dist/react/client/Interactables.js

@@ -1,30 +1,55 @@
+import { findModelKnownState, interactableToolName } from "../../model-context/interactable-composer-metadata.js";
 import { ModelContext } from "../../store/clients/model-context-client.js";
 import { buildInteractableModelContext } from "./interactable-model-context.js";
 import { toJSONSchema, toPartialJSONSchema } from "assistant-stream";
-import { useCallback, useEffect, useMemo, useRef, useState } from "@assistant-ui/tap/react-shim";
 import { attachTransformScopes, useAssistantClientRef } from "@assistant-ui/store";
+import { useCallback, useEffect, useMemo, useRef, useState } from "@assistant-ui/tap/react-shim";
 import { resource } from "@assistant-ui/tap";
 //#region src/react/client/Interactables.ts
 const PERSISTENCE_DEBOUNCE_MS = 500;
-const useInteractables = () => {
+const hasInteractableCreateCall = (messages, id, name) => messages.some((message) => message.role === "assistant" && message.content?.some((part) => {
+	if (!part || typeof part !== "object") return false;
+	const p = part;
+	return p.type === "tool-call" && p.toolCallId === id && p.toolName === name;
+}));
+const useInteractablesResource = ({ persistence } = {}) => {
 	const [state, setState] = useState(() => ({
 		definitions: {},
 		persistence: {}
 	}));
 	const clientRef = useAssistantClientRef();
 	const stateRef = useRef(state);
-	useEffect(() => {
-		stateRef.current = state;
-	}, [state]);
 	const subscribersRef = useRef(/* @__PURE__ */ new Set());
 	const partialSchemaCacheRef = useRef(/* @__PURE__ */ new Map());
-	const detachedStateRef = useRef(/* @__PURE__ */ new Map());
+	const streamBaselinesRef = useRef(/* @__PURE__ */ new Map());
+	const detachedAppStateRef = useRef(/* @__PURE__ */ new Map());
+	const detachedThreadStateRef = useRef(/* @__PURE__ */ new Map());
+	const registrationCountsRef = useRef(/* @__PURE__ */ new Map());
+	const updateToolUIsRef = useRef(/* @__PURE__ */ new Map());
+	const loadedStateRef = useRef(/* @__PURE__ */ new Map());
+	const touchedIdsRef = useRef(/* @__PURE__ */ new Set());
 	const adapterRef = useRef(void 0);
 	const debounceTimerRef = useRef(void 0);
 	const syncSeqRef = useRef(0);
 	const hasPendingLocalChangeRef = useRef(false);
 	const flushResolversRef = useRef([]);
 	const dirtyIdsRef = useRef(/* @__PURE__ */ new Set());
+	const setStateAndRef = useCallback((updater) => {
+		const next = updater(stateRef.current);
+		stateRef.current = next;
+		setState(next);
+	}, []);
+	const exportState = useCallback(() => {
+		const result = {};
+		for (const [id, def] of Object.entries(stateRef.current.definitions)) {
+			if (def.scope === "thread") continue;
+			result[id] = {
+				name: def.name,
+				state: def.state
+			};
+		}
+		return result;
+	}, []);
 	const runPersistence = useCallback(async () => {
 		const adapter = adapterRef.current;
 		if (!adapter) {
@@ -36,13 +61,8 @@ const useInteractables = () => {
 		const dirtyIds = new Set(dirtyIdsRef.current);
 		dirtyIdsRef.current.clear();
 		hasPendingLocalChangeRef.current = true;
-		const exported = stateRef.current.definitions;
-		const payload = {};
-		for (const [id, def] of Object.entries(exported)) payload[id] = {
-			name: def.name,
-			state: def.state
-		};
-		setState((prev) => ({
+		const payload = exportState();
+		setStateAndRef((prev) => ({
 			...prev,
 			persistence: {
 				...prev.persistence,
@@ -56,19 +76,19 @@ const useInteractables = () => {
 			await adapter.save(payload);
 			if (syncSeqRef.current === seq) {
 				hasPendingLocalChangeRef.current = false;
-				setState((prev_1) => {
-					const persistence = { ...prev_1.persistence };
-					for (const id_2 of dirtyIds) delete persistence[id_2];
+				setStateAndRef((prev_1) => {
+					const persistence_0 = { ...prev_1.persistence };
+					for (const id_2 of dirtyIds) delete persistence_0[id_2];
 					return {
 						...prev_1,
-						persistence
+						persistence: persistence_0
 					};
 				});
 			}
 		} catch (e) {
 			if (syncSeqRef.current === seq) {
 				hasPendingLocalChangeRef.current = false;
-				setState((prev_0) => ({
+				setStateAndRef((prev_0) => ({
 					...prev_0,
 					persistence: {
 						...prev_0.persistence,
@@ -86,7 +106,7 @@ const useInteractables = () => {
 				flushResolversRef.current = [];
 			}
 		}
-	}, []);
+	}, [exportState, setStateAndRef]);
 	const schedulePersistence = useCallback((id_3) => {
 		if (!adapterRef.current) return;
 		dirtyIdsRef.current.add(id_3);
@@ -100,35 +120,68 @@ const useInteractables = () => {
 			}, PERSISTENCE_DEBOUNCE_MS);
 		}, PERSISTENCE_DEBOUNCE_MS);
 	}, [runPersistence]);
-	const exportState = useCallback(() => {
-		const result = {};
-		for (const [id_4, def_0] of Object.entries(stateRef.current.definitions)) result[id_4] = {
-			name: def_0.name,
-			state: def_0.state
-		};
-		return result;
-	}, []);
-	const importState = useCallback((saved) => {
-		for (const [id_5, entry] of Object.entries(saved)) detachedStateRef.current.set(id_5, entry.state);
-		setState((prev_2) => {
+	const restorePersistedState = useCallback((saved, options) => {
+		const shouldStash = options.shouldStash ?? (() => true);
+		const shouldApply = options.shouldApply ?? (() => true);
+		for (const [id_4, entry] of Object.entries(saved)) if (shouldStash(id_4)) options.stash.set(id_4, entry.state);
+		setStateAndRef((prev_2) => {
 			let changed = false;
 			const definitions = { ...prev_2.definitions };
-			for (const [id_6, entry_0] of Object.entries(saved)) if (definitions[id_6]) {
-				definitions[id_6] = {
-					...definitions[id_6],
+			for (const [id_5, entry_0] of Object.entries(saved)) {
+				const def_0 = definitions[id_5];
+				if (!def_0 || !shouldApply(id_5, def_0)) continue;
+				definitions[id_5] = {
+					...def_0,
 					state: entry_0.state
 				};
 				changed = true;
 			}
-			return changed ? {
+			if (!changed) return prev_2;
+			return {
 				...prev_2,
 				definitions
-			} : prev_2;
+			};
 		});
-	}, []);
-	const setPersistenceAdapter = useCallback((adapter_0) => {
-		adapterRef.current = adapter_0;
-	}, []);
+	}, [setStateAndRef]);
+	const importState = useCallback((saved_0) => {
+		restorePersistedState(saved_0, { stash: detachedAppStateRef.current });
+	}, [restorePersistedState]);
+	const applyLoadedState = useCallback((saved_1) => {
+		restorePersistedState(saved_1, {
+			stash: loadedStateRef.current,
+			shouldStash: (id_6) => !touchedIdsRef.current.has(id_6),
+			shouldApply: (id_7, def_1) => !touchedIdsRef.current.has(id_7) && def_1.scope !== "thread"
+		});
+	}, [restorePersistedState]);
+	const loadFromAdapter = useCallback(async (adapter_0) => {
+		if (!adapter_0.load) return;
+		try {
+			const saved_2 = await adapter_0.load();
+			if (!saved_2 || adapterRef.current !== adapter_0) return;
+			applyLoadedState(saved_2);
+		} catch (e_0) {
+			console.warn("[Interactables] Persistence load failed.", e_0);
+		}
+	}, [applyLoadedState]);
+	const setPersistenceAdapter = useCallback((adapter_1) => {
+		adapterRef.current = adapter_1;
+		if (adapter_1) loadFromAdapter(adapter_1);
+	}, [loadFromAdapter]);
+	const getCurrentThreadId = useCallback(() => {
+		const client = clientRef.current;
+		if (!client) return void 0;
+		const threadListItem = client.threadListItem;
+		if (threadListItem.source != null) return threadListItem().getState().id;
+		const threads = client.threads;
+		if (threads.source != null) return threads().getState().mainThreadId;
+	}, [clientRef]);
+	useEffect(() => {
+		if (!persistence) return;
+		setPersistenceAdapter(persistence);
+		return () => {
+			if (adapterRef.current === persistence) adapterRef.current = void 0;
+		};
+	}, [persistence, setPersistenceAdapter]);
 	const flush = useCallback(async () => {
 		if (debounceTimerRef.current !== void 0) {
 			clearTimeout(debounceTimerRef.current);
@@ -149,43 +202,28 @@ const useInteractables = () => {
 			runPersistence();
 		}
 	}, [runPersistence]);
-	const setDefState = useCallback((id_7, updater) => {
-		setState((prev_3) => {
-			const existing = prev_3.definitions[id_7];
+	const setDefState = useCallback((id_8, updater_0) => {
+		touchedIdsRef.current.add(id_8);
+		setStateAndRef((prev_3) => {
+			const existing = prev_3.definitions[id_8];
 			if (!existing) return prev_3;
 			return {
 				...prev_3,
 				definitions: {
 					...prev_3.definitions,
-					[id_7]: {
-						...existing,
-						state: updater(existing.state)
-					}
-				}
-			};
-		});
-		if (stateRef.current.definitions[id_7]) schedulePersistence(id_7);
-	}, [schedulePersistence]);
-	const setDefSelected = useCallback((id_8, selected) => {
-		setState((prev_4) => {
-			const existing_0 = prev_4.definitions[id_8];
-			if (!existing_0) return prev_4;
-			return {
-				...prev_4,
-				definitions: {
-					...prev_4.definitions,
 					[id_8]: {
-						...existing_0,
-						selected
+						...existing,
+						state: updater_0(existing.state)
 					}
 				}
 			};
 		});
-	}, []);
+		if (stateRef.current.definitions[id_8]?.scope !== "thread") schedulePersistence(id_8);
+	}, [schedulePersistence, setStateAndRef]);
 	const provider = useMemo(() => ({
 		getModelContext: () => {
 			const defs = stateRef.current.definitions;
-			return buildInteractableModelContext(defs, partialSchemaCacheRef.current, setDefState) ?? {};
+			return buildInteractableModelContext(defs, partialSchemaCacheRef.current, setDefState, streamBaselinesRef.current) ?? {};
 		},
 		subscribe: (callback) => {
 			subscribersRef.current.add(callback);
@@ -201,59 +239,117 @@ const useInteractables = () => {
 		return clientRef.current.modelContext().register(provider);
 	}, [clientRef, provider]);
 	return {
-		getState: () => state,
-		register: useCallback((def_1) => {
-			try {
-				const jsonSchema = toJSONSchema(def_1.stateSchema);
-				partialSchemaCacheRef.current.set(def_1.id, toPartialJSONSchema(jsonSchema));
-			} catch (e_0) {
-				console.warn(`[Interactables] Failed to create partial schema for "${def_1.name}". The update tool will require all fields.`, e_0);
+		getState: () => stateRef.current,
+		register: useCallback((def_2) => {
+			const threadAccessor = clientRef.current?.thread;
+			const threadMessages = threadAccessor && threadAccessor.source != null ? threadAccessor().getState().messages ?? [] : [];
+			const scope = def_2.scope ?? (hasInteractableCreateCall(threadMessages, def_2.id, def_2.name) ? "thread" : "app");
+			if (process.env.NODE_ENV !== "production" && stateRef.current.definitions[def_2.id] && scope !== "thread") console.warn(`[Interactables] "${def_2.name}" (${def_2.id}) is already registered. Register an app-scoped interactable once (unstable_useInteractable) and read it from other components with unstable_useInteractableState.`);
+			registrationCountsRef.current.set(def_2.id, (registrationCountsRef.current.get(def_2.id) ?? 0) + 1);
+			let releaseUpdateToolUI;
+			if (def_2.updateRender) {
+				const toolsAccessor = clientRef.current?.tools;
+				if (toolsAccessor && toolsAccessor.source != null) {
+					const toolName = interactableToolName(def_2.name);
+					const existing_0 = updateToolUIsRef.current.get(def_2.name);
+					if (existing_0) existing_0.count++;
+					else updateToolUIsRef.current.set(def_2.name, {
+						count: 1,
+						unsubscribe: toolsAccessor().setToolUI(toolName, def_2.updateRender, { standalone: true })
+					});
+					releaseUpdateToolUI = () => {
+						const entry_1 = updateToolUIsRef.current.get(def_2.name);
+						if (!entry_1) return;
+						if (--entry_1.count === 0) {
+							updateToolUIsRef.current.delete(def_2.name);
+							entry_1.unsubscribe();
+						}
+					};
+				} else if (process.env.NODE_ENV !== "production") console.warn(`[Interactables] "${def_2.name}" supplied an updateRender, but no tools scope is available to install it into.`);
+			}
+			if (!partialSchemaCacheRef.current.has(def_2.id)) try {
+				const jsonSchema = toJSONSchema(def_2.stateSchema);
+				partialSchemaCacheRef.current.set(def_2.id, toPartialJSONSchema(jsonSchema));
+			} catch (e_1) {
+				console.warn(`[Interactables] Failed to create partial schema for "${def_2.name}". The update tool will accept arbitrary fields without validation.`, e_1);
 			}
-			const detached = detachedStateRef.current.get(def_1.id);
-			detachedStateRef.current.delete(def_1.id);
-			setState((prev_5) => ({
-				...prev_5,
+			const threadId = scope === "thread" ? getCurrentThreadId() : void 0;
+			const detached = scope === "thread" ? threadId ? detachedThreadStateRef.current.get(threadId)?.get(def_2.id) : void 0 : detachedAppStateRef.current.get(def_2.id);
+			if (scope === "thread") {
+				if (threadId) detachedThreadStateRef.current.get(threadId)?.delete(def_2.id);
+			} else detachedAppStateRef.current.delete(def_2.id);
+			const loaded = scope === "thread" ? void 0 : loadedStateRef.current.get(def_2.id);
+			const known = scope === "thread" ? findModelKnownState(threadMessages, def_2.id, def_2.name) : void 0;
+			setStateAndRef((prev_4) => ({
+				...prev_4,
 				definitions: {
-					...prev_5.definitions,
-					[def_1.id]: {
-						id: def_1.id,
-						name: def_1.name,
-						description: def_1.description,
-						stateSchema: def_1.stateSchema,
-						state: prev_5.definitions[def_1.id]?.state ?? detached ?? def_1.initialState,
-						selected: def_1.selected
+					...prev_4.definitions,
+					[def_2.id]: {
+						id: def_2.id,
+						name: def_2.name,
+						description: def_2.description,
+						stateSchema: def_2.stateSchema,
+						initialState: def_2.initialState,
+						scope,
+						state: prev_4.definitions[def_2.id]?.state ?? detached ?? known?.state ?? loaded ?? def_2.initialState
 					}
 				}
 			}));
 			return () => {
+				releaseUpdateToolUI?.();
+				const remaining = (registrationCountsRef.current.get(def_2.id) ?? 1) - 1;
+				if (remaining > 0) {
+					registrationCountsRef.current.set(def_2.id, remaining);
+					return;
+				}
+				registrationCountsRef.current.delete(def_2.id);
 				flushIfPending();
-				setState((prev_6) => {
-					const existing_1 = prev_6.definitions[def_1.id];
-					if (existing_1) detachedStateRef.current.set(def_1.id, existing_1.state);
-					partialSchemaCacheRef.current.delete(def_1.id);
-					const { [def_1.id]: _, ...rest } = prev_6.definitions;
-					const { [def_1.id]: __, ...restPersistence } = prev_6.persistence;
+				setStateAndRef((prev_5) => {
+					const existing_1 = prev_5.definitions[def_2.id];
+					if (existing_1) if (existing_1.scope === "thread") {
+						const threadId_0 = getCurrentThreadId();
+						if (threadId_0) {
+							let stateById = detachedThreadStateRef.current.get(threadId_0);
+							if (!stateById) {
+								stateById = /* @__PURE__ */ new Map();
+								detachedThreadStateRef.current.set(threadId_0, stateById);
+							}
+							stateById.set(def_2.id, existing_1.state);
+						}
+					} else detachedAppStateRef.current.set(def_2.id, existing_1.state);
+					partialSchemaCacheRef.current.delete(def_2.id);
+					const { [def_2.id]: _, ...rest } = prev_5.definitions;
+					const { [def_2.id]: __, ...restPersistence } = prev_5.persistence;
 					return {
-						...prev_6,
+						...prev_5,
 						definitions: rest,
 						persistence: restPersistence
 					};
 				});
 			};
-		}, [flushIfPending]),
+		}, [
+			flushIfPending,
+			clientRef,
+			getCurrentThreadId,
+			setStateAndRef
+		]),
 		setState: setDefState,
-		setSelected: setDefSelected,
 		exportState,
 		importState,
 		setPersistenceAdapter,
 		flush
 	};
 };
-const Interactables = resource(useInteractables);
-attachTransformScopes(useInteractables, (scopes, parent) => {
+/**
+* Registers the unstable interactables store scope.
+*
+* @deprecated Unstable / Experimental (not actually removed).
+*/
+const unstable_Interactables = resource(useInteractablesResource);
+attachTransformScopes(useInteractablesResource, (scopes, parent) => {
 	if (!scopes.modelContext && parent.modelContext.source === null) scopes.modelContext = ModelContext();
 });
 //#endregion
-export { Interactables };
+export { unstable_Interactables };
 
 //# sourceMappingURL=Interactables.js.map