@assistant-ui/store 0.0.0 → 0.0.1

package/dist/AssistantContext.js

@@ -20,6 +20,7 @@ var AssistantContext = createContext(
   new Proxy({}, {
     get(_, prop) {
       if (prop === "subscribe") return NO_OP_SUBSCRIBE;
+      if (prop === "on") return NO_OP_SUBSCRIBE;
       if (prop === "flushSync") return NO_OP_FLUSH_SYNC;
       if (hasRegisteredScope(prop))
         return NO_OP_SCOPE_FIELD;

package/dist/AssistantContext.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/AssistantContext.tsx"],"sourcesContent":["import React, { createContext, useContext } from \"react\";\nimport type { AssistantClient, AssistantScopes, ScopeField } from \"./types\";\nimport { hasRegisteredScope } from \"./ScopeRegistry\";\n\nconst NO_OP_SUBSCRIBE = () => () => {};\nconst NO_OP_FLUSH_SYNC = () => {};\nconst NO_OP_SCOPE_FIELD = (() => {\n  const fn = (() => {\n    throw new Error(\n      \"You need to wrap this component/hook in <AssistantProvider>\",\n    );\n  }) as ScopeField<never>;\n  fn.source = null;\n  fn.query = null;\n  return fn;\n})();\n\n/**\n * React Context for the AssistantClient\n */\nexport const AssistantContext = createContext<AssistantClient>(\n  new Proxy({} as AssistantClient, {\n    get(_, prop: string) {\n      // Allow access to subscribe and flushSync without error\n      if (prop === \"subscribe\") return NO_OP_SUBSCRIBE;\n\n      if (prop === \"flushSync\") return NO_OP_FLUSH_SYNC;\n\n      // If this is a registered scope, return a function that errors when called or accessed\n      if (hasRegisteredScope(prop as keyof AssistantScopes))\n        return NO_OP_SCOPE_FIELD;\n\n      return null;\n    },\n  }),\n);\n\nexport const useAssistantContextValue = (): AssistantClient => {\n  return useContext(AssistantContext);\n};\n\n/**\n * Provider component for AssistantClient\n *\n * @example\n * ```typescript\n * <AssistantProvider client={client}>\n *   <YourApp />\n * </AssistantProvider>\n * ```\n */\nexport const AssistantProvider = ({\n  client,\n  children,\n}: {\n  client: AssistantClient;\n  children: React.ReactNode;\n}): React.ReactElement => {\n  return (\n    <AssistantContext.Provider value={client}>\n      {children}\n    </AssistantContext.Provider>\n  );\n};\n"],"mappings":";AAAA,SAAgB,eAAe,kBAAkB;AAEjD,SAAS,0BAA0B;AAyD/B;AAvDJ,IAAM,kBAAkB,MAAM,MAAM;AAAC;AACrC,IAAM,mBAAmB,MAAM;AAAC;AAChC,IAAM,qBAAqB,MAAM;AAC/B,QAAM,MAAM,MAAM;AAChB,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAAA,EACF;AACA,KAAG,SAAS;AACZ,KAAG,QAAQ;AACX,SAAO;AACT,GAAG;AAKI,IAAM,mBAAmB;AAAA,EAC9B,IAAI,MAAM,CAAC,GAAsB;AAAA,IAC/B,IAAI,GAAG,MAAc;AAEnB,UAAI,SAAS,YAAa,QAAO;AAEjC,UAAI,SAAS,YAAa,QAAO;AAGjC,UAAI,mBAAmB,IAA6B;AAClD,eAAO;AAET,aAAO;AAAA,IACT;AAAA,EACF,CAAC;AACH;AAEO,IAAM,2BAA2B,MAAuB;AAC7D,SAAO,WAAW,gBAAgB;AACpC;AAYO,IAAM,oBAAoB,CAAC;AAAA,EAChC;AAAA,EACA;AACF,MAG0B;AACxB,SACE,oBAAC,iBAAiB,UAAjB,EAA0B,OAAO,QAC/B,UACH;AAEJ;","names":[]}
+{"version":3,"sources":["../src/AssistantContext.tsx"],"sourcesContent":["import React, { createContext, useContext } from \"react\";\nimport type { AssistantClient, AssistantScopes, ScopeField } from \"./types\";\nimport { hasRegisteredScope } from \"./ScopeRegistry\";\n\nconst NO_OP_SUBSCRIBE = () => () => {};\nconst NO_OP_FLUSH_SYNC = () => {};\nconst NO_OP_SCOPE_FIELD = (() => {\n  const fn = (() => {\n    throw new Error(\n      \"You need to wrap this component/hook in <AssistantProvider>\",\n    );\n  }) as ScopeField<never>;\n  fn.source = null;\n  fn.query = null;\n  return fn;\n})();\n\n/**\n * React Context for the AssistantClient\n */\nexport const AssistantContext = createContext<AssistantClient>(\n  new Proxy({} as AssistantClient, {\n    get(_, prop: string) {\n      // Allow access to subscribe and flushSync without error\n      if (prop === \"subscribe\") return NO_OP_SUBSCRIBE;\n      if (prop === \"on\") return NO_OP_SUBSCRIBE;\n      if (prop === \"flushSync\") return NO_OP_FLUSH_SYNC;\n\n      // If this is a registered scope, return a function that errors when called or accessed\n      if (hasRegisteredScope(prop as keyof AssistantScopes))\n        return NO_OP_SCOPE_FIELD;\n\n      return null;\n    },\n  }),\n);\n\nexport const useAssistantContextValue = (): AssistantClient => {\n  return useContext(AssistantContext);\n};\n\n/**\n * Provider component for AssistantClient\n *\n * @example\n * ```typescript\n * <AssistantProvider client={client}>\n *   <YourApp />\n * </AssistantProvider>\n * ```\n */\nexport const AssistantProvider = ({\n  client,\n  children,\n}: {\n  client: AssistantClient;\n  children: React.ReactNode;\n}): React.ReactElement => {\n  return (\n    <AssistantContext.Provider value={client}>\n      {children}\n    </AssistantContext.Provider>\n  );\n};\n"],"mappings":";AAAA,SAAgB,eAAe,kBAAkB;AAEjD,SAAS,0BAA0B;AAyD/B;AAvDJ,IAAM,kBAAkB,MAAM,MAAM;AAAC;AACrC,IAAM,mBAAmB,MAAM;AAAC;AAChC,IAAM,qBAAqB,MAAM;AAC/B,QAAM,MAAM,MAAM;AAChB,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAAA,EACF;AACA,KAAG,SAAS;AACZ,KAAG,QAAQ;AACX,SAAO;AACT,GAAG;AAKI,IAAM,mBAAmB;AAAA,EAC9B,IAAI,MAAM,CAAC,GAAsB;AAAA,IAC/B,IAAI,GAAG,MAAc;AAEnB,UAAI,SAAS,YAAa,QAAO;AACjC,UAAI,SAAS,KAAM,QAAO;AAC1B,UAAI,SAAS,YAAa,QAAO;AAGjC,UAAI,mBAAmB,IAA6B;AAClD,eAAO;AAET,aAAO;AAAA,IACT;AAAA,EACF,CAAC;AACH;AAEO,IAAM,2BAA2B,MAAuB;AAC7D,SAAO,WAAW,gBAAgB;AACpC;AAYO,IAAM,oBAAoB,CAAC;AAAA,EAChC;AAAA,EACA;AACF,MAG0B;AACxB,SACE,oBAAC,iBAAiB,UAAjB,EAA0B,OAAO,QAC/B,UACH;AAEJ;","names":[]}

package/dist/EventContext.d.ts

@@ -0,0 +1,65 @@
+import type { Unsubscribe } from "./types";
+/**
+ * Module augmentation interface for custom events.
+ *
+ * @example
+ * ```typescript
+ * declare module "@assistant-ui/store" {
+ *   interface AssistantEventRegistry {
+ *     "thread.run-start": { threadId: string };
+ *     "custom.my-event": { data: string };
+ *   }
+ * }
+ * ```
+ */
+export interface AssistantEventRegistry {
+}
+/**
+ * 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 {
+}
+export type AssistantEventMap = AssistantEventRegistry & {
+    "*": {
+        [K in Exclude<keyof AssistantEventRegistry, "*">]: {
+            event: K;
+            payload: AssistantEventRegistry[K];
+        };
+    }[Exclude<keyof AssistantEventRegistry, "*">];
+};
+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 declare const normalizeEventSelector: <TEvent extends AssistantEvent>(selector: AssistantEventSelector<TEvent>) => {
+    scope: AssistantEventScope<TEvent>;
+    event: TEvent;
+};
+export declare const checkEventScope: <TEvent extends AssistantEvent, TExpectedScope extends AssistantEventScope<AssistantEvent>>(expectedScope: TExpectedScope, scope: AssistantEventScope<TEvent>, _event: TEvent) => _event is Extract<TEvent, `${SourceByScope<TExpectedScope>}.${string}`>;
+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;
+};
+export declare const EventManager: () => import("@assistant-ui/tap").ResourceElement<{
+    on: <TEvent extends AssistantEvent>(event: TEvent, callback: AssistantEventCallback<TEvent>) => () => void;
+    emit: <TEvent extends Exclude<AssistantEvent, "*">>(event: TEvent, payload: AssistantEventMap[TEvent]) => void;
+}, undefined>;
+//# sourceMappingURL=EventContext.d.ts.map

package/dist/EventContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventContext.d.ts","sourceRoot":"","sources":["../src/EventContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,sBAAsB;CAAG;AAE1C;;;;;;;;;;;;;GAaG;AAEH,MAAM,WAAW,yBAAyB;CAAG;AAE7C,MAAM,MAAM,iBAAiB,GAAG,sBAAsB,GAAG;IAEvD,GAAG,EAAE;SACF,CAAC,IAAI,OAAO,CAAC,MAAM,sBAAsB,EAAE,GAAG,CAAC,GAAG;YACjD,KAAK,EAAE,CAAC,CAAC;YACT,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC;SACpC;KACF,CAAC,OAAO,CAAC,MAAM,sBAAsB,EAAE,GAAG,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC;AAErD,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,IAC/D,CAAC,SAAS,GAAG,MAAM,MAAM,IAAI,MAAM,EAAE,GAAG,MAAM,GAAG,KAAK,CAAC;AAEzD,MAAM,MAAM,aAAa,CAAC,MAAM,SAAS,mBAAmB,CAAC,cAAc,CAAC,IACxE,CAAC,MAAM,SAAS,GAAG,GAAG,WAAW,GAAG,KAAK,CAAC,GAC1C,CAAC,MAAM,SAAS,MAAM,yBAAyB,GAAG,MAAM,GAAG,KAAK,CAAC,GACjE;KACG,CAAC,IAAI,MAAM,yBAAyB,GAAG,MAAM,SAAS,yBAAyB,CAAC,CAAC,CAAC,GAC/E,CAAC,GACD,KAAK;CACV,CAAC,MAAM,yBAAyB,CAAC,CAAC;AAEvC,MAAM,MAAM,mBAAmB,CAAC,MAAM,SAAS,cAAc,IACzD,GAAG,GACH,WAAW,CAAC,MAAM,CAAC,GACnB,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,MAAM,yBAAyB,GACxD,yBAAyB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAC9C,KAAK,CAAC,CAAC;AAEf,MAAM,MAAM,sBAAsB,CAAC,MAAM,SAAS,cAAc,IAC5D,MAAM,GACN;IACE,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,eAAO,MAAM,sBAAsB,GAAI,MAAM,SAAS,cAAc,EAClE,UAAU,sBAAsB,CAAC,MAAM,CAAC;;;CAczC,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,MAAM,SAAS,cAAc,EAC7B,cAAc,SAAS,mBAAmB,CAAC,cAAc,CAAC,EAE1D,eAAe,cAAc,EAC7B,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAClC,QAAQ,MAAM,KACb,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,aAAa,CAAC,cAAc,CAAC,IAAI,MAAM,EAAE,CAExE,CAAC;AAEF,MAAM,MAAM,sBAAsB,CAAC,MAAM,SAAS,cAAc,IAAI,CAClE,OAAO,EAAE,iBAAiB,CAAC,MAAM,CAAC,KAC/B,IAAI,CAAC;AAEV,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,CAAC,MAAM,SAAS,cAAc,EAC9B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,sBAAsB,CAAC,MAAM,CAAC,GACvC,WAAW,CAAC;IACf,IAAI,CAAC,MAAM,SAAS,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,EAC9C,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,iBAAiB,CAAC,MAAM,CAAC,GACjC,IAAI,CAAC;CACT,CAAC;AAeF,eAAO,MAAM,YAAY;SAvBpB,MAAM,SAAS,cAAc;WAI3B,MAAM,SAAS,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC;aAwEhD,CAAC"}

package/dist/EventContext.js

@@ -0,0 +1,62 @@
+// src/EventContext.ts
+import { resource, tapMemo } from "@assistant-ui/tap";
+var normalizeEventSelector = (selector) => {
+  if (typeof selector === "string") {
+    const source = selector.split(".")[0];
+    return {
+      scope: source,
+      event: selector
+    };
+  }
+  return {
+    scope: selector.scope,
+    event: selector.event
+  };
+};
+var checkEventScope = (expectedScope, scope, _event) => {
+  return scope === expectedScope;
+};
+var EventManager = resource(() => {
+  const events = tapMemo(() => {
+    const listeners = /* @__PURE__ */ new Map();
+    return {
+      on: (event, callback) => {
+        if (!listeners.has(event)) {
+          listeners.set(event, /* @__PURE__ */ 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;
+        queueMicrotask(() => {
+          if (eventListeners) {
+            for (const callback of eventListeners) {
+              callback(payload);
+            }
+          }
+          if (wildcardListeners) {
+            for (const callback of wildcardListeners) {
+              callback({ event, payload });
+            }
+          }
+        });
+      }
+    };
+  }, []);
+  return events;
+});
+export {
+  EventManager,
+  checkEventScope,
+  normalizeEventSelector
+};
+//# sourceMappingURL=EventContext.js.map

