@assistant-ui/react-ink 0.0.4 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-ink",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "React Ink (terminal UI) bindings for assistant-ui",
   "keywords": [
     "assistant",
@@ -34,17 +34,17 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.1.5",
-    "@assistant-ui/store": "^0.2.2",
-    "@assistant-ui/tap": "^0.5.2",
-    "assistant-stream": "^0.3.5",
+    "@assistant-ui/core": "^0.1.7",
+    "@assistant-ui/store": "^0.2.3",
+    "@assistant-ui/tap": "^0.5.3",
+    "assistant-stream": "^0.3.6",
     "ink-spinner": "^5.0.0",
     "zustand": "^5.0.11"
   },
   "peerDependencies": {
     "@types/react": "*",
-    "ink": ">=4",
-    "react": "^18 || ^19"
+    "ink": ">=6",
+    "react": "^19"
   },
   "peerDependenciesMeta": {
     "@types/react": {
@@ -53,11 +53,11 @@
   },
   "devDependencies": {
     "@types/react": "^19.2.14",
-    "ink": "^5.2.0",
+    "ink": "^6.8.0",
     "ink-testing-library": "^4.0.0",
-    "react": "18.3.1",
-    "vitest": "^4.0.18",
-    "@assistant-ui/x-buildutils": "0.0.2"
+    "react": "^19.1.0",
+    "vitest": "^4.1.0",
+    "@assistant-ui/x-buildutils": "0.0.3"
   },
   "publishConfig": {
     "access": "public",

package/src/context/AssistantContext.tsx

@@ -1,4 +1 @@
-export {
-  AssistantRuntimeProvider,
-  useAssistantRuntime,
-} from "@assistant-ui/core/react";
+export { AssistantRuntimeProvider } from "@assistant-ui/core/react";

package/src/index.ts

@@ -91,15 +91,15 @@ export {
   type AssistantEventCallback,
 } from "@assistant-ui/store";
 
-// Context providers and hooks
-export { AssistantRuntimeProvider, useAssistantRuntime } from "./context";
+// Context providers
+export { AssistantRuntimeProvider } from "./context/AssistantContext";
 
 // Runtime
 export {
   useLocalRuntime,
   type LocalRuntimeOptions,
-  useRemoteThreadListRuntime,
-} from "./runtimes";
+} from "./runtimes/useLocalRuntime";
+export { useRemoteThreadListRuntime } from "./runtimes/useRemoteThreadListRuntime";
 
 // Primitives
 export * as ThreadPrimitive from "./primitives/thread";
@@ -113,6 +113,7 @@ export * as ThreadListItemPrimitive from "./primitives/threadListItem";
 export * as ChainOfThoughtPrimitive from "./primitives/chainOfThought";
 export * as SuggestionPrimitive from "./primitives/suggestion";
 export * as ToolCallPrimitive from "./primitives/toolCall";
+export * as ErrorPrimitive from "./primitives/error";
 
 // Re-export shared providers from core/react
 export {
@@ -126,6 +127,67 @@ export {
 } from "@assistant-ui/core/react";
 
 // Model context, tools & clients
-export * from "./model-context";
-export * from "./client";
-export * from "./types";
+export {
+  makeAssistantTool,
+  type AssistantTool,
+  makeAssistantToolUI,
+  type AssistantToolUI,
+  makeAssistantDataUI,
+  type AssistantDataUI,
+  useAssistantTool,
+  type AssistantToolProps,
+  useAssistantToolUI,
+  type AssistantToolUIProps,
+  useAssistantDataUI,
+  type AssistantDataUIProps,
+  useAssistantInstructions,
+  useInlineRender,
+  type Toolkit,
+  type ToolDefinition,
+  Tools,
+  DataRenderers,
+} from "@assistant-ui/core/react";
+export type {
+  ModelContext,
+  ModelContextProvider,
+  LanguageModelConfig,
+  LanguageModelV1CallSettings,
+} from "@assistant-ui/core";
+export { mergeModelContexts } from "@assistant-ui/core";
+export type { Tool } from "assistant-stream";
+export { tool } from "@assistant-ui/core";
+export { Suggestions, type SuggestionConfig } from "@assistant-ui/core/store";
+export { ModelContextRegistry } from "@assistant-ui/core";
+export type {
+  ModelContextRegistryToolHandle,
+  ModelContextRegistryInstructionHandle,
+  ModelContextRegistryProviderHandle,
+} from "@assistant-ui/core";
+
+// Client exports
+export { ModelContext as ModelContextClient } from "@assistant-ui/core/store";
+export { ChainOfThoughtClient } from "@assistant-ui/core/store";
+
+// Component types
+export type {
+  EmptyMessagePartComponent,
+  EmptyMessagePartProps,
+  TextMessagePartComponent,
+  TextMessagePartProps,
+  ReasoningMessagePartComponent,
+  ReasoningMessagePartProps,
+  ReasoningGroupProps,
+  ReasoningGroupComponent,
+  SourceMessagePartComponent,
+  SourceMessagePartProps,
+  ImageMessagePartComponent,
+  ImageMessagePartProps,
+  FileMessagePartComponent,
+  FileMessagePartProps,
+  Unstable_AudioMessagePartComponent,
+  Unstable_AudioMessagePartProps,
+  DataMessagePartComponent,
+  DataMessagePartProps,
+  ToolCallMessagePartComponent,
+  ToolCallMessagePartProps,
+} from "@assistant-ui/core/react";

package/src/primitives/{actionBar/index.ts → actionBar.ts}

@@ -1,20 +1,20 @@
 export {
   ActionBarCopy as Copy,
   type ActionBarCopyProps as CopyProps,
-} from "./ActionBarCopy";
+} from "./actionBar/ActionBarCopy";
 export {
   ActionBarEdit as Edit,
   type ActionBarEditProps as EditProps,
-} from "./ActionBarEdit";
+} from "./actionBar/ActionBarEdit";
 export {
   ActionBarReload as Reload,
   type ActionBarReloadProps as ReloadProps,
-} from "./ActionBarReload";
+} from "./actionBar/ActionBarReload";
 export {
   ActionBarFeedbackPositive as FeedbackPositive,
   type ActionBarFeedbackPositiveProps as FeedbackPositiveProps,
-} from "./ActionBarFeedbackPositive";
+} from "./actionBar/ActionBarFeedbackPositive";
 export {
   ActionBarFeedbackNegative as FeedbackNegative,
   type ActionBarFeedbackNegativeProps as FeedbackNegativeProps,
-} from "./ActionBarFeedbackNegative";
+} from "./actionBar/ActionBarFeedbackNegative";

