@assistant-ui/store 0.0.0 → 0.0.2

package/dist/useAssistantClient.js

@@ -6,17 +6,39 @@ import {
   tapMemo,
   tapResource,
   tapResources,
-  tapEffectEvent
+  tapEffectEvent,
+  tapInlineResource
 } from "@assistant-ui/tap";
 import { asStore } from "./asStore.js";
 import { useAssistantContextValue } from "./AssistantContext.js";
 import { splitScopes } from "./utils/splitScopes.js";
+import {
+  EventManager,
+  normalizeEventSelector
+} from "./EventContext.js";
+import { withStoreContextProvider } from "./StoreContext.js";
+var RootScopeStoreResource = resource(
+  ({
+    element,
+    events,
+    parent
+  }) => {
+    return withStoreContextProvider(
+      { events, parent },
+      () => tapInlineResource(element)
+    );
+  }
+);
 var RootScopeResource = resource(
   ({
     scopeName,
-    element
+    element,
+    events,
+    parent
   }) => {
-    const store = tapResource(asStore(element));
+    const store = tapResource(
+      asStore(RootScopeStoreResource({ element, events, parent }))
+    );
     return tapMemo(() => {
       const scopeFunction = (() => store.getState().api);
       scopeFunction.source = "root";
@@ -32,52 +54,63 @@ var RootScopeResource = resource(
     }, [scopeName, store]);
   }
 );
-var RootScopesResource = resource((scopes) => {
-  const resultEntries = tapResources(
-    Object.entries(scopes).map(
-      ([scopeName, element]) => RootScopeResource(
-        {
-          scopeName,
-          element
-        },
-        { key: scopeName }
+var RootScopesResource = resource(
+  ({ scopes, parent }) => {
+    const events = tapInlineResource(EventManager());
+    const resultEntries = tapResources(
+      Object.entries(scopes).map(
+        ([scopeName, element]) => RootScopeResource(
+          {
+            scopeName,
+            element,
+            events,
+            parent
+          },
+          { key: scopeName }
+        )
       )
-    )
-  );
-  return tapMemo(() => {
-    if (resultEntries.length === 0) {
-      return {
-        scopes: {}
-      };
-    }
-    return {
-      scopes: Object.fromEntries(
-        resultEntries.map(([scopeName, { scopeFunction }]) => [
-          scopeName,
-          scopeFunction
-        ])
-      ),
-      subscribe: (callback) => {
-        const unsubscribes = resultEntries.map(([, { subscribe }]) => {
-          return subscribe(() => {
-            console.log("Callback called for");
-            callback();
-          });
-        });
-        return () => {
-          unsubscribes.forEach((unsubscribe) => unsubscribe());
+    );
+    const on = (selector, callback) => {
+      const { event } = normalizeEventSelector(selector);
+      return events.on(event, callback);
+    };
+    return tapMemo(() => {
+      if (resultEntries.length === 0) {
+        return {
+          scopes: {},
+          on
         };
-      },
-      flushSync: () => {
-        resultEntries.forEach(([, { flushSync }]) => {
-          flushSync();
-        });
       }
-    };
-  }, [...resultEntries]);
-});
-var useRootScopes = (rootScopes) => {
-  return useResource(RootScopesResource(rootScopes));
+      return {
+        scopes: Object.fromEntries(
+          resultEntries.map(([scopeName, { scopeFunction }]) => [
+            scopeName,
+            scopeFunction
+          ])
+        ),
+        subscribe: (callback) => {
+          const unsubscribes = resultEntries.map(([, { subscribe }]) => {
+            return subscribe(() => {
+              console.log("Callback called for");
+              callback();
+            });
+          });
+          return () => {
+            unsubscribes.forEach((unsubscribe) => unsubscribe());
+          };
+        },
+        flushSync: () => {
+          resultEntries.forEach(([, { flushSync }]) => {
+            flushSync();
+          });
+        },
+        on
+      };
+    }, [...resultEntries, events]);
+  }
+);
+var useRootScopes = (rootScopes, parent) => {
+  return useResource(RootScopesResource({ scopes: rootScopes, parent }));
 };
 var DerivedScopeResource = resource(
   ({
@@ -126,7 +159,7 @@ var useDerivedScopes = (derivedScopes, parentClient) => {
 var useExtendedAssistantClientImpl = (scopes) => {
   const baseClient = useAssistantContextValue();
   const { rootScopes, derivedScopes } = splitScopes(scopes);
-  const rootFields = useRootScopes(rootScopes);
+  const rootFields = useRootScopes(rootScopes, baseClient);
   const derivedFields = useDerivedScopes(derivedScopes, baseClient);
   return useMemo(() => {
     return {
@@ -134,7 +167,8 @@ var useExtendedAssistantClientImpl = (scopes) => {
       ...rootFields.scopes,
       ...derivedFields,
       subscribe: rootFields.subscribe ?? baseClient.subscribe,
-      flushSync: rootFields.flushSync ?? baseClient.flushSync
+      flushSync: rootFields.flushSync ?? baseClient.flushSync,
+      on: rootFields.on ?? baseClient.on
     };
   }, [baseClient, rootFields, derivedFields]);
 };

package/dist/useAssistantClient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/useAssistantClient.tsx"],"sourcesContent":["import { useMemo } from \"react\";\nimport { useResource } from \"@assistant-ui/tap/react\";\nimport {\n  resource,\n  tapMemo,\n  tapResource,\n  tapResources,\n  tapEffectEvent,\n  ResourceElement,\n} from \"@assistant-ui/tap\";\nimport type {\n  AssistantClient,\n  AssistantScopes,\n  ScopesInput,\n  ScopeField,\n  ScopeInput,\n  DerivedScopeProps,\n} from \"./types\";\nimport { asStore } from \"./asStore\";\nimport { useAssistantContextValue } from \"./AssistantContext\";\nimport { splitScopes } from \"./utils/splitScopes\";\n\n/**\n * Resource for a single root scope\n * Returns a tuple of [scopeName, {scopeFunction, subscribe, flushSync}]\n */\nconst RootScopeResource = resource(\n  <K extends keyof AssistantScopes>({\n    scopeName,\n    element,\n  }: {\n    scopeName: K;\n    element: ScopeInput<AssistantScopes[K]>;\n  }) => {\n    const store = tapResource(asStore(element));\n\n    return tapMemo(() => {\n      const scopeFunction = (() => store.getState().api) as ScopeField<\n        AssistantScopes[K]\n      >;\n      scopeFunction.source = \"root\";\n      scopeFunction.query = {} as AssistantScopes[K][\"query\"];\n\n      return [\n        scopeName,\n        {\n          scopeFunction,\n          subscribe: store.subscribe,\n          flushSync: store.flushSync,\n        },\n      ] as const;\n    }, [scopeName, store]);\n  },\n);\n\n/**\n * Resource for all root scopes\n * Mounts each root scope and returns an object mapping scope names to their stores\n */\nconst RootScopesResource = resource((scopes: ScopesInput) => {\n  const resultEntries = tapResources(\n    Object.entries(scopes).map(([scopeName, element]) =>\n      RootScopeResource(\n        {\n          scopeName: scopeName as keyof AssistantScopes,\n          element: element as ScopeInput<\n            AssistantScopes[keyof AssistantScopes]\n          >,\n        },\n        { key: scopeName },\n      ),\n    ),\n  );\n\n  return tapMemo(() => {\n    if (resultEntries.length === 0) {\n      return {\n        scopes: {},\n      };\n    }\n\n    return {\n      scopes: Object.fromEntries(\n        resultEntries.map(([scopeName, { scopeFunction }]) => [\n          scopeName,\n          scopeFunction,\n        ]),\n      ) as {\n        [K in keyof typeof scopes]: ScopeField<AssistantScopes[K]>;\n      },\n      subscribe: (callback: () => void) => {\n        const unsubscribes = resultEntries.map(([, { subscribe }]) => {\n          return subscribe(() => {\n            console.log(\"Callback called for\");\n            callback();\n          });\n        });\n        return () => {\n          unsubscribes.forEach((unsubscribe) => unsubscribe());\n        };\n      },\n      flushSync: () => {\n        resultEntries.forEach(([, { flushSync }]) => {\n          flushSync();\n        });\n      },\n    };\n  }, [...resultEntries]);\n});\n\n/**\n * Hook to mount and access root scopes\n */\nexport const useRootScopes = (rootScopes: ScopesInput) => {\n  return useResource(RootScopesResource(rootScopes));\n};\n\n/**\n * Resource for a single derived scope\n * Returns a tuple of [scopeName, scopeFunction] where scopeFunction has source and query\n */\nconst DerivedScopeResource = resource(\n  <K extends keyof AssistantScopes>({\n    scopeName,\n    element,\n    parentClient,\n  }: {\n    scopeName: K;\n    element: ResourceElement<\n      AssistantScopes[K],\n      DerivedScopeProps<AssistantScopes[K]>\n    >;\n    parentClient: AssistantClient;\n  }) => {\n    const get = tapEffectEvent(element.props.get);\n    const source = element.props.source;\n    const query = element.props.query;\n    return tapMemo(() => {\n      const scopeFunction = (() => get(parentClient)) as ScopeField<\n        AssistantScopes[K]\n      >;\n      scopeFunction.source = source;\n      scopeFunction.query = query;\n\n      return [scopeName, scopeFunction] as const;\n    }, [scopeName, get, source, JSON.stringify(query), parentClient]);\n  },\n);\n\n/**\n * Resource for all derived scopes\n * Builds stable scope functions with source and query metadata\n */\nconst DerivedScopesResource = resource(\n  ({\n    scopes,\n    parentClient,\n  }: {\n    scopes: ScopesInput;\n    parentClient: AssistantClient;\n  }) => {\n    const resultEntries = tapResources(\n      Object.entries(scopes).map(([scopeName, element]) =>\n        DerivedScopeResource(\n          {\n            scopeName: scopeName as keyof AssistantScopes,\n            element: element as ScopeInput<\n              AssistantScopes[keyof AssistantScopes]\n            >,\n            parentClient,\n          },\n          { key: scopeName },\n        ),\n      ),\n    );\n\n    return tapMemo(() => {\n      return Object.fromEntries(resultEntries) as {\n        [K in keyof typeof scopes]: ScopeField<AssistantScopes[K]>;\n      };\n    }, [...resultEntries]);\n  },\n);\n\n/**\n * Hook to mount and access derived scopes\n */\nexport const useDerivedScopes = (\n  derivedScopes: ScopesInput,\n  parentClient: AssistantClient,\n) => {\n  return useResource(\n    DerivedScopesResource({ scopes: derivedScopes, parentClient }),\n  );\n};\n\nconst useExtendedAssistantClientImpl = (\n  scopes: ScopesInput,\n): AssistantClient => {\n  const baseClient = useAssistantContextValue();\n  const { rootScopes, derivedScopes } = splitScopes(scopes);\n\n  // Mount the scopes to keep them alive\n  const rootFields = useRootScopes(rootScopes);\n  const derivedFields = useDerivedScopes(derivedScopes, baseClient);\n\n  return useMemo(() => {\n    // Merge base client with extended client\n    // If baseClient is the default proxy, spreading it will be a no-op\n    return {\n      ...baseClient,\n      ...rootFields.scopes,\n      ...derivedFields,\n      subscribe: rootFields.subscribe ?? baseClient.subscribe,\n      flushSync: rootFields.flushSync ?? baseClient.flushSync,\n    } as AssistantClient;\n  }, [baseClient, rootFields, derivedFields]);\n};\n\n/**\n * Hook to access or extend the AssistantClient\n *\n * @example Without config - returns the client from context:\n * ```typescript\n * const client = useAssistantClient();\n * const fooState = client.foo.getState();\n * ```\n *\n * @example With config - creates a new client with additional scopes:\n * ```typescript\n * const client = useAssistantClient({\n *   message: DerivedScope({\n *     source: \"thread\",\n *     query: { type: \"index\", index: 0 },\n *     get: () => messageApi,\n *   }),\n * });\n * ```\n */\nexport function useAssistantClient(): AssistantClient;\nexport function useAssistantClient(scopes: ScopesInput): AssistantClient;\nexport function useAssistantClient(scopes?: ScopesInput): AssistantClient {\n  if (scopes) {\n    // eslint-disable-next-line react-hooks/rules-of-hooks\n    return useExtendedAssistantClientImpl(scopes);\n  } else {\n    // eslint-disable-next-line react-hooks/rules-of-hooks\n    return useAssistantContextValue();\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/useAssistantClient.tsx"],"sourcesContent":["import { useMemo } from \"react\";\nimport { useResource } from \"@assistant-ui/tap/react\";\nimport {\n  resource,\n  tapMemo,\n  tapResource,\n  tapResources,\n  tapEffectEvent,\n  tapInlineResource,\n  ResourceElement,\n} from \"@assistant-ui/tap\";\nimport type {\n  AssistantClient,\n  AssistantScopes,\n  ScopesInput,\n  ScopeField,\n  ScopeInput,\n  DerivedScopeProps,\n} from \"./types\";\nimport { asStore } from \"./asStore\";\nimport { useAssistantContextValue } from \"./AssistantContext\";\nimport { splitScopes } from \"./utils/splitScopes\";\nimport {\n  EventManager,\n  normalizeEventSelector,\n  type AssistantEvent,\n  type AssistantEventCallback,\n  type AssistantEventSelector,\n} from \"./EventContext\";\nimport { withStoreContextProvider } from \"./StoreContext\";\n\n/**\n * Resource that renders a store with the store context provider.\n * This ensures the context is re-established on every re-render.\n */\nconst RootScopeStoreResource = resource(\n  <K extends keyof AssistantScopes>({\n    element,\n    events,\n    parent,\n  }: {\n    element: ScopeInput<AssistantScopes[K]>;\n    events: EventManager;\n    parent: AssistantClient;\n  }) => {\n    return withStoreContextProvider({ events, parent }, () =>\n      tapInlineResource(element),\n    );\n  },\n);\n\n/**\n * Resource for a single root scope\n * Returns a tuple of [scopeName, {scopeFunction, subscribe, flushSync}]\n */\nconst RootScopeResource = resource(\n  <K extends keyof AssistantScopes>({\n    scopeName,\n    element,\n    events,\n    parent,\n  }: {\n    scopeName: K;\n    element: ScopeInput<AssistantScopes[K]>;\n    events: EventManager;\n    parent: AssistantClient;\n  }) => {\n    const store = tapResource(\n      asStore(RootScopeStoreResource({ element, events, parent })),\n    );\n\n    return tapMemo(() => {\n      const scopeFunction = (() => store.getState().api) as ScopeField<\n        AssistantScopes[K]\n      >;\n      scopeFunction.source = \"root\";\n      scopeFunction.query = {};\n\n      return [\n        scopeName,\n        {\n          scopeFunction,\n          subscribe: store.subscribe,\n          flushSync: store.flushSync,\n        },\n      ] as const;\n    }, [scopeName, store]);\n  },\n);\n\n/**\n * Resource for all root scopes\n * Mounts each root scope and returns an object mapping scope names to their stores\n */\nconst RootScopesResource = resource(\n  ({ scopes, parent }: { scopes: ScopesInput; parent: AssistantClient }) => {\n    const events = tapInlineResource(EventManager());\n\n    const resultEntries = tapResources(\n      Object.entries(scopes).map(([scopeName, element]) =>\n        RootScopeResource(\n          {\n            scopeName: scopeName as keyof AssistantScopes,\n            element: element as ScopeInput<\n              AssistantScopes[keyof AssistantScopes]\n            >,\n            events,\n            parent,\n          },\n          { key: scopeName },\n        ),\n      ),\n    );\n\n    const on = <TEvent extends AssistantEvent>(\n      selector: AssistantEventSelector<TEvent>,\n      callback: AssistantEventCallback<TEvent>,\n    ) => {\n      const { event } = normalizeEventSelector(selector);\n      return events.on(event, callback);\n    };\n\n    return tapMemo(() => {\n      if (resultEntries.length === 0) {\n        return {\n          scopes: {},\n          on,\n        };\n      }\n\n      return {\n        scopes: Object.fromEntries(\n          resultEntries.map(([scopeName, { scopeFunction }]) => [\n            scopeName,\n            scopeFunction,\n          ]),\n        ) as {\n          [K in keyof typeof scopes]: ScopeField<AssistantScopes[K]>;\n        },\n        subscribe: (callback: () => void) => {\n          const unsubscribes = resultEntries.map(([, { subscribe }]) => {\n            return subscribe(() => {\n              console.log(\"Callback called for\");\n              callback();\n            });\n          });\n          return () => {\n            unsubscribes.forEach((unsubscribe) => unsubscribe());\n          };\n        },\n        flushSync: () => {\n          resultEntries.forEach(([, { flushSync }]) => {\n            flushSync();\n          });\n        },\n        on,\n      };\n    }, [...resultEntries, events]);\n  },\n);\n\n/**\n * Hook to mount and access root scopes\n */\nexport const useRootScopes = (\n  rootScopes: ScopesInput,\n  parent: AssistantClient,\n) => {\n  return useResource(RootScopesResource({ scopes: rootScopes, parent }));\n};\n\n/**\n * Resource for a single derived scope\n * Returns a tuple of [scopeName, scopeFunction] where scopeFunction has source and query\n */\nconst DerivedScopeResource = resource(\n  <K extends keyof AssistantScopes>({\n    scopeName,\n    element,\n    parentClient,\n  }: {\n    scopeName: K;\n    element: ResourceElement<\n      AssistantScopes[K],\n      DerivedScopeProps<AssistantScopes[K]>\n    >;\n    parentClient: AssistantClient;\n  }) => {\n    const get = tapEffectEvent(element.props.get);\n    const source = element.props.source;\n    const query = element.props.query;\n    return tapMemo(() => {\n      const scopeFunction = (() => get(parentClient)) as ScopeField<\n        AssistantScopes[K]\n      >;\n      scopeFunction.source = source;\n      scopeFunction.query = query;\n\n      return [scopeName, scopeFunction] as const;\n    }, [scopeName, get, source, JSON.stringify(query), parentClient]);\n  },\n);\n\n/**\n * Resource for all derived scopes\n * Builds stable scope functions with source and query metadata\n */\nconst DerivedScopesResource = resource(\n  ({\n    scopes,\n    parentClient,\n  }: {\n    scopes: ScopesInput;\n    parentClient: AssistantClient;\n  }) => {\n    const resultEntries = tapResources(\n      Object.entries(scopes).map(([scopeName, element]) =>\n        DerivedScopeResource(\n          {\n            scopeName: scopeName as keyof AssistantScopes,\n            element: element as ScopeInput<\n              AssistantScopes[keyof AssistantScopes]\n            >,\n            parentClient,\n          },\n          { key: scopeName },\n        ),\n      ),\n    );\n\n    return tapMemo(() => {\n      return Object.fromEntries(resultEntries) as {\n        [K in keyof typeof scopes]: ScopeField<AssistantScopes[K]>;\n      };\n    }, [...resultEntries]);\n  },\n);\n\n/**\n * Hook to mount and access derived scopes\n */\nexport const useDerivedScopes = (\n  derivedScopes: ScopesInput,\n  parentClient: AssistantClient,\n) => {\n  return useResource(\n    DerivedScopesResource({ scopes: derivedScopes, parentClient }),\n  );\n};\n\nconst useExtendedAssistantClientImpl = (\n  scopes: ScopesInput,\n): AssistantClient => {\n  const baseClient = useAssistantContextValue();\n  const { rootScopes, derivedScopes } = splitScopes(scopes);\n\n  // Mount the scopes to keep them alive\n  const rootFields = useRootScopes(rootScopes, baseClient);\n  const derivedFields = useDerivedScopes(derivedScopes, baseClient);\n\n  return useMemo(() => {\n    // Merge base client with extended client\n    // If baseClient is the default proxy, spreading it will be a no-op\n    return {\n      ...baseClient,\n      ...rootFields.scopes,\n      ...derivedFields,\n      subscribe: rootFields.subscribe ?? baseClient.subscribe,\n      flushSync: rootFields.flushSync ?? baseClient.flushSync,\n      on: rootFields.on ?? baseClient.on,\n    } as AssistantClient;\n  }, [baseClient, rootFields, derivedFields]);\n};\n\n/**\n * Hook to access or extend the AssistantClient\n *\n * @example Without config - returns the client from context:\n * ```typescript\n * const client = useAssistantClient();\n * const fooState = client.foo.getState();\n * ```\n *\n * @example With config - creates a new client with additional scopes:\n * ```typescript\n * const client = useAssistantClient({\n *   message: DerivedScope({\n *     source: \"thread\",\n *     query: { type: \"index\", index: 0 },\n *     get: () => messageApi,\n *   }),\n * });\n * ```\n */\nexport function useAssistantClient(): AssistantClient;\nexport function useAssistantClient(scopes: ScopesInput): AssistantClient;\nexport function useAssistantClient(scopes?: ScopesInput): AssistantClient {\n  if (scopes) {\n    return useExtendedAssistantClientImpl(scopes);\n  } else {\n    return useAssistantContextValue();\n  }\n}\n"],"mappings":";AAAA,SAAS,eAAe;AACxB,SAAS,mBAAmB;AAC5B;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AASP,SAAS,eAAe;AACxB,SAAS,gCAAgC;AACzC,SAAS,mBAAmB;AAC5B;AAAA,EACE;AAAA,EACA;AAAA,OAIK;AACP,SAAS,gCAAgC;AAMzC,IAAM,yBAAyB;AAAA,EAC7B,CAAkC;AAAA,IAChC;AAAA,IACA;AAAA,IACA;AAAA,EACF,MAIM;AACJ,WAAO;AAAA,MAAyB,EAAE,QAAQ,OAAO;AAAA,MAAG,MAClD,kBAAkB,OAAO;AAAA,IAC3B;AAAA,EACF;AACF;AAMA,IAAM,oBAAoB;AAAA,EACxB,CAAkC;AAAA,IAChC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,MAKM;AACJ,UAAM,QAAQ;AAAA,MACZ,QAAQ,uBAAuB,EAAE,SAAS,QAAQ,OAAO,CAAC,CAAC;AAAA,IAC7D;AAEA,WAAO,QAAQ,MAAM;AACnB,YAAM,iBAAiB,MAAM,MAAM,SAAS,EAAE;AAG9C,oBAAc,SAAS;AACvB,oBAAc,QAAQ,CAAC;AAEvB,aAAO;AAAA,QACL;AAAA,QACA;AAAA,UACE;AAAA,UACA,WAAW,MAAM;AAAA,UACjB,WAAW,MAAM;AAAA,QACnB;AAAA,MACF;AAAA,IACF,GAAG,CAAC,WAAW,KAAK,CAAC;AAAA,EACvB;AACF;AAMA,IAAM,qBAAqB;AAAA,EACzB,CAAC,EAAE,QAAQ,OAAO,MAAwD;AACxE,UAAM,SAAS,kBAAkB,aAAa,CAAC;AAE/C,UAAM,gBAAgB;AAAA,MACpB,OAAO,QAAQ,MAAM,EAAE;AAAA,QAAI,CAAC,CAAC,WAAW,OAAO,MAC7C;AAAA,UACE;AAAA,YACE;AAAA,YACA;AAAA,YAGA;AAAA,YACA;AAAA,UACF;AAAA,UACA,EAAE,KAAK,UAAU;AAAA,QACnB;AAAA,MACF;AAAA,IACF;AAEA,UAAM,KAAK,CACT,UACA,aACG;AACH,YAAM,EAAE,MAAM,IAAI,uBAAuB,QAAQ;AACjD,aAAO,OAAO,GAAG,OAAO,QAAQ;AAAA,IAClC;AAEA,WAAO,QAAQ,MAAM;AACnB,UAAI,cAAc,WAAW,GAAG;AAC9B,eAAO;AAAA,UACL,QAAQ,CAAC;AAAA,UACT;AAAA,QACF;AAAA,MACF;AAEA,aAAO;AAAA,QACL,QAAQ,OAAO;AAAA,UACb,cAAc,IAAI,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,MAAM;AAAA,YACpD;AAAA,YACA;AAAA,UACF,CAAC;AAAA,QACH;AAAA,QAGA,WAAW,CAAC,aAAyB;AACnC,gBAAM,eAAe,cAAc,IAAI,CAAC,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM;AAC5D,mBAAO,UAAU,MAAM;AACrB,sBAAQ,IAAI,qBAAqB;AACjC,uBAAS;AAAA,YACX,CAAC;AAAA,UACH,CAAC;AACD,iBAAO,MAAM;AACX,yBAAa,QAAQ,CAAC,gBAAgB,YAAY,CAAC;AAAA,UACrD;AAAA,QACF;AAAA,QACA,WAAW,MAAM;AACf,wBAAc,QAAQ,CAAC,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM;AAC3C,sBAAU;AAAA,UACZ,CAAC;AAAA,QACH;AAAA,QACA;AAAA,MACF;AAAA,IACF,GAAG,CAAC,GAAG,eAAe,MAAM,CAAC;AAAA,EAC/B;AACF;AAKO,IAAM,gBAAgB,CAC3B,YACA,WACG;AACH,SAAO,YAAY,mBAAmB,EAAE,QAAQ,YAAY,OAAO,CAAC,CAAC;AACvE;AAMA,IAAM,uBAAuB;AAAA,EAC3B,CAAkC;AAAA,IAChC;AAAA,IACA;AAAA,IACA;AAAA,EACF,MAOM;AACJ,UAAM,MAAM,eAAe,QAAQ,MAAM,GAAG;AAC5C,UAAM,SAAS,QAAQ,MAAM;AAC7B,UAAM,QAAQ,QAAQ,MAAM;AAC5B,WAAO,QAAQ,MAAM;AACnB,YAAM,iBAAiB,MAAM,IAAI,YAAY;AAG7C,oBAAc,SAAS;AACvB,oBAAc,QAAQ;AAEtB,aAAO,CAAC,WAAW,aAAa;AAAA,IAClC,GAAG,CAAC,WAAW,KAAK,QAAQ,KAAK,UAAU,KAAK,GAAG,YAAY,CAAC;AAAA,EAClE;AACF;AAMA,IAAM,wBAAwB;AAAA,EAC5B,CAAC;AAAA,IACC;AAAA,IACA;AAAA,EACF,MAGM;AACJ,UAAM,gBAAgB;AAAA,MACpB,OAAO,QAAQ,MAAM,EAAE;AAAA,QAAI,CAAC,CAAC,WAAW,OAAO,MAC7C;AAAA,UACE;AAAA,YACE;AAAA,YACA;AAAA,YAGA;AAAA,UACF;AAAA,UACA,EAAE,KAAK,UAAU;AAAA,QACnB;AAAA,MACF;AAAA,IACF;AAEA,WAAO,QAAQ,MAAM;AACnB,aAAO,OAAO,YAAY,aAAa;AAAA,IAGzC,GAAG,CAAC,GAAG,aAAa,CAAC;AAAA,EACvB;AACF;AAKO,IAAM,mBAAmB,CAC9B,eACA,iBACG;AACH,SAAO;AAAA,IACL,sBAAsB,EAAE,QAAQ,eAAe,aAAa,CAAC;AAAA,EAC/D;AACF;AAEA,IAAM,iCAAiC,CACrC,WACoB;AACpB,QAAM,aAAa,yBAAyB;AAC5C,QAAM,EAAE,YAAY,cAAc,IAAI,YAAY,MAAM;AAGxD,QAAM,aAAa,cAAc,YAAY,UAAU;AACvD,QAAM,gBAAgB,iBAAiB,eAAe,UAAU;AAEhE,SAAO,QAAQ,MAAM;AAGnB,WAAO;AAAA,MACL,GAAG;AAAA,MACH,GAAG,WAAW;AAAA,MACd,GAAG;AAAA,MACH,WAAW,WAAW,aAAa,WAAW;AAAA,MAC9C,WAAW,WAAW,aAAa,WAAW;AAAA,MAC9C,IAAI,WAAW,MAAM,WAAW;AAAA,IAClC;AAAA,EACF,GAAG,CAAC,YAAY,YAAY,aAAa,CAAC;AAC5C;AAwBO,SAAS,mBAAmB,QAAuC;AACxE,MAAI,QAAQ;AACV,WAAO,+BAA+B,MAAM;AAAA,EAC9C,OAAO;AACL,WAAO,yBAAyB;AAAA,EAClC;AACF;","names":[]}

package/dist/useAssistantEvent.d.ts

@@ -0,0 +1,3 @@
+import type { AssistantEvent, AssistantEventCallback, AssistantEventSelector } from "./EventContext";
+export declare const useAssistantEvent: <TEvent extends AssistantEvent>(selector: AssistantEventSelector<TEvent>, callback: AssistantEventCallback<TEvent>) => void;
+//# sourceMappingURL=useAssistantEvent.d.ts.map

package/dist/useAssistantEvent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAssistantEvent.d.ts","sourceRoot":"","sources":["../src/useAssistantEvent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AAGxB,eAAO,MAAM,iBAAiB,GAAI,MAAM,SAAS,cAAc,EAC7D,UAAU,sBAAsB,CAAC,MAAM,CAAC,EACxC,UAAU,sBAAsB,CAAC,MAAM,CAAC,SAUzC,CAAC"}

package/dist/useAssistantEvent.js

@@ -0,0 +1,17 @@
+// src/useAssistantEvent.ts
+import { useEffect, useEffectEvent } from "react";
+import { useAssistantClient } from "./useAssistantClient.js";
+import { normalizeEventSelector } from "./EventContext.js";
+var useAssistantEvent = (selector, callback) => {
+  const client = useAssistantClient();
+  const callbackRef = useEffectEvent(callback);
+  const { scope, event } = normalizeEventSelector(selector);
+  useEffect(
+    () => client.on({ scope, event }, callbackRef),
+    [client, scope, event]
+  );
+};
+export {
+  useAssistantEvent
+};
+//# sourceMappingURL=useAssistantEvent.js.map

package/dist/useAssistantEvent.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/useAssistantEvent.ts"],"sourcesContent":["import { useEffect, useEffectEvent } from \"react\";\nimport { useAssistantClient } from \"./useAssistantClient\";\nimport type {\n  AssistantEvent,\n  AssistantEventCallback,\n  AssistantEventSelector,\n} from \"./EventContext\";\nimport { normalizeEventSelector } from \"./EventContext\";\n\nexport const useAssistantEvent = <TEvent extends AssistantEvent>(\n  selector: AssistantEventSelector<TEvent>,\n  callback: AssistantEventCallback<TEvent>,\n) => {\n  const client = useAssistantClient();\n  const callbackRef = useEffectEvent(callback);\n\n  const { scope, event } = normalizeEventSelector(selector);\n  useEffect(\n    () => client.on({ scope, event }, callbackRef),\n    [client, scope, event],\n  );\n};\n"],"mappings":";AAAA,SAAS,WAAW,sBAAsB;AAC1C,SAAS,0BAA0B;AAMnC,SAAS,8BAA8B;AAEhC,IAAM,oBAAoB,CAC/B,UACA,aACG;AACH,QAAM,SAAS,mBAAmB;AAClC,QAAM,cAAc,eAAe,QAAQ;AAE3C,QAAM,EAAE,OAAO,MAAM,IAAI,uBAAuB,QAAQ;AACxD;AAAA,IACE,MAAM,OAAO,GAAG,EAAE,OAAO,MAAM,GAAG,WAAW;AAAA,IAC7C,CAAC,QAAQ,OAAO,KAAK;AAAA,EACvB;AACF;","names":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@assistant-ui/store",
   "description": "Tap-based state management for @assistant-ui",
-  "version": "0.0.0",
+  "version": "0.0.2",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -20,15 +20,15 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/tap": "0.3.0"
+    "@assistant-ui/tap": "0.3.2"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
     "@types/node": "^24.10.1",
-    "@types/react": "19.2.5",
-    "tsx": "^4.20.6",
+    "@types/react": "19.2.7",
+    "tsx": "^4.21.0",
     "@assistant-ui/x-buildutils": "0.0.1"
   },
   "publishConfig": {
@@ -44,7 +44,6 @@
     "url": "https://github.com/assistant-ui/assistant-ui/issues"
   },
   "scripts": {
-    "build": "tsx scripts/build.mts",
-    "lint": "eslint ."
+    "build": "tsx scripts/build.mts"
   }
 }

package/src/AssistantContext.tsx

@@ -23,7 +23,7 @@ export const AssistantContext = createContext<AssistantClient>(
     get(_, prop: string) {
       // Allow access to subscribe and flushSync without error
       if (prop === "subscribe") return NO_OP_SUBSCRIBE;
-
+      if (prop === "on") return NO_OP_SUBSCRIBE;
       if (prop === "flushSync") return NO_OP_FLUSH_SYNC;
 
       // If this is a registered scope, return a function that errors when called or accessed

package/src/AssistantIf.tsx

@@ -0,0 +1,25 @@
+"use client";
+
+import type { FC, PropsWithChildren } from "react";
+import { useAssistantState } from "./useAssistantState";
+import type { AssistantState } from "./types";
+
+type UseAssistantIfProps = {
+  condition: AssistantIf.Condition;
+};
+
+const useAssistantIf = (props: UseAssistantIfProps) => {
+  return useAssistantState(props.condition);
+};
+
+export namespace AssistantIf {
+  export type Props = PropsWithChildren<UseAssistantIfProps>;
+  export type Condition = (state: AssistantState) => boolean;
+}
+
+export const AssistantIf: FC<AssistantIf.Props> = ({ children, condition }) => {
+  const result = useAssistantIf({ condition });
+  return result ? children : null;
+};
+
+AssistantIf.displayName = "AssistantIf";

package/src/DerivedScope.ts

@@ -1,5 +1,5 @@
 import { resource } from "@assistant-ui/tap";
-import type { ScopeDefinition, ScopeValue, DerivedScopeProps } from "./types";
+import type { ScopeDefinition, DerivedScopeProps } from "./types";
 
 /**
  * Creates a derived scope field that memoizes based on source and query.
@@ -7,15 +7,17 @@ import type { ScopeDefinition, ScopeValue, DerivedScopeProps } from "./types";
  *
  * @example
  * ```typescript
- * const MessageScope = DerivedScope<MessageScopeDefinition>({
- *   source: "thread",
- *   query: { type: "index", index: 0 },
- *   get: () => messageApi,
+ * const client = useAssistantClient({
+ *   message: DerivedScope({
+ *     source: "thread",
+ *     query: { index: 0 },
+ *     get: (client) => client.thread().message({ index: 0 }),
+ *   }),
  * });
  * ```
  */
 export const DerivedScope = resource(
-  <T extends ScopeDefinition>(config: DerivedScopeProps<T>): ScopeValue<T> => {
-    return config;
+  <T extends ScopeDefinition>(_config: DerivedScopeProps<T>): null => {
+    return null;
   },
 );

package/src/EventContext.ts

@@ -0,0 +1,187 @@
+import { resource, tapMemo } from "@assistant-ui/tap";
+import type { AssistantScopes, Unsubscribe } from "./types";
+
+/**
+ * Module augmentation interface for event scope configuration.
+ * Maps event sources to their parent scopes.
+ *
+ * @example
+ * ```typescript
+ * declare module "@assistant-ui/store" {
+ *   interface AssistantEventScopeConfig {
+ *     composer: "thread" | "message";
+ *     thread: never;
+ *   }
+ * }
+ * ```
+ */
+export interface AssistantEventScopeConfig {}
+
+type UnionToIntersection<U> = (
+  U extends unknown
+    ? (x: U) => void
+    : never
+) extends (x: infer I) => void
+  ? I
+  : never;
+
+/**
+ * Event map derived from scope event definitions
+ */
+export type ScopeEventMap = UnionToIntersection<
+  {
+    [K in keyof AssistantScopes]: AssistantScopes[K] extends {
+      events: infer E;
+    }
+      ? E extends Record<string, unknown>
+        ? E
+        : never
+      : never;
+  }[keyof AssistantScopes]
+>;
+
+type WildcardPayload = {
+  [K in keyof ScopeEventMap]: {
+    event: K;
+    payload: ScopeEventMap[K];
+  };
+}[keyof ScopeEventMap];
+
+export type AssistantEventMap = ScopeEventMap & {
+  // Catch-all
+  "*": WildcardPayload;
+};
+
+export type AssistantEvent = keyof AssistantEventMap;
+
+export type EventSource<T extends AssistantEvent = AssistantEvent> =
+  T extends `${infer Source}.${string}` ? Source : never;
+
+export type SourceByScope<TScope extends AssistantEventScope<AssistantEvent>> =
+  | (TScope extends "*" ? EventSource : never)
+  | (TScope extends keyof AssistantEventScopeConfig ? TScope : never)
+  | {
+      [K in keyof AssistantEventScopeConfig]: TScope extends AssistantEventScopeConfig[K]
+        ? K
+        : never;
+    }[keyof AssistantEventScopeConfig];
+
+export type AssistantEventScope<TEvent extends AssistantEvent> =
+  | "*"
+  | EventSource<TEvent>
+  | (EventSource<TEvent> extends keyof AssistantEventScopeConfig
+      ? AssistantEventScopeConfig[EventSource<TEvent>]
+      : never);
+
+export type AssistantEventSelector<TEvent extends AssistantEvent> =
+  | TEvent
+  | {
+      scope: AssistantEventScope<TEvent>;
+      event: TEvent;
+    };
+
+export const normalizeEventSelector = <TEvent extends AssistantEvent>(
+  selector: AssistantEventSelector<TEvent>,
+) => {
+  if (typeof selector === "string") {
+    const source = selector.split(".")[0] as AssistantEventScope<TEvent>;
+    return {
+      scope: source,
+      event: selector,
+    };
+  }
+
+  return {
+    scope: selector.scope,
+    event: selector.event,
+  };
+};
+
+export const checkEventScope = <
+  TEvent extends AssistantEvent,
+  TExpectedScope extends AssistantEventScope<AssistantEvent>,
+>(
+  expectedScope: TExpectedScope,
+  scope: AssistantEventScope<TEvent>,
+  _event: TEvent,
+): _event is Extract<TEvent, `${SourceByScope<TExpectedScope>}.${string}`> => {
+  return scope === expectedScope;
+};
+
+export type AssistantEventCallback<TEvent extends AssistantEvent> = (
+  payload: AssistantEventMap[TEvent],
+) => void;
+
+export type EventManager = {
+  on<TEvent extends AssistantEvent>(
+    event: TEvent,
+    callback: AssistantEventCallback<TEvent>,
+  ): Unsubscribe;
+  emit<TEvent extends Exclude<AssistantEvent, "*">>(
+    event: TEvent,
+    payload: AssistantEventMap[TEvent],
+  ): void;
+};
+
+type ListenerMap = Omit<
+  Map<AssistantEvent, Set<AssistantEventCallback<AssistantEvent>>>,
+  "get" | "set"
+> & {
+  get<TEvent extends AssistantEvent>(
+    event: TEvent,
+  ): Set<AssistantEventCallback<TEvent>> | undefined;
+  set<TEvent extends AssistantEvent>(
+    event: TEvent,
+    value: Set<AssistantEventCallback<TEvent>>,
+  ): void;
+};
+
+export const EventManager = resource(() => {
+  const events = tapMemo(() => {
+    const listeners: ListenerMap = new Map();
+
+    return {
+      on: (event, callback) => {
+        if (!listeners.has(event)) {
+          listeners.set(event, new Set());
+        }
+
+        const eventListeners = listeners.get(event)!;
+        eventListeners.add(callback);
+
+        return () => {
+          eventListeners.delete(callback);
+          if (eventListeners.size === 0) {
+            listeners.delete(event);
+          }
+        };
+      },
+
+      emit: (event, payload) => {
+        const eventListeners = listeners.get(event);
+        const wildcardListeners = listeners.get("*");
+
+        if (!eventListeners && !wildcardListeners) return;
+
+        // make sure state updates flush
+        queueMicrotask(() => {
+          // Emit to specific event listeners
+          if (eventListeners) {
+            for (const callback of eventListeners) {
+              callback(payload);
+            }
+          }
+
+          // Emit to wildcard listeners
+          if (wildcardListeners) {
+            for (const callback of wildcardListeners) {
+              callback({ event, payload } as any);
+            }
+          }
+        });
+      },
+    } satisfies EventManager;
+  }, []);
+
+  return events;
+});

package/src/StoreContext.ts

@@ -0,0 +1,28 @@
+import {
+  createContext,
+  tapContext,
+  withContextProvider,
+} from "@assistant-ui/tap";
+import type { EventManager } from "./EventContext";
+import type { AssistantClient } from "./types";
+
+export type StoreContextValue = {
+  events: EventManager;
+  parent: AssistantClient;
+};
+
+const StoreContext = createContext<StoreContextValue | null>(null);
+
+export const withStoreContextProvider = <TResult>(
+  value: StoreContextValue,
+  fn: () => TResult,
+) => {
+  return withContextProvider(StoreContext, value, fn);
+};
+
+export const tapStoreContext = () => {
+  const ctx = tapContext(StoreContext);
+  if (!ctx) throw new Error("Store context is not available");
+
+  return ctx;
+};

package/src/index.ts

@@ -1,13 +1,40 @@
+// hooks
 export { useAssistantClient } from "./useAssistantClient";
 export { useAssistantState } from "./useAssistantState";
+export { useAssistantEvent } from "./useAssistantEvent";
+
+// components
+export { AssistantIf } from "./AssistantIf";
 export { AssistantProvider } from "./AssistantContext";
-export type { AssistantScopes, AssistantClient, AssistantState } from "./types";
+
+// resources
 export { DerivedScope } from "./DerivedScope";
-export type { ApiObject } from "./tapApi";
-export { tapApi } from "./tapApi";
+
+// tap hooks
+export { tapApi, type ApiObject } from "./tapApi";
+export { tapStoreContext, type StoreContextValue } from "./StoreContext";
 export { tapLookupResources } from "./tapLookupResources";
-export { tapStoreList } from "./tapStoreList";
-export type { TapStoreListConfig } from "./tapStoreList";
+export { tapStoreList, type TapStoreListConfig } from "./tapStoreList";
+
+// registration
 export { registerAssistantScope } from "./ScopeRegistry";
 
-export type { AssistantScopeRegistry } from "./types";
+// types
+export type {
+  AssistantScopes,
+  AssistantScopeRegistry,
+  AssistantClient,
+  AssistantState,
+} from "./types";
+
+export type {
+  AssistantEvent,
+  AssistantEventScopeConfig,
+  AssistantEventMap,
+  AssistantEventScope,
+  AssistantEventSelector,
+  AssistantEventCallback,
+  EventSource,
+  SourceByScope,
+  EventManager,
+} from "./EventContext";