package/dist/EventContext.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/EventContext.ts"],"sourcesContent":["import { resource, tapMemo } from \"@assistant-ui/tap\";\nimport type { Unsubscribe } from \"./types\";\n\n/**\n * Module augmentation interface for custom events.\n *\n * @example\n * ```typescript\n * declare module \"@assistant-ui/store\" {\n *   interface AssistantEventRegistry {\n *     \"thread.run-start\": { threadId: string };\n *     \"custom.my-event\": { data: string };\n *   }\n * }\n * ```\n */\n// eslint-disable-next-line @typescript-eslint/no-empty-object-type\nexport interface AssistantEventRegistry {}\n\n/**\n * Module augmentation interface for event scope configuration.\n * Maps event sources to their parent scopes.\n *\n * @example\n * ```typescript\n * declare module \"@assistant-ui/store\" {\n *   interface AssistantEventScopeConfig {\n *     composer: \"thread\" | \"message\";\n *     thread: never;\n *   }\n * }\n * ```\n */\n// eslint-disable-next-line @typescript-eslint/no-empty-object-type\nexport interface AssistantEventScopeConfig {}\n\nexport type AssistantEventMap = AssistantEventRegistry & {\n  // Catch-all\n  \"*\": {\n    [K in Exclude<keyof AssistantEventRegistry, \"*\">]: {\n      event: K;\n      payload: AssistantEventRegistry[K];\n    };\n  }[Exclude<keyof AssistantEventRegistry, \"*\">];\n};\n\nexport type AssistantEvent = keyof AssistantEventMap;\n\nexport type EventSource<T extends AssistantEvent = AssistantEvent> =\n  T extends `${infer Source}.${string}` ? Source : never;\n\nexport type SourceByScope<TScope extends AssistantEventScope<AssistantEvent>> =\n  | (TScope extends \"*\" ? EventSource : never)\n  | (TScope extends keyof AssistantEventScopeConfig ? TScope : never)\n  | {\n      [K in keyof AssistantEventScopeConfig]: TScope extends AssistantEventScopeConfig[K]\n        ? K\n        : never;\n    }[keyof AssistantEventScopeConfig];\n\nexport type AssistantEventScope<TEvent extends AssistantEvent> =\n  | \"*\"\n  | EventSource<TEvent>\n  | (EventSource<TEvent> extends keyof AssistantEventScopeConfig\n      ? AssistantEventScopeConfig[EventSource<TEvent>]\n      : never);\n\nexport type AssistantEventSelector<TEvent extends AssistantEvent> =\n  | TEvent\n  | {\n      scope: AssistantEventScope<TEvent>;\n      event: TEvent;\n    };\n\nexport const normalizeEventSelector = <TEvent extends AssistantEvent>(\n  selector: AssistantEventSelector<TEvent>,\n) => {\n  if (typeof selector === \"string\") {\n    const source = selector.split(\".\")[0] as AssistantEventScope<TEvent>;\n    return {\n      scope: source,\n      event: selector,\n    };\n  }\n\n  return {\n    scope: selector.scope,\n    event: selector.event,\n  };\n};\n\nexport const checkEventScope = <\n  TEvent extends AssistantEvent,\n  TExpectedScope extends AssistantEventScope<AssistantEvent>,\n>(\n  expectedScope: TExpectedScope,\n  scope: AssistantEventScope<TEvent>,\n  _event: TEvent,\n): _event is Extract<TEvent, `${SourceByScope<TExpectedScope>}.${string}`> => {\n  return scope === expectedScope;\n};\n\nexport type AssistantEventCallback<TEvent extends AssistantEvent> = (\n  payload: AssistantEventMap[TEvent],\n) => void;\n\nexport type EventManager = {\n  on<TEvent extends AssistantEvent>(\n    event: TEvent,\n    callback: AssistantEventCallback<TEvent>,\n  ): Unsubscribe;\n  emit<TEvent extends Exclude<AssistantEvent, \"*\">>(\n    event: TEvent,\n    payload: AssistantEventMap[TEvent],\n  ): void;\n};\n\ntype ListenerMap = Omit<\n  Map<AssistantEvent, Set<AssistantEventCallback<AssistantEvent>>>,\n  \"get\" | \"set\"\n> & {\n  get<TEvent extends AssistantEvent>(\n    event: TEvent,\n  ): Set<AssistantEventCallback<TEvent>> | undefined;\n  set<TEvent extends AssistantEvent>(\n    event: TEvent,\n    value: Set<AssistantEventCallback<TEvent>>,\n  ): void;\n};\n\nexport const EventManager = resource(() => {\n  const events = tapMemo(() => {\n    const listeners: ListenerMap = new Map();\n\n    return {\n      on: (event, callback) => {\n        if (!listeners.has(event)) {\n          listeners.set(event, new Set());\n        }\n\n        const eventListeners = listeners.get(event)!;\n        eventListeners.add(callback);\n\n        return () => {\n          eventListeners.delete(callback);\n          if (eventListeners.size === 0) {\n            listeners.delete(event);\n          }\n        };\n      },\n\n      emit: (event, payload) => {\n        const eventListeners = listeners.get(event);\n        const wildcardListeners = listeners.get(\"*\");\n\n        if (!eventListeners && !wildcardListeners) return;\n\n        // make sure state updates flush\n        queueMicrotask(() => {\n          // Emit to specific event listeners\n          if (eventListeners) {\n            for (const callback of eventListeners) {\n              callback(payload);\n            }\n          }\n\n          // Emit to wildcard listeners\n          if (wildcardListeners) {\n            for (const callback of wildcardListeners) {\n              (\n                callback as (payload: {\n                  event: typeof event;\n                  payload: typeof payload;\n                }) => void\n              )({ event, payload });\n            }\n          }\n        });\n      },\n    } satisfies EventManager;\n  }, []);\n\n  return events;\n});\n"],"mappings":";AAAA,SAAS,UAAU,eAAe;AA0E3B,IAAM,yBAAyB,CACpC,aACG;AACH,MAAI,OAAO,aAAa,UAAU;AAChC,UAAM,SAAS,SAAS,MAAM,GAAG,EAAE,CAAC;AACpC,WAAO;AAAA,MACL,OAAO;AAAA,MACP,OAAO;AAAA,IACT;AAAA,EACF;AAEA,SAAO;AAAA,IACL,OAAO,SAAS;AAAA,IAChB,OAAO,SAAS;AAAA,EAClB;AACF;AAEO,IAAM,kBAAkB,CAI7B,eACA,OACA,WAC4E;AAC5E,SAAO,UAAU;AACnB;AA8BO,IAAM,eAAe,SAAS,MAAM;AACzC,QAAM,SAAS,QAAQ,MAAM;AAC3B,UAAM,YAAyB,oBAAI,IAAI;AAEvC,WAAO;AAAA,MACL,IAAI,CAAC,OAAO,aAAa;AACvB,YAAI,CAAC,UAAU,IAAI,KAAK,GAAG;AACzB,oBAAU,IAAI,OAAO,oBAAI,IAAI,CAAC;AAAA,QAChC;AAEA,cAAM,iBAAiB,UAAU,IAAI,KAAK;AAC1C,uBAAe,IAAI,QAAQ;AAE3B,eAAO,MAAM;AACX,yBAAe,OAAO,QAAQ;AAC9B,cAAI,eAAe,SAAS,GAAG;AAC7B,sBAAU,OAAO,KAAK;AAAA,UACxB;AAAA,QACF;AAAA,MACF;AAAA,MAEA,MAAM,CAAC,OAAO,YAAY;AACxB,cAAM,iBAAiB,UAAU,IAAI,KAAK;AAC1C,cAAM,oBAAoB,UAAU,IAAI,GAAG;AAE3C,YAAI,CAAC,kBAAkB,CAAC,kBAAmB;AAG3C,uBAAe,MAAM;AAEnB,cAAI,gBAAgB;AAClB,uBAAW,YAAY,gBAAgB;AACrC,uBAAS,OAAO;AAAA,YAClB;AAAA,UACF;AAGA,cAAI,mBAAmB;AACrB,uBAAW,YAAY,mBAAmB;AACxC,cACE,SAIA,EAAE,OAAO,QAAQ,CAAC;AAAA,YACtB;AAAA,UACF;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF,GAAG,CAAC,CAAC;AAEL,SAAO;AACT,CAAC;","names":[]}