package/src/primitives/{attachment/index.ts → attachment.ts}

@@ -1,16 +1,16 @@
 export {
   AttachmentRoot as Root,
   type AttachmentRootProps as RootProps,
-} from "./AttachmentRoot";
+} from "./attachment/AttachmentRoot";
 export {
   AttachmentName as Name,
   type AttachmentNameProps as NameProps,
-} from "./AttachmentName";
+} from "./attachment/AttachmentName";
 export {
   AttachmentThumb as Thumb,
   type AttachmentThumbProps as ThumbProps,
-} from "./AttachmentThumb";
+} from "./attachment/AttachmentThumb";
 export {
   AttachmentRemove as Remove,
   type AttachmentRemoveProps as RemoveProps,
-} from "./AttachmentRemove";
+} from "./attachment/AttachmentRemove";

package/src/primitives/branchPicker/BranchPickerNext.tsx

@@ -1,6 +1,5 @@
 import type { ReactNode } from "react";
-import { useCallback } from "react";
-import { useAui, useAuiState } from "@assistant-ui/store";
+import { useBranchPickerNext } from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type BranchPickerNextProps = Omit<PressableProps, "onPress"> & {
@@ -12,22 +11,11 @@ export const BranchPickerNext = ({
   disabled: disabledProp,
   ...pressableProps
 }: BranchPickerNextProps) => {
-  const aui = useAui();
-  const disabled = useAuiState((s) => {
-    if (s.message.branchNumber >= s.message.branchCount) return true;
-    if (s.thread.isRunning && !s.thread.capabilities.switchBranchDuringRun) {
-      return true;
-    }
-    return false;
-  });
-
-  const goToNext = useCallback(() => {
-    aui.message().switchToBranch({ position: "next" });
-  }, [aui]);
+  const { next, disabled } = useBranchPickerNext();
 
   return (
     <Pressable
-      onPress={goToNext}
+      onPress={next}
       disabled={disabledProp ?? disabled}
       {...pressableProps}
     >

package/src/primitives/branchPicker/BranchPickerPrevious.tsx

@@ -1,6 +1,5 @@
 import type { ReactNode } from "react";
-import { useCallback } from "react";
-import { useAui, useAuiState } from "@assistant-ui/store";
+import { useBranchPickerPrevious } from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type BranchPickerPreviousProps = Omit<PressableProps, "onPress"> & {
@@ -12,22 +11,11 @@ export const BranchPickerPrevious = ({
   disabled: disabledProp,
   ...pressableProps
 }: BranchPickerPreviousProps) => {
-  const aui = useAui();
-  const disabled = useAuiState((s) => {
-    if (s.message.branchNumber <= 1) return true;
-    if (s.thread.isRunning && !s.thread.capabilities.switchBranchDuringRun) {
-      return true;
-    }
-    return false;
-  });
-
-  const goToPrevious = useCallback(() => {
-    aui.message().switchToBranch({ position: "previous" });
-  }, [aui]);
+  const { previous, disabled } = useBranchPickerPrevious();
 
   return (
     <Pressable
-      onPress={goToPrevious}
+      onPress={previous}
       disabled={disabledProp ?? disabled}
       {...pressableProps}
     >

package/src/primitives/{branchPicker/index.ts → branchPicker.ts}

@@ -1,16 +1,16 @@
 export {
   BranchPickerPrevious as Previous,
   type BranchPickerPreviousProps as PreviousProps,
-} from "./BranchPickerPrevious";
+} from "./branchPicker/BranchPickerPrevious";
 export {
   BranchPickerNext as Next,
   type BranchPickerNextProps as NextProps,
-} from "./BranchPickerNext";
+} from "./branchPicker/BranchPickerNext";
 export {
   BranchPickerNumber as Number,
   type BranchPickerNumberProps as NumberProps,
-} from "./BranchPickerNumber";
+} from "./branchPicker/BranchPickerNumber";
 export {
   BranchPickerCount as Count,
   type BranchPickerCountProps as CountProps,
-} from "./BranchPickerCount";
+} from "./branchPicker/BranchPickerCount";

package/src/primitives/{chainOfThought/index.ts → chainOfThought.ts}

@@ -1,9 +1,9 @@
 export {
   ChainOfThoughtRoot as Root,
   type ChainOfThoughtRootProps as RootProps,
-} from "./ChainOfThoughtRoot";
+} from "./chainOfThought/ChainOfThoughtRoot";
 export {
   ChainOfThoughtAccordionTrigger as AccordionTrigger,
   type ChainOfThoughtAccordionTriggerProps as AccordionTriggerProps,
-} from "./ChainOfThoughtAccordionTrigger";
+} from "./chainOfThought/ChainOfThoughtAccordionTrigger";
 export { ChainOfThoughtPrimitiveParts as Parts } from "@assistant-ui/core/react";

