@assistant-ui/store 0.0.1 → 0.0.2

package/dist/AssistantIf.d.ts

@@ -0,0 +1,12 @@
+import type { FC, PropsWithChildren } from "react";
+import type { AssistantState } from "./types";
+type UseAssistantIfProps = {
+    condition: AssistantIf.Condition;
+};
+export declare namespace AssistantIf {
+    type Props = PropsWithChildren<UseAssistantIfProps>;
+    type Condition = (state: AssistantState) => boolean;
+}
+export declare const AssistantIf: FC<AssistantIf.Props>;
+export {};
+//# sourceMappingURL=AssistantIf.d.ts.map

package/dist/AssistantIf.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AssistantIf.d.ts","sourceRoot":"","sources":["../src/AssistantIf.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,KAAK,mBAAmB,GAAG;IACzB,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC;CAClC,CAAC;AAMF,yBAAiB,WAAW,CAAC;IAC3B,KAAY,KAAK,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;IAC3D,KAAY,SAAS,GAAG,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC;CAC5D;AAED,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAG7C,CAAC"}

package/dist/AssistantIf.js

@@ -0,0 +1,16 @@
+"use client";
+
+// src/AssistantIf.tsx
+import { useAssistantState } from "./useAssistantState.js";
+var useAssistantIf = (props) => {
+  return useAssistantState(props.condition);
+};
+var AssistantIf = ({ children, condition }) => {
+  const result = useAssistantIf({ condition });
+  return result ? children : null;
+};
+AssistantIf.displayName = "AssistantIf";
+export {
+  AssistantIf
+};
+//# sourceMappingURL=AssistantIf.js.map

package/dist/AssistantIf.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/AssistantIf.tsx"],"sourcesContent":["\"use client\";\n\nimport type { FC, PropsWithChildren } from \"react\";\nimport { useAssistantState } from \"./useAssistantState\";\nimport type { AssistantState } from \"./types\";\n\ntype UseAssistantIfProps = {\n  condition: AssistantIf.Condition;\n};\n\nconst useAssistantIf = (props: UseAssistantIfProps) => {\n  return useAssistantState(props.condition);\n};\n\nexport namespace AssistantIf {\n  export type Props = PropsWithChildren<UseAssistantIfProps>;\n  export type Condition = (state: AssistantState) => boolean;\n}\n\nexport const AssistantIf: FC<AssistantIf.Props> = ({ children, condition }) => {\n  const result = useAssistantIf({ condition });\n  return result ? children : null;\n};\n\nAssistantIf.displayName = \"AssistantIf\";\n"],"mappings":";;;AAGA,SAAS,yBAAyB;AAOlC,IAAM,iBAAiB,CAAC,UAA+B;AACrD,SAAO,kBAAkB,MAAM,SAAS;AAC1C;AAOO,IAAM,cAAqC,CAAC,EAAE,UAAU,UAAU,MAAM;AAC7E,QAAM,SAAS,eAAe,EAAE,UAAU,CAAC;AAC3C,SAAO,SAAS,WAAW;AAC7B;AAEA,YAAY,cAAc;","names":[]}

package/dist/DerivedScope.d.ts

@@ -1,18 +1,20 @@
-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.
  * The get callback always calls the most recent version (useEffectEvent pattern).
  *
  * @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 declare const DerivedScope: <T extends ScopeDefinition>(props: DerivedScopeProps<T>, options?: {
     key?: string | number;
-} | undefined) => import("@assistant-ui/tap").ResourceElement<ScopeValue<T>, DerivedScopeProps<T>>;
+} | undefined) => import("@assistant-ui/tap").ResourceElement<null, DerivedScopeProps<T>>;
 //# sourceMappingURL=DerivedScope.d.ts.map

