@assistant-ui/react-native 0.1.3 → 0.1.6

package/dist/primitives/threadListItem.d.ts

@@ -0,0 +1,7 @@
+export { ThreadListItemRoot as Root, type ThreadListItemRootProps as RootProps, } from "./threadListItem/ThreadListItemRoot.js";
+export { ThreadListItemPrimitiveTitle as Title } from "@assistant-ui/core/react";
+export { ThreadListItemTrigger as Trigger, type ThreadListItemTriggerProps as TriggerProps, } from "./threadListItem/ThreadListItemTrigger.js";
+export { ThreadListItemDelete as Delete, type ThreadListItemDeleteProps as DeleteProps, } from "./threadListItem/ThreadListItemDelete.js";
+export { ThreadListItemArchive as Archive, type ThreadListItemArchiveProps as ArchiveProps, } from "./threadListItem/ThreadListItemArchive.js";
+export { ThreadListItemUnarchive as Unarchive, type ThreadListItemUnarchiveProps as UnarchiveProps, } from "./threadListItem/ThreadListItemUnarchive.js";
+//# sourceMappingURL=threadListItem.d.ts.map

package/dist/primitives/threadListItem.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"threadListItem.d.ts","sourceRoot":"","sources":["../../src/primitives/threadListItem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,IAAI,IAAI,EAC1B,KAAK,uBAAuB,IAAI,SAAS,GAC1C,+CAA4C;AAC7C,OAAO,EAAE,4BAA4B,IAAI,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjF,OAAO,EACL,qBAAqB,IAAI,OAAO,EAChC,KAAK,0BAA0B,IAAI,YAAY,GAChD,kDAA+C;AAChD,OAAO,EACL,oBAAoB,IAAI,MAAM,EAC9B,KAAK,yBAAyB,IAAI,WAAW,GAC9C,iDAA8C;AAC/C,OAAO,EACL,qBAAqB,IAAI,OAAO,EAChC,KAAK,0BAA0B,IAAI,YAAY,GAChD,kDAA+C;AAChD,OAAO,EACL,uBAAuB,IAAI,SAAS,EACpC,KAAK,4BAA4B,IAAI,cAAc,GACpD,oDAAiD"}

package/dist/primitives/threadListItem.js

@@ -0,0 +1,7 @@
+export { ThreadListItemRoot as Root, } from "./threadListItem/ThreadListItemRoot.js";
+export { ThreadListItemPrimitiveTitle as Title } from "@assistant-ui/core/react";
+export { ThreadListItemTrigger as Trigger, } from "./threadListItem/ThreadListItemTrigger.js";
+export { ThreadListItemDelete as Delete, } from "./threadListItem/ThreadListItemDelete.js";
+export { ThreadListItemArchive as Archive, } from "./threadListItem/ThreadListItemArchive.js";
+export { ThreadListItemUnarchive as Unarchive, } from "./threadListItem/ThreadListItemUnarchive.js";
+//# sourceMappingURL=threadListItem.js.map

package/dist/primitives/threadListItem.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"threadListItem.js","sourceRoot":"","sources":["../../src/primitives/threadListItem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,IAAI,IAAI,GAE3B,+CAA4C;AAC7C,OAAO,EAAE,4BAA4B,IAAI,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjF,OAAO,EACL,qBAAqB,IAAI,OAAO,GAEjC,kDAA+C;AAChD,OAAO,EACL,oBAAoB,IAAI,MAAM,GAE/B,iDAA8C;AAC/C,OAAO,EACL,qBAAqB,IAAI,OAAO,GAEjC,kDAA+C;AAChD,OAAO,EACL,uBAAuB,IAAI,SAAS,GAErC,oDAAiD"}

package/dist/runtimes/useLocalRuntime.d.ts

@@ -1,18 +1,2 @@
-import type { AssistantRuntime, ChatModelAdapter, ThreadMessageLike } from "@assistant-ui/core";
-import type { LocalRuntimeOptionsBase } from "@assistant-ui/core/internal";
-import type { TitleGenerationAdapter } from "../adapters/TitleGenerationAdapter.js";
-type AsyncStorageLike = {
-    getItem(key: string): Promise<string | null>;
-    setItem(key: string, value: string): Promise<void>;
-    removeItem(key: string): Promise<void>;
-};
-export type LocalRuntimeOptions = Omit<LocalRuntimeOptionsBase, "adapters"> & {
-    adapters?: Omit<LocalRuntimeOptionsBase["adapters"], "chatModel"> | undefined;
-    initialMessages?: readonly ThreadMessageLike[] | undefined;
-    titleGenerator?: TitleGenerationAdapter | undefined;
-    storage?: AsyncStorageLike | undefined;
-    storagePrefix?: string | undefined;
-};
-export declare const useLocalRuntime: (chatModel: ChatModelAdapter, options?: LocalRuntimeOptions) => AssistantRuntime;
-export {};
+export { useLocalRuntime, type LocalRuntimeOptions, } from "@assistant-ui/core/react";
 //# sourceMappingURL=useLocalRuntime.d.ts.map