package/src/primitives/{composer/index.ts → composer.ts}

@@ -1,25 +1,25 @@
 export {
   ComposerRoot as Root,
   type ComposerRootProps as RootProps,
-} from "./ComposerRoot";
+} from "./composer/ComposerRoot";
 export {
   ComposerAttachments as Attachments,
   ComposerAttachmentByIndex as AttachmentByIndex,
-} from "./ComposerAttachments";
+} from "./composer/ComposerAttachments";
 export {
   ComposerInput as Input,
   type ComposerInputProps as InputProps,
-} from "./ComposerInput";
+} from "./composer/ComposerInput";
 export {
   ComposerSend as Send,
   type ComposerSendProps as SendProps,
-} from "./ComposerSend";
+} from "./composer/ComposerSend";
 export {
   ComposerCancel as Cancel,
   type ComposerCancelProps as CancelProps,
-} from "./ComposerCancel";
+} from "./composer/ComposerCancel";
 export {
   ComposerAddAttachment as AddAttachment,
   type ComposerAddAttachmentProps as AddAttachmentProps,
-} from "./ComposerAddAttachment";
-export { ComposerIf as If } from "./ComposerIf";
+} from "./composer/ComposerAddAttachment";
+export { ComposerIf as If } from "./composer/ComposerIf";