package/dist/StoreContext.d.ts

@@ -0,0 +1,9 @@
+import type { EventManager } from "./EventContext";
+import type { AssistantClient } from "./types";
+export type StoreContextValue = {
+    events: EventManager;
+    parent: AssistantClient;
+};
+export declare const withStoreContextProvider: <TResult>(value: StoreContextValue, fn: () => TResult) => TResult;
+export declare const tapStoreContext: () => StoreContextValue;
+//# sourceMappingURL=StoreContext.d.ts.map

package/dist/StoreContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StoreContext.d.ts","sourceRoot":"","sources":["../src/StoreContext.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;CACzB,CAAC;AAIF,eAAO,MAAM,wBAAwB,GAAI,OAAO,EAC9C,OAAO,iBAAiB,EACxB,IAAI,MAAM,OAAO,YAGlB,CAAC;AAEF,eAAO,MAAM,eAAe,yBAK3B,CAAC"}

package/dist/StoreContext.js

@@ -0,0 +1,20 @@
+// src/StoreContext.ts
+import {
+  createContext,
+  tapContext,
+  withContextProvider
+} from "@assistant-ui/tap";
+var StoreContext = createContext(null);
+var withStoreContextProvider = (value, fn) => {
+  return withContextProvider(StoreContext, value, fn);
+};
+var tapStoreContext = () => {
+  const ctx = tapContext(StoreContext);
+  if (!ctx) throw new Error("Store context is not available");
+  return ctx;
+};
+export {
+  tapStoreContext,
+  withStoreContextProvider
+};
+//# sourceMappingURL=StoreContext.js.map

