@assistant-ui/react-ink 0.0.2 → 0.0.6

package/src/context/AssistantContext.tsx

@@ -1,31 +1 @@
-import { type ReactNode, memo } from "react";
-import { useAui } from "@assistant-ui/store";
-import type { AssistantRuntime } from "@assistant-ui/core";
-import { AssistantProviderBase } from "@assistant-ui/core/react";
-
-export const useAssistantRuntime = (): AssistantRuntime => {
-  const aui = useAui();
-  const runtime = aui.threads().__internal_getAssistantRuntime?.();
-  if (!runtime) {
-    throw new Error(
-      "useAssistantRuntime must be used within an AssistantProvider",
-    );
-  }
-  return runtime;
-};
-
-export const AssistantProvider = memo(
-  ({
-    runtime,
-    children,
-  }: {
-    runtime: AssistantRuntime;
-    children: ReactNode;
-  }) => {
-    return (
-      <AssistantProviderBase runtime={runtime}>
-        {children}
-      </AssistantProviderBase>
-    );
-  },
-);
+export { AssistantRuntimeProvider } from "@assistant-ui/core/react";

package/src/index.ts

@@ -1,4 +1,4 @@
-import "@assistant-ui/core/react"; // store-augmentation side-effect (tools, dataRenderers scopes)
+/// <reference types="@assistant-ui/core/react" />
 
 // Re-export core types
 export type {
@@ -91,47 +91,29 @@ export {
   type AssistantEventCallback,
 } from "@assistant-ui/store";
 
-// Context providers and hooks
-export { AssistantProvider, useAssistantRuntime } from "./context";
-
-// Primitive hooks
-export {
-  useThreadMessages,
-  useThreadIsRunning,
-  useThreadIsEmpty,
-  useComposerSend,
-  useComposerCancel,
-  useMessageReload,
-  useMessageBranching,
-  useActionBarCopy,
-  type UseActionBarCopyOptions,
-  useActionBarEdit,
-  useActionBarReload,
-  useActionBarFeedbackPositive,
-  useActionBarFeedbackNegative,
-  useEditComposerSend,
-  useEditComposerCancel,
-  useComposerAddAttachment,
-} from "./primitive-hooks";
+// 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 * from "./primitives/thread";
-export * from "./primitives/composer";
-export * from "./primitives/message";
-export * from "./primitives/threadList";
-export * from "./primitives/actionBar";
-export * from "./primitives/branchPicker";
-export * from "./primitives/attachment";
-export * from "./primitives/threadListItem";
-export * from "./primitives/chainOfThought";
-export * from "./primitives/suggestion";
+export * as ThreadPrimitive from "./primitives/thread";
+export * as ComposerPrimitive from "./primitives/composer";
+export * as MessagePrimitive from "./primitives/message";
+export * as ThreadListPrimitive from "./primitives/threadList";
+export * as ActionBarPrimitive from "./primitives/actionBar";
+export * as BranchPickerPrimitive from "./primitives/branchPicker";
+export * as AttachmentPrimitive from "./primitives/attachment";
+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 {
@@ -145,13 +127,67 @@ export {
 } from "@assistant-ui/core/react";
 
 // Model context, tools & clients
-export * from "./model-context";
-export * from "./client";
-export * from "./types";
-
-// Adapters
 export {
-  type TitleGenerationAdapter,
-  createSimpleTitleAdapter,
-  createLocalStorageAdapter,
-} from "./adapters";
+  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/ActionBarCopy.tsx

@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
 import {
   useActionBarCopy,
   type UseActionBarCopyOptions,
-} from "../../primitive-hooks/useActionBarCopy";
+} from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type ActionBarCopyProps = Omit<PressableProps, "onPress" | "children"> &

package/src/primitives/actionBar/ActionBarEdit.tsx

@@ -1,5 +1,5 @@
 import type { ReactNode } from "react";
-import { useActionBarEdit } from "../../primitive-hooks/useActionBarEdit";
+import { useActionBarEdit } from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type ActionBarEditProps = Omit<PressableProps, "onPress"> & {

package/src/primitives/actionBar/ActionBarFeedbackNegative.tsx

@@ -1,5 +1,5 @@
 import type { ReactNode } from "react";
-import { useActionBarFeedbackNegative } from "../../primitive-hooks/useActionBarFeedback";
+import { useActionBarFeedbackNegative } from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type ActionBarFeedbackNegativeProps = Omit<

package/src/primitives/actionBar/ActionBarFeedbackPositive.tsx

@@ -1,5 +1,5 @@
 import type { ReactNode } from "react";
-import { useActionBarFeedbackPositive } from "../../primitive-hooks/useActionBarFeedback";
+import { useActionBarFeedbackPositive } from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type ActionBarFeedbackPositiveProps = Omit<

package/src/primitives/actionBar/ActionBarReload.tsx

@@ -1,5 +1,5 @@
 import type { ReactNode } from "react";
-import { useActionBarReload } from "../../primitive-hooks/useActionBarReload";
+import { useActionBarReload } from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type ActionBarReloadProps = Omit<PressableProps, "onPress"> & {

package/src/primitives/actionBar.ts

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

package/src/primitives/attachment.ts

@@ -0,0 +1,16 @@
+export {
+  AttachmentRoot as Root,
+  type AttachmentRootProps as RootProps,
+} from "./attachment/AttachmentRoot";
+export {
+  AttachmentName as Name,
+  type AttachmentNameProps as NameProps,
+} from "./attachment/AttachmentName";
+export {
+  AttachmentThumb as Thumb,
+  type AttachmentThumbProps as ThumbProps,
+} from "./attachment/AttachmentThumb";
+export {
+  AttachmentRemove as Remove,
+  type AttachmentRemoveProps as RemoveProps,
+} 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.ts

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

package/src/primitives/chainOfThought.ts

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

package/src/primitives/composer/ComposerAddAttachment.tsx

@@ -1,6 +1,5 @@
 import type { ReactNode } from "react";
-import { useAuiState } from "@assistant-ui/store";
-import { useComposerAddAttachment } from "../../primitive-hooks/useComposerAddAttachment";
+import { useComposerAddAttachment } from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type ComposerAddAttachmentProps = Omit<PressableProps, "onPress"> & {
@@ -12,11 +11,10 @@ export const ComposerAddAttachment = ({
   disabled: disabledProp,
   ...pressableProps
 }: ComposerAddAttachmentProps) => {
-  const isDisabled = useAuiState((s) => !s.composer.isEditing);
-  const { addAttachment: _addAttachment } = useComposerAddAttachment();
+  const { disabled } = useComposerAddAttachment();
 
   return (
-    <Pressable disabled={disabledProp ?? isDisabled} {...pressableProps}>
+    <Pressable disabled={disabledProp ?? disabled} {...pressableProps}>
       {children}
     </Pressable>
   );

package/src/primitives/composer/ComposerCancel.tsx

@@ -1,5 +1,5 @@
 import type { ReactNode } from "react";
-import { useComposerCancel } from "../../primitive-hooks/useComposerCancel";
+import { useComposerCancel } from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type ComposerCancelProps = Omit<PressableProps, "onPress"> & {
@@ -11,12 +11,12 @@ export const ComposerCancel = ({
   disabled,
   ...pressableProps
 }: ComposerCancelProps) => {
-  const { cancel, canCancel } = useComposerCancel();
+  const { cancel, disabled: hookDisabled } = useComposerCancel();
 
   return (
     <Pressable
       onPress={cancel}
-      disabled={disabled ?? !canCancel}
+      disabled={disabled ?? hookDisabled}
       {...pressableProps}
     >
       {children}

package/src/primitives/composer/ComposerSend.tsx

@@ -1,5 +1,5 @@
 import type { ReactNode } from "react";
-import { useComposerSend } from "../../primitive-hooks/useComposerSend";
+import { useComposerSend } from "@assistant-ui/core/react";
 import { Pressable, type PressableProps } from "../internal/Pressable";
 
 export type ComposerSendProps = Omit<PressableProps, "onPress"> & {
@@ -11,12 +11,12 @@ export const ComposerSend = ({
   disabled,
   ...pressableProps
 }: ComposerSendProps) => {
-  const { send, canSend } = useComposerSend();
+  const { send, disabled: hookDisabled } = useComposerSend();
 
   return (
     <Pressable
       onPress={send}
-      disabled={disabled ?? !canSend}
+      disabled={disabled ?? hookDisabled}
       {...pressableProps}
     >
       {children}

package/src/primitives/composer.ts

@@ -0,0 +1,25 @@
+export {
+  ComposerRoot as Root,
+  type ComposerRootProps as RootProps,
+} from "./composer/ComposerRoot";
+export {
+  ComposerAttachments as Attachments,
+  ComposerAttachmentByIndex as AttachmentByIndex,
+} from "./composer/ComposerAttachments";
+export {
+  ComposerInput as Input,
+  type ComposerInputProps as InputProps,
+} from "./composer/ComposerInput";
+export {
+  ComposerSend as Send,
+  type ComposerSendProps as SendProps,
+} from "./composer/ComposerSend";
+export {
+  ComposerCancel as Cancel,
+  type ComposerCancelProps as CancelProps,
+} from "./composer/ComposerCancel";
+export {
+  ComposerAddAttachment as AddAttachment,
+  type ComposerAddAttachmentProps as AddAttachmentProps,
+} 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.test.tsx

@@ -0,0 +1,83 @@
+import type { ReactElement } from "react";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { cleanup, render } from "ink-testing-library";
+import { MessageContent } from "./MessageContent";
+
+const mockUseAui = vi.fn();
+const mockUseAuiState = vi.fn();
+
+type UseAuiStateSelector = Parameters<
+  typeof import("@assistant-ui/store")["useAuiState"]
+>[0];
+
+vi.mock("@assistant-ui/store", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@assistant-ui/store")>();
+  return {
+    ...actual,
+    useAui: () => mockUseAui(),
+    useAuiState: (selector: UseAuiStateSelector) => mockUseAuiState(selector),
+  };
+});
+
+const renderFrame = async (node: ReactElement) => {
+  const instance = render(node);
+  await new Promise((resolve) => setTimeout(resolve, 0));
+  return instance.lastFrame() ?? "";
+};
+
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+});
+
+describe("MessageContent", () => {
+  it("renders incomplete tool calls as errors instead of running forever", async () => {
+    const state = {
+      tools: { tools: {} },
+      message: {
+        content: [
+          {
+            type: "tool-call",
+            toolCallId: "tool-call-1",
+            toolName: "search",
+            args: { query: "weather" },
+            argsText: '{"query":"weather"}',
+          },
+        ],
+        parts: [
+          {
+            type: "tool-call",
+            toolCallId: "tool-call-1",
+            toolName: "search",
+            args: { query: "weather" },
+            argsText: '{"query":"weather"}',
+            status: {
+              type: "incomplete",
+              reason: "error",
+              error: "request failed",
+            },
+          },
+        ],
+      },
+    };
+
+    mockUseAuiState.mockImplementation((selector: UseAuiStateSelector) =>
+      selector(state as never),
+    );
+    mockUseAui.mockReturnValue({
+      message: () => ({
+        part: () => ({
+          addToolResult: vi.fn(),
+          resumeToolCall: vi.fn(),
+        }),
+      }),
+    });
+
+    const frame = await renderFrame(<MessageContent />);
+
+    expect(frame).toContain("search");
+    expect(frame).toContain("Error:");
+    expect(frame).toContain("request failed");
+    expect(frame).not.toContain("Running...");
+  });
+});

package/src/primitives/message/MessageContent.tsx

@@ -3,16 +3,17 @@ import { Text } from "ink";
 import type {
   ThreadUserMessagePart,
   ThreadAssistantMessagePart,
-  ToolCallMessagePart,
-  DataMessagePart,
+  MessagePartState,
 } from "@assistant-ui/core";
 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;
+type MessageContentStatePart = MessagePartState;
 
 export type MessageContentProps = {
   renderText?: (props: {
@@ -59,9 +60,12 @@ const ToolUIDisplay = ({
   index,
 }: {
   Fallback:
-    | ((props: { part: ToolCallMessagePart; index: number }) => ReactElement)
+    | ((props: {
+        part: Extract<MessageContentPart, { type: "tool-call" }>;
+        index: number;
+      }) => ReactElement)
     | undefined;
-  part: ToolCallMessagePart;
+  part: Extract<MessageContentStatePart, { type: "tool-call" }>;
   index: number;
 }) => {
   const aui = useAui();
@@ -75,18 +79,17 @@ const ToolUIDisplay = ({
     () => aui.message().part({ index }),
     [aui, index],
   );
+  const toolProps = {
+    ...(part as ToolCallMessagePartProps),
+    addResult: partMethods.addToolResult,
+    resume: partMethods.resumeToolCall,
+  };
 
   if (Render) {
-    return (
-      <Render
-        {...(part as ToolCallMessagePartProps)}
-        addResult={partMethods.addToolResult}
-        resume={partMethods.resumeToolCall}
-      />
-    );
+    return <Render {...toolProps} />;
   }
   if (Fallback) return <Fallback part={part} index={index} />;
-  return null;
+  return <ToolFallback {...toolProps} />;
 };
 
 const DataUIDisplay = ({
@@ -95,9 +98,12 @@ const DataUIDisplay = ({
   index,
 }: {
   Fallback:
-    | ((props: { part: DataMessagePart; index: number }) => ReactElement)
+    | ((props: {
+        part: Extract<MessageContentPart, { type: "data" }>;
+        index: number;
+      }) => ReactElement)
     | undefined;
-  part: DataMessagePart;
+  part: Extract<MessageContentStatePart, { type: "data" }>;
   index: number;
 }) => {
   const Render = useAuiState((s) => {
@@ -119,7 +125,7 @@ export const MessageContent = ({
   renderFile,
   renderData,
 }: MessageContentProps) => {
-  const content = useAuiState((s) => s.message.content);
+  const content = useAuiState((s) => s.message.parts);
 
   return (
     <>