package/src/primitives/error/ErrorMessage.tsx

@@ -0,0 +1,17 @@
+import type { ComponentProps, ReactNode } from "react";
+import { Text } from "ink";
+import { useMessageError } from "@assistant-ui/core/react";
+
+export type ErrorMessageProps = ComponentProps<typeof Text> & {
+  children?: ReactNode;
+};
+
+export const ErrorMessage = ({ children, ...props }: ErrorMessageProps) => {
+  const error = useMessageError();
+
+  if (error === undefined) return null;
+
+  return <Text {...props}>{children ?? String(error)}</Text>;
+};
+
+ErrorMessage.displayName = "ErrorPrimitive.Message";

package/src/primitives/error/ErrorRoot.tsx

@@ -0,0 +1,16 @@
+import type { ComponentProps, ReactNode } from "react";
+import { Box } from "ink";
+import { useMessageError } from "@assistant-ui/core/react";
+
+export type ErrorRootProps = ComponentProps<typeof Box> & {
+  children: ReactNode;
+};
+
+export const ErrorRoot = ({ children, ...props }: ErrorRootProps) => {
+  const error = useMessageError();
+  if (error === undefined) return null;
+
+  return <Box {...props}>{children}</Box>;
+};
+
+ErrorRoot.displayName = "ErrorPrimitive.Root";

package/src/primitives/error/index.ts

@@ -0,0 +1,8 @@
+export {
+  ErrorRoot as Root,
+  type ErrorRootProps as RootProps,
+} from "./ErrorRoot";
+export {
+  ErrorMessage as Message,
+  type ErrorMessageProps as MessageProps,
+} from "./ErrorMessage";

package/src/primitives/message/MessageContent.tsx

@@ -9,7 +9,7 @@ import { useAui, useAuiState } from "@assistant-ui/store";
 import type {
   ToolCallMessagePartProps,
   DataMessagePartProps,
-} from "../../types";
+} from "@assistant-ui/core/react";
 import { ToolFallback } from "../toolCall/ToolFallback";
 
 type MessageContentPart = ThreadUserMessagePart | ThreadAssistantMessagePart;

package/src/primitives/message/MessageError.tsx

@@ -0,0 +1,9 @@
+import type { FC, PropsWithChildren } from "react";
+import { useMessageError } from "@assistant-ui/core/react";
+
+export const MessageError: FC<PropsWithChildren> = ({ children }) => {
+  const error = useMessageError();
+  return error !== undefined ? children : null;
+};
+
+MessageError.displayName = "MessagePrimitive.Error";

package/src/primitives/message/MessageParts.tsx

