@assistant-ui/core 0.1.8 → 0.1.9

package/src/react/primitives/message/MessageParts.tsx

@@ -440,6 +440,8 @@ const EmptyPartsImpl: FC<MessagePartComponentProps> = ({ components }) => {
 
   if (components?.Empty) return <components.Empty status={status} />;
 
+  if (status.type !== "running") return null;
+
   return (
     <EmptyPartFallback
       status={status}

package/src/react/types/scopes/interactables.ts

@@ -0,0 +1,44 @@
+import type { Tool } from "assistant-stream";
+import type { Unsubscribe } from "../../..";
+
+/**
+ * Schema type matching Tool["parameters"] from assistant-stream.
+ * Accepts both StandardSchemaV1 and JSONSchema7.
+ */
+export type InteractableStateSchema = NonNullable<
+  Extract<Tool, { parameters: unknown }>["parameters"]
+>;
+
+export type InteractableDefinition = {
+  id: string;
+  name: string;
+  description: string;
+  stateSchema: InteractableStateSchema;
+  state: unknown;
+  selected?: boolean | undefined;
+};
+
+export type InteractableRegistration = {
+  id: string;
+  name: string;
+  description: string;
+  stateSchema: InteractableStateSchema;
+  initialState: unknown;
+  selected?: boolean | undefined;
+};
+
+export type InteractablesState = {
+  /** Keyed by instance id */
+  definitions: Record<string, InteractableDefinition>;
+};
+
+export type InteractablesMethods = {
+  getState(): InteractablesState;
+  register(def: InteractableRegistration): Unsubscribe;
+  setState(id: string, updater: (prev: unknown) => unknown): void;
+  setSelected(id: string, selected: boolean): void;
+};
+
+export type InteractablesClientSchema = {
+  methods: InteractablesMethods;
+};

package/src/react/types/store-augmentation.ts

@@ -1,9 +1,11 @@
 import type { ToolsClientSchema } from "./scopes/tools";
 import type { DataRenderersClientSchema } from "./scopes/dataRenderers";
+import type { InteractablesClientSchema } from "./scopes/interactables";
 
 declare module "@assistant-ui/store" {
   interface ScopeRegistry {
     tools: ToolsClientSchema;
     dataRenderers: DataRenderersClientSchema;
+    interactables: InteractablesClientSchema;
   }
 }

package/src/runtime/base/base-composer-runtime-core.ts

@@ -9,7 +9,10 @@ import type { QuoteInfo } from "../../types/quote";
 import type { Unsubscribe } from "../../types/unsubscribe";
 import type { RunConfig } from "../../types/message";
 import { BaseSubscribable } from "../../subscribable/subscribable";
-import type { AttachmentAdapter } from "../../adapters/attachment";
+import {
+  type AttachmentAdapter,
+  fileMatchesAccept,
+} from "../../adapters/attachment";
 import type {
   ComposerRuntimeCore,
   ComposerRuntimeEventType,
@@ -216,6 +219,17 @@ export abstract class BaseComposerRuntimeCore
     const adapter = this.getAttachmentAdapter();
     if (!adapter) throw new Error("Attachments are not supported");
 
+    if (
+      !fileMatchesAccept(
+        { name: fileOrAttachment.name, type: fileOrAttachment.type },
+        adapter.accept,
+      )
+    ) {
+      throw new Error(
+        `File type ${fileOrAttachment.type || "unknown"} is not accepted. Accepted types: ${adapter.accept}`,
+      );
+    }
+
     const upsertAttachment = (a: PendingAttachment) => {
       const idx = this._attachments.findIndex(
         (attachment) => attachment.id === a.id,
@@ -233,17 +247,39 @@ export abstract class BaseComposerRuntimeCore
       this._notifySubscribers();
     };
 
-    const promiseOrGenerator = adapter.add({ file: fileOrAttachment });
-    if (Symbol.asyncIterator in promiseOrGenerator) {
-      for await (const r of promiseOrGenerator) {
-        upsertAttachment(r);
+    let lastAttachment: PendingAttachment | undefined;
+    try {
+      const promiseOrGenerator = adapter.add({ file: fileOrAttachment });
+      if (Symbol.asyncIterator in promiseOrGenerator) {
+        for await (const r of promiseOrGenerator) {
+          lastAttachment = r;
+          upsertAttachment(r);
+        }
+      } else {
+        lastAttachment = await promiseOrGenerator;
+        upsertAttachment(lastAttachment);
       }
-    } else {
-      upsertAttachment(await promiseOrGenerator);
+    } catch (e) {
+      if (lastAttachment) {
+        upsertAttachment({
+          ...lastAttachment,
+          status: { type: "incomplete", reason: "error" },
+        });
+      }
+      try {
+        this._notifyEventSubscribers("attachmentAddError");
+      } catch {
+        // prevent subscriber errors from masking the adapter error
+      }
+      throw e;
     }
 
-    this._notifyEventSubscribers("attachmentAdd");
-    this._notifySubscribers();
+    const hasError =
+      lastAttachment?.status.type === "incomplete" &&
+      lastAttachment.status.reason === "error";
+    this._notifyEventSubscribers(
+      hasError ? "attachmentAddError" : "attachmentAdd",
+    );
   }
 
   async removeAttachment(attachmentId: string) {

package/src/runtime/interfaces/composer-runtime-core.ts

@@ -5,7 +5,10 @@ import type { Unsubscribe } from "../../types/unsubscribe";
 import type { RunConfig } from "../../types/message";
 import type { DictationAdapter } from "../../adapters/speech";
 
-export type ComposerRuntimeEventType = "send" | "attachmentAdd";
+export type ComposerRuntimeEventType =
+  | "send"
+  | "attachmentAdd"
+  | "attachmentAddError";
 
 export type DictationState = {
   readonly status: DictationAdapter.Status;

package/src/store/runtime-clients/composer-runtime-client.ts

@@ -16,7 +16,6 @@ import {
   ComposerRuntime,
   EditComposerRuntime,
 } from "../../runtime/api/composer-runtime";
-import { ComposerRuntimeEventType } from "../../runtime/interfaces/composer-runtime-core";
 import { ComposerState } from "../scopes/composer";
 import { AttachmentRuntimeClient } from "./attachment-runtime-client";
 import { tapSubscribable } from "./tap-subscribable";
@@ -54,12 +53,7 @@ export const ComposerClient = resource(
       const unsubscribers: Unsubscribe[] = [];
 
       // Subscribe to composer events
-      const composerEvents: ComposerRuntimeEventType[] = [
-        "send",
-        "attachmentAdd",
-      ];
-
-      for (const event of composerEvents) {
+      for (const event of ["send", "attachmentAdd"] as const) {
         const unsubscribe = runtime.unstable_on(event, () => {
           emit(`composer.${event}`, {
             threadId: threadIdRef.current,
@@ -69,6 +63,23 @@ export const ComposerClient = resource(
         unsubscribers.push(unsubscribe);
       }
 
+      // attachmentAddError carries the failed attachment ID
+      unsubscribers.push(
+        runtime.unstable_on("attachmentAddError", () => {
+          const errorAttachment = runtime
+            .getState()
+            .attachments.findLast(
+              (a) =>
+                a.status.type === "incomplete" && a.status.reason === "error",
+            );
+          emit("composer.attachmentAddError", {
+            threadId: threadIdRef.current,
+            ...(messageIdRef && { messageId: messageIdRef.current }),
+            ...(errorAttachment && { attachmentId: errorAttachment.id }),
+          });
+        }),
+      );
+
       return () => {
         for (const unsub of unsubscribers) unsub();
       };

package/src/store/scopes/composer.ts

@@ -90,6 +90,11 @@ export type ComposerMeta = {
 export type ComposerEvents = {
   "composer.send": { threadId: string; messageId?: string };
   "composer.attachmentAdd": { threadId: string; messageId?: string };
+  "composer.attachmentAddError": {
+    threadId: string;
+    messageId?: string;
+    attachmentId?: string;
+  };
 };
 
 export type ComposerClientSchema = {