@assistant-ui/core 0.2.10 → 0.2.12

package/src/store/clients/model-context-client.ts

@@ -1,4 +1,5 @@
-import { resource, tapEffect, tapMemo, tapState } from "@assistant-ui/tap";
+import { useEffect, useMemo, useState } from "react";
+import { resource } from "@assistant-ui/tap";
 import type { ClientOutput } from "@assistant-ui/store";
 import { CompositeContextProvider } from "../../utils/composite-context-provider";
 import type { ModelContextState } from "../scopes/model-context";
@@ -28,23 +29,25 @@ const deriveState = (
   return { modelName, toolNames };
 };
 
-export const ModelContext = resource((): ClientOutput<"modelContext"> => {
-  const composite = tapMemo(() => new CompositeContextProvider(), []);
-  const [state, setState] = tapState<ModelContextState>(() =>
-    deriveState(composite, INITIAL_STATE),
-  );
+export const ModelContext = resource(
+  function ModelContext(): ClientOutput<"modelContext"> {
+    const composite = useMemo(() => new CompositeContextProvider(), []);
+    const [state, setState] = useState<ModelContextState>(() =>
+      deriveState(composite, INITIAL_STATE),
+    );
 
-  tapEffect(() => {
-    setState((prev) => deriveState(composite, prev));
-    return composite.subscribe(() => {
+    useEffect(() => {
       setState((prev) => deriveState(composite, prev));
-    });
-  }, [composite]);
-
-  return {
-    getState: () => deriveState(composite, state),
-    getModelContext: () => composite.getModelContext(),
-    subscribe: (callback) => composite.subscribe(callback),
-    register: (provider) => composite.registerModelContextProvider(provider),
-  };
-});
+      return composite.subscribe(() => {
+        setState((prev) => deriveState(composite, prev));
+      });
+    }, [composite]);
+
+    return {
+      getState: () => deriveState(composite, state),
+      getModelContext: () => composite.getModelContext(),
+      subscribe: (callback) => composite.subscribe(callback),
+      register: (provider) => composite.registerModelContextProvider(provider),
+    };
+  },
+);

package/src/store/clients/no-op-composer-client.ts

@@ -1,71 +1,74 @@
-import { resource, tapMemo } from "@assistant-ui/tap";
+import { useMemo } from "react";
+import { resource } from "@assistant-ui/tap";
 import type { ClientOutput } from "@assistant-ui/store";
 import type { ComposerState } from "../scopes/composer";
 
-export const NoOpComposerClient = resource(
-  ({ type }: { type: "edit" | "thread" }): ClientOutput<"composer"> => {
-    const state = tapMemo<ComposerState>(() => {
-      return {
-        isEditing: false,
-        isEmpty: true,
-        text: "",
-        attachmentAccept: "*",
-        attachments: [],
-        role: "user",
-        runConfig: {},
-        canCancel: false,
-        canSend: false,
-        type: type,
-        dictation: undefined,
-        quote: undefined,
-        queue: [],
-      };
-    }, [type]);
-
+export const NoOpComposerClient = resource(function NoOpComposerClient({
+  type,
+}: {
+  type: "edit" | "thread";
+}): ClientOutput<"composer"> {
+  const state = useMemo<ComposerState>(() => {
     return {
-      getState: () => state,
-      setText: () => {
-        throw new Error("Not supported");
-      },
-      setRole: () => {
-        throw new Error("Not supported");
-      },
-      setRunConfig: () => {
-        throw new Error("Not supported");
-      },
-      addAttachment: () => {
-        throw new Error("Not supported");
-      },
-      clearAttachments: () => {
-        throw new Error("Not supported");
-      },
-      attachment: () => {
-        throw new Error("Not supported");
-      },
-      reset: () => {
-        throw new Error("Not supported");
-      },
-      send: () => {
-        throw new Error("Not supported");
-      },
-      cancel: () => {
-        throw new Error("Not supported");
-      },
-      startDictation: () => {
-        throw new Error("Not supported");
-      },
-      stopDictation: () => {
-        throw new Error("Not supported");
-      },
-      beginEdit: () => {
-        throw new Error("Not supported");
-      },
-      setQuote: () => {
-        throw new Error("Not supported");
-      },
-      queueItem: () => {
-        throw new Error("Not supported");
-      },
+      isEditing: false,
+      isEmpty: true,
+      text: "",
+      attachmentAccept: "*",
+      attachments: [],
+      role: "user",
+      runConfig: {},
+      canCancel: false,
+      canSend: false,
+      type: type,
+      dictation: undefined,
+      quote: undefined,
+      queue: [],
     };
-  },
-);
+  }, [type]);
+
+  return {
+    getState: () => state,
+    setText: () => {
+      throw new Error("Not supported");
+    },
+    setRole: () => {
+      throw new Error("Not supported");
+    },
+    setRunConfig: () => {
+      throw new Error("Not supported");
+    },
+    addAttachment: () => {
+      throw new Error("Not supported");
+    },
+    clearAttachments: () => {
+      throw new Error("Not supported");
+    },
+    attachment: () => {
+      throw new Error("Not supported");
+    },
+    reset: () => {
+      throw new Error("Not supported");
+    },
+    send: () => {
+      throw new Error("Not supported");
+    },
+    cancel: () => {
+      throw new Error("Not supported");
+    },
+    startDictation: () => {
+      throw new Error("Not supported");
+    },
+    stopDictation: () => {
+      throw new Error("Not supported");
+    },
+    beginEdit: () => {
+      throw new Error("Not supported");
+    },
+    setQuote: () => {
+      throw new Error("Not supported");
+    },
+    queueItem: () => {
+      throw new Error("Not supported");
+    },
+  };
+});

