@assistant-ui/react 0.7.8 → 0.7.10

package/dist/ui/user-message.js

@@ -35,12 +35,12 @@ __export(user_message_exports, {
 });
 module.exports = __toCommonJS(user_message_exports);
 var import_react = require("react");
-var import_branch_picker = __toESM(require("./branch-picker.cjs"));
-var import_withDefaults = require("./utils/withDefaults.cjs");
-var import_user_action_bar = __toESM(require("./user-action-bar.cjs"));
-var import_content_part = __toESM(require("./content-part.cjs"));
-var import_primitives = require("../primitives/index.cjs");
-var import_attachment_ui = __toESM(require("./attachment-ui.cjs"));
+var import_branch_picker = __toESM(require("./branch-picker.js"));
+var import_withDefaults = require("./utils/withDefaults.js");
+var import_user_action_bar = __toESM(require("./user-action-bar.js"));
+var import_content_part = __toESM(require("./content-part.js"));
+var import_primitives = require("../primitives/index.js");
+var import_attachment_ui = __toESM(require("./attachment-ui.js"));
 var import_jsx_runtime = require("react/jsx-runtime");
 var UserMessage = () => {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(UserMessageRoot, { children: [

package/dist/utils/ProxyConfigProvider.js

@@ -23,7 +23,7 @@ __export(ProxyConfigProvider_exports, {
   ProxyConfigProvider: () => ProxyConfigProvider
 });
 module.exports = __toCommonJS(ProxyConfigProvider_exports);
-var import_ModelConfigTypes = require("../types/ModelConfigTypes.cjs");
+var import_ModelConfigTypes = require("../types/ModelConfigTypes.js");
 var ProxyConfigProvider = class {
   _providers = /* @__PURE__ */ new Set();
   getModelConfig() {

package/dist/utils/combined/createCombinedStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCombinedStore.d.ts","sourceRoot":"","sources":["../../../src/utils/combined/createCombinedStore.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;IAC9B,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClB,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,WAAW,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;AAE9E,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,GACtE,CAAY,IAAP,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACrC,gBAUmB,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,CAM5C,CAAC"}
+{"version":3,"file":"createCombinedStore.d.ts","sourceRoot":"","sources":["../../../src/utils/combined/createCombinedStore.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;IAC9B,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClB,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,WAAW,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;AAE9E,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,GACtE,CAAC,IAAI,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACrC,gBAUmB,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,CAM5C,CAAC"}

package/dist/utils/combined/useCombinedStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCombinedStore.d.ts","sourceRoot":"","sources":["../../../src/utils/combined/useCombinedStore.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,gBAAgB,EAErB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,UAClD,GAAG,CAAY,IAAP,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAE,YACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,KAC/B,CAIF,CAAC"}
+{"version":3,"file":"useCombinedStore.d.ts","sourceRoot":"","sources":["../../../src/utils/combined/useCombinedStore.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,gBAAgB,EAErB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,UAClD,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAE,YACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,KAC/B,CAIF,CAAC"}

package/dist/utils/combined/useCombinedStore.js

@@ -24,7 +24,7 @@ __export(useCombinedStore_exports, {
 });
 module.exports = __toCommonJS(useCombinedStore_exports);
 var import_react = require("react");
-var import_createCombinedStore = require("./createCombinedStore.cjs");
+var import_createCombinedStore = require("./createCombinedStore.js");
 var useCombinedStore = (stores, selector) => {
   const useCombined = (0, import_react.useMemo)(() => (0, import_createCombinedStore.createCombinedStore)(stores), stores);
   return useCombined(selector);

package/dist/utils/hooks/useOnResizeContent.js

@@ -25,7 +25,7 @@ __export(useOnResizeContent_exports, {
 module.exports = __toCommonJS(useOnResizeContent_exports);
 var import_react_use_callback_ref = require("@radix-ui/react-use-callback-ref");
 var import_react = require("react");
-var import_useManagedRef = require("./useManagedRef.cjs");
+var import_useManagedRef = require("./useManagedRef.js");
 var useOnResizeContent = (callback) => {
   const callbackRef = (0, import_react_use_callback_ref.useCallbackRef)(callback);
   const refCallback = (0, import_react.useCallback)(

package/dist/utils/hooks/useOnScrollToBottom.js

@@ -25,7 +25,7 @@ __export(useOnScrollToBottom_exports, {
 module.exports = __toCommonJS(useOnScrollToBottom_exports);
 var import_react_use_callback_ref = require("@radix-ui/react-use-callback-ref");
 var import_react = require("react");
-var import_ThreadContext = require("../../context/react/ThreadContext.cjs");
+var import_ThreadContext = require("../../context/react/ThreadContext.js");
 var useOnScrollToBottom = (callback) => {
   const callbackRef = (0, import_react_use_callback_ref.useCallbackRef)(callback);
   const onScrollToBottom = (0, import_ThreadContext.useThreadViewport)((vp) => vp.onScrollToBottom);

package/dist/utils/smooth/SmoothContext.js

@@ -28,8 +28,8 @@ __export(SmoothContext_exports, {
 module.exports = __toCommonJS(SmoothContext_exports);
 var import_react = require("react");
 var import_zustand = require("zustand");
-var import_ContentPartContext = require("../../context/react/ContentPartContext.cjs");
-var import_createContextStoreHook = require("../../context/react/utils/createContextStoreHook.cjs");
+var import_ContentPartContext = require("../../context/react/ContentPartContext.js");
+var import_createContextStoreHook = require("../../context/react/utils/createContextStoreHook.js");
 var import_jsx_runtime = require("react/jsx-runtime");
 var SmoothContext = (0, import_react.createContext)(null);
 var makeSmoothContext = (initialState) => {

package/dist/utils/smooth/index.js

@@ -25,9 +25,9 @@ __export(smooth_exports, {
   withSmoothContextProvider: () => import_SmoothContext2.withSmoothContextProvider
 });
 module.exports = __toCommonJS(smooth_exports);
-var import_useSmooth = require("./useSmooth.cjs");
-var import_SmoothContext = require("./SmoothContext.cjs");
-var import_SmoothContext2 = require("./SmoothContext.cjs");
+var import_useSmooth = require("./useSmooth.js");
+var import_SmoothContext = require("./SmoothContext.js");
+var import_SmoothContext2 = require("./SmoothContext.js");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   useSmooth,

package/dist/utils/smooth/useSmooth.js

@@ -25,10 +25,10 @@ __export(useSmooth_exports, {
 });
 module.exports = __toCommonJS(useSmooth_exports);
 var import_react = require("react");
-var import_context = require("../../context/index.cjs");
+var import_context = require("../../context/index.js");
 var import_react_use_callback_ref = require("@radix-ui/react-use-callback-ref");
-var import_SmoothContext = require("./SmoothContext.cjs");
-var import_ReadonlyStore = require("../../context/ReadonlyStore.cjs");
+var import_SmoothContext = require("./SmoothContext.js");
+var import_ReadonlyStore = require("../../context/ReadonlyStore.js");
 var TextStreamAnimator = class {
   constructor(currentText, setText) {
     this.currentText = currentText;

package/package.json

@@ -29,7 +29,7 @@
     "conversational-ui",
     "conversational-ai"
   ],
-  "version": "0.7.8",
+  "version": "0.7.10",
   "license": "MIT",
   "exports": {
     ".": {

package/src/api/AssistantRuntime.ts

@@ -2,6 +2,7 @@ import { AssistantRuntimeCore } from "../runtimes/core/AssistantRuntimeCore";
 import { NestedSubscriptionSubject } from "./subscribable/NestedSubscriptionSubject";
 import { ModelConfigProvider } from "../types/ModelConfigTypes";
 import {
+  ThreadListItemRuntimeBinding,
   ThreadRuntime,
   ThreadRuntimeCoreBinding,
   ThreadRuntimeImpl,
@@ -46,12 +47,27 @@ export class AssistantRuntimeImpl
     AssistantRuntime
 {
   public readonly threadList;
+  public readonly _thread: ThreadRuntime;
 
   protected constructor(
     private readonly _core: AssistantRuntimeCore,
-    private readonly _thread: ThreadRuntime,
+    runtimeFactory: new (
+      binding: ThreadRuntimeCoreBinding,
+      threadListItemBinding: ThreadListItemRuntimeBinding,
+    ) => ThreadRuntime = ThreadRuntimeImpl,
   ) {
     this.threadList = new ThreadListRuntimeImpl(_core.threadList);
+    this._thread = new runtimeFactory(
+      new NestedSubscriptionSubject({
+        path: {
+          ref: "threads.main",
+          threadSelector: { type: "main" },
+        },
+        getState: () => _core.threadList.getMainThreadRuntimeCore(),
+        subscribe: (callback) => _core.threadList.subscribe(callback),
+      }),
+      this.threadList.mainThreadListItem, // TODO capture "main" threadListItem from context around useLocalRuntime / useExternalStoreRuntime
+    );
   }
 
   public get thread() {
@@ -70,33 +86,13 @@ export class AssistantRuntimeImpl
     return this._core.registerModelConfigProvider(provider);
   }
 
-  protected static createMainThreadRuntime(
-    _core: AssistantRuntimeCore,
-    CustomThreadRuntime: new (
-      binding: ThreadRuntimeCoreBinding,
-    ) => ThreadRuntime = ThreadRuntimeImpl,
-  ) {
-    return new CustomThreadRuntime(
-      new NestedSubscriptionSubject({
-        path: {
-          ref: "threads.main",
-          threadSelector: { type: "main" },
-        },
-        getState: () => _core.threadList.mainThread,
-        subscribe: (callback) => _core.threadList.subscribe(callback),
-      }),
-    );
-  }
-
   public static create(
     _core: AssistantRuntimeCore,
-    CustomThreadRuntime: new (
+    runtimeFactory: new (
       binding: ThreadRuntimeCoreBinding,
+      threadListItemBinding: ThreadListItemRuntimeBinding,
     ) => ThreadRuntime = ThreadRuntimeImpl,
-  ) {
-    return new AssistantRuntimeImpl(
-      _core,
-      AssistantRuntimeImpl.createMainThreadRuntime(_core, CustomThreadRuntime),
-    ) as AssistantRuntime;
+  ): AssistantRuntime {
+    return new AssistantRuntimeImpl(_core, runtimeFactory);
   }
 }

package/src/api/ThreadListItemRuntime.ts

@@ -1,11 +1,22 @@
-import { ThreadMetadata } from "../runtimes/core/ThreadRuntimeCore";
 import { Unsubscribe } from "../types";
 import { ThreadListItemRuntimePath } from "./RuntimePathTypes";
 import { SubscribableWithState } from "./subscribable/Subscribable";
 import { ThreadListRuntimeCoreBinding } from "./ThreadListRuntime";
 
-export type ThreadListItemState = ThreadMetadata & {
+export type ThreadListItemEventType = "switched-to" | "switched-away";
+
+export type ThreadListItemState = {
   readonly isMain: boolean;
+
+  readonly id: string;
+
+  /**
+   * @deprecated This field was renamed to `id`. This field will be removed in 0.8.0.
+   */
+  readonly threadId: string;
+
+  readonly state: "archived" | "regular" | "new" | "deleted";
+  readonly title?: string | undefined;
 };
 
 export type ThreadListItemRuntime = {
@@ -19,6 +30,11 @@ export type ThreadListItemRuntime = {
   delete(): Promise<void>;
 
   subscribe(callback: () => void): Unsubscribe;
+
+  unstable_on(
+    event: ThreadListItemEventType,
+    callback: () => void,
+  ): Unsubscribe;
 };
 
 export type ThreadListItemStateBinding = SubscribableWithState<
@@ -42,31 +58,44 @@ export class ThreadListItemRuntimeImpl implements ThreadListItemRuntime {
 
   public switchTo(): Promise<void> {
     const state = this._core.getState();
-    return this._threadListBinding.switchToThread(state.threadId);
+    return this._threadListBinding.switchToThread(state.id);
   }
 
   public rename(newTitle: string): Promise<void> {
     const state = this._core.getState();
 
-    return this._threadListBinding.rename(state.threadId, newTitle);
+    return this._threadListBinding.rename(state.id, newTitle);
   }
 
   public archive(): Promise<void> {
     const state = this._core.getState();
 
-    return this._threadListBinding.archive(state.threadId);
+    return this._threadListBinding.archive(state.id);
   }
 
   public unarchive(): Promise<void> {
     const state = this._core.getState();
 
-    return this._threadListBinding.unarchive(state.threadId);
+    return this._threadListBinding.unarchive(state.id);
   }
 
   public delete(): Promise<void> {
     const state = this._core.getState();
 
-    return this._threadListBinding.delete(state.threadId);
+    return this._threadListBinding.delete(state.id);
+  }
+
+  public unstable_on(event: ThreadListItemEventType, callback: () => void) {
+    let prevIsMain = this._core.getState().isMain;
+    return this.subscribe(() => {
+      const newIsMain = this._core.getState().isMain;
+      if (prevIsMain === newIsMain) return;
+      prevIsMain = newIsMain;
+
+      if (event === "switched-to" && !newIsMain) return;
+      if (event === "switched-away" && newIsMain) return;
+      callback();
+    });
   }
 
   public subscribe(callback: () => void): Unsubscribe {

package/src/api/ThreadListRuntime.ts

@@ -21,6 +21,7 @@ export type ThreadListRuntime = {
 
   subscribe(callback: () => void): Unsubscribe;
 
+  readonly mainThreadListItem: ThreadListItemRuntime;
   getThreadListItemById(threadId: string): ThreadListItemRuntime;
   getThreadListItemByIndex(idx: number): ThreadListItemRuntime;
   getThreadListArchivedItemByIndex(idx: number): ThreadListItemRuntime;
@@ -30,10 +31,10 @@ const getThreadListState = (
   threadList: ThreadListRuntimeCore,
 ): ThreadListState => {
   return {
-    mainThreadId: threadList.mainThread.metadata.threadId,
-    newThread: threadList.newThread,
-    threads: threadList.threads,
-    archivedThreads: threadList.archivedThreads,
+    mainThreadId: threadList.mainThreadId,
+    newThread: threadList.newThreadId,
+    threads: threadList.threadIds,
+    archivedThreads: threadList.archivedThreadIds,
   };
 };
 
@@ -43,13 +44,14 @@ const getThreadListItemState = (
 ): ThreadListItemState | SKIP_UPDATE => {
   if (threadId === undefined) return SKIP_UPDATE;
 
-  const threadData = threadList.getThreadMetadataById(threadId);
+  const threadData = threadList.getItemById(threadId);
   if (!threadData) return SKIP_UPDATE;
   return {
-    threadId: threadData.threadId,
+    id: threadData.threadId,
+    threadId: threadData.threadId, // TODO remove in 0.8.0
     title: threadData.title,
     state: threadData.state,
-    isMain: threadList.mainThread.metadata.threadId === threadId,
+    isMain: threadData.threadId === threadList.mainThreadId,
   };
 };
 
@@ -65,6 +67,20 @@ export class ThreadListRuntimeImpl implements ThreadListRuntime {
     });
 
     this._getState = stateBinding.getState.bind(stateBinding);
+
+    this._mainThreadListItemRuntime = new ThreadListItemRuntimeImpl(
+      new ShallowMemoizeSubject({
+        path: {
+          ref: `threadItems[main]`,
+          threadSelector: { type: "main" },
+        },
+        getState: () => {
+          return getThreadListItemState(this._core, this._core.mainThreadId);
+        },
+        subscribe: (callback) => this._core.subscribe(callback),
+      }),
+      this._core,
+    );
   }
 
   public getState(): ThreadListState {
@@ -75,6 +91,12 @@ export class ThreadListRuntimeImpl implements ThreadListRuntime {
     return this._core.subscribe(callback);
   }
 
+  private _mainThreadListItemRuntime;
+
+  public get mainThreadListItem() {
+    return this._mainThreadListItemRuntime;
+  }
+
   public getThreadListItemByIndex(idx: number) {
     return new ThreadListItemRuntimeImpl(
       new ShallowMemoizeSubject({
@@ -83,7 +105,7 @@ export class ThreadListRuntimeImpl implements ThreadListRuntime {
           threadSelector: { type: "index", index: idx },
         },
         getState: () => {
-          return getThreadListItemState(this._core, this._core.threads[idx]);
+          return getThreadListItemState(this._core, this._core.threadIds[idx]);
         },
         subscribe: (callback) => this._core.subscribe(callback),
       }),
@@ -101,7 +123,7 @@ export class ThreadListRuntimeImpl implements ThreadListRuntime {
         getState: () => {
           return getThreadListItemState(
             this._core,
-            this._core.archivedThreads[idx],
+            this._core.archivedThreadIds[idx],
           );
         },
         subscribe: (callback) => this._core.subscribe(callback),

package/src/api/ThreadRuntime.ts

@@ -4,7 +4,6 @@ import {
   ThreadRuntimeCore,
   SpeechState,
   ThreadRuntimeEventType,
-  ThreadMetadata,
 } from "../runtimes/core/ThreadRuntimeCore";
 import { ExportedMessageRepository } from "../runtimes/utils/MessageRepository";
 import {
@@ -30,7 +29,12 @@ import {
 } from "./ComposerRuntime";
 import { LazyMemoizeSubject } from "./subscribable/LazyMemoizeSubject";
 import { SKIP_UPDATE } from "./subscribable/SKIP_UPDATE";
-import { MessageRuntimePath, ThreadRuntimePath } from "./RuntimePathTypes";
+import {
+  MessageRuntimePath,
+  ThreadListItemRuntimePath,
+  ThreadRuntimePath,
+} from "./RuntimePathTypes";
+import { ThreadListItemState } from "./ThreadListItemRuntime";
 
 export type CreateAppendMessage =
   | string
@@ -74,17 +78,24 @@ export type ThreadRuntimeCoreBinding = SubscribableWithState<
   outerSubscribe(callback: () => void): Unsubscribe;
 };
 
+export type ThreadListItemRuntimeBinding = SubscribableWithState<
+  ThreadListItemState,
+  ThreadListItemRuntimePath
+>;
+
 export type ThreadState = {
   /**
    * The thread ID.
-   * @deprecated This field is deprecated and will be removed in 0.8.0. Use `metadata.threadId` instead.
+   * @deprecated This field is deprecated and will be removed in 0.8.0. Use `useThreadListItem().id` instead.
    */
   readonly threadId: string;
 
   /**
    * The thread metadata.
+   *
+   * @deprecated Use `useThreadListItem()` instead. This field is deprecated and will be removed in 0.8.0.
    */
-  readonly metadata: ThreadMetadata;
+  readonly metadata: ThreadListItemState;
 
   /**
    * Whether the thread is disabled. Disabled threads cannot receive new messages.
@@ -122,11 +133,14 @@ export type ThreadState = {
   readonly speech: SpeechState | undefined;
 };
 
-export const getThreadState = (runtime: ThreadRuntimeCore): ThreadState => {
+export const getThreadState = (
+  runtime: ThreadRuntimeCore,
+  threadListItemState: ThreadListItemState,
+): ThreadState => {
   const lastMessage = runtime.messages.at(-1);
   return Object.freeze({
-    threadId: runtime.metadata.threadId,
-    metadata: runtime.metadata,
+    threadId: threadListItemState.id,
+    metadata: threadListItemState,
     capabilities: runtime.capabilities,
     isDisabled: runtime.isDisabled,
     isRunning:
@@ -208,11 +222,25 @@ export class ThreadRuntimeImpl implements ThreadRuntime {
     getStateState(): ThreadState;
   };
 
-  constructor(threadBinding: ThreadRuntimeCoreBinding) {
+  constructor(
+    threadBinding: ThreadRuntimeCoreBinding,
+    threadListItemBinding: ThreadListItemRuntimeBinding,
+  ) {
     const stateBinding = new LazyMemoizeSubject({
       path: threadBinding.path,
-      getState: () => getThreadState(threadBinding.getState()),
-      subscribe: (callback) => threadBinding.subscribe(callback),
+      getState: () =>
+        getThreadState(
+          threadBinding.getState(),
+          threadListItemBinding.getState(),
+        ),
+      subscribe: (callback) => {
+        const sub1 = threadBinding.subscribe(callback);
+        const sub2 = threadListItemBinding.subscribe(callback);
+        return () => {
+          sub1();
+          sub2();
+        };
+      },
     });
 
     this._threadBinding = {

package/src/context/providers/AssistantRuntimeProvider.tsx

@@ -61,7 +61,10 @@ export const AssistantRuntimeProviderImpl: FC<
 
   return (
     <AssistantContext.Provider value={context}>
-      <ThreadRuntimeProvider runtime={runtime.thread}>
+      <ThreadRuntimeProvider
+        runtime={runtime.thread}
+        listItemRuntime={runtime.threadList.mainThreadListItem}
+      >
         {children}
       </ThreadRuntimeProvider>
     </AssistantContext.Provider>

package/src/context/providers/ThreadRuntimeProvider.tsx

@@ -7,8 +7,11 @@ import { writableStore } from "../ReadonlyStore";
 import { ThreadRuntime } from "../../api/ThreadRuntime";
 import { create } from "zustand";
 import { ThreadComposerRuntime } from "../../api/ComposerRuntime";
+import { ThreadListItemRuntime } from "../../api/ThreadListItemRuntime";
+import { ThreadListItemRuntimeProvider } from "./ThreadListItemRuntimeProvider";
 
 type ThreadProviderProps = {
+  listItemRuntime: ThreadListItemRuntime;
   runtime: ThreadRuntime;
 };
 
@@ -49,7 +52,7 @@ const useThreadComposerStore = (runtime: ThreadComposerRuntime) => {
 
 export const ThreadRuntimeProvider: FC<
   PropsWithChildren<ThreadProviderProps>
-> = ({ children, runtime }) => {
+> = ({ children, listItemRuntime: threadListItemRuntime, runtime }) => {
   const useThreadRuntime = useThreadRuntimeStore(runtime);
   const useThread = useThreadStore(runtime);
   const useThreadComposer = useThreadComposerStore(runtime.composer);
@@ -66,6 +69,10 @@ export const ThreadRuntimeProvider: FC<
   }, [useThread, useThreadRuntime, useThreadComposer]);
 
   return (
-    <ThreadContext.Provider value={context}>{children}</ThreadContext.Provider>
+    <ThreadListItemRuntimeProvider runtime={threadListItemRuntime}>
+      <ThreadContext.Provider value={context}>
+        {children}
+      </ThreadContext.Provider>
+    </ThreadListItemRuntimeProvider>
   );
 };

package/src/internal.ts

@@ -10,7 +10,7 @@ export { AssistantRuntimeImpl } from "./api/AssistantRuntime";
 export {
   ThreadRuntimeImpl,
   type ThreadRuntimeCoreBinding,
+  type ThreadListItemRuntimeBinding,
 } from "./api/ThreadRuntime";
-export { LocalThreadMetadataRuntimeCore } from "./runtimes/local/LocalThreadMetadataRuntimeCore";
 
 export * from "./utils/smooth";

package/src/primitives/composer/ComposerInput.tsx

@@ -20,6 +20,7 @@ import {
 import { useThread, useThreadRuntime } from "../../context/react/ThreadContext";
 import { useEscapeKeydown } from "@radix-ui/react-use-escape-keydown";
 import { useOnScrollToBottom } from "../../utils/hooks/useOnScrollToBottom";
+import { useThreadListItemRuntime } from "../../context/react/ThreadListItemContext";
 
 export namespace ComposerPrimitiveInput {
   export type Element = HTMLTextAreaElement;
@@ -53,6 +54,7 @@ export const ComposerPrimitiveInput = forwardRef<
     },
     forwardedRef,
   ) => {
+    const threadListItemRuntime = useThreadListItemRuntime();
     const threadRuntime = useThreadRuntime();
     const composerRuntime = useComposerRuntime();
 
@@ -124,7 +126,7 @@ export const ComposerPrimitiveInput = forwardRef<
       if (composerRuntime.type !== "thread" || !unstable_focusOnThreadSwitched)
         return undefined;
 
-      return threadRuntime.unstable_on("switched-to", focus);
+      return threadListItemRuntime.unstable_on("switched-to", focus);
     }, [unstable_focusOnThreadSwitched]);
 
     return (

package/src/primitives/threadList/ThreadListNew.tsx

@@ -31,7 +31,7 @@ export const ThreadListPrimitiveNew = forwardRef<
   return (
     <Primitive.button
       type="button"
-      {...(isMain ? { "data-active": "true" } : null)}
+      {...(isMain ? { "data-active": "true", "aria-current": "true" } : null)}
       {...props}
       ref={forwardedRef}
       disabled={disabled || !callback}

package/src/primitives/threadListItem/ThreadListItemRoot.tsx

@@ -19,7 +19,7 @@ export const ThreadListItemPrimitiveRoot = forwardRef<
 
   return (
     <Primitive.div
-      {...(isMain ? { "data-active": "true" } : null)}
+      {...(isMain ? { "data-active": "true", "aria-current": "true" } : null)}
       {...props}
       ref={ref}
     />

package/src/runtimes/core/BaseThreadRuntimeCore.tsx

@@ -17,7 +17,6 @@ import {
   RuntimeCapabilities,
   SubmittedFeedback,
   ThreadRuntimeEventType,
-  ThreadMetadataRuntimeCore,
 } from "../core/ThreadRuntimeCore";
 import { DefaultEditComposerRuntimeCore } from "../composer/DefaultEditComposerRuntimeCore";
 import { SpeechSynthesisAdapter } from "../speech/SpeechAdapterTypes";
@@ -46,20 +45,13 @@ export abstract class BaseThreadRuntimeCore implements ThreadRuntimeCore {
   public abstract addToolResult(options: AddToolResultOptions): void;
   public abstract cancelRun(): void;
 
-  public get metadata() {
-    return this._metadata;
-  }
-
   public get messages() {
     return this.repository.getMessages();
   }
 
   public readonly composer = new DefaultThreadComposerRuntimeCore(this);
 
-  constructor(
-    private readonly _configProvider: ModelConfigProvider,
-    private readonly _metadata: ThreadMetadataRuntimeCore,
-  ) {}
+  constructor(private readonly _configProvider: ModelConfigProvider) {}
 
   public getModelConfig() {
     return this._configProvider.getModelConfig();

package/src/runtimes/core/ThreadListRuntimeCore.tsx

@@ -1,21 +1,30 @@
 import { Unsubscribe } from "../../types";
-import { ThreadMetadata, ThreadRuntimeCore } from "./ThreadRuntimeCore";
+import { ThreadRuntimeCore } from "./ThreadRuntimeCore";
+
+type ThreadListItemCoreState = {
+  readonly threadId: string;
+  readonly state: "archived" | "regular" | "new" | "deleted";
+  readonly title?: string | undefined;
+
+  readonly runtime?: ThreadRuntimeCore | undefined;
+};
 
 export type ThreadListRuntimeCore = {
-  mainThread: ThreadRuntimeCore;
+  mainThreadId: string;
+  newThreadId: string | undefined;
 
-  newThread: string | undefined;
-  threads: readonly string[];
-  archivedThreads: readonly string[];
+  threadIds: readonly string[];
+  archivedThreadIds: readonly string[];
 
-  getThreadMetadataById(threadId: string): ThreadMetadata | undefined;
+  getMainThreadRuntimeCore(): ThreadRuntimeCore;
+  getItemById(threadId: string): ThreadListItemCoreState | undefined;
 
   switchToThread(threadId: string): Promise<void>;
   switchToNewThread(): Promise<void>;
 
   // getLoadThreadsPromise(): Promise<void>;
   // getLoadArchivedThreadsPromise(): Promise<void>;
-  // create(): Promise<ThreadMetadata>;
+
   rename(threadId: string, newTitle: string): Promise<void>;
   archive(threadId: string): Promise<void>;
   unarchive(threadId: string): Promise<void>;