@assistant-ui/react-ink 0.0.4 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-ink",
-  "version": "0.0.4",
+  "version": "0.0.7",
   "description": "React Ink (terminal UI) bindings for assistant-ui",
   "keywords": [
     "assistant",
@@ -34,17 +34,19 @@
   ],
   "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.8",
+    "@assistant-ui/store": "^0.2.4",
+    "@assistant-ui/tap": "^0.5.4",
+    "assistant-stream": "^0.3.7",
+    "diff": "^8.0.3",
     "ink-spinner": "^5.0.0",
-    "zustand": "^5.0.11"
+    "parse-diff": "^0.11.1",
+    "zustand": "^5.0.12"
   },
   "peerDependencies": {
     "@types/react": "*",
-    "ink": ">=4",
-    "react": "^18 || ^19"
+    "ink": ">=6",
+    "react": "^19"
   },
   "peerDependenciesMeta": {
     "@types/react": {
@@ -53,11 +55,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.2.4",
+    "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,9 @@ 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";
+export * as DiffPrimitive from "./primitives/diff";
+export { DiffView, type DiffViewProps } from "./primitives/diff/DiffView";
 
 // Re-export shared providers from core/react
 export {
@@ -126,6 +129,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/ComposerSend.tsx

@@ -15,7 +15,7 @@ export const ComposerSend = ({
 
   return (
     <Pressable
-      onPress={send}
+      onPress={() => send()}
       disabled={disabled ?? hookDisabled}
       {...pressableProps}
     >

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/diff/DiffContent.tsx

@@ -0,0 +1,77 @@
+import { type ComponentProps, type ReactNode, Fragment } from "react";
+import { Box, Text } from "ink";
+import { useMemo } from "react";
+import { useDiffContext } from "./DiffContext";
+import { DiffLine } from "./DiffLine";
+import { foldContext } from "./diff-utils";
+import type { ParsedLine, DisplayLine, FoldedRegion } from "./types";
+
+export type DiffContentProps = ComponentProps<typeof Box> & {
+  fileIndex?: number | undefined;
+  showLineNumbers?: boolean | undefined;
+  contextLines?: number | undefined;
+  maxLines?: number | undefined;
+  renderLine?:
+    | ((props: { line: ParsedLine; index: number }) => ReactNode)
+    | undefined;
+  renderFold?:
+    | ((props: { region: FoldedRegion; index: number }) => ReactNode)
+    | undefined;
+};
+
+export const DiffContent = ({
+  fileIndex = 0,
+  showLineNumbers = true,
+  contextLines,
+  maxLines,
+  renderLine,
+  renderFold,
+  ...boxProps
+}: DiffContentProps) => {
+  const { files } = useDiffContext();
+  const file = files[fileIndex];
+
+  const displayLines: DisplayLine[] = useMemo(() => {
+    if (!file) return [];
+    if (contextLines !== undefined) {
+      return foldContext(file.lines, contextLines);
+    }
+    return file.lines;
+  }, [file, contextLines]);
+
+  if (!file) return null;
+
+  const truncated = maxLines !== undefined && displayLines.length > maxLines;
+  const visibleLines = truncated
+    ? displayLines.slice(0, maxLines)
+    : displayLines;
+  const remainingCount = truncated ? displayLines.length - maxLines! : 0;
+
+  return (
+    <Box flexDirection="column" {...boxProps}>
+      {visibleLines.map((line, i) => {
+        if (line.type === "fold") {
+          if (renderFold) {
+            return (
+              <Fragment key={i}>
+                {renderFold({ region: line, index: i })}
+              </Fragment>
+            );
+          }
+          return (
+            <Text key={i}>{`  --- ${line.hiddenCount} lines hidden ---`}</Text>
+          );
+        }
+        if (renderLine) {
+          return <Fragment key={i}>{renderLine({ line, index: i })}</Fragment>;
+        }
+        return (
+          <DiffLine key={i} line={line} showLineNumbers={showLineNumbers} />
+        );
+      })}
+      {truncated && <Text>{`... (${remainingCount} more lines)`}</Text>}
+    </Box>
+  );
+};
+
+DiffContent.displayName = "DiffPrimitive.Content";

package/src/primitives/diff/DiffContext.tsx

@@ -0,0 +1,18 @@
+import { createContext, useContext } from "react";
+import type { ParsedFile } from "./types";
+
+interface DiffContextValue {
+  files: ParsedFile[];
+}
+
+const DiffContext = createContext<DiffContextValue | null>(null);
+
+export const useDiffContext = (): DiffContextValue => {
+  const ctx = useContext(DiffContext);
+  if (!ctx) {
+    throw new Error("useDiffContext must be used within a DiffRoot");
+  }
+  return ctx;
+};
+
+export const DiffContextProvider = DiffContext.Provider;

package/src/primitives/diff/DiffHeader.tsx

@@ -0,0 +1,38 @@
+import type { ComponentProps } from "react";
+import { Box, Text } from "ink";
+import { useDiffContext } from "./DiffContext";
+import { DiffStats } from "./DiffStats";
+
+export type DiffHeaderProps = ComponentProps<typeof Box> & {
+  fileIndex?: number;
+};
+
+export const DiffHeader = ({ fileIndex = 0, ...boxProps }: DiffHeaderProps) => {
+  const { files } = useDiffContext();
+  const file = files[fileIndex];
+  if (!file) return null;
+
+  const isDevNull = (n: string | undefined) => !n || n === "/dev/null";
+  const renamed =
+    !isDevNull(file.oldName) &&
+    !isDevNull(file.newName) &&
+    file.oldName !== file.newName;
+  const displayName = isDevNull(file.newName) ? file.oldName : file.newName;
+
+  return (
+    <Box gap={1} {...boxProps}>
+      {renamed ? (
+        <>
+          <Text>{file.oldName}</Text>
+          <Text>{"->"}</Text>
+          <Text>{file.newName}</Text>
+        </>
+      ) : (
+        <Text>{displayName}</Text>
+      )}
+      <DiffStats fileIndex={fileIndex} />
+    </Box>
+  );
+};
+
+DiffHeader.displayName = "DiffPrimitive.Header";

package/src/primitives/diff/DiffLine.tsx

@@ -0,0 +1,42 @@
+import type { ComponentProps } from "react";
+import { Box, Text } from "ink";
+import type { ParsedLine } from "./types";
+
+const INDICATOR: Record<ParsedLine["type"], string> = {
+  add: "+",
+  del: "-",
+  normal: " ",
+};
+
+export type DiffLineProps = ComponentProps<typeof Box> & {
+  line: ParsedLine;
+  showLineNumbers?: boolean;
+  lineNumberWidth?: number;
+};
+
+export const DiffLine = ({
+  line,
+  showLineNumbers = true,
+  lineNumberWidth = 4,
+  ...boxProps
+}: DiffLineProps) => {
+  const lineNum =
+    line.type === "del"
+      ? line.oldLineNumber
+      : line.type === "add"
+        ? line.newLineNumber
+        : line.oldLineNumber;
+
+  const numStr = lineNum !== undefined ? String(lineNum) : "";
+  const padded = numStr.padStart(lineNumberWidth);
+  const content = `${INDICATOR[line.type]} ${line.content}`;
+
+  return (
+    <Box {...boxProps}>
+      {showLineNumbers && <Text>{padded} </Text>}
+      <Text>{content}</Text>
+    </Box>
+  );
+};
+
+DiffLine.displayName = "DiffPrimitive.Line";

package/src/primitives/diff/DiffRoot.tsx

@@ -0,0 +1,25 @@
+import type { ComponentProps, ReactNode } from "react";
+import { Box } from "ink";
+import { DiffContextProvider } from "./DiffContext";
+import type { ParsedFile } from "./types";
+
+export type DiffRootProps = ComponentProps<typeof Box> & {
+  files?: ParsedFile[] | undefined;
+  children: ReactNode;
+};
+
+export const DiffRoot = ({
+  files = [],
+  children,
+  ...boxProps
+}: DiffRootProps) => {
+  return (
+    <DiffContextProvider value={{ files }}>
+      <Box flexDirection="column" {...boxProps}>
+        {children}
+      </Box>
+    </DiffContextProvider>
+  );
+};
+
+DiffRoot.displayName = "DiffPrimitive.Root";

package/src/primitives/diff/DiffStats.tsx

@@ -0,0 +1,22 @@
+import type { ComponentProps } from "react";
+import { Box, Text } from "ink";
+import { useDiffContext } from "./DiffContext";
+
+export type DiffStatsProps = ComponentProps<typeof Box> & {
+  fileIndex?: number;
+};
+
+export const DiffStats = ({ fileIndex = 0, ...boxProps }: DiffStatsProps) => {
+  const { files } = useDiffContext();
+  const file = files[fileIndex];
+  if (!file) return null;
+
+  return (
+    <Box gap={1} {...boxProps}>
+      <Text>+{file.additions}</Text>
+      <Text>-{file.deletions}</Text>
+    </Box>
+  );
+};
+
+DiffStats.displayName = "DiffPrimitive.Stats";