@assistant-ui/react 0.11.39 → 0.11.43

package/dist/utils/hooks/useOnScrollToBottom.d.ts

@@ -1,2 +1,4 @@
-export declare const useOnScrollToBottom: (callback: () => void) => void;
+export declare const useOnScrollToBottom: (callback: (config: {
+    behavior: ScrollBehavior;
+}) => void) => void;
 //# sourceMappingURL=useOnScrollToBottom.d.ts.map

package/dist/utils/hooks/useOnScrollToBottom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOnScrollToBottom.d.ts","sourceRoot":"","sources":["../../../src/utils/hooks/useOnScrollToBottom.tsx"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB,GAAI,UAAU,MAAM,IAAI,SAOvD,CAAC"}
+{"version":3,"file":"useOnScrollToBottom.d.ts","sourceRoot":"","sources":["../../../src/utils/hooks/useOnScrollToBottom.tsx"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB,GAC9B,UAAU,CAAC,MAAM,EAAE;IAAE,QAAQ,EAAE,cAAc,CAAA;CAAE,KAAK,IAAI,SAQzD,CAAC"}

package/dist/utils/hooks/useOnScrollToBottom.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/hooks/useOnScrollToBottom.tsx"],"sourcesContent":["\"use client\";\n\nimport { useCallbackRef } from \"@radix-ui/react-use-callback-ref\";\nimport { useEffect } from \"react\";\nimport { useThreadViewport } from \"../../context/react/ThreadViewportContext\";\n\nexport const useOnScrollToBottom = (callback: () => void) => {\n  const callbackRef = useCallbackRef(callback);\n  const onScrollToBottom = useThreadViewport((vp) => vp.onScrollToBottom);\n\n  useEffect(() => {\n    return onScrollToBottom(callbackRef);\n  }, [onScrollToBottom, callbackRef]);\n};\n"],"mappings":";;;AAEA,SAAS,sBAAsB;AAC/B,SAAS,iBAAiB;AAC1B,SAAS,yBAAyB;AAE3B,IAAM,sBAAsB,CAAC,aAAyB;AAC3D,QAAM,cAAc,eAAe,QAAQ;AAC3C,QAAM,mBAAmB,kBAAkB,CAAC,OAAO,GAAG,gBAAgB;AAEtE,YAAU,MAAM;AACd,WAAO,iBAAiB,WAAW;AAAA,EACrC,GAAG,CAAC,kBAAkB,WAAW,CAAC;AACpC;","names":[]}
+{"version":3,"sources":["../../../src/utils/hooks/useOnScrollToBottom.tsx"],"sourcesContent":["\"use client\";\n\nimport { useCallbackRef } from \"@radix-ui/react-use-callback-ref\";\nimport { useEffect } from \"react\";\nimport { useThreadViewport } from \"../../context/react/ThreadViewportContext\";\n\nexport const useOnScrollToBottom = (\n  callback: (config: { behavior: ScrollBehavior }) => void,\n) => {\n  const callbackRef = useCallbackRef(callback);\n  const onScrollToBottom = useThreadViewport((vp) => vp.onScrollToBottom);\n\n  useEffect(() => {\n    return onScrollToBottom(callbackRef);\n  }, [onScrollToBottom, callbackRef]);\n};\n"],"mappings":";;;AAEA,SAAS,sBAAsB;AAC/B,SAAS,iBAAiB;AAC1B,SAAS,yBAAyB;AAE3B,IAAM,sBAAsB,CACjC,aACG;AACH,QAAM,cAAc,eAAe,QAAQ;AAC3C,QAAM,mBAAmB,kBAAkB,CAAC,OAAO,GAAG,gBAAgB;AAEtE,YAAU,MAAM;AACd,WAAO,iBAAiB,WAAW;AAAA,EACrC,GAAG,CAAC,kBAAkB,WAAW,CAAC;AACpC;","names":[]}

package/dist/utils/hooks/useSizeHandle.d.ts

@@ -0,0 +1,11 @@
+import type { SizeHandle } from "../../context/stores/ThreadViewport";
+/**
+ * Hook that creates a ref for tracking element size via a SizeHandle.
+ * Automatically sets up ResizeObserver and reports height changes.
+ *
+ * @param register - Function that returns a SizeHandle (e.g., registerContentInset)
+ * @param getHeight - Optional function to compute height (defaults to el.offsetHeight)
+ * @returns A ref callback to attach to the element
+ */
+export declare const useSizeHandle: (register: (() => SizeHandle) | null | undefined, getHeight?: (el: HTMLElement) => number) => (el: HTMLElement | null) => void;
+//# sourceMappingURL=useSizeHandle.d.ts.map