package/dist/StoreContext.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/StoreContext.ts"],"sourcesContent":["import {\n  createContext,\n  tapContext,\n  withContextProvider,\n} from \"@assistant-ui/tap\";\nimport type { EventManager } from \"./EventContext\";\nimport type { AssistantClient } from \"./types\";\n\nexport type StoreContextValue = {\n  events: EventManager;\n  parent: AssistantClient;\n};\n\nconst StoreContext = createContext<StoreContextValue | null>(null);\n\nexport const withStoreContextProvider = <TResult>(\n  value: StoreContextValue,\n  fn: () => TResult,\n) => {\n  return withContextProvider(StoreContext, value, fn);\n};\n\nexport const tapStoreContext = () => {\n  const ctx = tapContext(StoreContext);\n  if (!ctx) throw new Error(\"Store context is not available\");\n\n  return ctx;\n};\n"],"mappings":";AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AASP,IAAM,eAAe,cAAwC,IAAI;AAE1D,IAAM,2BAA2B,CACtC,OACA,OACG;AACH,SAAO,oBAAoB,cAAc,OAAO,EAAE;AACpD;AAEO,IAAM,kBAAkB,MAAM;AACnC,QAAM,MAAM,WAAW,YAAY;AACnC,MAAI,CAAC,IAAK,OAAM,IAAI,MAAM,gCAAgC;AAE1D,SAAO;AACT;","names":[]}

