@assistant-ui/react-ink 0.0.1 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-ink",
-  "version": "0.0.1",
+  "version": "0.0.4",
   "description": "React Ink (terminal UI) bindings for assistant-ui",
   "keywords": [
     "assistant",
@@ -33,16 +33,12 @@
     "README.md"
   ],
   "sideEffects": false,
-  "scripts": {
-    "build": "aui-build",
-    "test": "vitest run",
-    "test:watch": "vitest"
-  },
   "dependencies": {
-    "@assistant-ui/core": "^0.1.2",
+    "@assistant-ui/core": "^0.1.5",
     "@assistant-ui/store": "^0.2.2",
     "@assistant-ui/tap": "^0.5.2",
-    "assistant-stream": "^0.3.4",
+    "assistant-stream": "^0.3.5",
+    "ink-spinner": "^5.0.0",
     "zustand": "^5.0.11"
   },
   "peerDependencies": {
@@ -56,11 +52,12 @@
     }
   },
   "devDependencies": {
-    "@assistant-ui/x-buildutils": "workspace:*",
     "@types/react": "^19.2.14",
     "ink": "^5.2.0",
+    "ink-testing-library": "^4.0.0",
     "react": "18.3.1",
-    "vitest": "^4.0.18"
+    "vitest": "^4.0.18",
+    "@assistant-ui/x-buildutils": "0.0.2"
   },
   "publishConfig": {
     "access": "public",
@@ -74,5 +71,10 @@
   },
   "bugs": {
     "url": "https://github.com/assistant-ui/assistant-ui/issues"
+  },
+  "scripts": {
+    "build": "aui-build",
+    "test": "vitest run",
+    "test:watch": "vitest"
   }
-}
+}

package/src/context/AssistantContext.tsx

@@ -1,31 +1,4 @@
-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,
+  useAssistantRuntime,
+} from "@assistant-ui/core/react";

package/src/context/index.ts

@@ -1 +1,4 @@
-export { AssistantProvider, useAssistantRuntime } from "./AssistantContext";
+export {
+  AssistantRuntimeProvider,
+  useAssistantRuntime,
+} from "./AssistantContext";

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 {
@@ -92,27 +92,7 @@ export {
 } 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";
+export { AssistantRuntimeProvider, useAssistantRuntime } from "./context";
 
 // Runtime
 export {
@@ -122,16 +102,17 @@ export {
 } from "./runtimes";
 
 // 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";
 
 // Re-export shared providers from core/react
 export {
@@ -148,10 +129,3 @@ export {
 export * from "./model-context";
 export * from "./client";
 export * from "./types";
-
-// Adapters
-export {
-  type TitleGenerationAdapter,
-  createSimpleTitleAdapter,
-  createLocalStorageAdapter,
-} from "./adapters";

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/index.ts

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

package/src/primitives/attachment/index.ts

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

package/src/primitives/branchPicker/index.ts

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

package/src/primitives/chainOfThought/index.ts

@@ -1,9 +1,9 @@
 export {
-  ChainOfThoughtRoot,
-  type ChainOfThoughtRootProps,
+  ChainOfThoughtRoot as Root,
+  type ChainOfThoughtRootProps as RootProps,
 } from "./ChainOfThoughtRoot";
 export {
-  ChainOfThoughtAccordionTrigger,
-  type ChainOfThoughtAccordionTriggerProps,
+  ChainOfThoughtAccordionTrigger as AccordionTrigger,
+  type ChainOfThoughtAccordionTriggerProps as AccordionTriggerProps,
 } from "./ChainOfThoughtAccordionTrigger";
-export { ChainOfThoughtPrimitiveParts } from "@assistant-ui/core/react";
+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/index.ts

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

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";
+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 (
     <>

package/src/primitives/message/index.ts

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

package/src/primitives/suggestion/index.ts

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

package/src/primitives/thread/ThreadEmpty.tsx

@@ -1,5 +1,5 @@
 import type { ReactNode } from "react";
-import { useThreadIsEmpty } from "../../primitive-hooks/useThreadIsEmpty";
+import { useThreadIsEmpty } from "@assistant-ui/core/react";
 
 export type ThreadEmptyProps = {
   children: ReactNode;