package/dist/DerivedScope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DerivedScope.d.ts","sourceRoot":"","sources":["../src/DerivedScope.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE9E;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,YAAY,GACtB,CAAC,SAAS,eAAe;;kGAG3B,CAAC"}
+{"version":3,"file":"DerivedScope.d.ts","sourceRoot":"","sources":["../src/DerivedScope.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAElE;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,GACtB,CAAC,SAAS,eAAe;;yFAG3B,CAAC"}

package/dist/DerivedScope.js

@@ -1,8 +1,8 @@
 // src/DerivedScope.ts
 import { resource } from "@assistant-ui/tap";
 var DerivedScope = resource(
-  (config) => {
-    return config;
+  (_config) => {
+    return null;
   }
 );
 export {

package/dist/DerivedScope.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/DerivedScope.ts"],"sourcesContent":["import { resource } from \"@assistant-ui/tap\";\nimport type { ScopeDefinition, ScopeValue, DerivedScopeProps } from \"./types\";\n\n/**\n * Creates a derived scope field that memoizes based on source and query.\n * The get callback always calls the most recent version (useEffectEvent pattern).\n *\n * @example\n * ```typescript\n * const MessageScope = DerivedScope<MessageScopeDefinition>({\n *   source: \"thread\",\n *   query: { type: \"index\", index: 0 },\n *   get: () => messageApi,\n * });\n * ```\n */\nexport const DerivedScope = resource(\n  <T extends ScopeDefinition>(config: DerivedScopeProps<T>): ScopeValue<T> => {\n    return config;\n  },\n);\n"],"mappings":";AAAA,SAAS,gBAAgB;AAgBlB,IAAM,eAAe;AAAA,EAC1B,CAA4B,WAAgD;AAC1E,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../src/DerivedScope.ts"],"sourcesContent":["import { resource } from \"@assistant-ui/tap\";\nimport type { ScopeDefinition, DerivedScopeProps } from \"./types\";\n\n/**\n * Creates a derived scope field that memoizes based on source and query.\n * The get callback always calls the most recent version (useEffectEvent pattern).\n *\n * @example\n * ```typescript\n * const client = useAssistantClient({\n *   message: DerivedScope({\n *     source: \"thread\",\n *     query: { index: 0 },\n *     get: (client) => client.thread().message({ index: 0 }),\n *   }),\n * });\n * ```\n */\nexport const DerivedScope = resource(\n  <T extends ScopeDefinition>(_config: DerivedScopeProps<T>): null => {\n    return null;\n  },\n);\n"],"mappings":";AAAA,SAAS,gBAAgB;AAkBlB,IAAM,eAAe;AAAA,EAC1B,CAA4B,YAAwC;AAClE,WAAO;AAAA,EACT;AACF;","names":[]}

package/dist/EventContext.d.ts

@@ -1,19 +1,4 @@
-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 {
-}
+import type { AssistantScopes, Unsubscribe } from "./types";
 /**
  * Module augmentation interface for event scope configuration.
  * Maps event sources to their parent scopes.
@@ -30,13 +15,23 @@ export interface AssistantEventRegistry {
  */
 export interface AssistantEventScopeConfig {
 }
-export type AssistantEventMap = AssistantEventRegistry & {
-    "*": {
-        [K in Exclude<keyof AssistantEventRegistry, "*">]: {
-            event: K;
-            payload: AssistantEventRegistry[K];
-        };
-    }[Exclude<keyof AssistantEventRegistry, "*">];
+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 & {
+    "*": WildcardPayload;
 };
 export type AssistantEvent = keyof AssistantEventMap;
 export type EventSource<T extends AssistantEvent = AssistantEvent> = T extends `${infer Source}.${string}` ? Source : never;
@@ -62,4 +57,5 @@ export declare const EventManager: () => import("@assistant-ui/tap").ResourceEle
     on: <TEvent extends AssistantEvent>(event: TEvent, callback: AssistantEventCallback<TEvent>) => () => void;
     emit: <TEvent extends Exclude<AssistantEvent, "*">>(event: TEvent, payload: AssistantEventMap[TEvent]) => void;
 }, undefined>;
+export {};
 //# sourceMappingURL=EventContext.d.ts.map

package/dist/EventContext.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"EventContext.d.ts","sourceRoot":"","sources":["../src/EventContext.ts"],"names":[],"mappings":"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"}

package/dist/EventContext.js.map

