@assistant-ui/react 0.11.48 → 0.11.50

package/dist/utils/tap-store/derived-scopes.d.ts

@@ -25,7 +25,7 @@ type AssistantApiFieldNames = {
 /**
  * Configuration for a derived scope field - infers types from the actual values provided
  */
-export type DerivedScopeConfig<TSource extends string | null, TQuery, TApi> = {
+export type DerivedConfig<TSource extends string | null, TQuery, TApi> = {
     source: TSource;
     query: TQuery;
     get: () => TApi;
@@ -38,17 +38,12 @@ export type OnCallbackFn = <TEvent extends AssistantEvent>(selector: AssistantEv
  * Type for the special `subscribe` callback function
  */
 export type SubscribeCallbackFn = (listener: () => void) => Unsubscribe;
-/**
- * Type for the special `flushSync` callback function
- */
-export type FlushSyncCallbackFn = () => void;
 /**
  * Type for special non-field functions in AssistantApi
  */
 export type SpecialCallbacks = {
     on?: OnCallbackFn;
     subscribe?: SubscribeCallbackFn;
-    flushSync?: FlushSyncCallbackFn;
 };
 /**
  * Type for the scopes parameter - allows both DerivedScope elements and special callbacks.
@@ -67,12 +62,10 @@ export type DerivedScopesInput = {
  * TypeScript infers TSource, TQuery, and TApi from the config object.
  * Validation happens at the DerivedScopesInput level.
  */
-export declare const DerivedScope: <TSource extends string | null, TQuery, TApi>(props: DerivedScopeConfig<TSource, TQuery, TApi>, options?: {
-    key?: string | number;
-} | undefined) => ResourceElement<AssistantApiField<TApi, {
+export declare const DerivedScope: <TSource extends string | null, TQuery, TApi>(props: DerivedConfig<TSource, TQuery, TApi>) => ResourceElement<AssistantApiField<TApi, {
     source: TSource;
     query: TQuery;
-}>, DerivedScopeConfig<TSource, TQuery, TApi>>;
+}>, DerivedConfig<TSource, TQuery, TApi>>;
 /**
  * DerivedScopes resource - takes an object of DerivedScope resource elements and special callbacks,
  * and returns a Partial<AssistantApi> with all the derived fields.

package/dist/utils/tap-store/derived-scopes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derived-scopes.d.ts","sourceRoot":"","sources":["../../../src/utils/tap-store/derived-scopes.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EAClB,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;GAEG;AACH,KAAK,cAAc,CAAC,CAAC,IACnB,CAAC,SAAS,iBAAiB,CAAC,MAAM,IAAI,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAE9D;;;;;GAKG;AACH,KAAK,WAAW,CAAC,CAAC,IAChB,CAAC,SAAS,iBAAiB,CAAC,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC;AAEhE;;GAEG;AACH,KAAK,sBAAsB,GAAG;KAC3B,CAAC,IAAI,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,SAAS;QAAE,MAAM,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,GAC1E,CAAC,GACD,KAAK;CACV,CAAC,MAAM,YAAY,CAAC,CAAC;AAEtB;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,IAAI;IAC5E,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,IAAI,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,SAAS,cAAc,EACvD,QAAQ,EAAE,sBAAsB,CAAC,MAAM,CAAC,EACxC,QAAQ,EAAE,sBAAsB,CAAC,MAAM,CAAC,KACrC,WAAW,CAAC;AAEjB;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,WAAW,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC;AAE7C;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE,YAAY,CAAC;IAClB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG;KAC9B,CAAC,IAAI,sBAAsB,CAAC,CAAC,EAAE,eAAe,CAC7C,iBAAiB,CACf,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAC/B;QACE,MAAM,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC/C,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;KAC9C,CACF,CACF;CACF,GAAG,gBAAgB,CAAC;AAErB;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GACtB,OAAO,SAAS,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI;;;YAKhC,OAAO;WACR,MAAM;8CAgBlB,CAAC;AAmBF;;;GAGG;AACH,eAAO,MAAM,aAAa,iFAyCzB,CAAC"}
+{"version":3,"file":"derived-scopes.d.ts","sourceRoot":"","sources":["../../../src/utils/tap-store/derived-scopes.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EAClB,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;GAEG;AACH,KAAK,cAAc,CAAC,CAAC,IACnB,CAAC,SAAS,iBAAiB,CAAC,MAAM,IAAI,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAE9D;;;;;GAKG;AACH,KAAK,WAAW,CAAC,CAAC,IAChB,CAAC,SAAS,iBAAiB,CAAC,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC;AAEhE;;GAEG;AACH,KAAK,sBAAsB,GAAG;KAC3B,CAAC,IAAI,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,SAAS;QAAE,MAAM,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,GAC1E,CAAC,GACD,KAAK;CACV,CAAC,MAAM,YAAY,CAAC,CAAC;AAEtB;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,OAAO,SAAS,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,IAAI;IACvE,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,IAAI,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,SAAS,cAAc,EACvD,QAAQ,EAAE,sBAAsB,CAAC,MAAM,CAAC,EACxC,QAAQ,EAAE,sBAAsB,CAAC,MAAM,CAAC,KACrC,WAAW,CAAC;AAEjB;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,WAAW,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE,YAAY,CAAC;IAClB,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG;KAC9B,CAAC,IAAI,sBAAsB,CAAC,CAAC,EAAE,eAAe,CAC7C,iBAAiB,CACf,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAC/B;QACE,MAAM,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC/C,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;KAC9C,CACF,CACF;CACF,GAAG,gBAAgB,CAAC;AAErB;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GACtB,OAAO,SAAS,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI;YAKhC,OAAO;WACR,MAAM;yCAgBlB,CAAC;AAmBF;;;GAGG;AACH,eAAO,MAAM,aAAa,iFAoCzB,CAAC"}

package/dist/utils/tap-store/derived-scopes.js

@@ -28,36 +28,30 @@ var ScopeFieldWithNameResource = resource(
 );
 var DerivedScopes = resource(
   (scopes) => {
-    const { on, subscribe, flushSync, ...scopeFields } = scopes;
-    const callbacksRef = tapRef({ on, subscribe, flushSync });
+    const { on, subscribe, ...scopeFields } = scopes;
+    const callbacksRef = tapRef({ on, subscribe });
     tapEffect(() => {
-      callbacksRef.current = { on, subscribe, flushSync };
+      callbacksRef.current = { on, subscribe };
     });
     const results = tapResources(
-      Object.entries(scopeFields).map(
-        ([fieldName, scopeElement]) => ScopeFieldWithNameResource(
-          {
-            fieldName,
-            scopeElement
-          },
-          { key: fieldName }
-        )
-      )
+      scopeFields,
+      (scopeElement, fieldName) => ScopeFieldWithNameResource({
+        fieldName,
+        scopeElement
+      }),
+      []
     );
     return tapMemo(() => {
-      const result = Object.fromEntries(results);
-      const {
-        on: onCb,
-        subscribe: subCb,
-        flushSync: flushCb
-      } = callbacksRef.current;
+      const result = Object.fromEntries(
+        Object.values(results)
+      );
+      const { on: onCb, subscribe: subCb } = callbacksRef.current;
       if (onCb) {
         result.on = (selector, callback) => onCb(selector, callback);
       }
       if (subCb) result.subscribe = (listener) => subCb(listener);
-      if (flushCb) result.flushSync = () => flushCb();
       return result;
-    }, [...results]);
+    }, [results]);
   }
 );
 export {

package/dist/utils/tap-store/derived-scopes.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/tap-store/derived-scopes.ts"],"sourcesContent":["import { resource, tapEffect } from \"@assistant-ui/tap\";\nimport { tapMemo, tapRef, tapResource, tapResources } from \"@assistant-ui/tap\";\nimport { createAssistantApiField } from \"../../context/react/AssistantApiContext\";\nimport type {\n  AssistantApi,\n  AssistantApiField,\n} from \"../../context/react/AssistantApiContext\";\nimport type {\n  AssistantEvent,\n  AssistantEventCallback,\n  AssistantEventSelector,\n} from \"../../types/EventTypes\";\nimport type { ResourceElement } from \"@assistant-ui/tap\";\nimport { Unsubscribe } from \"../../types\";\n\n/**\n * Extract the API return type from an AssistantApiField\n */\ntype ExtractApiType<T> =\n  T extends AssistantApiField<infer TApi, any> ? TApi : never;\n\n/**\n * Extract the metadata type from an AssistantApiField\n *\n * Used in DerivedScopesInput to validate that each field's source/query types match\n * the expected types from AssistantApi.\n */\ntype ExtractMeta<T> =\n  T extends AssistantApiField<any, infer TMeta> ? TMeta : never;\n\n/**\n * Get only the field names from AssistantApi (exclude method names)\n */\ntype AssistantApiFieldNames = {\n  [K in keyof AssistantApi]: AssistantApi[K] extends { source: any; query: any }\n    ? K\n    : never;\n}[keyof AssistantApi];\n\n/**\n * Configuration for a derived scope field - infers types from the actual values provided\n */\nexport type DerivedScopeConfig<TSource extends string | null, TQuery, TApi> = {\n  source: TSource;\n  query: TQuery;\n  get: () => TApi;\n};\n\n/**\n * Type for the special `on` callback function\n */\nexport type OnCallbackFn = <TEvent extends AssistantEvent>(\n  selector: AssistantEventSelector<TEvent>,\n  callback: AssistantEventCallback<TEvent>,\n) => Unsubscribe;\n\n/**\n * Type for the special `subscribe` callback function\n */\nexport type SubscribeCallbackFn = (listener: () => void) => Unsubscribe;\n\n/**\n * Type for the special `flushSync` callback function\n */\nexport type FlushSyncCallbackFn = () => void;\n\n/**\n * Type for special non-field functions in AssistantApi\n */\nexport type SpecialCallbacks = {\n  on?: OnCallbackFn;\n  subscribe?: SubscribeCallbackFn;\n  flushSync?: FlushSyncCallbackFn;\n};\n\n/**\n * Type for the scopes parameter - allows both DerivedScope elements and special callbacks.\n * Field names are restricted to valid AssistantApi field names.\n * TypeScript validates that the source/query/get types match the expected field type.\n */\nexport type DerivedScopesInput = {\n  [K in AssistantApiFieldNames]?: ResourceElement<\n    AssistantApiField<\n      ExtractApiType<AssistantApi[K]>,\n      {\n        source: ExtractMeta<AssistantApi[K]>[\"source\"];\n        query: ExtractMeta<AssistantApi[K]>[\"query\"];\n      }\n    >\n  >;\n} & SpecialCallbacks;\n\n/**\n * DerivedScope resource - memoizes an AssistantApiField based on source and query.\n * The get callback always calls the most recent version (useEffectEvent pattern).\n * TypeScript infers TSource, TQuery, and TApi from the config object.\n * Validation happens at the DerivedScopesInput level.\n */\nexport const DerivedScope = resource(\n  <TSource extends string | null, TQuery, TApi>(\n    config: DerivedScopeConfig<TSource, TQuery, TApi>,\n  ): AssistantApiField<\n    TApi,\n    {\n      source: TSource;\n      query: TQuery;\n    }\n  > => {\n    const getRef = tapRef(config.get);\n    tapEffect(() => {\n      getRef.current = config.get;\n    });\n\n    return tapMemo(() => {\n      return createAssistantApiField({\n        source: config.source,\n        query: config.query,\n        get: () => getRef.current(),\n      });\n    }, [config.source, JSON.stringify(config.query)]);\n  },\n);\n\n/**\n * Helper resource to wrap each scope field - stable resource identity for proper memoization.\n * Creating this outside the map ensures tapResources can properly track and memoize each field.\n */\nconst ScopeFieldWithNameResource = resource(\n  (config: {\n    fieldName: string;\n    scopeElement: ReturnType<typeof DerivedScope>;\n  }) => {\n    const field = tapResource(config.scopeElement);\n    return tapMemo(\n      () => [config.fieldName, field] as const,\n      [config.fieldName, field],\n    );\n  },\n);\n\n/**\n * DerivedScopes resource - takes an object of DerivedScope resource elements and special callbacks,\n * and returns a Partial<AssistantApi> with all the derived fields.\n */\nexport const DerivedScopes = resource(\n  (scopes: DerivedScopesInput): Partial<AssistantApi> => {\n    const { on, subscribe, flushSync, ...scopeFields } = scopes;\n    const callbacksRef = tapRef({ on, subscribe, flushSync });\n    tapEffect(() => {\n      callbacksRef.current = { on, subscribe, flushSync };\n    });\n\n    const results = tapResources(\n      Object.entries(scopeFields).map(([fieldName, scopeElement]) =>\n        ScopeFieldWithNameResource(\n          {\n            fieldName,\n            scopeElement: scopeElement as ReturnType<typeof DerivedScope>,\n          },\n          { key: fieldName },\n        ),\n      ),\n    );\n\n    return tapMemo(() => {\n      const result = Object.fromEntries(results) as Partial<AssistantApi>;\n\n      const {\n        on: onCb,\n        subscribe: subCb,\n        flushSync: flushCb,\n      } = callbacksRef.current;\n\n      if (onCb) {\n        result.on = <TEvent extends AssistantEvent>(\n          selector: AssistantEventSelector<TEvent>,\n          callback: AssistantEventCallback<TEvent>,\n        ) => onCb(selector, callback);\n      }\n      if (subCb) result.subscribe = (listener) => subCb(listener);\n      if (flushCb) result.flushSync = () => flushCb();\n\n      return result;\n    }, [...results]);\n  },\n);\n"],"mappings":";AAAA,SAAS,UAAU,iBAAiB;AACpC,SAAS,SAAS,QAAQ,aAAa,oBAAoB;AAC3D,SAAS,+BAA+B;AAgGjC,IAAM,eAAe;AAAA,EAC1B,CACE,WAOG;AACH,UAAM,SAAS,OAAO,OAAO,GAAG;AAChC,cAAU,MAAM;AACd,aAAO,UAAU,OAAO;AAAA,IAC1B,CAAC;AAED,WAAO,QAAQ,MAAM;AACnB,aAAO,wBAAwB;AAAA,QAC7B,QAAQ,OAAO;AAAA,QACf,OAAO,OAAO;AAAA,QACd,KAAK,MAAM,OAAO,QAAQ;AAAA,MAC5B,CAAC;AAAA,IACH,GAAG,CAAC,OAAO,QAAQ,KAAK,UAAU,OAAO,KAAK,CAAC,CAAC;AAAA,EAClD;AACF;AAMA,IAAM,6BAA6B;AAAA,EACjC,CAAC,WAGK;AACJ,UAAM,QAAQ,YAAY,OAAO,YAAY;AAC7C,WAAO;AAAA,MACL,MAAM,CAAC,OAAO,WAAW,KAAK;AAAA,MAC9B,CAAC,OAAO,WAAW,KAAK;AAAA,IAC1B;AAAA,EACF;AACF;AAMO,IAAM,gBAAgB;AAAA,EAC3B,CAAC,WAAsD;AACrD,UAAM,EAAE,IAAI,WAAW,WAAW,GAAG,YAAY,IAAI;AACrD,UAAM,eAAe,OAAO,EAAE,IAAI,WAAW,UAAU,CAAC;AACxD,cAAU,MAAM;AACd,mBAAa,UAAU,EAAE,IAAI,WAAW,UAAU;AAAA,IACpD,CAAC;AAED,UAAM,UAAU;AAAA,MACd,OAAO,QAAQ,WAAW,EAAE;AAAA,QAAI,CAAC,CAAC,WAAW,YAAY,MACvD;AAAA,UACE;AAAA,YACE;AAAA,YACA;AAAA,UACF;AAAA,UACA,EAAE,KAAK,UAAU;AAAA,QACnB;AAAA,MACF;AAAA,IACF;AAEA,WAAO,QAAQ,MAAM;AACnB,YAAM,SAAS,OAAO,YAAY,OAAO;AAEzC,YAAM;AAAA,QACJ,IAAI;AAAA,QACJ,WAAW;AAAA,QACX,WAAW;AAAA,MACb,IAAI,aAAa;AAEjB,UAAI,MAAM;AACR,eAAO,KAAK,CACV,UACA,aACG,KAAK,UAAU,QAAQ;AAAA,MAC9B;AACA,UAAI,MAAO,QAAO,YAAY,CAAC,aAAa,MAAM,QAAQ;AAC1D,UAAI,QAAS,QAAO,YAAY,MAAM,QAAQ;AAE9C,aAAO;AAAA,IACT,GAAG,CAAC,GAAG,OAAO,CAAC;AAAA,EACjB;AACF;","names":[]}
+{"version":3,"sources":["../../../src/utils/tap-store/derived-scopes.ts"],"sourcesContent":["import { resource, tapEffect } from \"@assistant-ui/tap\";\nimport { tapMemo, tapRef, tapResource, tapResources } from \"@assistant-ui/tap\";\nimport { createAssistantApiField } from \"../../context/react/AssistantApiContext\";\nimport type {\n  AssistantApi,\n  AssistantApiField,\n} from \"../../context/react/AssistantApiContext\";\nimport type {\n  AssistantEvent,\n  AssistantEventCallback,\n  AssistantEventSelector,\n} from \"../../types/EventTypes\";\nimport type { ResourceElement } from \"@assistant-ui/tap\";\nimport { Unsubscribe } from \"../../types\";\n\n/**\n * Extract the API return type from an AssistantApiField\n */\ntype ExtractApiType<T> =\n  T extends AssistantApiField<infer TApi, any> ? TApi : never;\n\n/**\n * Extract the metadata type from an AssistantApiField\n *\n * Used in DerivedScopesInput to validate that each field's source/query types match\n * the expected types from AssistantApi.\n */\ntype ExtractMeta<T> =\n  T extends AssistantApiField<any, infer TMeta> ? TMeta : never;\n\n/**\n * Get only the field names from AssistantApi (exclude method names)\n */\ntype AssistantApiFieldNames = {\n  [K in keyof AssistantApi]: AssistantApi[K] extends { source: any; query: any }\n    ? K\n    : never;\n}[keyof AssistantApi];\n\n/**\n * Configuration for a derived scope field - infers types from the actual values provided\n */\nexport type DerivedConfig<TSource extends string | null, TQuery, TApi> = {\n  source: TSource;\n  query: TQuery;\n  get: () => TApi;\n};\n\n/**\n * Type for the special `on` callback function\n */\nexport type OnCallbackFn = <TEvent extends AssistantEvent>(\n  selector: AssistantEventSelector<TEvent>,\n  callback: AssistantEventCallback<TEvent>,\n) => Unsubscribe;\n\n/**\n * Type for the special `subscribe` callback function\n */\nexport type SubscribeCallbackFn = (listener: () => void) => Unsubscribe;\n\n/**\n * Type for special non-field functions in AssistantApi\n */\nexport type SpecialCallbacks = {\n  on?: OnCallbackFn;\n  subscribe?: SubscribeCallbackFn;\n};\n\n/**\n * Type for the scopes parameter - allows both DerivedScope elements and special callbacks.\n * Field names are restricted to valid AssistantApi field names.\n * TypeScript validates that the source/query/get types match the expected field type.\n */\nexport type DerivedScopesInput = {\n  [K in AssistantApiFieldNames]?: ResourceElement<\n    AssistantApiField<\n      ExtractApiType<AssistantApi[K]>,\n      {\n        source: ExtractMeta<AssistantApi[K]>[\"source\"];\n        query: ExtractMeta<AssistantApi[K]>[\"query\"];\n      }\n    >\n  >;\n} & SpecialCallbacks;\n\n/**\n * DerivedScope resource - memoizes an AssistantApiField based on source and query.\n * The get callback always calls the most recent version (useEffectEvent pattern).\n * TypeScript infers TSource, TQuery, and TApi from the config object.\n * Validation happens at the DerivedScopesInput level.\n */\nexport const DerivedScope = resource(\n  <TSource extends string | null, TQuery, TApi>(\n    config: DerivedConfig<TSource, TQuery, TApi>,\n  ): AssistantApiField<\n    TApi,\n    {\n      source: TSource;\n      query: TQuery;\n    }\n  > => {\n    const getRef = tapRef(config.get);\n    tapEffect(() => {\n      getRef.current = config.get;\n    });\n\n    return tapMemo(() => {\n      return createAssistantApiField({\n        source: config.source,\n        query: config.query,\n        get: () => getRef.current(),\n      });\n    }, [config.source, JSON.stringify(config.query)]);\n  },\n);\n\n/**\n * Helper resource to wrap each scope field - stable resource identity for proper memoization.\n * Creating this outside the map ensures tapResources can properly track and memoize each field.\n */\nconst ScopeFieldWithNameResource = resource(\n  (config: {\n    fieldName: string;\n    scopeElement: ReturnType<typeof DerivedScope>;\n  }) => {\n    const field = tapResource(config.scopeElement);\n    return tapMemo(\n      () => [config.fieldName, field] as const,\n      [config.fieldName, field],\n    );\n  },\n);\n\n/**\n * DerivedScopes resource - takes an object of DerivedScope resource elements and special callbacks,\n * and returns a Partial<AssistantApi> with all the derived fields.\n */\nexport const DerivedScopes = resource(\n  (scopes: DerivedScopesInput): Partial<AssistantApi> => {\n    const { on, subscribe, ...scopeFields } = scopes;\n    const callbacksRef = tapRef({ on, subscribe });\n    tapEffect(() => {\n      callbacksRef.current = { on, subscribe };\n    });\n\n    const results = tapResources(\n      scopeFields as Record<string, ReturnType<typeof DerivedScope>>,\n      (scopeElement, fieldName) =>\n        ScopeFieldWithNameResource({\n          fieldName,\n          scopeElement,\n        }),\n      [],\n    );\n\n    return tapMemo(() => {\n      const result = Object.fromEntries(\n        Object.values(results),\n      ) as Partial<AssistantApi>;\n\n      const { on: onCb, subscribe: subCb } = callbacksRef.current;\n\n      if (onCb) {\n        result.on = <TEvent extends AssistantEvent>(\n          selector: AssistantEventSelector<TEvent>,\n          callback: AssistantEventCallback<TEvent>,\n        ) => onCb(selector, callback);\n      }\n      if (subCb) result.subscribe = (listener) => subCb(listener);\n\n      return result;\n    }, [results]);\n  },\n);\n"],"mappings":";AAAA,SAAS,UAAU,iBAAiB;AACpC,SAAS,SAAS,QAAQ,aAAa,oBAAoB;AAC3D,SAAS,+BAA+B;AA0FjC,IAAM,eAAe;AAAA,EAC1B,CACE,WAOG;AACH,UAAM,SAAS,OAAO,OAAO,GAAG;AAChC,cAAU,MAAM;AACd,aAAO,UAAU,OAAO;AAAA,IAC1B,CAAC;AAED,WAAO,QAAQ,MAAM;AACnB,aAAO,wBAAwB;AAAA,QAC7B,QAAQ,OAAO;AAAA,QACf,OAAO,OAAO;AAAA,QACd,KAAK,MAAM,OAAO,QAAQ;AAAA,MAC5B,CAAC;AAAA,IACH,GAAG,CAAC,OAAO,QAAQ,KAAK,UAAU,OAAO,KAAK,CAAC,CAAC;AAAA,EAClD;AACF;AAMA,IAAM,6BAA6B;AAAA,EACjC,CAAC,WAGK;AACJ,UAAM,QAAQ,YAAY,OAAO,YAAY;AAC7C,WAAO;AAAA,MACL,MAAM,CAAC,OAAO,WAAW,KAAK;AAAA,MAC9B,CAAC,OAAO,WAAW,KAAK;AAAA,IAC1B;AAAA,EACF;AACF;AAMO,IAAM,gBAAgB;AAAA,EAC3B,CAAC,WAAsD;AACrD,UAAM,EAAE,IAAI,WAAW,GAAG,YAAY,IAAI;AAC1C,UAAM,eAAe,OAAO,EAAE,IAAI,UAAU,CAAC;AAC7C,cAAU,MAAM;AACd,mBAAa,UAAU,EAAE,IAAI,UAAU;AAAA,IACzC,CAAC;AAED,UAAM,UAAU;AAAA,MACd;AAAA,MACA,CAAC,cAAc,cACb,2BAA2B;AAAA,QACzB;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACH,CAAC;AAAA,IACH;AAEA,WAAO,QAAQ,MAAM;AACnB,YAAM,SAAS,OAAO;AAAA,QACpB,OAAO,OAAO,OAAO;AAAA,MACvB;AAEA,YAAM,EAAE,IAAI,MAAM,WAAW,MAAM,IAAI,aAAa;AAEpD,UAAI,MAAM;AACR,eAAO,KAAK,CACV,UACA,aACG,KAAK,UAAU,QAAQ;AAAA,MAC9B;AACA,UAAI,MAAO,QAAO,YAAY,CAAC,aAAa,MAAM,QAAQ;AAE1D,aAAO;AAAA,IACT,GAAG,CAAC,OAAO,CAAC;AAAA,EACd;AACF;","names":[]}

package/dist/utils/tap-store/index.d.ts

@@ -1,4 +1,4 @@
 export { type Store, asStore } from "./store";
 export { tapApi, type ApiObject } from "./tap-api";
-export { DerivedScope, type DerivedScopeConfig, type OnCallbackFn, type SubscribeCallbackFn, type FlushSyncCallbackFn, type SpecialCallbacks, type DerivedScopesInput, } from "./derived-scopes";
+export { DerivedScope, type DerivedConfig, type OnCallbackFn, type SubscribeCallbackFn, type SpecialCallbacks, type DerivedScopesInput, } from "./derived-scopes";
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/tap-store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/tap-store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EACL,YAAY,EACZ,KAAK,kBAAkB,EACvB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,GACxB,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/tap-store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EACL,YAAY,EACZ,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,GACxB,MAAM,kBAAkB,CAAC"}

package/dist/utils/tap-store/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/tap-store/index.ts"],"sourcesContent":["export { type Store, asStore } from \"./store\";\nexport { tapApi, type ApiObject } from \"./tap-api\";\nexport {\n  DerivedScope,\n  type DerivedScopeConfig,\n  type OnCallbackFn,\n  type SubscribeCallbackFn,\n  type FlushSyncCallbackFn,\n  type SpecialCallbacks,\n  type DerivedScopesInput,\n} from \"./derived-scopes\";\n"],"mappings":";AAAA,SAAqB,eAAe;AACpC,SAAS,cAA8B;AACvC;AAAA,EACE;AAAA,OAOK;","names":[]}
+{"version":3,"sources":["../../../src/utils/tap-store/index.ts"],"sourcesContent":["export { type Store, asStore } from \"./store\";\nexport { tapApi, type ApiObject } from \"./tap-api\";\nexport {\n  DerivedScope,\n  type DerivedConfig,\n  type OnCallbackFn,\n  type SubscribeCallbackFn,\n  type SpecialCallbacks,\n  type DerivedScopesInput,\n} from \"./derived-scopes\";\n"],"mappings":";AAAA,SAAqB,eAAe;AACpC,SAAS,cAA8B;AACvC;AAAA,EACE;AAAA,OAMK;","names":[]}

package/dist/utils/tap-store/store.d.ts

@@ -9,12 +9,6 @@ export interface Store<TState> {
      * Subscribe to the store.
      */
     subscribe(listener: () => void): Unsubscribe;
-    /**
-     * Synchronously flush all the updates to the store.
-     */
-    flushSync(): void;
 }
-export declare const asStore: <TState, TProps>(props: ResourceElement<TState, TProps>, options?: {
-    key?: string | number;
-} | undefined) => ResourceElement<Store<TState>, ResourceElement<TState, TProps>>;
+export declare const asStore: <TState, TProps>(props: ResourceElement<TState, TProps>) => ResourceElement<Store<TState>, ResourceElement<TState, TProps>>;
 //# sourceMappingURL=store.d.ts.map

package/dist/utils/tap-store/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../src/utils/tap-store/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAGhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,KAAK,CAAC,MAAM;IAC3B;;OAEG;IACH,QAAQ,IAAI,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,WAAW,CAAC;IAE7C;;OAEG;IACH,SAAS,IAAI,IAAI,CAAC;CACnB;AAED,eAAO,MAAM,OAAO,GACjB,MAAM,EAAE,MAAM;;iFAYhB,CAAC"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../src/utils/tap-store/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAGhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,KAAK,CAAC,MAAM;IAC3B;;OAEG;IACH,QAAQ,IAAI,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,WAAW,CAAC;CAC9C;AAED,eAAO,MAAM,OAAO,GACjB,MAAM,EAAE,MAAM,4GAYhB,CAAC"}

package/dist/utils/tap-store/store.js

@@ -8,11 +8,11 @@ import {
 var asStore = resource(
   (element) => {
     const resource2 = tapMemo(
-      () => createResource(element, true),
+      () => createResource(element, { mount: false }),
       [element.type]
     );
     tapEffect(() => {
-      resource2.updateInput(element.props);
+      resource2.render(element);
     });
     return resource2;
   }

package/dist/utils/tap-store/store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/tap-store/store.ts"],"sourcesContent":["import {\n  tapMemo,\n  tapEffect,\n  ResourceElement,\n  resource,\n  createResource,\n} from \"@assistant-ui/tap\";\nimport { Unsubscribe } from \"../../types\";\n\nexport interface Store<TState> {\n  /**\n   * Get the current state of the store.\n   */\n  getState(): TState;\n\n  /**\n   * Subscribe to the store.\n   */\n  subscribe(listener: () => void): Unsubscribe;\n\n  /**\n   * Synchronously flush all the updates to the store.\n   */\n  flushSync(): void;\n}\n\nexport const asStore = resource(\n  <TState, TProps>(element: ResourceElement<TState, TProps>): Store<TState> => {\n    const resource = tapMemo(\n      () => createResource(element, true),\n      [element.type],\n    );\n\n    tapEffect(() => {\n      resource.updateInput(element.props);\n    });\n\n    return resource;\n  },\n);\n"],"mappings":";AAAA;AAAA,EACE;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,OACK;AAoBA,IAAM,UAAU;AAAA,EACrB,CAAiB,YAA4D;AAC3E,UAAMA,YAAW;AAAA,MACf,MAAM,eAAe,SAAS,IAAI;AAAA,MAClC,CAAC,QAAQ,IAAI;AAAA,IACf;AAEA,cAAU,MAAM;AACd,MAAAA,UAAS,YAAY,QAAQ,KAAK;AAAA,IACpC,CAAC;AAED,WAAOA;AAAA,EACT;AACF;","names":["resource"]}
+{"version":3,"sources":["../../../src/utils/tap-store/store.ts"],"sourcesContent":["import {\n  tapMemo,\n  tapEffect,\n  ResourceElement,\n  resource,\n  createResource,\n} from \"@assistant-ui/tap\";\nimport { Unsubscribe } from \"../../types\";\n\nexport interface Store<TState> {\n  /**\n   * Get the current state of the store.\n   */\n  getState(): TState;\n\n  /**\n   * Subscribe to the store.\n   */\n  subscribe(listener: () => void): Unsubscribe;\n}\n\nexport const asStore = resource(\n  <TState, TProps>(element: ResourceElement<TState, TProps>): Store<TState> => {\n    const resource = tapMemo(\n      () => createResource(element, { mount: false }),\n      [element.type],\n    );\n\n    tapEffect(() => {\n      resource.render(element);\n    });\n\n    return resource;\n  },\n);\n"],"mappings":";AAAA;AAAA,EACE;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,OACK;AAeA,IAAM,UAAU;AAAA,EACrB,CAAiB,YAA4D;AAC3E,UAAMA,YAAW;AAAA,MACf,MAAM,eAAe,SAAS,EAAE,OAAO,MAAM,CAAC;AAAA,MAC9C,CAAC,QAAQ,IAAI;AAAA,IACf;AAEA,cAAU,MAAM;AACd,MAAAA,UAAS,OAAO,OAAO;AAAA,IACzB,CAAC;AAED,WAAOA;AAAA,EACT;AACF;","names":["resource"]}

package/dist/utils/tap-store/tap-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tap-api.d.ts","sourceRoot":"","sources":["../../../src/utils/tap-store/tap-api.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,SAAS;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;CACtD;AAgCD,eAAO,MAAM,MAAM,GAAI,IAAI,SAAS,SAAS,GAAG;IAAE,QAAQ,EAAE,MAAM,GAAG,CAAA;CAAE,EACrE,KAAK,IAAI,EACT,UAAU;IACR,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B;;;;CAwBF,CAAC"}
+{"version":3,"file":"tap-api.d.ts","sourceRoot":"","sources":["../../../src/utils/tap-store/tap-api.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,SAAS;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;CACtD;AAsCD,eAAO,MAAM,MAAM,GAAI,IAAI,SAAS,SAAS,GAAG;IAAE,QAAQ,EAAE,MAAM,GAAG,CAAA;CAAE,EACrE,KAAK,IAAI,EACT,UAAU;IACR,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B;;;;CAuBF,CAAC"}

package/dist/utils/tap-store/tap-api.js

@@ -1,30 +1,36 @@
 // src/utils/tap-store/tap-api.ts
 import { tapEffect, tapMemo, tapRef } from "@assistant-ui/tap";
 var ReadonlyApiHandler = class {
-  constructor(getApi) {
-    this.getApi = getApi;
+  constructor(ref) {
+    this.ref = ref;
   }
   get(_, prop) {
-    return this.getApi()[prop];
+    return this.ref.current[prop];
   }
   ownKeys() {
-    return Object.keys(this.getApi());
+    return Object.keys(this.ref.current);
   }
   has(_, prop) {
-    return prop in this.getApi();
+    return prop in this.ref.current;
   }
   getOwnPropertyDescriptor(_, prop) {
-    return Object.getOwnPropertyDescriptor(this.getApi(), prop);
+    return Object.getOwnPropertyDescriptor(this.ref.current, prop);
   }
   set() {
     return false;
   }
+  setPrototypeOf() {
+    return false;
+  }
   defineProperty() {
     return false;
   }
   deleteProperty() {
     return false;
   }
+  preventExtensions() {
+    return false;
+  }
 };
 var tapApi = (api, options) => {
   const ref = tapRef(api);
@@ -32,7 +38,7 @@ var tapApi = (api, options) => {
     ref.current = api;
   });
   const apiProxy = tapMemo(
-    () => new Proxy({}, new ReadonlyApiHandler(() => ref.current)),
+    () => new Proxy({}, new ReadonlyApiHandler(ref)),
     []
   );
   const key = options?.key;

package/dist/utils/tap-store/tap-api.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/tap-store/tap-api.ts"],"sourcesContent":["import { tapEffect, tapMemo, tapRef } from \"@assistant-ui/tap\";\n\nexport interface ApiObject {\n  [key: string]: ((...args: any[]) => any) | ApiObject;\n}\n\nclass ReadonlyApiHandler<TApi extends ApiObject> implements ProxyHandler<TApi> {\n  constructor(private readonly getApi: () => TApi) {}\n\n  get(_: unknown, prop: string | symbol) {\n    return this.getApi()[prop as keyof TApi];\n  }\n\n  ownKeys(): ArrayLike<string | symbol> {\n    return Object.keys(this.getApi() as object);\n  }\n\n  has(_: unknown, prop: string | symbol) {\n    return prop in (this.getApi() as object);\n  }\n\n  getOwnPropertyDescriptor(_: unknown, prop: string | symbol) {\n    return Object.getOwnPropertyDescriptor(this.getApi(), prop);\n  }\n\n  set() {\n    return false;\n  }\n  defineProperty() {\n    return false;\n  }\n  deleteProperty() {\n    return false;\n  }\n}\n\nexport const tapApi = <TApi extends ApiObject & { getState: () => any }>(\n  api: TApi,\n  options?: {\n    key?: string | undefined;\n  },\n) => {\n  const ref = tapRef(api);\n  tapEffect(() => {\n    ref.current = api;\n  });\n\n  const apiProxy = tapMemo(\n    () =>\n      new Proxy<TApi>({} as TApi, new ReadonlyApiHandler(() => ref.current)),\n    [],\n  );\n\n  const key = options?.key;\n  const state = api.getState();\n\n  return tapMemo(\n    () => ({\n      key,\n      state,\n      api: apiProxy,\n    }),\n    [state, key],\n  );\n};\n"],"mappings":";AAAA,SAAS,WAAW,SAAS,cAAc;AAM3C,IAAM,qBAAN,MAA+E;AAAA,EAC7E,YAA6B,QAAoB;AAApB;AAAA,EAAqB;AAAA,EAElD,IAAI,GAAY,MAAuB;AACrC,WAAO,KAAK,OAAO,EAAE,IAAkB;AAAA,EACzC;AAAA,EAEA,UAAsC;AACpC,WAAO,OAAO,KAAK,KAAK,OAAO,CAAW;AAAA,EAC5C;AAAA,EAEA,IAAI,GAAY,MAAuB;AACrC,WAAO,QAAS,KAAK,OAAO;AAAA,EAC9B;AAAA,EAEA,yBAAyB,GAAY,MAAuB;AAC1D,WAAO,OAAO,yBAAyB,KAAK,OAAO,GAAG,IAAI;AAAA,EAC5D;AAAA,EAEA,MAAM;AACJ,WAAO;AAAA,EACT;AAAA,EACA,iBAAiB;AACf,WAAO;AAAA,EACT;AAAA,EACA,iBAAiB;AACf,WAAO;AAAA,EACT;AACF;AAEO,IAAM,SAAS,CACpB,KACA,YAGG;AACH,QAAM,MAAM,OAAO,GAAG;AACtB,YAAU,MAAM;AACd,QAAI,UAAU;AAAA,EAChB,CAAC;AAED,QAAM,WAAW;AAAA,IACf,MACE,IAAI,MAAY,CAAC,GAAW,IAAI,mBAAmB,MAAM,IAAI,OAAO,CAAC;AAAA,IACvE,CAAC;AAAA,EACH;AAEA,QAAM,MAAM,SAAS;AACrB,QAAM,QAAQ,IAAI,SAAS;AAE3B,SAAO;AAAA,IACL,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,KAAK;AAAA,IACP;AAAA,IACA,CAAC,OAAO,GAAG;AAAA,EACb;AACF;","names":[]}
+{"version":3,"sources":["../../../src/utils/tap-store/tap-api.ts"],"sourcesContent":["import { tapEffect, tapMemo, tapRef } from \"@assistant-ui/tap\";\n\nexport interface ApiObject {\n  [key: string]: ((...args: any[]) => any) | ApiObject;\n}\n\nclass ReadonlyApiHandler<TApi extends ApiObject> implements ProxyHandler<TApi> {\n  constructor(private readonly ref: tapRef.RefObject<TApi>) {}\n\n  get(_: unknown, prop: string | symbol) {\n    return this.ref.current[prop as keyof TApi];\n  }\n\n  ownKeys(): ArrayLike<string | symbol> {\n    return Object.keys(this.ref.current as object);\n  }\n\n  has(_: unknown, prop: string | symbol) {\n    return prop in (this.ref.current as object);\n  }\n\n  getOwnPropertyDescriptor(_: unknown, prop: string | symbol) {\n    return Object.getOwnPropertyDescriptor(this.ref.current, prop);\n  }\n\n  set() {\n    return false;\n  }\n  setPrototypeOf() {\n    return false;\n  }\n  defineProperty() {\n    return false;\n  }\n  deleteProperty() {\n    return false;\n  }\n  preventExtensions(): boolean {\n    return false;\n  }\n}\n\nexport const tapApi = <TApi extends ApiObject & { getState: () => any }>(\n  api: TApi,\n  options?: {\n    key?: string | undefined;\n  },\n) => {\n  const ref = tapRef(api);\n  tapEffect(() => {\n    ref.current = api;\n  });\n\n  const apiProxy = tapMemo(\n    () => new Proxy<TApi>({} as TApi, new ReadonlyApiHandler(ref)),\n    [],\n  );\n\n  const key = options?.key;\n  const state = api.getState();\n\n  return tapMemo(\n    () => ({\n      key,\n      state,\n      api: apiProxy,\n    }),\n    [state, key],\n  );\n};\n"],"mappings":";AAAA,SAAS,WAAW,SAAS,cAAc;AAM3C,IAAM,qBAAN,MAA+E;AAAA,EAC7E,YAA6B,KAA6B;AAA7B;AAAA,EAA8B;AAAA,EAE3D,IAAI,GAAY,MAAuB;AACrC,WAAO,KAAK,IAAI,QAAQ,IAAkB;AAAA,EAC5C;AAAA,EAEA,UAAsC;AACpC,WAAO,OAAO,KAAK,KAAK,IAAI,OAAiB;AAAA,EAC/C;AAAA,EAEA,IAAI,GAAY,MAAuB;AACrC,WAAO,QAAS,KAAK,IAAI;AAAA,EAC3B;AAAA,EAEA,yBAAyB,GAAY,MAAuB;AAC1D,WAAO,OAAO,yBAAyB,KAAK,IAAI,SAAS,IAAI;AAAA,EAC/D;AAAA,EAEA,MAAM;AACJ,WAAO;AAAA,EACT;AAAA,EACA,iBAAiB;AACf,WAAO;AAAA,EACT;AAAA,EACA,iBAAiB;AACf,WAAO;AAAA,EACT;AAAA,EACA,iBAAiB;AACf,WAAO;AAAA,EACT;AAAA,EACA,oBAA6B;AAC3B,WAAO;AAAA,EACT;AACF;AAEO,IAAM,SAAS,CACpB,KACA,YAGG;AACH,QAAM,MAAM,OAAO,GAAG;AACtB,YAAU,MAAM;AACd,QAAI,UAAU;AAAA,EAChB,CAAC;AAED,QAAM,WAAW;AAAA,IACf,MAAM,IAAI,MAAY,CAAC,GAAW,IAAI,mBAAmB,GAAG,CAAC;AAAA,IAC7D,CAAC;AAAA,EACH;AAEA,QAAM,MAAM,SAAS;AACrB,QAAM,QAAQ,IAAI,SAAS;AAE3B,SAAO;AAAA,IACL,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,KAAK;AAAA,IACP;AAAA,IACA,CAAC,OAAO,GAAG;AAAA,EACb;AACF;","names":[]}

package/package.json

@@ -28,7 +28,7 @@
     "conversational-ui",
     "conversational-ai"
   ],
-  "version": "0.11.48",
+  "version": "0.11.50",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -48,8 +48,8 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "assistant-cloud": "^0.1.10",
-    "@assistant-ui/tap": "^0.3.2",
+    "assistant-cloud": "^0.1.11",
+    "@assistant-ui/tap": "^0.3.3",
     "@radix-ui/primitive": "^1.1.3",
     "@radix-ui/react-compose-refs": "^1.1.2",
     "@radix-ui/react-context": "^1.1.3",
@@ -59,7 +59,7 @@
     "@radix-ui/react-use-callback-ref": "^1.1.1",
     "@radix-ui/react-use-escape-keydown": "^1.1.1",
     "@standard-schema/spec": "^1.0.0",
-    "assistant-stream": "^0.2.43",
+    "assistant-stream": "^0.2.45",
     "nanoid": "5.1.6",
     "react-textarea-autosize": "^8.5.9",
     "zod": "^4.1.13",
@@ -83,7 +83,7 @@
     "@stryker-mutator/core": "^9.4.0",
     "@stryker-mutator/vitest-runner": "^9.4.0",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^24.10.1",
+    "@types/node": "^25.0.0",
     "tsx": "^4.21.0",
     "vitest": "^4.0.15",
     "@assistant-ui/x-buildutils": "0.0.1"

package/src/client/AssistantClient.ts

@@ -147,7 +147,6 @@ const getClientFromStore = (client: Store<{ api: AssistantClientApi }>) => {
       );
     },
     subscribe: client.subscribe,
