@assistant-ui/react 0.12.10 → 0.12.11

package/src/legacy-runtime/cloud/auiV0.ts

@@ -1,12 +1,11 @@
-import { ThreadMessage } from "../../types";
-import { MessageStatus } from "../../types/AssistantTypes";
+import type { MessageStatus, ThreadMessage } from "@assistant-ui/core";
 import { fromThreadMessageLike } from "../runtime-cores/external-store/ThreadMessageLike";
 import { CloudMessage } from "assistant-cloud";
 import { isJSONValue } from "../../utils/json/is-json";
 import { ReadonlyJSONObject, ReadonlyJSONValue } from "assistant-stream/utils";
 import { ExportedMessageRepositoryItem } from "../runtime-cores/utils/MessageRepository";
 
-type AuiV0MessageMessagePart =
+type AuiV0MessagePart =
   | {
       readonly type: "text";
       readonly text: string;
@@ -52,44 +51,42 @@ type AuiV0MessageMessagePart =
 type AuiV0Message = {
   readonly role: "assistant" | "user" | "system";
   readonly status?: MessageStatus;
-  readonly content: readonly AuiV0MessageMessagePart[];
+  readonly content: readonly AuiV0MessagePart[];
   readonly metadata: {
     readonly unstable_state?: ReadonlyJSONValue;
     readonly unstable_annotations: readonly ReadonlyJSONValue[];
     readonly unstable_data: readonly ReadonlyJSONValue[];
     readonly steps: readonly {
       readonly usage?: {
-        readonly promptTokens: number;
-        readonly completionTokens: number;
+        readonly inputTokens: number;
+        readonly outputTokens: number;
       };
     }[];
     readonly custom: ReadonlyJSONObject;
   };
 };
 
-export const auiV0Encode = (message: ThreadMessage): AuiV0Message => {
+export function auiV0Encode(message: ThreadMessage): AuiV0Message {
   // TODO attachments are currently intentionally ignored
   // info: ID and createdAt are ignored (we use the server value instead)
+
+  const status: MessageStatus | undefined =
+    message.status?.type === "running"
+      ? { type: "incomplete", reason: "cancelled" }
+      : message.status;
+
   return {
     role: message.role,
     content: message.content.map((part) => {
       const type = part.type;
       switch (type) {
-        case "text": {
-          return {
-            type: "text",
-            text: part.text,
-          };
-        }
+        case "text":
+          return { type: "text", text: part.text };
 
-        case "reasoning": {
-          return {
-            type: "reasoning",
-            text: part.text,
-          };
-        }
+        case "reasoning":
+          return { type: "reasoning", text: part.text };
 
-        case "source": {
+        case "source":
           return {
             type: "source",
             sourceType: part.sourceType,
@@ -97,7 +94,6 @@ export const auiV0Encode = (message: ThreadMessage): AuiV0Message => {
             url: part.url,
             ...(part.title ? { title: part.title } : undefined),
           };
-        }
 
         case "tool-call": {
           if (!isJSONValue(part.result)) {
@@ -110,32 +106,25 @@ export const auiV0Encode = (message: ThreadMessage): AuiV0Message => {
             toolCallId: part.toolCallId,
             toolName: part.toolName,
             ...(JSON.stringify(part.args) === part.argsText
-              ? {
-                  args: part.args,
-                }
+              ? { args: part.args }
               : { argsText: part.argsText }),
             ...(part.result
               ? { result: part.result as ReadonlyJSONValue }
-              : {}),
-            ...(part.isError ? { isError: true } : {}),
+              : undefined),
+            ...(part.isError ? { isError: true } : undefined),
           };
         }
 
-        case "image": {
-          return {
-            type: "image",
-            image: part.image,
-          };
-        }
+        case "image":
+          return { type: "image", image: part.image };
 
-        case "file": {
+        case "file":
           return {
             type: "file",
             data: part.data,
             mimeType: part.mimeType,
             ...(part.filename ? { filename: part.filename } : undefined),
           };
-        }
 
         default: {
           const unhandledType: "audio" | "data" = type;
@@ -146,23 +135,13 @@ export const auiV0Encode = (message: ThreadMessage): AuiV0Message => {
       }
     }),
     metadata: message.metadata as AuiV0Message["metadata"],
-    ...(message.status
-      ? {
-          status:
-            message.status?.type === "running"
-              ? {
-                  type: "incomplete",
-                  reason: "cancelled",
-                }
-              : message.status,
-        }
-      : undefined),
+    ...(status ? { status } : undefined),
   };
-};
+}
 
-export const auiV0Decode = (
+export function auiV0Decode(
   cloudMessage: CloudMessage & { format: "aui/v0" },
-): ExportedMessageRepositoryItem => {
+): ExportedMessageRepositoryItem {
   const payload = cloudMessage.content as unknown as AuiV0Message;
   const message = fromThreadMessageLike(
     {
@@ -171,14 +150,11 @@ export const auiV0Decode = (
       ...payload,
     },
     cloudMessage.id,
-    {
-      type: "complete",
-      reason: "unknown",
-    },
+    { type: "complete", reason: "unknown" },
   );
 
   return {
     parentId: cloudMessage.parent_id,
     message,
   };
-};
+}

package/src/legacy-runtime/cloud/{useCloudThreadListRuntime.tsx → useCloudThreadListRuntime.ts}

@@ -18,16 +18,14 @@ type CloudThreadListAdapter = {
   delete?(threadId: string): Promise<void>;
 };
 
-export const useCloudThreadListRuntime = ({
+export function useCloudThreadListRuntime({
   runtimeHook,
   ...adapterOptions
-}: CloudThreadListAdapter) => {
+}: CloudThreadListAdapter) {
   const adapter = useCloudThreadListAdapter(adapterOptions);
-  const runtime = useRemoteThreadListRuntime({
-    runtimeHook: runtimeHook,
+  return useRemoteThreadListRuntime({
+    runtimeHook,
     adapter,
     allowNesting: true,
   });
-
-  return runtime;
-};
+}

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

@@ -1,111 +1,2 @@
-import { AssistantRuntimeCore } from "../runtime-cores/core/AssistantRuntimeCore";
-import { ModelContextProvider } from "../../model-context/ModelContextTypes";
-import { ThreadRuntime } from "./ThreadRuntime";
-import { Unsubscribe } from "../../types";
-import { ThreadListRuntime, ThreadListRuntimeImpl } from "./ThreadListRuntime";
-import { ExportedMessageRepository, ThreadMessageLike } from "../runtime-cores";
-
-export type AssistantRuntime = {
-  /**
-   * The threads in this assistant.
-   */
-  readonly threads: ThreadListRuntime;
-
-  /**
-   * The currently selected main thread. Equivalent to `threads.main`.
-   */
-  readonly thread: ThreadRuntime;
-
-  /**
-   * @deprecated This field was renamed to `threads`.
-   */
-  readonly threadList: ThreadListRuntime;
-
-  /**
-   * Switch to a new thread.
-   *
-   * @deprecated This method was moved to `threads.switchToNewThread`.
-   */
-  switchToNewThread(): void;
-
-  /**
-   * Switch to a thread.
-   *
-   * @param threadId The thread ID to switch to.
-   * @deprecated This method was moved to `threads.switchToThread`.
-   */
-  switchToThread(threadId: string): void;
-
-  /**
-   * Register a model context provider. Model context providers are configuration such as system message, temperature, etc. that are set in the frontend.
-   *
-   * @param provider The model context provider to register.
-   */
-  registerModelContextProvider(provider: ModelContextProvider): Unsubscribe;
-
-  /**
-   * @deprecated This method was renamed to `registerModelContextProvider`.
-   */
-  registerModelConfigProvider(provider: ModelContextProvider): Unsubscribe;
-
-  /**
-   * @deprecated Use `runtime.thread.reset(initialMessages)`.
-   */
-  reset: unknown; // make it a type error
-};
-
-export class AssistantRuntimeImpl implements AssistantRuntime {
-  public readonly threads;
-  public get threadList() {
-    return this.threads;
-  }
-
-  public readonly _thread: ThreadRuntime;
-
-  public constructor(private readonly _core: AssistantRuntimeCore) {
-    this.threads = new ThreadListRuntimeImpl(_core.threads);
-    this._thread = this.threads.main;
-
-    this.__internal_bindMethods();
-  }
-
-  protected __internal_bindMethods() {
-    this.switchToNewThread = this.switchToNewThread.bind(this);
-    this.switchToThread = this.switchToThread.bind(this);
-    this.registerModelContextProvider =
-      this.registerModelContextProvider.bind(this);
-    this.registerModelConfigProvider =
-      this.registerModelConfigProvider.bind(this);
-    this.reset = this.reset.bind(this);
-  }
-
-  public get thread() {
-    return this._thread;
-  }
-
-  public switchToNewThread() {
-    return this._core.threads.switchToNewThread();
-  }
-
-  public switchToThread(threadId: string) {
-    return this._core.threads.switchToThread(threadId);
-  }
-
-  public registerModelContextProvider(provider: ModelContextProvider) {
-    return this._core.registerModelContextProvider(provider);
-  }
-
-  public registerModelConfigProvider(provider: ModelContextProvider) {
-    return this.registerModelContextProvider(provider);
-  }
-
-  public reset({
-    initialMessages,
-  }: {
-    initialMessages?: ThreadMessageLike[];
-  } = {}) {
-    return this._core.threads
-      .getMainThreadRuntimeCore()
-      .import(ExportedMessageRepository.fromArray(initialMessages ?? []));
-  }
-}
+export type { AssistantRuntime } from "@assistant-ui/core";
+export { AssistantRuntimeImpl } from "@assistant-ui/core/internal";

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

@@ -1,119 +1,7 @@
-import { SubscribableWithState } from "./subscribable/Subscribable";
-
-import type { ComposerRuntimeCoreBinding } from "./RuntimeBindings";
-import {
-  Attachment,
-  CompleteAttachment,
-  PendingAttachment,
-  Unsubscribe,
-} from "../../types";
-import { AttachmentRuntimePath } from "./RuntimePathTypes";
-
-type MessageAttachmentState = CompleteAttachment & {
-  readonly source: "message";
-};
-
-type ThreadComposerAttachmentState = PendingAttachment & {
-  readonly source: "thread-composer";
-};
-
-type EditComposerAttachmentState = Attachment & {
-  readonly source: "edit-composer";
-};
-
-export type AttachmentState =
-  | ThreadComposerAttachmentState
-  | EditComposerAttachmentState
-  | MessageAttachmentState;
-
-type AttachmentSnapshotBinding<Source extends AttachmentRuntimeSource> =
-  SubscribableWithState<
-    AttachmentState & { source: Source },
-    AttachmentRuntimePath & { attachmentSource: Source }
-  >;
-
-type AttachmentRuntimeSource = AttachmentState["source"];
-
-export type AttachmentRuntime<
-  TSource extends AttachmentRuntimeSource = AttachmentRuntimeSource,
-> = {
-  readonly path: AttachmentRuntimePath & { attachmentSource: TSource };
-  readonly source: TSource;
-  getState(): AttachmentState & { source: TSource };
-  remove(): Promise<void>;
-  subscribe(callback: () => void): Unsubscribe;
-};
-
-export abstract class AttachmentRuntimeImpl<
-  Source extends AttachmentRuntimeSource = AttachmentRuntimeSource,
-> implements AttachmentRuntime
-{
-  public get path() {
-    return this._core.path;
-  }
-
-  public abstract get source(): Source;
-
-  constructor(private _core: AttachmentSnapshotBinding<Source>) {
-    this.__internal_bindMethods();
-  }
-
-  protected __internal_bindMethods() {
-    this.getState = this.getState.bind(this);
-    this.remove = this.remove.bind(this);
-    this.subscribe = this.subscribe.bind(this);
-  }
-
-  public getState(): AttachmentState & { source: Source } {
-    return this._core.getState();
-  }
-
-  public abstract remove(): Promise<void>;
-
-  public subscribe(callback: () => void) {
-    return this._core.subscribe(callback);
-  }
-}
-
-abstract class ComposerAttachmentRuntime<
-  Source extends "thread-composer" | "edit-composer",
-> extends AttachmentRuntimeImpl<Source> {
-  constructor(
-    core: AttachmentSnapshotBinding<Source>,
-    private _composerApi: ComposerRuntimeCoreBinding,
-  ) {
-    super(core);
-  }
-
-  public remove() {
-    const core = this._composerApi.getState();
-    if (!core) throw new Error("Composer is not available");
-    return core.removeAttachment(this.getState().id);
-  }
-}
-
-export class ThreadComposerAttachmentRuntimeImpl extends ComposerAttachmentRuntime<"thread-composer"> {
-  public get source(): "thread-composer" {
-    return "thread-composer";
-  }
-}
-
-export class EditComposerAttachmentRuntimeImpl extends ComposerAttachmentRuntime<"edit-composer"> {
-  public get source(): "edit-composer" {
-    return "edit-composer";
-  }
-}
-
-export class MessageAttachmentRuntimeImpl extends AttachmentRuntimeImpl<"message"> {
-  public get source(): "message" {
-    return "message";
-  }
-
-  constructor(core: AttachmentSnapshotBinding<"message">) {
-    super(core);
-  }
-
-  public remove(): never {
-    throw new Error("Message attachments cannot be removed");
-  }
-}
+export type { AttachmentState, AttachmentRuntime } from "@assistant-ui/core";
+export {
+  AttachmentRuntimeImpl,
+  ThreadComposerAttachmentRuntimeImpl,
+  EditComposerAttachmentRuntimeImpl,
+  MessageAttachmentRuntimeImpl,
+} from "@assistant-ui/core/internal";