package/dist/utils/hooks/useSizeHandle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSizeHandle.d.ts","sourceRoot":"","sources":["../../../src/utils/hooks/useSizeHandle.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEtE;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,GACxB,UAAU,CAAC,MAAM,UAAU,CAAC,GAAG,IAAI,GAAG,SAAS,EAC/C,YAAY,CAAC,EAAE,EAAE,WAAW,KAAK,MAAM,qCA0BxC,CAAC"}

package/dist/utils/hooks/useSizeHandle.js

@@ -0,0 +1,30 @@
+"use client";
+
+// src/utils/hooks/useSizeHandle.ts
+import { useCallback } from "react";
+import { useManagedRef } from "./useManagedRef.js";
+var useSizeHandle = (register, getHeight) => {
+  const callbackRef = useCallback(
+    (el) => {
+      if (!register) return;
+      const sizeHandle = register();
+      const updateHeight = () => {
+        const height = getHeight ? getHeight(el) : el.offsetHeight;
+        sizeHandle.setHeight(height);
+      };
+      const ro = new ResizeObserver(updateHeight);
+      ro.observe(el);
+      updateHeight();
+      return () => {
+        ro.disconnect();
+        sizeHandle.unregister();
+      };
+    },
+    [register, getHeight]
+  );
+  return useManagedRef(callbackRef);
+};
+export {
+  useSizeHandle
+};
+//# sourceMappingURL=useSizeHandle.js.map

package/dist/utils/hooks/useSizeHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/utils/hooks/useSizeHandle.ts"],"sourcesContent":["\"use client\";\n\nimport { useCallback } from \"react\";\nimport { useManagedRef } from \"./useManagedRef\";\nimport type { SizeHandle } from \"../../context/stores/ThreadViewport\";\n\n/**\n * Hook that creates a ref for tracking element size via a SizeHandle.\n * Automatically sets up ResizeObserver and reports height changes.\n *\n * @param register - Function that returns a SizeHandle (e.g., registerContentInset)\n * @param getHeight - Optional function to compute height (defaults to el.offsetHeight)\n * @returns A ref callback to attach to the element\n */\nexport const useSizeHandle = (\n  register: (() => SizeHandle) | null | undefined,\n  getHeight?: (el: HTMLElement) => number,\n) => {\n  const callbackRef = useCallback(\n    (el: HTMLElement) => {\n      if (!register) return;\n\n      const sizeHandle = register();\n\n      const updateHeight = () => {\n        const height = getHeight ? getHeight(el) : el.offsetHeight;\n        sizeHandle.setHeight(height);\n      };\n\n      const ro = new ResizeObserver(updateHeight);\n      ro.observe(el);\n      updateHeight();\n\n      return () => {\n        ro.disconnect();\n        sizeHandle.unregister();\n      };\n    },\n    [register, getHeight],\n  );\n\n  return useManagedRef(callbackRef);\n};\n"],"mappings":";;;AAEA,SAAS,mBAAmB;AAC5B,SAAS,qBAAqB;AAWvB,IAAM,gBAAgB,CAC3B,UACA,cACG;AACH,QAAM,cAAc;AAAA,IAClB,CAAC,OAAoB;AACnB,UAAI,CAAC,SAAU;AAEf,YAAM,aAAa,SAAS;AAE5B,YAAM,eAAe,MAAM;AACzB,cAAM,SAAS,YAAY,UAAU,EAAE,IAAI,GAAG;AAC9C,mBAAW,UAAU,MAAM;AAAA,MAC7B;AAEA,YAAM,KAAK,IAAI,eAAe,YAAY;AAC1C,SAAG,QAAQ,EAAE;AACb,mBAAa;AAEb,aAAO,MAAM;AACX,WAAG,WAAW;AACd,mBAAW,WAAW;AAAA,MACxB;AAAA,IACF;AAAA,IACA,CAAC,UAAU,SAAS;AAAA,EACtB;AAEA,SAAO,cAAc,WAAW;AAClC;","names":[]}

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