@@ -1 +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":[]}
+{"version":3,"sources":["../src/EventContext.ts"],"sourcesContent":["import { resource, tapMemo } from \"@assistant-ui/tap\";\nimport type { AssistantScopes, Unsubscribe } from \"./types\";\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 */\nexport interface AssistantEventScopeConfig {}\n\ntype UnionToIntersection<U> = (\n  U extends unknown\n    ? (x: U) => void\n    : never\n) extends (x: infer I) => void\n  ? I\n  : never;\n\n/**\n * Event map derived from scope event definitions\n */\nexport type ScopeEventMap = UnionToIntersection<\n  {\n    [K in keyof AssistantScopes]: AssistantScopes[K] extends {\n      events: infer E;\n    }\n      ? E extends Record<string, unknown>\n        ? E\n        : never\n      : never;\n  }[keyof AssistantScopes]\n>;\n\ntype WildcardPayload = {\n  [K in keyof ScopeEventMap]: {\n    event: K;\n    payload: ScopeEventMap[K];\n  };\n}[keyof ScopeEventMap];\n\nexport type AssistantEventMap = ScopeEventMap & {\n  // Catch-all\n  \"*\": WildcardPayload;\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              callback({ event, payload } as any);\n            }\n          }\n        });\n      },\n    } satisfies EventManager;\n  }, []);\n\n  return events;\n});\n"],"mappings":";AAAA,SAAS,UAAU,eAAe;AAkF3B,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,uBAAS,EAAE,OAAO,QAAQ,CAAQ;AAAA,YACpC;AAAA,UACF;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF,GAAG,CAAC,CAAC;AAEL,SAAO;AACT,CAAC;","names":[]}

package/dist/index.d.ts

@@ -1,18 +1,14 @@
 export { useAssistantClient } from "./useAssistantClient";
 export { useAssistantState } from "./useAssistantState";
+export { useAssistantEvent } from "./useAssistantEvent";
+export { AssistantIf } from "./AssistantIf";
 export { AssistantProvider } from "./AssistantContext";
-export type { AssistantScopes, AssistantClient, AssistantState } from "./types";
 export { DerivedScope } from "./DerivedScope";
-export type { ApiObject } from "./tapApi";
-export { tapApi } from "./tapApi";
+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";
 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";
+export type { AssistantScopes, AssistantScopeRegistry, AssistantClient, AssistantState, } from "./types";
+export type { AssistantEvent, 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;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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAGzD,YAAY,EACV,eAAe,EACf,sBAAsB,EACtB,eAAe,EACf,cAAc,GACf,MAAM,SAAS,CAAC;AAEjB,YAAY,EACV,cAAc,EACd,yBAAyB,EACzB,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,WAAW,EACX,aAAa,EACb,YAAY,GACb,MAAM,gBAAgB,CAAC"}

package/dist/index.js

@@ -1,20 +1,19 @@
 // src/index.ts
 import { useAssistantClient } from "./useAssistantClient.js";
 import { useAssistantState } from "./useAssistantState.js";
+import { useAssistantEvent } from "./useAssistantEvent.js";
+import { AssistantIf } from "./AssistantIf.js";
 import { AssistantProvider } from "./AssistantContext.js";
 import { DerivedScope } from "./DerivedScope.js";
 import { tapApi } from "./tapApi.js";
+import { tapStoreContext } from "./StoreContext.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 {
+  AssistantIf,
   AssistantProvider,
   DerivedScope,
-  checkEventScope,
-  normalizeEventSelector,
   registerAssistantScope,
   tapApi,
   tapLookupResources,

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\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":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["// hooks\nexport { useAssistantClient } from \"./useAssistantClient\";\nexport { useAssistantState } from \"./useAssistantState\";\nexport { useAssistantEvent } from \"./useAssistantEvent\";\n\n// components\nexport { AssistantIf } from \"./AssistantIf\";\nexport { AssistantProvider } from \"./AssistantContext\";\n\n// resources\nexport { DerivedScope } from \"./DerivedScope\";\n\n// tap hooks\nexport { tapApi, type ApiObject } from \"./tapApi\";\nexport { tapStoreContext, type StoreContextValue } from \"./StoreContext\";\nexport { tapLookupResources } from \"./tapLookupResources\";\nexport { tapStoreList, type TapStoreListConfig } from \"./tapStoreList\";\n\n// registration\nexport { registerAssistantScope } from \"./ScopeRegistry\";\n\n// types\nexport type {\n  AssistantScopes,\n  AssistantScopeRegistry,\n  AssistantClient,\n  AssistantState,\n} from \"./types\";\n\nexport type {\n  AssistantEvent,\n  AssistantEventScopeConfig,\n  AssistantEventMap,\n  AssistantEventScope,\n  AssistantEventSelector,\n  AssistantEventCallback,\n  EventSource,\n  SourceByScope,\n  EventManager,\n} from \"./EventContext\";\n"],"mappings":";AACA,SAAS,0BAA0B;AACnC,SAAS,yBAAyB;AAClC,SAAS,yBAAyB;AAGlC,SAAS,mBAAmB;AAC5B,SAAS,yBAAyB;AAGlC,SAAS,oBAAoB;AAG7B,SAAS,cAA8B;AACvC,SAAS,uBAA+C;AACxD,SAAS,0BAA0B;AACnC,SAAS,oBAA6C;AAGtD,SAAS,8BAA8B;","names":[]}

package/dist/types.d.ts

@@ -9,8 +9,19 @@ import type { AssistantEvent, AssistantEventCallback, AssistantEventSelector } f
  *   interface AssistantScopeRegistry {
  *     foo: {
  *       value: { getState: () => { bar: string }; updateBar: (bar: string) => void };
- *       source: "root";
- *       query: Record<string, never>;
+ *       meta: { source: "root"; query: Record<string, never> };
+ *       events: {
+ *         "foo.updated": { id: string; newValue: string };
+ *         "foo.deleted": { id: string };
+ *       };
+ *     };
+ *     // Example with multiple sources (discriminated union):
+ *     bar: {
+ *       value: { getState: () => { id: string } };
+ *       meta:
+ *         | { source: "fooList"; query: { index: number } }
+ *         | { source: "barList"; query: { id: string } };
+ *       events: Record<string, never>;
  *     };
  *   }
  * }