package/dist/runtimes/useLocalRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLocalRuntime.d.ts","sourceRoot":"","sources":["../../src/runtimes/useLocalRuntime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EAElB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAM3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,8CAA2C;AAKjF,KAAK,gBAAgB,GAAG;IACtB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,uBAAuB,EAAE,UAAU,CAAC,GAAG;IAC5E,QAAQ,CAAC,EAAE,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IAC9E,eAAe,CAAC,EAAE,SAAS,iBAAiB,EAAE,GAAG,SAAS,CAAC;IAC3D,cAAc,CAAC,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAmDF,eAAO,MAAM,eAAe,GAC1B,WAAW,gBAAgB,EAC3B,UAAS,mBAAwB,KAChC,gBAmBF,CAAC"}
+{"version":3,"file":"useLocalRuntime.d.ts","sourceRoot":"","sources":["../../src/runtimes/useLocalRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,KAAK,mBAAmB,GACzB,MAAM,0BAA0B,CAAC"}

package/dist/runtimes/useLocalRuntime.js

@@ -1,62 +1,2 @@
-import { useEffect, useMemo, useRef, useState } from "react";
-import { InMemoryThreadListAdapter } from "@assistant-ui/core";
-import { AssistantRuntimeImpl, LocalRuntimeCore, } from "@assistant-ui/core/internal";
-import { useAuiState } from "@assistant-ui/store";
-import { useRemoteThreadListRuntime } from "./useRemoteThreadListRuntime.js";
-import { createLocalStorageAdapter } from "../adapters/LocalStorageThreadListAdapter.js";
-import { useRuntimeAdapters } from "../context/providers/RuntimeAdapterProvider.js";
-const useInnerLocalRuntime = (chatModel, options) => {
-    const { initialMessages, ...restOptions } = options;
-    const { modelContext, ...threadListAdapters } = useRuntimeAdapters() ?? {};
-    const opt = {
-        ...restOptions,
-        adapters: {
-            ...threadListAdapters,
-            ...restOptions.adapters,
-            chatModel,
-        },
-    };
-    const [runtime] = useState(() => new LocalRuntimeCore(opt, initialMessages));
-    const threadIdRef = useRef(undefined);
-    threadIdRef.current = useAuiState((s) => s.threadListItem.remoteId);
-    useEffect(() => {
-        runtime.threads
-            .getMainThreadRuntimeCore()
-            .__internal_setGetThreadId(() => threadIdRef.current);
-    }, [runtime]);
-    useEffect(() => {
-        return () => {
-            runtime.threads.getMainThreadRuntimeCore().detach();
-        };
-    }, [runtime]);
-    useEffect(() => {
-        runtime.threads.getMainThreadRuntimeCore().__internal_setOptions(opt);
-        runtime.threads.getMainThreadRuntimeCore().__internal_load();
-    });
-    useEffect(() => {
-        if (!modelContext)
-            return undefined;
-        return runtime.registerModelContextProvider(modelContext);
-    }, [modelContext, runtime]);
-    return useMemo(() => new AssistantRuntimeImpl(runtime), [runtime]);
-};
-export const useLocalRuntime = (chatModel, options = {}) => {
-    const { titleGenerator, storage, storagePrefix, ...innerOptions } = options;
-    const adapter = useMemo(() => {
-        if (!storage)
-            return new InMemoryThreadListAdapter();
-        return createLocalStorageAdapter({
-            storage,
-            prefix: storagePrefix,
-            titleGenerator,
-        });
-    }, [storage, storagePrefix, titleGenerator]);
-    return useRemoteThreadListRuntime({
-        runtimeHook: function RuntimeHook() {
-            return useInnerLocalRuntime(chatModel, innerOptions);
-        },
-        adapter,
-        allowNesting: true,
-    });
-};
+export { useLocalRuntime, } from "@assistant-ui/core/react";
 //# sourceMappingURL=useLocalRuntime.js.map

package/dist/runtimes/useLocalRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLocalRuntime.js","sourceRoot":"","sources":["../../src/runtimes/useLocalRuntime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useLocalRuntime.js","sourceRoot":"","sources":["../../src/runtimes/useLocalRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,GAEhB,MAAM,0BAA0B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-native",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "React Native bindings for assistant-ui",
   "keywords": [
     "assistant",
@@ -33,10 +33,10 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.1.3",
-    "@assistant-ui/store": "^0.2.2",
-    "@assistant-ui/tap": "^0.5.2",
-    "assistant-stream": "^0.3.4",
+    "@assistant-ui/core": "^0.1.7",
+    "@assistant-ui/store": "^0.2.3",
+    "@assistant-ui/tap": "^0.5.3",
+    "assistant-stream": "^0.3.6",
     "zustand": "^5.0.11"
   },
   "peerDependencies": {
@@ -53,8 +53,8 @@
     "@types/react": "^19.2.14",
     "react": "^19.2.4",
     "react-native": "^0.84.1",
-    "vitest": "^4.0.18",
-    "@assistant-ui/x-buildutils": "0.0.2"
+    "vitest": "^4.1.0",
+    "@assistant-ui/x-buildutils": "0.0.3"
   },
   "publishConfig": {
     "access": "public",

package/src/context/AssistantContext.tsx

@@ -1,33 +1 @@
-import { type ReactNode, memo } from "react";
-import { useAui, type AssistantClient } 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 AssistantRuntimeProvider = memo(
-  ({
-    runtime,
-    aui,
-    children,
-  }: {
-    runtime: AssistantRuntime;
-    aui?: AssistantClient | null;
-    children: ReactNode;
-  }) => {
-    return (
-      <AssistantProviderBase runtime={runtime} aui={aui ?? null}>
-        {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 {
@@ -92,32 +92,14 @@ export {
 } from "@assistant-ui/store";
 
 // Context providers and hooks
-export { AssistantRuntimeProvider, useAssistantRuntime } from "./context";
-
-// Primitive hooks
-export {
-  useThreadMessages,
-  useThreadIsRunning,
-  useThreadIsEmpty,
-  useComposerSend,
-  useComposerCancel,
-  useMessageReload,
-  useMessageBranching,
-  useActionBarCopy,
-  type UseActionBarCopyOptions,
-  useActionBarEdit,
-  useActionBarReload,
-  useActionBarFeedbackPositive,
-  useActionBarFeedbackNegative,
-  useComposerAddAttachment,
-} from "./primitive-hooks";
+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";
@@ -130,6 +112,7 @@ 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 ErrorPrimitive from "./primitives/error";
 
 // Re-export shared providers from core/react
 export {
@@ -142,7 +125,74 @@ export {
   SuggestionByIndexProvider,
 } from "@assistant-ui/core/react";
 
-// Model context, tools & clients
-export * from "./model-context";
-export * from "./client";
-export * from "./types";
+// Model context, tools & clients (inlined from model-context)
+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 (inlined from client)
+export { ModelContext as ModelContextClient } from "@assistant-ui/core/store";
+export { ChainOfThoughtClient } from "@assistant-ui/core/store";
+
+// Component types (inlined from 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

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

package/src/primitives/actionBar/ActionBarEdit.tsx

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

package/src/primitives/actionBar/ActionBarFeedbackNegative.tsx

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

package/src/primitives/actionBar/ActionBarFeedbackPositive.tsx

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

package/src/primitives/actionBar/ActionBarReload.tsx

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

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,7 +1,6 @@
 import type { ReactNode } from "react";
 import { Pressable, type PressableProps } from "react-native";
-import { useCallback } from "react";
-import { useAui, useAuiState } from "@assistant-ui/store";
+import { useBranchPickerNext } from "@assistant-ui/core/react";
 
 export type BranchPickerNextProps = Omit<PressableProps, "onPress"> & {
   children: ReactNode;
@@ -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,7 +1,6 @@
 import type { ReactNode } from "react";
 import { Pressable, type PressableProps } from "react-native";
-import { useCallback } from "react";
-import { useAui, useAuiState } from "@assistant-ui/store";
+import { useBranchPickerPrevious } from "@assistant-ui/core/react";
 
 export type BranchPickerPreviousProps = Omit<PressableProps, "onPress"> & {
   children: ReactNode;
@@ -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/ComposerAddAttachment.tsx

@@ -1,7 +1,6 @@
 import type { ReactNode } from "react";
 import { Pressable, type PressableProps } from "react-native";
-import { useComposerAddAttachment } from "../../primitive-hooks/useComposerAddAttachment";
-import { useAuiState } from "@assistant-ui/store";
+import { useComposerAddAttachment } from "@assistant-ui/core/react";
 
 export type ComposerAddAttachmentProps = Omit<PressableProps, "onPress"> & {
   children: ReactNode;
@@ -11,7 +10,7 @@ export type ComposerAddAttachmentProps = Omit<PressableProps, "onPress"> & {
  * A button that triggers the attachment adding flow.
  *
  * Note: The actual file picker implementation is platform-specific.
- * This component calls `useComposerAddAttachment()` from your primitive-hooks.
+ * This component calls `useComposerAddAttachment()` from `@assistant-ui/core/react`.
  * You must handle the file selection in your own component using the returned `addAttachment` callback.
  */
 export const ComposerAddAttachment = ({
@@ -19,11 +18,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,6 +1,6 @@
 import type { ReactNode } from "react";
 import { Pressable, type PressableProps } from "react-native";
-import { useComposerCancel } from "../../primitive-hooks/useComposerCancel";
+import { useComposerCancel } from "@assistant-ui/core/react";
 
 export type ComposerCancelProps = Omit<PressableProps, "onPress"> & {
   children: ReactNode;
@@ -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,6 +1,6 @@
 import type { ReactNode } from "react";
 import { Pressable, type PressableProps } from "react-native";
-import { useComposerSend } from "../../primitive-hooks/useComposerSend";
+import { useComposerSend } from "@assistant-ui/core/react";
 
 export type ComposerSendProps = Omit<PressableProps, "onPress"> & {
   children: ReactNode;
@@ -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 → 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";