@@ -1,6 +1,7 @@
 import type { AssistantApi, AssistantApiField } from "../../context/react/AssistantApiContext";
 import type { AssistantEvent, AssistantEventCallback, AssistantEventSelector } from "../../types/EventTypes";
-import type { ResourceElement, Unsubscribe } from "@assistant-ui/tap";
+import type { ResourceElement } from "@assistant-ui/tap";
+import { Unsubscribe } from "../../types";
 /**
  * Extract the API return type from an AssistantApiField
  */

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

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

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

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

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

@@ -1,4 +1,5 @@
-import { ResourceElement, Unsubscribe } from "@assistant-ui/tap";
+import { ResourceElement } from "@assistant-ui/tap";
+import { Unsubscribe } from "../../types";
 export interface Store<TState> {
     /**
      * Get the current state of the store.

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

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

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

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

package/package.json

@@ -28,7 +28,7 @@
     "conversational-ui",
     "conversational-ai"
   ],
-  "version": "0.11.39",
+  "version": "0.11.43",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -48,8 +48,8 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "assistant-cloud": "^0.1.7",
-    "@assistant-ui/tap": "^0.2.1",
+    "assistant-cloud": "^0.1.8",
+    "@assistant-ui/tap": "^0.3.0",
     "@radix-ui/primitive": "^1.1.3",
     "@radix-ui/react-compose-refs": "^1.1.2",
     "@radix-ui/react-context": "^1.1.3",
@@ -59,7 +59,7 @@
     "@radix-ui/react-use-callback-ref": "^1.1.1",
     "@radix-ui/react-use-escape-keydown": "^1.1.1",
     "@standard-schema/spec": "^1.0.0",
-    "assistant-stream": "^0.2.39",
+    "assistant-stream": "^0.2.41",
     "json-schema": "^0.4.0",
     "nanoid": "5.1.6",
     "react-textarea-autosize": "^8.5.9",
@@ -88,7 +88,7 @@
     "eslint": "^9",
     "eslint-config-next": "16.0.3",
     "tsx": "^4.20.6",
-    "vitest": "^4.0.8",
+    "vitest": "^4.0.10",
     "@assistant-ui/x-buildutils": "0.0.1"
   },
   "publishConfig": {
@@ -98,7 +98,7 @@
   "homepage": "https://www.assistant-ui.com/",
   "repository": {
     "type": "git",
-    "url": "https://github.com/assistant-ui/assistant-ui/tree/main/packages/react"
+    "url": "https://github.com/assistant-ui/assistant-ui"
   },
   "bugs": {
     "url": "https://github.com/assistant-ui/assistant-ui/issues"

package/src/client/AssistantClient.ts

@@ -1,7 +1,6 @@
 import {
   tapMemo,
   resource,
-  Unsubscribe,
   tapInlineResource,
   ResourceElement,
   tapResource,
@@ -29,6 +28,7 @@ import { withModelContextProvider } from "./ModelContext";
 import { ToolsApi, ToolsState } from "./types/Tools";
 import { ModelContextApi, ModelContextState } from "./types/ModelContext";
 import { ModelContext as ModelContextResource } from "./ModelContextClient";
+import { Unsubscribe } from "../types";
 
 type AssistantClientState = {
   readonly threads: ThreadListClientState;

package/src/client/ModelContext.ts

@@ -2,9 +2,9 @@ import {
   createContext,
   tapContext,
   withContextProvider,
-  Unsubscribe,
 } from "@assistant-ui/tap";
 import { ModelContextProvider } from "../model-context/ModelContextTypes";
+import { Unsubscribe } from "../types";
 
 export type ModelContextRegistrar = ModelContextProvider & {
   register: (provider: ModelContextProvider) => Unsubscribe;

package/src/client/ThreadMessageClient.tsx

@@ -63,6 +63,7 @@ const ThreadMessageAttachmentClient = resource(
 );
 export type ThreadMessageClientProps = {
   message: ThreadMessage;
+  index: number;
   isLast?: boolean;
   branchNumber?: number;
   branchCount?: number;
@@ -70,6 +71,7 @@ export type ThreadMessageClientProps = {
 export const ThreadMessageClient = resource(
   ({
     message,
+    index,
     isLast = true,
     branchNumber = 1,
     branchCount = 1,
@@ -102,6 +104,7 @@ export const ThreadMessageClient = resource(
         parts: parts.state,
         composer: composerState.state,
         parentId: null,
+        index,
         isLast,
         branchNumber,
         branchCount,
@@ -110,7 +113,7 @@ export const ThreadMessageClient = resource(
         isCopied: isCopiedState,
         isHovering: isHoveringState,
       };
-    }, [message, isCopiedState, isHoveringState, isLast]);
+    }, [message, index, isCopiedState, isHoveringState, isLast]);
 
     return tapApi<MessageClientApi>({
       getState: () => state,

package/src/client/types/Message.ts

@@ -30,6 +30,9 @@ export type MessageClientState = ThreadMessage & {
 
   readonly isCopied: boolean;
   readonly isHovering: boolean;
+
+  /** The position of this message in the thread (0 for first message) */
+  readonly index: number;
 };
 
 export type MessageClientApi = {

package/src/client/types/ModelContext.ts

@@ -1,4 +1,4 @@
-import type { Unsubscribe } from "@assistant-ui/tap";
+import type { Unsubscribe } from "../../types";
 import type { ModelContextProvider } from "../../model-context/ModelContextTypes";
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type

package/src/client/types/Tools.ts

@@ -1,5 +1,4 @@
-import { Unsubscribe } from "@assistant-ui/tap";
-import { ToolCallMessagePartComponent } from "../../types";
+import { ToolCallMessagePartComponent, Unsubscribe } from "../../types";
 
 export type ToolsState = {
   tools: Record<string, ToolCallMessagePartComponent[]>;

package/src/context/providers/ThreadViewportProvider.tsx

@@ -2,7 +2,10 @@
 
 import type { FC, PropsWithChildren } from "react";
 import { useEffect, useState } from "react";
-import { makeThreadViewportStore } from "../stores/ThreadViewport";
+import {
+  makeThreadViewportStore,
+  type ThreadViewportStoreOptions,
+} from "../stores/ThreadViewport";
 import {
   ThreadViewportContext,
   ThreadViewportContextValue,
@@ -10,10 +13,15 @@ import {
 } from "../react/ThreadViewportContext";
 import { writableStore } from "../ReadonlyStore";
 
-const useThreadViewportStoreValue = () => {
+export type ThreadViewportProviderProps = PropsWithChildren<{
+  options?: ThreadViewportStoreOptions;
+}>;
+
+const useThreadViewportStoreValue = (options: ThreadViewportStoreOptions) => {
   const outerViewport = useThreadViewportStore({ optional: true });
-  const [store] = useState(() => makeThreadViewportStore());
+  const [store] = useState(() => makeThreadViewportStore(options));
 
+  // Forward scrollToBottom from outer viewport to inner viewport
   useEffect(() => {
     return outerViewport?.getState().onScrollToBottom(() => {
       store.getState().scrollToBottom();
@@ -29,11 +37,25 @@ const useThreadViewportStoreValue = () => {
     });
   }, [store, outerViewport]);
 
+  // Sync options to store when they change
+  useEffect(() => {
+    const nextState = {
+      turnAnchor: options.turnAnchor ?? "bottom",
+    };
+
+    const currentState = store.getState();
+    if (currentState.turnAnchor !== nextState.turnAnchor) {
+      writableStore(store).setState(nextState);
+    }
+  }, [store, options.turnAnchor]);
+
   return store;
 };
 
-export const ThreadViewportProvider: FC<PropsWithChildren> = ({ children }) => {
-  const useThreadViewport = useThreadViewportStoreValue();
+export const ThreadPrimitiveViewportProvider: FC<
+  ThreadViewportProviderProps
+> = ({ children, options = {} }) => {
+  const useThreadViewport = useThreadViewportStoreValue(options);
 
   const [context] = useState<ThreadViewportContextValue>(() => {
     return {

package/src/context/react/AssistantApiContext.tsx

@@ -31,7 +31,7 @@ import {
   AttachmentClientApi,
   AttachmentClientState,
 } from "../../client/types/Attachment";
-import { Unsubscribe } from "@assistant-ui/tap";
+import { Unsubscribe } from "../../types";
 import {
   AssistantEvent,
   AssistantEventCallback,
@@ -42,7 +42,6 @@ import {
   ThreadListClientApi,
   ThreadListClientState,
 } from "../../client/types/ThreadList";
-import { ThreadViewportProvider } from "../providers/ThreadViewportProvider";
 import { DevToolsProviderApi } from "../../devtools/DevToolsHooks";
 import {
   AssistantClientProps,
@@ -354,9 +353,7 @@ export const AssistantProvider: FC<
 
   return (
     <AssistantApiContext.Provider value={api}>
-      {/* TODO temporarily allow accessing viewport state from outside the viewport */}
-      {/* TODO figure out if this behavior should be deprecated, since it is quite hacky */}
-      <ThreadViewportProvider>{children}</ThreadViewportProvider>
+      {children}
     </AssistantApiContext.Provider>
   );
 };

package/src/context/stores/ThreadViewport.tsx

@@ -3,20 +3,124 @@
 import { create } from "zustand";
 import type { Unsubscribe } from "../../types/Unsubscribe";
 
+export type SizeHandle = {
+  /** Update the height */
+  setHeight: (height: number) => void;
+  /** Unregister this handle */
+  unregister: Unsubscribe;
+};
+
+type SizeRegistry = {
+  register: () => SizeHandle;
+};
+
+const createSizeRegistry = (
+  onChange: (total: number) => void,
+): SizeRegistry => {
+  const entries = new Map<symbol, number>();
+
+  const recalculate = () => {
+    let total = 0;
+    for (const height of entries.values()) {
+      total += height;
+    }
+    onChange(total);
+  };
+
+  return {
+    register: () => {
+      const id = Symbol();
+      entries.set(id, 0);
+
+      return {
+        setHeight: (height: number) => {
+          if (entries.get(id) !== height) {
+            entries.set(id, height);
+            recalculate();
+          }
+        },
+        unregister: () => {
+          entries.delete(id);
+          recalculate();
+        },
+      };
+    },
+  };
+};
+
 export type ThreadViewportState = {
   readonly isAtBottom: boolean;
-  readonly scrollToBottom: () => void;
-  readonly onScrollToBottom: (callback: () => void) => Unsubscribe;
+  readonly scrollToBottom: (config?: {
+    behavior?: ScrollBehavior | undefined;
+  }) => void;
+  readonly onScrollToBottom: (
+    callback: ({ behavior }: { behavior: ScrollBehavior }) => void,
+  ) => Unsubscribe;
+
+  /** Controls scroll anchoring: "top" anchors user messages at top, "bottom" is classic behavior */
+  readonly turnAnchor: "top" | "bottom";
+
+  /** Raw height values from registered elements */
+  readonly height: {
+    /** Total viewport height */
+    readonly viewport: number;
+    /** Total content inset height (footer, anchor message, etc.) */
+    readonly inset: number;
+    /** Height of the anchor user message (full height) */
+    readonly userMessage: number;
+  };
+
+  /** Register a viewport and get a handle to update its height */
+  readonly registerViewport: () => SizeHandle;
+
+  /** Register a content inset (footer, anchor message, etc.) and get a handle to update its height */
+  readonly registerContentInset: () => SizeHandle;
+
+  /** Register the anchor user message height */
+  readonly registerUserMessageHeight: () => SizeHandle;
+};
+
+export type ThreadViewportStoreOptions = {
+  turnAnchor?: "top" | "bottom" | undefined;
 };
 
-export const makeThreadViewportStore = () => {
-  const scrollToBottomListeners = new Set<() => void>();
+export const makeThreadViewportStore = (
+  options: ThreadViewportStoreOptions = {},
+) => {
+  const scrollToBottomListeners = new Set<
+    (config: { behavior: ScrollBehavior }) => void
+  >();
 
-  return create<ThreadViewportState>(() => ({
+  const viewportRegistry = createSizeRegistry((total) => {
+    store.setState({
+      height: {
+        ...store.getState().height,
+        viewport: total,
+      },
+    });
+  });
+  const insetRegistry = createSizeRegistry((total) => {
+    store.setState({
+      height: {
+        ...store.getState().height,
+        inset: total,
+      },
+    });
+  });
+  const userMessageRegistry = createSizeRegistry((total) => {
+    store.setState({
+      height: {
+        ...store.getState().height,
+        userMessage: total,
+      },
+    });
+  });
+
+  const store = create<ThreadViewportState>(() => ({
     isAtBottom: true,
-    scrollToBottom: () => {
+    scrollToBottom: ({ behavior = "auto" } = {}) => {
       for (const listener of scrollToBottomListeners) {
-        listener();
+        listener({ behavior });
       }
     },
     onScrollToBottom: (callback) => {
@@ -25,5 +129,19 @@ export const makeThreadViewportStore = () => {
         scrollToBottomListeners.delete(callback);
       };
     },
+
+    turnAnchor: options.turnAnchor ?? "bottom",
+
+    height: {
+      viewport: 0,
+      inset: 0,
+      userMessage: 0,
+    },
+
+    registerViewport: viewportRegistry.register,
+    registerContentInset: insetRegistry.register,
+    registerUserMessageHeight: userMessageRegistry.register,
   }));
+
+  return store;
 };

package/src/devtools/DevToolsHooks.ts

@@ -1,5 +1,5 @@
 import { AssistantApi } from "../context/react/AssistantApiContext";
-import { Unsubscribe } from "@assistant-ui/tap";
+import { Unsubscribe } from "../types";
 
 export interface EventLog {
   time: Date;

package/src/legacy-runtime/AssistantRuntimeProvider.tsx

@@ -8,6 +8,7 @@ import {
 import { AssistantRuntime } from "./runtime/AssistantRuntime";
 import { AssistantRuntimeCore } from "./runtime-cores/core/AssistantRuntimeCore";
 import { RuntimeAdapter } from "./RuntimeAdapter";
+import { ThreadPrimitiveViewportProvider } from "../context/providers/ThreadViewportProvider";
 
 export namespace AssistantProvider {
   export type Props = PropsWithChildren<{
@@ -36,7 +37,11 @@ export const AssistantRuntimeProviderImpl: FC<AssistantProvider.Props> = ({
     <AssistantProvider api={api}>
       {RenderComponent && <RenderComponent />}
 
-      {children}
+      {/* TODO temporarily allow accessing viewport state from outside the viewport */}
+      {/* TODO figure out if this behavior should be deprecated, since it is quite hacky */}
+      <ThreadPrimitiveViewportProvider>
+        {children}
+      </ThreadPrimitiveViewportProvider>
     </AssistantProvider>
   );
 };

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

@@ -2,8 +2,8 @@ import {
   resource,
   tapMemo,
   tapEffect,
-  RefObject,
   tapInlineResource,
+  type tapRef,
 } from "@assistant-ui/tap";
 import {
   ComposerRuntime,
@@ -43,8 +43,8 @@ export const ComposerClient = resource(
     messageIdRef,
     runtime,
   }: {
-    threadIdRef: RefObject<string>;
-    messageIdRef?: RefObject<string>;
+    threadIdRef: tapRef.RefObject<string>;
+    messageIdRef?: tapRef.RefObject<string>;
     runtime: ComposerRuntime;
   }) => {
     const runtimeState = tapSubscribable(runtime);

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

@@ -5,7 +5,7 @@ import {
   tapInlineResource,
   tapMemo,
   tapEffect,
-  RefObject,
+  type tapRef,
 } from "@assistant-ui/tap";
 import { ComposerClient } from "./ComposerRuntimeClient";
 import { MessageClient } from "./MessageRuntimeClient";
@@ -24,7 +24,7 @@ const MessageClientById = resource(
   }: {
     runtime: ThreadRuntime;
     id: string;
-    threadIdRef: RefObject<string>;
+    threadIdRef: tapRef.RefObject<string>;
   }) => {
     const messageRuntime = tapMemo(
       () => runtime.getMessageById(id),

package/src/legacy-runtime/runtime/MessageRuntime.ts

@@ -80,6 +80,8 @@ const getMessagePartState = (
 
 export type MessageState = ThreadMessage & {
   readonly parentId: string | null;
+  /** The position of this message in the thread (0 for first message) */
+  readonly index: number;
   readonly isLast: boolean;
 
   readonly branchNumber: number;

package/src/legacy-runtime/runtime/RuntimeBindings.ts

@@ -45,6 +45,8 @@ export type ThreadListRuntimeCoreBinding = SubscribableWithState<
 export type MessageStateBinding = SubscribableWithState<
   ThreadMessage & {
     readonly parentId: string | null;
+    /** The position of this message in the thread (0 for first message) */
+    readonly index: number;
     readonly isLast: boolean;
     readonly branchNumber: number;
     readonly branchCount: number;