@@ -19,10 +19,16 @@ export namespace MessagePrimitiveParts {
 /**
  * Renders the parts of a message with Ink-specific default components.
  */
-export const MessagePrimitiveParts: FC<MessagePrimitiveParts.Props> = ({
-  components,
-  ...rest
-}) => {
+export const MessagePrimitiveParts: FC<MessagePrimitiveParts.Props> = (
+  props,
+) => {
+  if ("children" in props) {
+    return (
+      <MessagePrimitivePartsBase>{props.children}</MessagePrimitivePartsBase>
+    );
+  }
+
+  const { components, ...rest } = props;
   const merged = components
     ? {
         Text: components.Text ?? inkDefaultComponents.Text,

package/src/primitives/{message/index.ts → message.ts}

@@ -1,17 +1,21 @@
 export {
   MessageRoot as Root,
   type MessageRootProps as RootProps,
-} from "./MessageRoot";
+} from "./message/MessageRoot";
 export {
   MessageContent as Content,
   type MessageContentProps as ContentProps,
-} from "./MessageContent";
+} from "./message/MessageContent";
 export {
   MessagePrimitiveParts as Parts,
   MessagePrimitivePartByIndex as PartByIndex,
-} from "./MessageParts";
-export { MessageIf as If, type MessageIfProps as IfProps } from "./MessageIf";
+} from "./message/MessageParts";
+export {
+  MessageIf as If,
+  type MessageIfProps as IfProps,
+} from "./message/MessageIf";
 export {
   MessageAttachments as Attachments,
   MessageAttachmentByIndex as AttachmentByIndex,
-} from "./MessageAttachments";
+} from "./message/MessageAttachments";
+export { MessageError as Error } from "./message/MessageError";

package/src/primitives/suggestion/SuggestionTrigger.tsx

@@ -1,5 +1,6 @@
-import { useCallback, type ReactNode } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import type { ReactNode } from "react";
+import { useAuiState } from "@assistant-ui/store";
+import { useSuggestionTrigger } from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type SuggestionTriggerProps = Omit<PressableProps, "onPress"> & {
@@ -15,38 +16,17 @@ export const SuggestionTrigger = ({
   disabled: disabledProp,
   ...pressableProps
 }: SuggestionTriggerProps) => {
-  const aui = useAui();
-  const isDisabled = useAuiState((s) => s.thread.isDisabled);
   const prompt = useAuiState((s) => s.suggestion.prompt);
-  const resolvedSend = send ?? false;
-
-  const onPress = useCallback(() => {
-    const isRunning = aui.thread().getState().isRunning;
-
-    if (resolvedSend && !isRunning) {
-      aui.thread().append({
-        content: [{ type: "text", text: prompt }],
-        runConfig: aui.composer().getState().runConfig,
-      });
-      if (clearComposer) {
-        aui.composer().setText("");
-      }
-    } else {
-      if (clearComposer) {
-        aui.composer().setText(prompt);
-      } else {
-        const currentText = aui.composer().getState().text;
-        aui
-          .composer()
-          .setText(currentText.trim() ? `${currentText} ${prompt}` : prompt);
-      }
-    }
-  }, [aui, resolvedSend, clearComposer, prompt]);
+  const { trigger, disabled } = useSuggestionTrigger({
+    prompt,
+    send,
+    clearComposer,
+  });
 
   return (
     <Pressable
-      onPress={onPress}
-      disabled={disabledProp ?? isDisabled}
+      onPress={trigger}
+      disabled={disabledProp ?? disabled}
       {...pressableProps}
     >
       {children}

package/src/primitives/{suggestion/index.ts → suggestion.ts}

@@ -1,12 +1,12 @@
 export {
   SuggestionTitle as Title,
   type SuggestionTitleProps as TitleProps,
-} from "./SuggestionTitle";
+} from "./suggestion/SuggestionTitle";
 export {
   SuggestionDescription as Description,
   type SuggestionDescriptionProps as DescriptionProps,
-} from "./SuggestionDescription";
+} from "./suggestion/SuggestionDescription";
 export {
   SuggestionTrigger as Trigger,
   type SuggestionTriggerProps as TriggerProps,
-} from "./SuggestionTrigger";
+} from "./suggestion/SuggestionTrigger";