-    flushSync: client.flushSync,
   } satisfies Partial<AssistantApi>;
 };
 

package/src/client/ThreadMessageClient.tsx

@@ -80,18 +80,19 @@ export const ThreadMessageClient = resource(
     const [isHoveringState, setIsHovering] = tapState(false);
 
     const parts = tapLookupResources(
-      message.content.map((_, idx) =>
-        ThreadMessagePartClient({ part: message.content[idx]! }, { key: idx }),
-      ),
+      message.content.map((part, idx) => [
+        "toolCallId" in part && part.toolCallId != null
+          ? `toolCallId-${part.toolCallId}`
+          : `index-${idx}`,
+        ThreadMessagePartClient({ part }),
+      ]),
     );
 
     const attachments = tapLookupResources(
-      message.attachments?.map((_, idx) =>
-        ThreadMessageAttachmentClient(
-          { attachment: message.attachments![idx]! },
-          { key: idx },
-        ),
-      ) ?? [],
+      message.attachments?.map((attachment) => [
+        attachment.id,
+        ThreadMessageAttachmentClient({ attachment }),
+      ]) ?? [],
     );
 
     const composerState = tapInlineResource(

package/src/client/util-hooks/tapLookupResources.ts

@@ -1,22 +1,37 @@
-import { ResourceElement, tapResources } from "@assistant-ui/tap";
+import { ResourceElement, tapMemo, tapResources } from "@assistant-ui/tap";
 import { ApiObject } from "../../utils/tap-store";
 
 export const tapLookupResources = <TState, TApi extends ApiObject>(
-  elements: ResourceElement<{
-    key: string | undefined;
-    state: TState;
-    api: TApi;
-  }>[],
-) => {
-  const resources = tapResources(elements);
+  elements: readonly (readonly [
+    string,
+    ResourceElement<{
+      key: string | undefined;
+      state: TState;
+      api: TApi;
+    }>,
+  ])[],
+): {
+  state: TState[];
+  api: (lookup: { index: number } | { key: string }) => TApi;
+} => {
+  const elementsMap = tapMemo(() => Object.fromEntries(elements), [elements]);
+  const resources = tapResources(elementsMap, (t) => t, []);
+  const keys = tapMemo(() => Object.keys(resources), [resources]);
+  const state = tapMemo(() => {
+    const result = new Array(keys.length);
+    for (let i = 0; i < keys.length; i++) {
+      result[i] = resources[keys[i]!]!.state;
+    }
+    return result;
+  }, [keys, resources]);
 
   return {
-    state: resources.map((r) => r.state),
+    state,
     api: (lookup: { index: number } | { key: string }) => {
       const value =
         "index" in lookup
-          ? resources[lookup.index]?.api
-          : resources.find((r) => r.key === lookup.key)?.api;
+          ? resources[keys[lookup.index]!]?.api
+          : resources[lookup.key]?.api;
 
       if (!value) {
         throw new Error(

package/src/context/providers/MessageProvider.tsx

@@ -24,7 +24,6 @@ export const MessageProvider: FC<
       get: () => store.getState().api,
     }),
     subscribe: store.subscribe,
-    flushSync: store.flushSync,
   });
 
   return <AssistantProvider api={api}>{children}</AssistantProvider>;

package/src/context/providers/TextMessagePartProvider.tsx

@@ -53,7 +53,6 @@ export const TextMessagePartProvider: FC<
       get: () => store.getState().api,
     }),
     subscribe: store.subscribe,
-    flushSync: store.flushSync,
   });
 
   return <AssistantProvider api={api}>{children}</AssistantProvider>;