package/dist/index.d.ts

@@ -10,4 +10,9 @@ export { tapStoreList } from "./tapStoreList";
 export type { TapStoreListConfig } from "./tapStoreList";
 export { registerAssistantScope } from "./ScopeRegistry";
 export type { AssistantScopeRegistry } from "./types";
+export { tapStoreContext } from "./StoreContext";
+export type { StoreContextValue } from "./StoreContext";
+export { useAssistantEvent } from "./useAssistantEvent";
+export { normalizeEventSelector, checkEventScope } from "./EventContext";
+export type { AssistantEvent, AssistantEventRegistry, AssistantEventScopeConfig, AssistantEventMap, AssistantEventScope, AssistantEventSelector, AssistantEventCallback, EventSource, SourceByScope, EventManager, } from "./EventContext";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,YAAY,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,YAAY,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACzE,YAAY,EACV,cAAc,EACd,sBAAsB,EACtB,yBAAyB,EACzB,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,WAAW,EACX,aAAa,EACb,YAAY,GACb,MAAM,gBAAgB,CAAC"}

package/dist/index.js

@@ -7,14 +7,21 @@ import { tapApi } from "./tapApi.js";
 import { tapLookupResources } from "./tapLookupResources.js";
 import { tapStoreList } from "./tapStoreList.js";
 import { registerAssistantScope } from "./ScopeRegistry.js";
+import { tapStoreContext } from "./StoreContext.js";
+import { useAssistantEvent } from "./useAssistantEvent.js";
+import { normalizeEventSelector, checkEventScope } from "./EventContext.js";
 export {
   AssistantProvider,
   DerivedScope,
+  checkEventScope,
+  normalizeEventSelector,
   registerAssistantScope,
   tapApi,
   tapLookupResources,
+  tapStoreContext,
   tapStoreList,
   useAssistantClient,
+  useAssistantEvent,
   useAssistantState
 };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export { useAssistantClient } from \"./useAssistantClient\";\nexport { useAssistantState } from \"./useAssistantState\";\nexport { AssistantProvider } from \"./AssistantContext\";\nexport type { AssistantScopes, AssistantClient, AssistantState } from \"./types\";\nexport { DerivedScope } from \"./DerivedScope\";\nexport type { ApiObject } from \"./tapApi\";\nexport { tapApi } from \"./tapApi\";\nexport { tapLookupResources } from \"./tapLookupResources\";\nexport { tapStoreList } from \"./tapStoreList\";\nexport type { TapStoreListConfig } from \"./tapStoreList\";\nexport { registerAssistantScope } from \"./ScopeRegistry\";\n\nexport type { AssistantScopeRegistry } from \"./types\";\n"],"mappings":";AAAA,SAAS,0BAA0B;AACnC,SAAS,yBAAyB;AAClC,SAAS,yBAAyB;AAElC,SAAS,oBAAoB;AAE7B,SAAS,cAAc;AACvB,SAAS,0BAA0B;AACnC,SAAS,oBAAoB;AAE7B,SAAS,8BAA8B;","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export { useAssistantClient } from \"./useAssistantClient\";\nexport { useAssistantState } from \"./useAssistantState\";\nexport { AssistantProvider } from \"./AssistantContext\";\nexport type { AssistantScopes, AssistantClient, AssistantState } from \"./types\";\nexport { DerivedScope } from \"./DerivedScope\";\nexport type { ApiObject } from \"./tapApi\";\nexport { tapApi } from \"./tapApi\";\nexport { tapLookupResources } from \"./tapLookupResources\";\nexport { tapStoreList } from \"./tapStoreList\";\nexport type { TapStoreListConfig } from \"./tapStoreList\";\nexport { registerAssistantScope } from \"./ScopeRegistry\";\n\nexport type { AssistantScopeRegistry } from \"./types\";\n\n// Events & Store Context\nexport { tapStoreContext } from \"./StoreContext\";\nexport type { StoreContextValue } from \"./StoreContext\";\nexport { useAssistantEvent } from \"./useAssistantEvent\";\nexport { normalizeEventSelector, checkEventScope } from \"./EventContext\";\nexport type {\n  AssistantEvent,\n  AssistantEventRegistry,\n  AssistantEventScopeConfig,\n  AssistantEventMap,\n  AssistantEventScope,\n  AssistantEventSelector,\n  AssistantEventCallback,\n  EventSource,\n  SourceByScope,\n  EventManager,\n} from \"./EventContext\";\n"],"mappings":";AAAA,SAAS,0BAA0B;AACnC,SAAS,yBAAyB;AAClC,SAAS,yBAAyB;AAElC,SAAS,oBAAoB;AAE7B,SAAS,cAAc;AACvB,SAAS,0BAA0B;AACnC,SAAS,oBAAoB;AAE7B,SAAS,8BAA8B;AAKvC,SAAS,uBAAuB;AAEhC,SAAS,yBAAyB;AAClC,SAAS,wBAAwB,uBAAuB;","names":[]}

package/dist/types.d.ts

@@ -1,4 +1,5 @@
 import type { ResourceElement } from "@assistant-ui/tap";