package/src/primitives/thread/ThreadMessages.tsx

@@ -1,7 +1,7 @@
-import { type ComponentType, type FC, memo } from "react";
+import { type ComponentType, type FC, type ReactNode, useMemo } from "react";
 import { Box } from "ink";
 import type { ThreadMessage } from "@assistant-ui/core";
-import { useAuiState } from "@assistant-ui/store";
+import { RenderChildrenWithAccessor, useAuiState } from "@assistant-ui/store";
 import { MessageByIndexProvider } from "@assistant-ui/core/react";
 
 type MessageComponents =
@@ -26,9 +26,15 @@ type MessageComponents =
       SystemMessage?: ComponentType | undefined;
     };
 
-export type ThreadMessagesProps = {
-  components: MessageComponents;
-};
+export type ThreadMessagesProps =
+  | {
+      components: MessageComponents;
+      children?: never;
+    }
+  | {
+      children: (value: { message: ThreadMessage }) => ReactNode;
+      components?: never;
+    };
 
 const DEFAULT_SYSTEM_MESSAGE = () => null;
 
@@ -95,44 +101,47 @@ const ThreadMessageComponent: FC<{ components: MessageComponents }> = ({
   return <Component />;
 };
 
-const isComponentsSame = (prev: MessageComponents, next: MessageComponents) => {
-  return (
-    prev.Message === next.Message &&
-    prev.EditComposer === next.EditComposer &&
-    prev.UserEditComposer === next.UserEditComposer &&
-    prev.AssistantEditComposer === next.AssistantEditComposer &&
-    prev.SystemEditComposer === next.SystemEditComposer &&
-    prev.UserMessage === next.UserMessage &&
-    prev.AssistantMessage === next.AssistantMessage &&
-    prev.SystemMessage === next.SystemMessage
-  );
+const ThreadMessagesInner: FC<{
+  children: (value: { message: ThreadMessage }) => ReactNode;
+}> = ({ children }) => {
+  const messagesLength = useAuiState((s) => s.thread.messages.length);
+
+  return useMemo(() => {
+    if (messagesLength === 0) return null;
+    return Array.from({ length: messagesLength }, (_, index) => (
+      <MessageByIndexProvider key={index} index={index}>
+        <RenderChildrenWithAccessor
+          getItemState={(aui) => aui.thread().message({ index }).getState()}
+        >
+          {(getItem) =>
+            children({
+              get message() {
+                return getItem();
+              },
+            })
+          }
+        </RenderChildrenWithAccessor>
+      </MessageByIndexProvider>
+    ));
+  }, [messagesLength, children]);
 };
 
-const ThreadMessageByIndex = memo(
-  ({ index, components }: { index: number; components: MessageComponents }) => {
+export const ThreadMessages: FC<ThreadMessagesProps> = ({
+  components,
+  children,
+}) => {
+  if (components) {
     return (
-      <MessageByIndexProvider index={index}>
-        <ThreadMessageComponent components={components} />
-      </MessageByIndexProvider>
+      <Box flexDirection="column">
+        <ThreadMessagesInner>
+          {() => <ThreadMessageComponent components={components} />}
+        </ThreadMessagesInner>
+      </Box>
     );
-  },
-  (prev, next) =>
-    prev.index === next.index &&
-    isComponentsSame(prev.components, next.components),
-);
-
-export const ThreadMessages = ({ components }: ThreadMessagesProps) => {
-  const messagesLength = useAuiState((s) => s.thread.messages.length);
-
+  }
   return (
     <Box flexDirection="column">
-      {Array.from({ length: messagesLength }, (_, index) => (
-        <ThreadMessageByIndex
-          key={index}
-          index={index}
-          components={components}
-        />
-      ))}
+      <ThreadMessagesInner>{children}</ThreadMessagesInner>
     </Box>
   );
 };