package/src/context/react/AssistantApiContext.tsx

@@ -133,7 +133,6 @@ export type AssistantApi = {
   attachment: AssistantApiField<AttachmentClientApi, AttachmentMeta>;
 
   subscribe(listener: () => void): Unsubscribe;
-  flushSync(): void;
 
   on<TEvent extends AssistantEvent>(
     event: AssistantEventSelector<TEvent>,
@@ -235,7 +234,6 @@ const AssistantApiContext = createContext<AssistantApi>({
   }),
 
   subscribe: NO_OP_FN,
-  flushSync: NO_OP_FN,
   on: (selector) => {
     const { scope } = normalizeEventSelector(selector);
     throw new Error(`Event scope is not available in this component: ${scope}`);
@@ -250,7 +248,7 @@ export const useAssistantApiImpl = (): AssistantApi => {
  * Hook to extend the current AssistantApi with additional derived scope fields and special callbacks.
  * This merges the derived fields with the existing API from context.
  * Fields are automatically memoized based on source and query changes.
- * Special callbacks (on, subscribe, flushSync) use the useEffectEvent pattern to always access latest values.
+ * Special callbacks (on, subscribe) use the useEffectEvent pattern to always access latest values.
  *
  * @param scopes - Record of field names to DerivedScope resource elements, plus optional special callbacks
  * @returns The merged AssistantApi
@@ -293,19 +291,6 @@ export function useAssistantApi(config?: AssistantClientProps): AssistantApi {
   }
 }
 
-const mergeFns = <TArgs extends Array<unknown>>(
-  fn1: (...args: TArgs) => void,
-  fn2: (...args: TArgs) => void,
-) => {
-  if (fn1 === NO_OP_FN) return fn2;
-  if (fn2 === NO_OP_FN) return fn1;
-
-  return (...args: TArgs) => {
-    fn1(...args);
-    fn2(...args);
-  };
-};
-
 const mergeFnsWithUnsubscribe = <TArgs extends Array<unknown>>(
   fn1: (...args: TArgs) => Unsubscribe,
   fn2: (...args: TArgs) => Unsubscribe,
@@ -329,7 +314,6 @@ export const extendApi = (
   api2: Partial<AssistantApi>,
 ): AssistantApi => {
   const api2Subscribe = api2.subscribe;
-  const api2FlushSync = api2.flushSync;
   return {
     ...api,
     ...api2,
@@ -337,7 +321,6 @@ export const extendApi = (
       api.subscribe,
       api2Subscribe ?? NO_OP_FN,
     ),
-    flushSync: mergeFns(api.flushSync, api2FlushSync ?? NO_OP_FN),
   };
 };
 

package/src/legacy-runtime/client/ComposerRuntimeClient.ts

@@ -76,12 +76,10 @@ export const ComposerClient = resource(
     }, [runtime, events, threadIdRef, messageIdRef]);
 
     const attachments = tapLookupResources(
-      runtimeState.attachments.map((_, idx) =>
-        ComposerAttachmentClientByIndex(
-          { runtime: runtime, index: idx },
-          { key: idx },
-        ),
-      ),
+      runtimeState.attachments.map((attachment, idx) => [
+        attachment.id,
+        ComposerAttachmentClientByIndex({ runtime: runtime, index: idx }),
+      ]),
     );
 
     const state = tapMemo<ComposerClientState>(() => {

package/src/legacy-runtime/client/MessageRuntimeClient.ts

@@ -70,15 +70,19 @@ export const MessageClient = resource(
     );
 
     const parts = tapLookupResources(
-      runtimeState.content.map((_, idx) =>
-        MessagePartByIndex({ runtime, index: idx }, { key: idx }),
-      ),
+      runtimeState.content.map((part, idx) => [
+        "toolCallId" in part && part.toolCallId != null
+          ? `toolCallId-${part.toolCallId}`
+          : `index-${idx}`,
+        MessagePartByIndex({ runtime, index: idx }),
+      ]),
     );
 
     const attachments = tapLookupResources(
-      runtimeState.attachments?.map((_, idx) =>
-        MessageAttachmentClientByIndex({ runtime, index: idx }, { key: idx }),
-      ) ?? [],
+      runtimeState.attachments?.map((attachment, idx) => [
+        attachment.id,
+        MessageAttachmentClientByIndex({ runtime, index: idx }),
+      ]) ?? [],
     );
 
     const state = tapMemo<MessageClientState>(() => {

package/src/legacy-runtime/client/ThreadListRuntimeClient.ts

@@ -42,9 +42,10 @@ export const ThreadListClient = resource(
     );
 
     const threadItems = tapLookupResources(
-      Object.keys(runtimeState.threadItems).map((id) =>
-        ThreadListItemClientById({ runtime, id }, { key: id }),
-      ),
+      Object.keys(runtimeState.threadItems).map((id) => [
+        id,
+        ThreadListItemClientById({ runtime, id }),
+      ]),
     );
 
     const state = tapMemo<ThreadListClientState>(() => {

package/src/legacy-runtime/client/ThreadRuntimeClient.ts

@@ -87,12 +87,10 @@ export const ThreadClient = resource(
     );
 
     const messages = tapLookupResources(
-      runtimeState.messages.map((m) =>
-        MessageClientById(
-          { runtime: runtime, id: m.id, threadIdRef },
-          { key: m.id },
-        ),
-      ),
+      runtimeState.messages.map((m) => [
+        m.id,
+        MessageClientById({ runtime: runtime, id: m.id, threadIdRef }),
+      ]),
     );
 
     const state = tapMemo<ThreadClientState>(() => {

package/src/legacy-runtime/runtime-cores/assistant-transport/useAssistantTransportRuntime.tsx

@@ -274,7 +274,7 @@ const useAssistantTransportThreadRuntime = <T,>(
     },
     onCancel: async () => {
       runManager.cancel();
-      toolInvocations.abort();
+      await toolInvocations.abort();
     },
     onResume: async () => {
       if (!options.resumeApi)