+import type { AssistantEvent, AssistantEventCallback, AssistantEventSelector } from "./EventContext";
 /**
  * Module augmentation interface for assistant-ui store type extensions.
  *
@@ -82,5 +83,6 @@ export type AssistantClient = {
 } & {
     subscribe(listener: () => void): Unsubscribe;
     flushSync(): void;
+    on<TEvent extends AssistantEvent>(selector: AssistantEventSelector<TEvent>, callback: AssistantEventCallback<TEvent>): Unsubscribe;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAmBzD;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,WAAW,sBAAsB;CAAG;AAE1C,MAAM,MAAM,eAAe,GAAG,MAAM,sBAAsB,SAAS,KAAK,GACpE,MAAM,CAAC,+BAA+B,EAAE,eAAe,CAAC,GACxD;KAAG,CAAC,IAAI,MAAM,sBAAsB,GAAG,sBAAsB,CAAC,CAAC,CAAC;CAAE,CAAC;AAEvE;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;AAE/D;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;AAE/D;;;GAGG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC,GACvE,CACI;IACE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CACtB,GACD;IACE,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;CACb,CACJ,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,eAAe,IAAI;IACzD,GAAG,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CACtB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,eAAe,IAAI,eAAe,CAAC;IAClE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CACpB,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;KACvB,CAAC,IAAI,MAAM,eAAe,CAAC,CAAC,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;CAC9D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAErC;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;KAC1B,CAAC,IAAI,MAAM,eAAe,GAAG,UAAU,CACtC,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CACxC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;KAC3B,CAAC,IAAI,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;CAC7D,GAAG;IACF,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,WAAW,CAAC;IAC7C,SAAS,IAAI,IAAI,CAAC;CACnB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AAmBxB;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,WAAW,sBAAsB;CAAG;AAE1C,MAAM,MAAM,eAAe,GAAG,MAAM,sBAAsB,SAAS,KAAK,GACpE,MAAM,CAAC,+BAA+B,EAAE,eAAe,CAAC,GACxD;KAAG,CAAC,IAAI,MAAM,sBAAsB,GAAG,sBAAsB,CAAC,CAAC,CAAC;CAAE,CAAC;AAEvE;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;AAE/D;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;AAE/D;;;GAGG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC,GACvE,CACI;IACE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CACtB,GACD;IACE,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;CACb,CACJ,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,eAAe,IAAI;IACzD,GAAG,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CACtB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,eAAe,IAAI,eAAe,CAAC;IAClE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CACpB,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;KACvB,CAAC,IAAI,MAAM,eAAe,CAAC,CAAC,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;CAC9D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAErC;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;KAC1B,CAAC,IAAI,MAAM,eAAe,GAAG,UAAU,CACtC,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CACxC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;KAC3B,CAAC,IAAI,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;CAC7D,GAAG;IACF,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,WAAW,CAAC;IAC7C,SAAS,IAAI,IAAI,CAAC;IAClB,EAAE,CAAC,MAAM,SAAS,cAAc,EAC9B,QAAQ,EAAE,sBAAsB,CAAC,MAAM,CAAC,EACxC,QAAQ,EAAE,sBAAsB,CAAC,MAAM,CAAC,GACvC,WAAW,CAAC;CAChB,CAAC"}

package/dist/useAssistantClient.d.ts

@@ -1,15 +1,18 @@
 import type { AssistantClient, AssistantScopes, ScopesInput, ScopeField } from "./types";
+import { type AssistantEvent, type AssistantEventCallback, type AssistantEventSelector } from "./EventContext";
 /**
  * Hook to mount and access root scopes
  */