package/src/store/clients/runtime-adapter.ts

@@ -1,8 +1,9 @@
-import { resource, tapEffect, tapResource } from "@assistant-ui/tap";
+import { useEffect } from "react";
+import { useResource, resource } from "@assistant-ui/tap";
 import type { AssistantRuntime } from "../../runtime/api/assistant-runtime";
 import { ThreadListClient } from "../runtime-clients/thread-list-runtime-client";
 import {
-  tapAssistantClientRef,
+  useAssistantClientRef,
   Derived,
   type ScopesConfig,
   type AssistantClient,
@@ -10,16 +11,18 @@ import {
 import { ModelContext } from "./model-context-client";
 import { Suggestions } from "./suggestions";
 
-export const RuntimeAdapterResource = resource((runtime: AssistantRuntime) => {
-  const clientRef = tapAssistantClientRef();
+export const RuntimeAdapterResource = resource(function RuntimeAdapterResource(
+  runtime: AssistantRuntime,
+) {
+  const clientRef = useAssistantClientRef();
 
-  tapEffect(() => {
+  useEffect(() => {
     return runtime.registerModelContextProvider(
       clientRef.current!.modelContext(),
     );
   }, [runtime, clientRef]);
 
-  return tapResource(
+  return useResource(
     ThreadListClient({
       runtime: runtime.threads,
       __internal_assistantRuntime: runtime,

package/src/store/clients/suggestions.ts

@@ -1,6 +1,7 @@
-import { resource, tapState, withKey } from "@assistant-ui/tap";
+import { useState } from "react";
+import { resource, withKey } from "@assistant-ui/tap";
 import type { ClientOutput } from "@assistant-ui/store";
-import { tapClientLookup } from "@assistant-ui/store";
+import { useClientLookup } from "@assistant-ui/store";
 import type { SuggestionsState } from "../scopes/suggestions";
 import type { SuggestionState } from "../scopes/suggestion";
 
@@ -8,53 +9,53 @@ export type SuggestionConfig =
   | string
   | { title: string; label: string; prompt: string };
 
-const SuggestionClient = resource(
-  (state: SuggestionState): ClientOutput<"suggestion"> => {
-    return {
-      getState: () => state,
-    };
-  },
-);
+const SuggestionClient = resource(function SuggestionClient(
+  state: SuggestionState,
+): ClientOutput<"suggestion"> {
+  return {
+    getState: () => state,
+  };
+});
 
-const SuggestionsResource = resource(
-  (suggestions?: SuggestionConfig[]): ClientOutput<"suggestions"> => {
-    const [state] = tapState<SuggestionsState>(() => {
-      const normalizedSuggestions = (suggestions ?? []).map((s) => {
-        if (typeof s === "string") {
-          return {
-            title: s,
-            label: "",
-            prompt: s,
-          };
-        }
+const SuggestionsResource = resource(function SuggestionsResource(
+  suggestions?: SuggestionConfig[],
+): ClientOutput<"suggestions"> {
+  const [state] = useState<SuggestionsState>(() => {
+    const normalizedSuggestions = (suggestions ?? []).map((s) => {
+      if (typeof s === "string") {
         return {
-          title: s.title,
-          label: s.label,
-          prompt: s.prompt,
+          title: s,
+          label: "",
+          prompt: s,
         };
-      });
-
+      }
       return {
-        suggestions: normalizedSuggestions,
+        title: s.title,
+        label: s.label,
+        prompt: s.prompt,
       };
     });
 
-    const suggestionClients = tapClientLookup(
-      () =>
-        state.suggestions.map((suggestion, index) =>
-          withKey(index, SuggestionClient(suggestion)),
-        ),
-      [state.suggestions],
-    );
-
     return {
-      getState: () => state,
-      suggestion: ({ index }: { index: number }) => {
-        return suggestionClients.get({ index });
-      },
+      suggestions: normalizedSuggestions,
     };
-  },
-);
+  });
+
+  const suggestionClients = useClientLookup(
+    () =>
+      state.suggestions.map((suggestion, index) =>
+        withKey(index, SuggestionClient(suggestion)),
+      ),
+    [state.suggestions],
+  );
+
+  return {
+    getState: () => state,
+    suggestion: ({ index }: { index: number }) => {
+      return suggestionClients.get({ index });
+    },
+  };
+});
 
 export const Suggestions: {
   (): import("@assistant-ui/tap").ResourceElement<

package/src/store/clients/thread-message-client.ts

@@ -4,49 +4,46 @@ import type {
   ThreadMessage,
 } from "../../types/message";
 import type { Attachment } from "../../types/attachment";
-import {
-  resource,
-  tapMemo,
-  tapState,
-  tapResource,
-  withKey,
-} from "@assistant-ui/tap";
+import { useMemo, useState } from "react";
+import { useResource, resource, withKey } from "@assistant-ui/tap";
 import type { ClientOutput } from "@assistant-ui/store";
-import { tapClientLookup } from "@assistant-ui/store";
+import { useClientLookup } from "@assistant-ui/store";
 import type { MessageState } from "../scopes/message";
 import type { PartState } from "../scopes/part";
 import { NoOpComposerClient } from "./no-op-composer-client";
 
-const ThreadMessagePartClient = resource(
-  ({
-    part,
-  }: {
-    part: ThreadAssistantMessagePart | ThreadUserMessagePart;
-  }): ClientOutput<"part"> => {
-    const state = tapMemo<PartState>(() => {
-      return {
-        ...part,
-        status: { type: "complete" },
-      };
-    }, [part]);
-
+const ThreadMessagePartClient = resource(function ThreadMessagePartClient({
+  part,
+}: {
+  part: ThreadAssistantMessagePart | ThreadUserMessagePart;
+}): ClientOutput<"part"> {
+  const state = useMemo<PartState>(() => {
     return {
-      getState: () => state,
-      addToolResult: () => {
-        throw new Error("Not supported");
-      },
-      resumeToolCall: () => {
-        throw new Error("Not supported");
-      },
-      respondToToolApproval: () => {
-        throw new Error("Not supported");
-      },
+      ...part,
+      status: { type: "complete" },
     };
-  },
-);
+  }, [part]);
+
+  return {
+    getState: () => state,
+    addToolResult: () => {
+      throw new Error("Not supported");
+    },
+    resumeToolCall: () => {
+      throw new Error("Not supported");
+    },
+    respondToToolApproval: () => {
+      throw new Error("Not supported");
+    },
+  };
+});
 
 const ThreadMessageAttachmentClient = resource(
-  ({ attachment }: { attachment: Attachment }): ClientOutput<"attachment"> => {
+  function ThreadMessageAttachmentClient({
+    attachment,
+  }: {
+    attachment: Attachment;
+  }): ClientOutput<"attachment"> {
     return {
       getState: () => attachment,
       remove: () => {
@@ -63,111 +60,109 @@ export type ThreadMessageClientProps = {
   branchCount?: number;
 };
 
-export const ThreadMessageClient = resource(
-  ({
-    message,
-    index,
-    isLast = true,
-    branchNumber = 1,
-    branchCount = 1,
-  }: ThreadMessageClientProps): ClientOutput<"message"> => {
-    const [isCopiedState, setIsCopied] = tapState(false);
-    const [isHoveringState, setIsHovering] = tapState(false);
+export const ThreadMessageClient = resource(function ThreadMessageClient({
+  message,
+  index,
+  isLast = true,
+  branchNumber = 1,
+  branchCount = 1,
+}: ThreadMessageClientProps): ClientOutput<"message"> {
+  const [isCopiedState, setIsCopied] = useState(false);
+  const [isHoveringState, setIsHovering] = useState(false);
 
-    const parts = tapClientLookup(
-      () =>
-        message.content.map((part, idx) =>
-          withKey(
-            "toolCallId" in part && part.toolCallId != null
-              ? `toolCallId-${part.toolCallId}`
-              : `index-${idx}`,
-            ThreadMessagePartClient({ part }),
-          ),
+  const parts = useClientLookup(
+    () =>
+      message.content.map((part, idx) =>
+        withKey(
+          "toolCallId" in part && part.toolCallId != null
+            ? `toolCallId-${part.toolCallId}`
+            : `index-${idx}`,
+          ThreadMessagePartClient({ part }),
         ),
-      [message.content],
-    );
+      ),
+    [message.content],
+  );
 
-    const attachments = tapClientLookup(
-      () =>
-        (message.attachments ?? []).map((attachment) =>
-          withKey(attachment.id, ThreadMessageAttachmentClient({ attachment })),
-        ),
-      [message.attachments],
-    );
+  const attachments = useClientLookup(
+    () =>
+      (message.attachments ?? []).map((attachment) =>
+        withKey(attachment.id, ThreadMessageAttachmentClient({ attachment })),
+      ),
+    [message.attachments],
+  );
 
-    const composer = tapResource(NoOpComposerClient({ type: "edit" }));
-    const composerState = composer.getState();
+  const composer = useResource(NoOpComposerClient({ type: "edit" }));
+  const composerState = composer.getState();
 
-    const state = tapMemo<MessageState>(() => {
-      return {
-        ...message,
-        parts: parts.state,
-        composer: composerState,
-        parentId: null,
-        index,
-        isLast,
-        branchNumber,
-        branchCount,
-        speech: undefined,
-        isCopied: isCopiedState,
-        isHovering: isHoveringState,
-      };
-    }, [
-      message,
+  const state = useMemo<MessageState>(() => {
+    return {
+      ...message,
+      parts: parts.state,
+      composer: composerState,
+      parentId: null,
       index,
-      isCopiedState,
-      isHoveringState,
       isLast,
-      parts.state,
-      composerState,
       branchNumber,
       branchCount,
-    ]);
-
-    return {
-      getState: () => state,
-      composer: () => composer,
-      part: (selector) => {
-        if ("index" in selector) {
-          return parts.get({ index: selector.index });
-        } else {
-          return parts.get({ key: `toolCallId-${selector.toolCallId}` });
-        }
-      },
-      attachment: (selector) => {
-        if ("id" in selector) {
-          return attachments.get({ key: selector.id });
-        } else {
-          return attachments.get(selector);
-        }
-      },
-      reload: () => {
-        throw new Error("Not supported in ThreadMessageProvider");
-      },
-      speak: () => {
-        throw new Error("Not supported in ThreadMessageProvider");
-      },
-      stopSpeaking: () => {
-        throw new Error("Not supported in ThreadMessageProvider");
-      },
-      submitFeedback: () => {
-        throw new Error("Not supported in ThreadMessageProvider");
-      },
-      switchToBranch: () => {
-        throw new Error("Not supported in ThreadMessageProvider");
-      },
-      getCopyText: () => {
-        return message.content
-          .map((part) => {
-            if ("text" in part && typeof part.text === "string") {
-              return part.text;
-            }
-            return "";
-          })
-          .join("\n");
-      },
-      setIsCopied,
-      setIsHovering,
+      speech: undefined,
+      isCopied: isCopiedState,
+      isHovering: isHoveringState,
     };
-  },
-);
+  }, [
+    message,
+    index,
+    isCopiedState,
+    isHoveringState,
+    isLast,
+    parts.state,
+    composerState,
+    branchNumber,
+    branchCount,
+  ]);
+
+  return {
+    getState: () => state,
+    composer: () => composer,
+    part: (selector) => {
+      if ("index" in selector) {
+        return parts.get({ index: selector.index });
+      } else {
+        return parts.get({ key: `toolCallId-${selector.toolCallId}` });
+      }
+    },
+    attachment: (selector) => {
+      if ("id" in selector) {
+        return attachments.get({ key: selector.id });
+      } else {
+        return attachments.get(selector);
+      }
+    },
+    reload: () => {
+      throw new Error("Not supported in ThreadMessageProvider");
+    },
+    speak: () => {
+      throw new Error("Not supported in ThreadMessageProvider");
+    },
+    stopSpeaking: () => {
+      throw new Error("Not supported in ThreadMessageProvider");
+    },
+    submitFeedback: () => {
+      throw new Error("Not supported in ThreadMessageProvider");
+    },
+    switchToBranch: () => {
+      throw new Error("Not supported in ThreadMessageProvider");
+    },
+    getCopyText: () => {
+      return message.content
+        .map((part) => {
+          if ("text" in part && typeof part.text === "string") {
+            return part.text;
+          }
+          return "";
+        })
+        .join("\n");
+    },
+    setIsCopied,
+    setIsHovering,
+  };
+});

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

@@ -1,11 +1,15 @@
 import { resource } from "@assistant-ui/tap";
 import type { ClientOutput } from "@assistant-ui/store";
 import type { AttachmentRuntime } from "../../runtime/api/attachment-runtime";
-import { tapSubscribable } from "./tap-subscribable";
+import { useSubscribable } from "./useSubscribable";
 
 export const AttachmentRuntimeClient = resource(
-  ({ runtime }: { runtime: AttachmentRuntime }): ClientOutput<"attachment"> => {
-    const state = tapSubscribable(runtime);
+  function AttachmentRuntimeClient({
+    runtime,
+  }: {
+    runtime: AttachmentRuntime;
+  }): ClientOutput<"attachment"> {
+    const state = useSubscribable(runtime);
 
     return {
       getState: () => state,