@@ -21,26 +32,11 @@ export interface AssistantScopeRegistry {
 export type AssistantScopes = keyof AssistantScopeRegistry extends never ? Record<"ERROR: No scopes were defined", ScopeDefinition> : {
     [K in keyof AssistantScopeRegistry]: AssistantScopeRegistry[K];
 };
-/**
- * Helper type to extract the value type from a scope definition
- */
-export type ScopeValue<T extends ScopeDefinition> = T["value"];
-/**
- * Helper type to extract the source type from a scope definition
- */
-export type ScopeSource<T extends ScopeDefinition> = T["source"];
-/**
- * Helper type to extract the query type from a scope definition
- */
-export type ScopeQuery<T extends ScopeDefinition> = T["query"];
 /**
  * Type for a scope field - a function that returns the current API value,
- * with source and query metadata attached
+ * with source/query metadata attached (derived from meta)
  */
-export type ScopeField<T extends ScopeDefinition> = (() => ScopeValue<T>) & ({
-    source: ScopeSource<T>;
-    query: ScopeQuery<T>;
-} | {
+export type ScopeField<T extends ScopeDefinition> = (() => T["value"]) & (T["meta"] | {
     source: null;
     query: null;
 });
@@ -48,16 +44,16 @@ export type ScopeField<T extends ScopeDefinition> = (() => ScopeValue<T>) & ({
  * Props passed to a derived scope resource element
  */
 export type DerivedScopeProps<T extends ScopeDefinition> = {
-    get: (parent: AssistantClient) => ScopeValue<T>;
-    source: ScopeSource<T>;
-    query: ScopeQuery<T>;
+    get: (parent: AssistantClient) => T["value"];
+    source: T["meta"]["source"];
+    query: T["meta"]["query"];
 };
 /**
  * Input type for scope definitions - ResourceElement that returns the API value
  * Can optionally include source/query metadata via DerivedScope
  */
 export type ScopeInput<T extends ScopeDefinition> = ResourceElement<{
-    api: ScopeValue<T>;
+    api: T["value"];
 }>;
 /**
  * Map of scope names to their input definitions

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;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"}
+{"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;AAwBxB;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,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;AACvE;;;GAGG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GACpE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC;AAE9C;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,eAAe,IAAI;IACzD,GAAG,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC5B,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;CAC3B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,eAAe,IAAI,eAAe,CAAC;IAClE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;CACjB,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

@@ -18,7 +18,12 @@ export declare const useRootScopes: (rootScopes: ScopesInput, parent: AssistantC
  * Hook to mount and access derived scopes
  */
 export declare const useDerivedScopes: (derivedScopes: ScopesInput, parentClient: AssistantClient) => {
-    "ERROR: No scopes were defined"?: ScopeField<import("./types").ScopeDefinition<any, any, any>>;
+    "ERROR: No scopes were defined"?: ScopeField<import("./types").ScopeDefinition<Record<string, unknown> & {
+        getState: () => Record<string, unknown>;
+    }, {
+        source: string;
+        query: Record<string, unknown>;
+    }, Record<string, unknown>>>;
 };
 /**
  * Hook to access or extend the AssistantClient

package/dist/useAssistantClient.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"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;AAqIxB;;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

@@ -17,12 +17,28 @@ import {
   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";
@@ -41,17 +57,16 @@ var RootScopeResource = resource(
 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 }
-          )
+    const resultEntries = tapResources(
+      Object.entries(scopes).map(
+        ([scopeName, element]) => RootScopeResource(
+          {
+            scopeName,
+            element,
+            events,
+            parent
+          },
+          { key: scopeName }
         )
       )
     );

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  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":[]}
+{"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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@assistant-ui/store",
   "description": "Tap-based state management for @assistant-ui",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -20,7 +20,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/tap": "0.3.1"
+    "@assistant-ui/tap": "0.3.2"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@types/node": "^24.10.1",
     "@types/react": "19.2.7",
-    "tsx": "^4.20.6",
+    "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/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

@@ -1,21 +1,5 @@
 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 {}
+import type { AssistantScopes, Unsubscribe } from "./types";
 
 /**
  * Module augmentation interface for event scope configuration.
@@ -31,17 +15,41 @@ export interface AssistantEventRegistry {}
  * }
  * ```
  */
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface AssistantEventScopeConfig {}
 
-export type AssistantEventMap = AssistantEventRegistry & {
+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
-  "*": {
-    [K in Exclude<keyof AssistantEventRegistry, "*">]: {
-      event: K;
-      payload: AssistantEventRegistry[K];
-    };
-  }[Exclude<keyof AssistantEventRegistry, "*">];
+  "*": WildcardPayload;
 };
 
 export type AssistantEvent = keyof AssistantEventMap;
@@ -167,12 +175,7 @@ export const EventManager = resource(() => {
           // Emit to wildcard listeners
           if (wildcardListeners) {
             for (const callback of wildcardListeners) {
-              (
-                callback as (payload: {
-                  event: typeof event;
-                  payload: typeof payload;
-                }) => void
-              )({ event, payload });
+              callback({ event, payload } as any);
             }
           }
         });

package/src/index.ts

@@ -1,25 +1,34 @@
+// 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";
 
-// 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,

package/src/types.ts

@@ -5,21 +5,26 @@ import type {
   AssistantEventSelector,
 } from "./EventContext";
 
+type ScopeValueType = Record<string, unknown> & {
+  getState: () => Record<string, unknown>;
+};
+type ScopeMetaType = { source: string; query: Record<string, unknown> };
+
 /**
  * Definition of a scope in the assistant client (internal type)
  * @template TValue - The API type (must include getState() and any actions)
- * @template TSource - The parent scope name (or "root" for top-level scopes)
- * @template TQuery - The query parameters needed to access this scope from its source
+ * @template TMeta - Source/query metadata (use ScopeMeta or discriminated union)
+ * @template TEvents - Optional events that this scope can emit
  * @internal
  */
 export type ScopeDefinition<
-  TValue = any,
-  TSource extends string | "root" = any,
-  TQuery = any,
+  TValue extends ScopeValueType = ScopeValueType,
+  TMeta extends ScopeMetaType = ScopeMetaType,
+  TEvents extends Record<string, unknown> = Record<string, unknown>,
 > = {
   value: TValue;
-  source: TSource;
-  query: TQuery;
+  meta: TMeta;
+  events: TEvents;
 };
 
 /**
@@ -31,58 +36,43 @@ export type ScopeDefinition<
  *   interface AssistantScopeRegistry {
  *     foo: {
  *       value: { getState: () => { bar: string }; updateBar: (bar: string) => void };
- *       source: "root";
- *       query: Record<string, never>;
+ *       meta: { source: "root"; query: Record<string, never> };
+ *       events: {
+ *         "foo.updated": { id: string; newValue: string };
+ *         "foo.deleted": { id: string };
+ *       };
+ *     };
+ *     // Example with multiple sources (discriminated union):
+ *     bar: {
+ *       value: { getState: () => { id: string } };
+ *       meta:
+ *         | { source: "fooList"; query: { index: number } }
+ *         | { source: "barList"; query: { id: string } };
+ *       events: Record<string, never>;
  *     };
  *   }
  * }
  * ```
  */
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface AssistantScopeRegistry {}
 
 export type AssistantScopes = keyof AssistantScopeRegistry extends never
   ? Record<"ERROR: No scopes were defined", ScopeDefinition>
   : { [K in keyof AssistantScopeRegistry]: AssistantScopeRegistry[K] };
-
-/**
- * Helper type to extract the value type from a scope definition
- */
-export type ScopeValue<T extends ScopeDefinition> = T["value"];
-
-/**
- * Helper type to extract the source type from a scope definition
- */
-export type ScopeSource<T extends ScopeDefinition> = T["source"];
-
-/**
- * Helper type to extract the query type from a scope definition
- */
-export type ScopeQuery<T extends ScopeDefinition> = T["query"];
-
 /**
  * Type for a scope field - a function that returns the current API value,
- * with source and query metadata attached
+ * with source/query metadata attached (derived from meta)
  */
-export type ScopeField<T extends ScopeDefinition> = (() => ScopeValue<T>) &
-  (
-    | {
-        source: ScopeSource<T>;
-        query: ScopeQuery<T>;
-      }
-    | {
-        source: null;
-        query: null;
-      }
-  );
+export type ScopeField<T extends ScopeDefinition> = (() => T["value"]) &
+  (T["meta"] | { source: null; query: null });
 
 /**
  * Props passed to a derived scope resource element
  */
 export type DerivedScopeProps<T extends ScopeDefinition> = {
-  get: (parent: AssistantClient) => ScopeValue<T>;
-  source: ScopeSource<T>;
-  query: ScopeQuery<T>;
+  get: (parent: AssistantClient) => T["value"];
+  source: T["meta"]["source"];
+  query: T["meta"]["query"];
 };
 
 /**
@@ -90,7 +80,7 @@ export type DerivedScopeProps<T extends ScopeDefinition> = {
  * Can optionally include source/query metadata via DerivedScope
  */
 export type ScopeInput<T extends ScopeDefinition> = ResourceElement<{
-  api: ScopeValue<T>;
+  api: T["value"];
 }>;
 
 /**

package/src/useAssistantClient.tsx

@@ -29,6 +29,26 @@ import {
 } from "./EventContext";
 import { withStoreContextProvider } from "./StoreContext";
 
+/**
+ * Resource that renders a store with the store context provider.
+ * This ensures the context is re-established on every re-render.
+ */
+const RootScopeStoreResource = resource(
+  <K extends keyof AssistantScopes>({
+    element,
+    events,
+    parent,
+  }: {
+    element: ScopeInput<AssistantScopes[K]>;
+    events: EventManager;
+    parent: AssistantClient;
+  }) => {
+    return withStoreContextProvider({ events, parent }, () =>
+      tapInlineResource(element),
+    );
+  },
+);
+
 /**
  * Resource for a single root scope
  * Returns a tuple of [scopeName, {scopeFunction, subscribe, flushSync}]
@@ -37,18 +57,24 @@ const RootScopeResource = resource(
   <K extends keyof AssistantScopes>({
     scopeName,
     element,
+    events,
+    parent,
   }: {
     scopeName: K;
     element: ScopeInput<AssistantScopes[K]>;
+    events: EventManager;
+    parent: AssistantClient;
   }) => {
-    const store = tapResource(asStore(element));
+    const store = tapResource(
+      asStore(RootScopeStoreResource({ element, events, parent })),
+    );
 
     return tapMemo(() => {
       const scopeFunction = (() => store.getState().api) as ScopeField<
         AssistantScopes[K]
       >;
       scopeFunction.source = "root";
-      scopeFunction.query = {} as AssistantScopes[K]["query"];
+      scopeFunction.query = {};
 
       return [
         scopeName,
@@ -70,18 +96,18 @@ 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 },
-          ),
+    const resultEntries = tapResources(
+      Object.entries(scopes).map(([scopeName, element]) =>
+        RootScopeResource(
+          {
+            scopeName: scopeName as keyof AssistantScopes,
+            element: element as ScopeInput<
+              AssistantScopes[keyof AssistantScopes]
+            >,
+            events,
+            parent,
+          },
+          { key: scopeName },
         ),
       ),
     );
@@ -270,10 +296,8 @@ export function useAssistantClient(): AssistantClient;
 export function useAssistantClient(scopes: ScopesInput): AssistantClient;
 export function useAssistantClient(scopes?: ScopesInput): AssistantClient {
   if (scopes) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
     return useExtendedAssistantClientImpl(scopes);
   } else {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
     return useAssistantContextValue();
   }
 }