-export declare const useRootScopes: (rootScopes: ScopesInput) => {
+export declare const useRootScopes: (rootScopes: ScopesInput, parent: AssistantClient) => {
     scopes: {};
+    on: <TEvent extends AssistantEvent>(selector: AssistantEventSelector<TEvent>, callback: AssistantEventCallback<TEvent>) => () => void;
     subscribe?: never;
     flushSync?: never;
 } | {
     scopes: { [K in "ERROR: No scopes were defined"]: ScopeField<AssistantScopes[K]>; };
     subscribe: (callback: () => void) => () => void;
     flushSync: () => void;
+    on: <TEvent extends AssistantEvent>(selector: AssistantEventSelector<TEvent>, callback: AssistantEventCallback<TEvent>) => () => void;
 };
 /**
  * Hook to mount and access derived scopes

package/dist/useAssistantClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAssistantClient.d.ts","sourceRoot":"","sources":["../src/useAssistantClient.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,WAAW,EACX,UAAU,EAGX,MAAM,SAAS,CAAC;AA6FjB;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,YAAY,WAAW;;;;;YA1B1C,GACF,CAAC,mCAAuB,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,GAC3D;0BACqB,MAAM,IAAI;;CAyBrC,CAAC;AAqEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,eAAe,WAAW,EAC1B,cAAc,eAAe;;CAK9B,CAAC;AAyBF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,IAAI,eAAe,CAAC;AACtD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,eAAe,CAAC"}
+{"version":3,"file":"useAssistantClient.d.ts","sourceRoot":"","sources":["../src/useAssistantClient.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,WAAW,EACX,UAAU,EAGX,MAAM,SAAS,CAAC;AAIjB,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAC5B,MAAM,gBAAgB,CAAC;AA2GxB;;GAEG;AACH,eAAO,MAAM,aAAa,GACxB,YAAY,WAAW,EACvB,QAAQ,eAAe;;SApDT,MAAM,SAAS,cAAc,YAC7B,sBAAsB,CAAC,MAAM,CAAC,YAC9B,sBAAsB,CAAC,MAAM,CAAC;;;;YAoBjC,GACF,CAAC,mCAAuB,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,GAC3D;0BACqB,MAAM,IAAI;;SAzBxB,MAAM,SAAS,cAAc,YAC7B,sBAAsB,CAAC,MAAM,CAAC,YAC9B,sBAAsB,CAAC,MAAM,CAAC;CAqD7C,CAAC;AAqEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,eAAe,WAAW,EAC1B,cAAc,eAAe;;CAK9B,CAAC;AA0BF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,IAAI,eAAe,CAAC;AACtD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,eAAe,CAAC"}

package/dist/useAssistantClient.js

@@ -6,11 +6,17 @@ 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 RootScopeResource = resource(
   ({
     scopeName,
@@ -32,52 +38,64 @@ 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 = withStoreContextProvider(
+      { events, parent },
+      () => tapResources(
+        Object.entries(scopes).map(
+          ([scopeName, element]) => RootScopeResource(
+            {
+              scopeName,
+              element
+            },
+            { 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 +144,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 +152,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":";AAAA,SAAS,eAAe;AACxB,SAAS,mBAAmB;AAC5B;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AASP,SAAS,eAAe;AACxB,SAAS,gCAAgC;AACzC,SAAS,mBAAmB;AAM5B,IAAM,oBAAoB;AAAA,EACxB,CAAkC;AAAA,IAChC;AAAA,IACA;AAAA,EACF,MAGM;AACJ,UAAM,QAAQ,YAAY,QAAQ,OAAO,CAAC;AAE1C,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,SAAS,CAAC,WAAwB;AAC3D,QAAM,gBAAgB;AAAA,IACpB,OAAO,QAAQ,MAAM,EAAE;AAAA,MAAI,CAAC,CAAC,WAAW,OAAO,MAC7C;AAAA,QACE;AAAA,UACE;AAAA,UACA;AAAA,QAGF;AAAA,QACA,EAAE,KAAK,UAAU;AAAA,MACnB;AAAA,IACF;AAAA,EACF;AAEA,SAAO,QAAQ,MAAM;AACnB,QAAI,cAAc,WAAW,GAAG;AAC9B,aAAO;AAAA,QACL,QAAQ,CAAC;AAAA,MACX;AAAA,IACF;AAEA,WAAO;AAAA,MACL,QAAQ,OAAO;AAAA,QACb,cAAc,IAAI,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,MAAM;AAAA,UACpD;AAAA,UACA;AAAA,QACF,CAAC;AAAA,MACH;AAAA,MAGA,WAAW,CAAC,aAAyB;AACnC,cAAM,eAAe,cAAc,IAAI,CAAC,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM;AAC5D,iBAAO,UAAU,MAAM;AACrB,oBAAQ,IAAI,qBAAqB;AACjC,qBAAS;AAAA,UACX,CAAC;AAAA,QACH,CAAC;AACD,eAAO,MAAM;AACX,uBAAa,QAAQ,CAAC,gBAAgB,YAAY,CAAC;AAAA,QACrD;AAAA,MACF;AAAA,MACA,WAAW,MAAM;AACf,sBAAc,QAAQ,CAAC,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM;AAC3C,oBAAU;AAAA,QACZ,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF,GAAG,CAAC,GAAG,aAAa,CAAC;AACvB,CAAC;AAKM,IAAM,gBAAgB,CAAC,eAA4B;AACxD,SAAO,YAAY,mBAAmB,UAAU,CAAC;AACnD;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,UAAU;AAC3C,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,IAChD;AAAA,EACF,GAAG,CAAC,YAAY,YAAY,aAAa,CAAC;AAC5C;AAwBO,SAAS,mBAAmB,QAAuC;AACxE,MAAI,QAAQ;AAEV,WAAO,+BAA+B,MAAM;AAAA,EAC9C,OAAO;AAEL,WAAO,yBAAyB;AAAA,EAClC;AACF;","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 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(\n  ({ scopes, parent }: { scopes: ScopesInput; parent: AssistantClient }) => {\n    const events = tapInlineResource(EventManager());\n\n    const resultEntries = withStoreContextProvider({ events, parent }, () =>\n      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\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    // 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":[]}

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.1",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -20,14 +20,14 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/tap": "0.3.0"
+    "@assistant-ui/tap": "0.3.1"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
     "@types/node": "^24.10.1",
-    "@types/react": "19.2.5",
+    "@types/react": "19.2.7",
     "tsx": "^4.20.6",
     "@assistant-ui/x-buildutils": "0.0.1"
   },

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/EventContext.ts

@@ -0,0 +1,184 @@
+import { resource, tapMemo } from "@assistant-ui/tap";
+import type { Unsubscribe } from "./types";
+
+/**
+ * Module augmentation interface for custom events.
+ *
+ * @example
+ * ```typescript
+ * declare module "@assistant-ui/store" {
+ *   interface AssistantEventRegistry {
+ *     "thread.run-start": { threadId: string };
+ *     "custom.my-event": { data: string };
+ *   }
+ * }
+ * ```
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface AssistantEventRegistry {}
+
+/**
+ * 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;
+ *   }
+ * }
+ * ```
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface AssistantEventScopeConfig {}
+
+export type AssistantEventMap = AssistantEventRegistry & {
+  // Catch-all
+  "*": {
+    [K in Exclude<keyof AssistantEventRegistry, "*">]: {
+      event: K;
+      payload: AssistantEventRegistry[K];
+    };
+  }[Exclude<keyof AssistantEventRegistry, "*">];
+};
+
+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 as (payload: {
+                  event: typeof event;
+                  payload: typeof payload;
+                }) => void
+              )({ event, payload });
+            }
+          }
+        });
+      },
+    } 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

@@ -11,3 +11,21 @@ export type { TapStoreListConfig } from "./tapStoreList";
 export { registerAssistantScope } from "./ScopeRegistry";
 
 export type { AssistantScopeRegistry } from "./types";
+
+// Events & Store Context
+export { tapStoreContext } from "./StoreContext";
+export type { StoreContextValue } from "./StoreContext";
+export { useAssistantEvent } from "./useAssistantEvent";
+export { normalizeEventSelector, checkEventScope } from "./EventContext";
+export type {
+  AssistantEvent,
+  AssistantEventRegistry,
+  AssistantEventScopeConfig,
+  AssistantEventMap,
+  AssistantEventScope,
+  AssistantEventSelector,
+  AssistantEventCallback,
+  EventSource,
+  SourceByScope,
+  EventManager,
+} from "./EventContext";

package/src/types.ts

@@ -1,4 +1,9 @@
 import type { ResourceElement } from "@assistant-ui/tap";
+import type {
+  AssistantEvent,
+  AssistantEventCallback,
+  AssistantEventSelector,
+} from "./EventContext";
 
 /**
  * Definition of a scope in the assistant client (internal type)
@@ -117,4 +122,8 @@ export type AssistantClient = {
 } & {
   subscribe(listener: () => void): Unsubscribe;
   flushSync(): void;
+  on<TEvent extends AssistantEvent>(
+    selector: AssistantEventSelector<TEvent>,
+    callback: AssistantEventCallback<TEvent>,
+  ): Unsubscribe;
 };

package/src/useAssistantClient.tsx

@@ -6,6 +6,7 @@ import {
   tapResource,
   tapResources,
   tapEffectEvent,
+  tapInlineResource,
   ResourceElement,
 } from "@assistant-ui/tap";
 import type {
@@ -19,6 +20,14 @@ import type {
 import { asStore } from "./asStore";
 import { useAssistantContextValue } from "./AssistantContext";
 import { splitScopes } from "./utils/splitScopes";
+import {
+  EventManager,
+  normalizeEventSelector,
+  type AssistantEvent,
+  type AssistantEventCallback,
+  type AssistantEventSelector,
+} from "./EventContext";
+import { withStoreContextProvider } from "./StoreContext";
 
 /**
  * Resource for a single root scope
@@ -57,62 +66,81 @@ const RootScopeResource = resource(
  * Resource for all root scopes
  * Mounts each root scope and returns an object mapping scope names to their stores
  */
-const RootScopesResource = resource((scopes: ScopesInput) => {
-  const resultEntries = tapResources(
-    Object.entries(scopes).map(([scopeName, element]) =>
-      RootScopeResource(
-        {
-          scopeName: scopeName as keyof AssistantScopes,
-          element: element as ScopeInput<
-            AssistantScopes[keyof AssistantScopes]
-          >,
-        },
-        { key: scopeName },
+const RootScopesResource = resource(
+  ({ scopes, parent }: { scopes: ScopesInput; parent: AssistantClient }) => {
+    const events = tapInlineResource(EventManager());
+
+    const resultEntries = withStoreContextProvider({ events, parent }, () =>
+      tapResources(
+        Object.entries(scopes).map(([scopeName, element]) =>
+          RootScopeResource(
+            {
+              scopeName: scopeName as keyof AssistantScopes,
+              element: element as ScopeInput<
+                AssistantScopes[keyof AssistantScopes]
+              >,
+            },
+            { key: scopeName },
+          ),
+        ),
       ),
-    ),
-  );
+    );
 
-  return tapMemo(() => {
-    if (resultEntries.length === 0) {
-      return {
-        scopes: {},
-      };
-    }
+    const on = <TEvent extends AssistantEvent>(
+      selector: AssistantEventSelector<TEvent>,
+      callback: AssistantEventCallback<TEvent>,
+    ) => {
+      const { event } = normalizeEventSelector(selector);
+      return events.on(event, callback);
+    };
 
-    return {
-      scopes: Object.fromEntries(
-        resultEntries.map(([scopeName, { scopeFunction }]) => [
-          scopeName,
-          scopeFunction,
-        ]),
-      ) as {
-        [K in keyof typeof scopes]: ScopeField<AssistantScopes[K]>;
-      },
-      subscribe: (callback: () => void) => {
-        const unsubscribes = resultEntries.map(([, { subscribe }]) => {
-          return subscribe(() => {
-            console.log("Callback called for");
-            callback();
-          });
-        });
-        return () => {
-          unsubscribes.forEach((unsubscribe) => unsubscribe());
+    return tapMemo(() => {
+      if (resultEntries.length === 0) {
+        return {
+          scopes: {},
+          on,
         };
-      },
-      flushSync: () => {
-        resultEntries.forEach(([, { flushSync }]) => {
-          flushSync();
-        });
-      },
-    };
-  }, [...resultEntries]);
-});
+      }
+
+      return {
+        scopes: Object.fromEntries(
+          resultEntries.map(([scopeName, { scopeFunction }]) => [
+            scopeName,
+            scopeFunction,
+          ]),
+        ) as {
+          [K in keyof typeof scopes]: ScopeField<AssistantScopes[K]>;
+        },
+        subscribe: (callback: () => void) => {
+          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]);
+  },
+);
 
 /**
  * Hook to mount and access root scopes
  */
-export const useRootScopes = (rootScopes: ScopesInput) => {
-  return useResource(RootScopesResource(rootScopes));
+export const useRootScopes = (
+  rootScopes: ScopesInput,
+  parent: AssistantClient,
+) => {
+  return useResource(RootScopesResource({ scopes: rootScopes, parent }));
 };
 
 /**
@@ -201,7 +229,7 @@ const useExtendedAssistantClientImpl = (
   const { rootScopes, derivedScopes } = splitScopes(scopes);
 
   // Mount the scopes to keep them alive
-  const rootFields = useRootScopes(rootScopes);
+  const rootFields = useRootScopes(rootScopes, baseClient);
   const derivedFields = useDerivedScopes(derivedScopes, baseClient);
 
   return useMemo(() => {
@@ -213,6 +241,7 @@ const useExtendedAssistantClientImpl = (
       ...derivedFields,
       subscribe: rootFields.subscribe ?? baseClient.subscribe,
       flushSync: rootFields.flushSync ?? baseClient.flushSync,
+      on: rootFields.on ?? baseClient.on,
     } as AssistantClient;
   }, [baseClient, rootFields, derivedFields]);
 };

package/src/useAssistantEvent.ts

@@ -0,0 +1,22 @@
+import { useEffect, useEffectEvent } from "react";
+import { useAssistantClient } from "./useAssistantClient";
+import type {
+  AssistantEvent,
+  AssistantEventCallback,
+  AssistantEventSelector,
+} from "./EventContext";
+import { normalizeEventSelector } from "./EventContext";
+
+export const useAssistantEvent = <TEvent extends AssistantEvent>(
+  selector: AssistantEventSelector<TEvent>,
+  callback: AssistantEventCallback<TEvent>,
+) => {
+  const client = useAssistantClient();
+  const callbackRef = useEffectEvent(callback);
+
+  const { scope, event } = normalizeEventSelector(selector);
+  useEffect(
+    () => client.on({ scope, event }, callbackRef),
+    [client, scope, event],
+  );
+};