diff --git a/packages/@react-spectrum/ai/exports/AttachmentList.ts b/packages/@react-spectrum/ai/exports/AttachmentList.ts
deleted file mode 100644
index 6daac523b4d..00000000000
--- a/packages/@react-spectrum/ai/exports/AttachmentList.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {Attachment, AttachmentList} from '../src/AttachmentList';
diff --git a/packages/@react-spectrum/ai/exports/HorizontalCard.ts b/packages/@react-spectrum/ai/exports/HorizontalCard.ts
deleted file mode 100644
index 07442cb6638..00000000000
--- a/packages/@react-spectrum/ai/exports/HorizontalCard.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export {BasicHorizontalCard, HorizontalCard, CardPreview} from '../src/HorizontalCard';
-export type {CardProps, BasicCardProps} from '../src/HorizontalCard';
diff --git a/packages/@react-spectrum/ai/exports/MessageFeedback.ts b/packages/@react-spectrum/ai/exports/MessageFeedback.ts
deleted file mode 100644
index cca83d4afb5..00000000000
--- a/packages/@react-spectrum/ai/exports/MessageFeedback.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {MessageFeedback} from '../src/MessageFeedback';
diff --git a/packages/@react-spectrum/ai/exports/MessageSource.ts b/packages/@react-spectrum/ai/exports/MessageSource.ts
deleted file mode 100644
index 45f17aca4ce..00000000000
--- a/packages/@react-spectrum/ai/exports/MessageSource.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export {MessageSource, SourceList, SourceListItem, NumberBadge} from '../src/MessageSource';
-
-export type {
-  MessageSourceProps,
-  SourceListProps,
-  SourceListItemProps,
-  NumberBadgeProps
-} from '../src/MessageSource';
diff --git a/packages/@react-spectrum/ai/exports/MessageSuggestion.ts b/packages/@react-spectrum/ai/exports/MessageSuggestion.ts
deleted file mode 100644
index 03edf7e545e..00000000000
--- a/packages/@react-spectrum/ai/exports/MessageSuggestion.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {MessageSuggestion, MessageSuggestionList} from '../src/MessageSuggestion';
diff --git a/packages/@react-spectrum/ai/exports/ResponseStatus.ts b/packages/@react-spectrum/ai/exports/ResponseStatus.ts
deleted file mode 100644
index de2ca50f993..00000000000
--- a/packages/@react-spectrum/ai/exports/ResponseStatus.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export {ResponseStatus, ResponseStatusTitle, ResponseStatusPanel} from '../src/ResponseStatus';
-
-export type {
-  ResponseStatusProps,
-  ResponseStatusTitleProps,
-  ResponseStatusPanelProps
-} from '../src/ResponseStatus';
diff --git a/packages/@react-spectrum/ai/exports/UserMessage.ts b/packages/@react-spectrum/ai/exports/UserMessage.ts
deleted file mode 100644
index f5cbd1b36bf..00000000000
--- a/packages/@react-spectrum/ai/exports/UserMessage.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {UserMessage} from '../src/UserMessage';
diff --git a/packages/@react-spectrum/ai/exports/index.ts b/packages/@react-spectrum/ai/exports/index.ts
index 40978ed667f..50bc70ba511 100644
--- a/packages/@react-spectrum/ai/exports/index.ts
+++ b/packages/@react-spectrum/ai/exports/index.ts
@@ -1,6 +1,45 @@
 export {Attachment, AttachmentList} from '../src/AttachmentList';
-export {BasicHorizontalCard, HorizontalCard} from '../src/HorizontalCard';
+export {BasicHorizontalCard, CardPreview, HorizontalCard} from '../src/HorizontalCard';
 export {MessageFeedback} from '../src/MessageFeedback';
+export {MessageSource, SourceList, SourceListItem} from '../src/MessageSource';
 export {MessageSuggestion, MessageSuggestionList} from '../src/MessageSuggestion';
-export {ResponseStatus, ResponseStatusPanel} from '../src/ResponseStatus';
+export {
+  PromptField,
+  PromptFieldSubmitButton,
+  PromptTokenField,
+  AttachFileMenuItem,
+  InsertMenuButton,
+  InsertTokenMenuItem,
+  PromptFieldAttachmentList,
+  PromptFieldToolbar,
+  PromptToken
+} from '../src/PromptField';
+export {ResponseStatus, ResponseStatusTitle, ResponseStatusPanel} from '../src/ResponseStatus';
+export {Chat, Thread, ThreadItem, ThreadScrollButton} from '../src/Chat';
+export {TokenSegmentList} from '../src/TokenSegmentList';
 export {UserMessage} from '../src/UserMessage';
+
+export type {AttachmentProps, AttachmentListProps} from '../src/AttachmentList';
+export type {HorizontalCardProps, BasicCardProps} from '../src/HorizontalCard';
+export type {
+  PromptFieldProps,
+  PromptFieldSubmitButtonProps,
+  PromptTokenFieldProps,
+  PromptTokenProps,
+  PromptFieldAttachment,
+  PromptFieldAttachmentListProps,
+  PromptTokenFieldPopoverProps,
+  PromptFieldToolbarProps,
+  InsertMenuItemProps
+} from '../src/PromptField';
+export type {MessageFeedbackProps} from '../src/MessageFeedback';
+export type {MessageSourceProps, SourceListProps, SourceListItemProps} from '../src/MessageSource';
+export type {MessageSuggestionProps, MessageSuggestionListProps} from '../src/MessageSuggestion';
+export type {
+  ResponseStatusProps,
+  ResponseStatusTitleProps,
+  ResponseStatusPanelProps
+} from '../src/ResponseStatus';
+export type {ChatProps, ThreadProps, ThreadItemProps, ThreadScrollButtonProps} from '../src/Chat';
+export type {TokenSegmentListOptions} from '../src/TokenSegmentList';
+export type {UserMessageProps} from '../src/UserMessage';
diff --git a/packages/@react-spectrum/ai/src/AttachmentList.tsx b/packages/@react-spectrum/ai/src/AttachmentList.tsx
index e5b8b93e847..8881b4426b0 100644
--- a/packages/@react-spectrum/ai/src/AttachmentList.tsx
+++ b/packages/@react-spectrum/ai/src/AttachmentList.tsx
@@ -10,22 +10,34 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaLabelingProps, DOMRef, forwardRefType} from '@react-types/shared';
+import {AriaLabelingProps, DOMRef, forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
 import {baseColor, focusRing, style} from '@react-spectrum/s2/style' with {type: 'macro'};
 import {BasicHorizontalCard} from './HorizontalCard';
 import {Button} from 'react-aria-components/Button';
 import {CardProps} from '@react-spectrum/s2/Card';
 import Close from '@react-spectrum/s2/icons/Close';
-import {forwardRef, useRef} from 'react';
+import {forwardRef, ReactNode, useRef} from 'react';
 import {iconStyle} from '@react-spectrum/s2/style' with {type: 'macro'};
 import {ImageContext} from '@react-spectrum/s2/Image';
 import {mergeStyles} from '@react-spectrum/s2/mergeStyles';
 import {pressScale} from '@react-spectrum/s2/pressScale';
 import {ProgressCircle} from '@react-spectrum/s2/ProgressCircle';
-import {StyleProps, TagProps} from '@react-spectrum/s2';
-import {Tag, TagGroup, TagGroupProps, TagList, TagListProps} from 'react-aria-components/TagGroup';
+import {StyleString} from './types';
+import {
+  Tag,
+  TagGroup,
+  TagGroupProps,
+  TagList,
+  TagListProps,
+  TagProps
+} from 'react-aria-components/TagGroup';
 import {useDOMRef} from './useDOMRef';
 
+interface AttachmentRenderProps {
+  /** The size of the Card. */
+  size: 'XS' | 'S' | 'M' | 'L' | 'XL';
+}
+
 const controlSizeM = {
   default: 32,
   size: {
@@ -108,9 +120,29 @@ const CloseButton = function CloseButton(props) {
 
 export interface AttachmentListProps<T>
   extends
-    Omit<TagGroupProps, 'children'>,
-    StyleProps,
-    Pick<TagListProps<T>, 'items' | 'children' | 'dependencies'> {}
+    Omit<
+      TagGroupProps,
+      | 'children'
+      | 'selectionMode'
+      | 'defaultSelectedKeys'
+      | 'selectionBehavior'
+      | 'selectedKeys'
+      | 'disallowEmptySelection'
+      | 'escapeKeyBehavior'
+      | 'onSelectionChange'
+      | 'shouldSelectOnPressUp'
+      | 'onAction'
+      | 'render'
+      | 'style'
+      | 'className'
+      | keyof GlobalDOMAttributes
+    >,
+    Pick<TagListProps<T>, 'items' | 'children' | 'dependencies'> {
+  /**
+   * Spectrum-defined styles, returned by the `style()` macro.
+   */
+  styles?: StyleString;
+}
 
 export const AttachmentList = (forwardRef as forwardRefType)(function AttachmentList<T>(
   props: AttachmentListProps<T>,
@@ -137,10 +169,27 @@ export const AttachmentList = (forwardRef as forwardRefType)(function Attachment
 });
 
 export interface AttachmentProps
-  extends CardProps, AriaLabelingProps, Pick<TagProps, 'id' | 'textValue'> {
+  extends
+    Omit<CardProps, 'styles' | 'UNSAFE_className' | 'UNSAFE_style'>,
+    AriaLabelingProps,
+    Pick<TagProps, 'id' | 'textValue'> {
+  /** The children of the Attachment. */
+  children: ReactNode | ((renderProps: AttachmentRenderProps) => ReactNode);
   uploadProgress?: number;
+  /**
+   * Spectrum-defined styles, returned by the `style()` macro.
+   */
+  styles?: StyleString;
 }
 
+const tagStyles = style({
+  flexShrink: 0,
+  flexGrow: 0,
+  position: 'relative',
+  ...focusRing(),
+  borderRadius: 'default'
+});
+
 export const Attachment = forwardRef(function Attachment(
   props: AttachmentProps,
   ref: DOMRef<HTMLDivElement>
@@ -162,13 +211,7 @@ export const Attachment = forwardRef(function Attachment(
       aria-labelledby={ariaLabelledby}
       aria-describedby={ariaDescribedby}
       ref={domRef}
-      className={style({
-        flexShrink: 0,
-        flexGrow: 0,
-        position: 'relative',
-        ...focusRing(),
-        borderRadius: 'default'
-      })}>
+      className={renderProps => mergeStyles(tagStyles({...renderProps}), props.styles)}>
       <BasicHorizontalCard {...otherProps}>
         {props.uploadProgress != null && props.uploadProgress < 100 && (
           <div
diff --git a/packages/@react-spectrum/ai/src/Chat.tsx b/packages/@react-spectrum/ai/src/Chat.tsx
index b50d071300e..1052229605a 100644
--- a/packages/@react-spectrum/ai/src/Chat.tsx
+++ b/packages/@react-spectrum/ai/src/Chat.tsx
@@ -91,7 +91,7 @@ const ThreadScrollButtonContext = createContext<ThreadScrollButtonContextValue>(
 });
 
 // TODO: make this more RAC like (aka default class name and other RAC prop)
-interface ChatProps {
+export interface ChatProps {
   className?: string;
   style?: CSSProperties;
   children?: ReactNode;
@@ -198,7 +198,7 @@ export const Chat = /*#__PURE__*/ (forwardRef as forwardRefType)(function Chat(
 });
 
 // TODO: update the items/className/children/etc type to reflect a thread specific classname once we finalize API
-interface ThreadProps<T extends object> extends Pick<
+export interface ThreadProps<T extends object> extends Pick<
   GridListProps<T>,
   'items' | 'children' | 'UNSTABLE_focusOnEntry' | 'aria-label' | 'aria-labelledby' | 'className'
 > {}
@@ -261,14 +261,19 @@ export function Thread<T extends object>(props: ThreadProps<T>) {
       aria-label={ariaLabel}
       aria-labelledby={ariaLabelledby}
       // TODO: for now we enforce this, but to be configurable?
-      style={{display: 'flex', flexDirection: 'column-reverse'}}
+      style={{
+        display: 'flex',
+        flexDirection: 'column-reverse',
+        boxSizing: 'border-box',
+        minWidth: 0
+      }}
       className={className}>
       {children}
     </GridList>
   );
 }
 
-interface ThreadScrollButtonProps {
+export interface ThreadScrollButtonProps {
   children?: ReactNode;
 }
 
@@ -310,7 +315,10 @@ function ThreadScrollButtonInner({domRef, isExiting, children}: ThreadScrollButt
 }
 
 // TODO: update the className type to reflect a thread specific classname once we finalize API
-interface ThreadItemProps extends Pick<GridListItemProps, 'className' | 'children' | 'textValue'> {
+export interface ThreadItemProps extends Pick<
+  GridListItemProps,
+  'className' | 'children' | 'textValue'
+> {
   /** Whether or not the item's content is currently being streamed in. */
   isStreaming?: boolean;
   /** Announce textValue on mount even when isStreaming is provided. */
diff --git a/packages/@react-spectrum/ai/src/HorizontalCard.tsx b/packages/@react-spectrum/ai/src/HorizontalCard.tsx
index b56af6bcc1f..4135e44dbb3 100644
--- a/packages/@react-spectrum/ai/src/HorizontalCard.tsx
+++ b/packages/@react-spectrum/ai/src/HorizontalCard.tsx
@@ -39,12 +39,12 @@ import {SkeletonContext, useIsSkeleton} from '@react-spectrum/s2/Skeleton';
 import {StyleString} from './types';
 import {TextContext} from '@react-spectrum/s2/Text';
 import {useDOMRef} from './useDOMRef';
-interface CardRenderProps {
+interface HorizontalCardRenderProps {
   /** The size of the Card. */
   size: 'XS' | 'S' | 'M' | 'L' | 'XL';
 }
 
-export interface CardProps extends Omit<
+export interface HorizontalCardProps extends Omit<
   GridListItemProps,
   | 'className'
   | 'style'
@@ -57,7 +57,7 @@ export interface CardProps extends Omit<
   | keyof GlobalDOMAttributes
 > {
   /** The children of the Card. */
-  children: ReactNode | ((renderProps: CardRenderProps) => ReactNode);
+  children: ReactNode | ((renderProps: HorizontalCardRenderProps) => ReactNode);
   /**
    * The size of the Card.
    *
@@ -82,7 +82,7 @@ export interface CardProps extends Omit<
   styles?: StyleString;
 }
 
-export interface BasicCardProps extends Omit<CardProps, 'variant'> {
+export interface BasicCardProps extends Omit<HorizontalCardProps, 'variant'> {
   /**
    * The visual style of the Card.
    *
@@ -193,8 +193,7 @@ let card = style({
         XL: 80
       }
     },
-    isCardView: 'full',
-    [onlyPreview]: 68
+    isCardView: 'full'
   },
   width: {
     default: 'full',
@@ -456,7 +455,7 @@ const actionButtonSize = {
 } as const;
 
 const Card = forwardRef(function Card(
-  props: Omit<CardProps, 'variant'> & {
+  props: Omit<HorizontalCardProps, 'variant'> & {
     isBasic?: boolean;
     variant?: 'primary' | 'secondary' | 'tertiary' | 'quiet';
   },
@@ -669,6 +668,7 @@ export interface CardPreviewProps extends DOMProps {
   styles?: StyleString;
 }
 
+// TODO: this should be the same component as the one in @react-spectrum/s2/Card
 export const CardPreview = forwardRef(function CardPreview(
   props: CardPreviewProps,
   ref: DOMRef<HTMLDivElement>
@@ -681,10 +681,7 @@ export const CardPreview = forwardRef(function CardPreview(
       {...filterDOMProps(props)}
       slot="preview"
       ref={domRef}
-      className={mergeStyles(
-        preview({size, isQuiet, isHovered, isFocusVisible, isSelected}),
-        props.styles
-      )}
+      className={preview({size, isQuiet, isHovered, isFocusVisible, isSelected})}
       style={isQuiet ? pressScale(domRef)({isPressed}) : undefined}>
       {isQuiet && <SelectionIndicator />}
       {isQuiet && isCheckboxSelection && <CardCheckbox />}
@@ -742,7 +739,7 @@ const buttonSize = {
 } as const;
 
 export const HorizontalCard = forwardRef(function HorizontalCard(
-  props: CardProps,
+  props: HorizontalCardProps,
   ref: DOMRef<HTMLDivElement>
 ) {
   let {size = 'M'} = props;
diff --git a/packages/@react-spectrum/ai/src/MessageSource.tsx b/packages/@react-spectrum/ai/src/MessageSource.tsx
index 687557b2a7e..e27648f6bd8 100644
--- a/packages/@react-spectrum/ai/src/MessageSource.tsx
+++ b/packages/@react-spectrum/ai/src/MessageSource.tsx
@@ -10,7 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaLabelingProps, DOMProps, DOMRef, forwardRefType} from '@react-types/shared';
+import {
+  AriaLabelingProps,
+  DOMProps,
+  DOMRef,
+  forwardRefType,
+  GlobalDOMAttributes
+} from '@react-types/shared';
 import {baseColor, focusRing, style} from '@react-spectrum/s2/style' with {type: 'macro'};
 import {
   Disclosure,
@@ -28,6 +34,7 @@ import {SlotProps} from 'react-aria-components/slots';
 import {StyleString} from './types';
 import {useDOMRef} from './useDOMRef';
 import {useLocale} from 'react-aria/I18nProvider';
+
 export interface MessageSourceProps extends Omit<
   DisclosureProps,
   'isQuiet' | 'styles' | 'UNSAFE_className' | 'UNSAFE_style'
@@ -139,7 +146,8 @@ const linkStyles = style({
   disableTapHighlight: true
 });
 
-export interface SourceListItemProps extends Omit<LinkProps, 'className' | 'style'>, DOMProps {
+export interface SourceListItemProps
+  extends Omit<LinkProps, 'className' | 'style' | keyof GlobalDOMAttributes>, DOMProps {
   /** The content of the source list item. */
   children: React.ReactNode;
   /**
diff --git a/packages/@react-spectrum/ai/src/MessageSuggestion.tsx b/packages/@react-spectrum/ai/src/MessageSuggestion.tsx
index c1daf4303b1..6c3fc377b8f 100644
--- a/packages/@react-spectrum/ai/src/MessageSuggestion.tsx
+++ b/packages/@react-spectrum/ai/src/MessageSuggestion.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaLabelingProps, DOMProps, DOMRef} from '@react-types/shared';
+import {AriaLabelingProps, DOMProps, DOMRef, GlobalDOMAttributes} from '@react-types/shared';
 import ArrowCurved from '@react-spectrum/s2/icons/ArrowCurved';
 import {
   baseColor,
@@ -42,7 +42,7 @@ const controlSizeM = {
 
 export interface MessageSuggestionProps extends Omit<
   ButtonProps,
-  'style' | 'className' | 'isPending' | 'isDisabled'
+  'style' | 'className' | 'isPending' | 'isDisabled' | keyof GlobalDOMAttributes
 > {
   /** The text content of the suggestion. */
   children: ReactNode;
diff --git a/packages/@react-spectrum/ai/src/PromptField.tsx b/packages/@react-spectrum/ai/src/PromptField.tsx
index d4ca06edbd7..66851d662b0 100644
--- a/packages/@react-spectrum/ai/src/PromptField.tsx
+++ b/packages/@react-spectrum/ai/src/PromptField.tsx
@@ -52,26 +52,26 @@ import Send from '@react-spectrum/s2/icons/ArrowUpSend';
 import Stop from '@react-spectrum/s2/icons/StopProcessing';
 import {useFocusWithin} from 'react-aria/useFocusWithin';
 
-interface Attachment {
+export interface PromptFieldAttachment {
   id: string;
   file: File;
   image: string;
 }
 
-interface PromptFieldProps extends UnsafeStyles {
+export interface PromptFieldProps extends UnsafeStyles {
   children: React.ReactNode;
   acceptedAttachmentTypes?: string[];
-  onSubmit?: (prompt: TokenSegmentList, attachments: Attachment[]) => void;
+  onSubmit?: (prompt: TokenSegmentList, attachments: PromptFieldAttachment[]) => void;
   isGenerating?: boolean;
   onStop?: () => void;
-  onAddAttachments?: (attachments: Attachment[]) => void;
-  onRemoveAttachments?: (attachments: Attachment[]) => void;
+  onAddAttachments?: (attachments: PromptFieldAttachment[]) => void;
+  onRemoveAttachments?: (attachments: PromptFieldAttachment[]) => void;
   styles?: StyleString;
 }
 
 interface PromptFieldState {
-  attachments: Attachment[];
-  setAttachments: React.Dispatch<React.SetStateAction<Attachment[]>>;
+  attachments: PromptFieldAttachment[];
+  setAttachments: React.Dispatch<React.SetStateAction<PromptFieldAttachment[]>>;
   acceptedAttachmentTypes?: string[];
   prompt: TokenSegmentList;
   setPrompt: React.Dispatch<React.SetStateAction<TokenSegmentList>>;
@@ -79,8 +79,8 @@ interface PromptFieldState {
   onSubmit?: () => void;
   onStop?: () => void;
   isGenerating: boolean;
-  onAddAttachments?: (attachments: Attachment[]) => void;
-  onRemoveAttachments?: (attachments: Attachment[]) => void;
+  onAddAttachments?: (attachments: PromptFieldAttachment[]) => void;
+  onRemoveAttachments?: (attachments: PromptFieldAttachment[]) => void;
 }
 
 // TODO: make this customizable
@@ -146,7 +146,7 @@ export function PromptField(props: PromptFieldProps) {
     onRemoveAttachments
   } = props;
   let [prompt, setPrompt] = useState<TokenSegmentList>(new AutoLinkingSegmentList([]));
-  let [attachments, setAttachments] = useState<Attachment[]>([]);
+  let [attachments, setAttachments] = useState<PromptFieldAttachment[]>([]);
 
   // Not using RAC DropZone because it adds its own focusable button,
   // and we want to avoid an extra tab. We support pasting files directly into the input.
@@ -261,8 +261,8 @@ export function PromptField(props: PromptFieldProps) {
   );
 }
 
-interface PromptFieldAttachmentListProps extends AttachmentListProps<Attachment> {
-  children?: (attachment: Attachment) => React.ReactNode;
+export interface PromptFieldAttachmentListProps extends AttachmentListProps<PromptFieldAttachment> {
+  children?: (attachment: PromptFieldAttachment) => React.ReactNode;
 }
 
 export function PromptFieldAttachmentList(props: PromptFieldAttachmentListProps) {
@@ -295,7 +295,7 @@ export function PromptFieldAttachmentList(props: PromptFieldAttachmentListProps)
   );
 }
 
-interface PromptTokenFieldProps {
+export interface PromptTokenFieldProps {
   completionTrigger?: RegExp;
   renderCompletions?: (
     filterValue: string
@@ -358,7 +358,7 @@ export function PromptTokenField(props: PromptTokenFieldProps) {
           acceptedAttachmentTypes
             ? e => {
                 let clipboardData = e.clipboardData as DataTransfer;
-                let attachments: Attachment[] = [];
+                let attachments: PromptFieldAttachment[] = [];
                 for (let item of clipboardData.items) {
                   if (matchMimeType(item.type, acceptedAttachmentTypes)) {
                     let file = item.getAsFile()!;
@@ -404,7 +404,7 @@ export function PromptTokenField(props: PromptTokenFieldProps) {
   );
 }
 
-interface PromptTokenFieldPopoverProps extends PopoverProps {
+export interface PromptTokenFieldPopoverProps extends PopoverProps {
   filterAnchor?: Position | null;
   items?: React.ReactNode[] | null | Promise<React.ReactNode[] | null>;
   isFocused?: boolean;
@@ -496,7 +496,7 @@ export function PromptToken(props: PromptTokenProps) {
   );
 }
 
-interface PromptFieldToolbarProps {
+export interface PromptFieldToolbarProps {
   children: React.ReactNode;
 }
 
@@ -515,7 +515,10 @@ export function PromptFieldToolbar(props: PromptFieldToolbarProps) {
   );
 }
 
-export function PromptFieldSubmitButton() {
+export interface PromptFieldSubmitButtonProps {}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function PromptFieldSubmitButton(props: PromptFieldSubmitButtonProps) {
   let {prompt, isGenerating, onSubmit, onStop} = useContext(PromptFieldContext);
   return (
     <Button
@@ -529,7 +532,7 @@ export function PromptFieldSubmitButton() {
   );
 }
 
-interface InsertMenuItemProps {
+export interface InsertMenuItemProps {
   children: React.ReactNode;
 }
 
diff --git a/packages/@react-spectrum/ai/stories/AttachmentList.stories.tsx b/packages/@react-spectrum/ai/stories/AttachmentList.stories.tsx
new file mode 100644
index 00000000000..f66030ce120
--- /dev/null
+++ b/packages/@react-spectrum/ai/stories/AttachmentList.stories.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import {Attachment as AttachmentComponent, AttachmentList} from '../src/AttachmentList';
+import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
+import {Content} from '@react-spectrum/s2/Content';
+import {Image} from '@react-spectrum/s2/Image';
+import type {Meta, StoryObj} from '@storybook/react';
+import {style} from '@react-spectrum/s2/style' with {type: 'macro'};
+import {Text} from '@react-spectrum/s2/Text';
+
+const events = ['onRemove'];
+
+const meta: Meta<typeof AttachmentList> = {
+  component: AttachmentList,
+  parameters: {
+    layout: 'centered'
+  },
+  tags: ['autodocs'],
+  argTypes: {
+    ...categorizeArgTypes('Events', events),
+    children: {table: {disable: true}}
+  },
+  args: {...getActionArgs(events)},
+  title: 'AI/AttachmentList'
+};
+
+export default meta;
+
+type Story = StoryObj<typeof AttachmentList>;
+
+export const AIAttachmentList: Story = {
+  render: args => (
+    <AttachmentList {...args} styles={style({width: 500})}>
+      <AttachmentComponent aria-label="Demo file.pdf">
+        <Image
+          slot="thumbnail"
+          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
+        />
+      </AttachmentComponent>
+      <AttachmentComponent aria-label="Alligator.pdf">
+        <Image
+          slot="thumbnail"
+          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
+        />
+      </AttachmentComponent>
+      <AttachmentComponent aria-label="Rules.pdf">
+        <Image
+          slot="thumbnail"
+          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
+        />
+      </AttachmentComponent>
+      <AttachmentComponent aria-label="Echidna.pdf">
+        <Image
+          slot="thumbnail"
+          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
+        />
+        <Content>
+          <Text slot="title">Card title</Text>
+          <Text slot="description">Card description.</Text>
+        </Content>
+      </AttachmentComponent>
+    </AttachmentList>
+  )
+};
diff --git a/packages/@react-spectrum/ai/stories/BasicHorizontalCard.stories.tsx b/packages/@react-spectrum/ai/stories/BasicHorizontalCard.stories.tsx
new file mode 100644
index 00000000000..7c7f706ea2f
--- /dev/null
+++ b/packages/@react-spectrum/ai/stories/BasicHorizontalCard.stories.tsx
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import {ActionButton} from '@react-spectrum/s2/ActionButton';
+import {ActionMenu} from '@react-spectrum/s2/ActionMenu';
+import {type BasicCardProps, BasicHorizontalCard} from '@react-spectrum/ai';
+import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
+import ChevronRight from '@react-spectrum/s2/icons/ChevronRight';
+import {Content} from '@react-spectrum/s2/Content';
+import {Footer} from '@react-spectrum/s2/Footer';
+import {Image} from '@react-spectrum/s2/Image';
+import {MenuItem} from '@react-spectrum/s2/Menu';
+import type {Meta, StoryObj} from '@storybook/react';
+import {Skeleton} from '@react-spectrum/s2/Skeleton';
+import {style} from '@react-spectrum/s2/style' with {type: 'macro'};
+import {Text} from '@react-spectrum/s2/Text';
+
+const events = ['onAction'];
+
+const meta: Meta<BasicCardProps & {isLoading?: boolean}> = {
+  component: BasicHorizontalCard,
+  parameters: {
+    layout: 'centered'
+  },
+  tags: ['autodocs'],
+  args: {
+    isLoading: false,
+    ...getActionArgs(events)
+  },
+  argTypes: {
+    ...categorizeArgTypes('Events', events),
+    href: {table: {disable: true}},
+    download: {table: {disable: true}},
+    hrefLang: {table: {disable: true}},
+    referrerPolicy: {table: {disable: true}},
+    rel: {table: {disable: true}},
+    routerOptions: {table: {disable: true}},
+    ping: {table: {disable: true}},
+    target: {table: {disable: true}},
+    value: {table: {disable: true}},
+    textValue: {table: {disable: true}},
+    onAction: {table: {disable: true, category: 'Events'}},
+    isDisabled: {table: {disable: true}},
+    children: {table: {disable: true}}
+  },
+  decorators: (children, {args}) => (
+    <Skeleton isLoading={args.isLoading || false}>{children(args)}</Skeleton>
+  ),
+  title: 'AI/BasicHorizontalCard'
+};
+
+export default meta;
+
+type BasicStory = StoryObj<typeof BasicHorizontalCard>;
+
+export const Basic: BasicStory = {
+  render: args => (
+    <div
+      className={style({
+        display: 'flex',
+        gap: 16,
+        flexWrap: 'wrap',
+        alignItems: 'start',
+        justifyContent: 'center',
+        padding: 16,
+        backgroundColor: {
+          default: 'layer-1',
+          variant: {
+            secondary: 'layer-2'
+          }
+        }
+      })({variant: args.variant})}>
+      <BasicHorizontalCard {...args} styles={style({maxWidth: 400})}>
+        <Image
+          slot="thumbnail"
+          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
+        />
+        <Content>
+          <Text slot="title">Card title</Text>
+          <Text slot="description">Card description.</Text>
+        </Content>
+        <Footer>
+          <ActionMenu>
+            <MenuItem>Test</MenuItem>
+          </ActionMenu>
+        </Footer>
+      </BasicHorizontalCard>
+      <BasicHorizontalCard {...args} styles={style({maxWidth: 400})}>
+        <Image
+          slot="thumbnail"
+          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
+        />
+        <Content>
+          <Text slot="title">Card title</Text>
+          <Text slot="description">Card description.</Text>
+        </Content>
+        <Footer>
+          <ActionButton isQuiet>
+            <ChevronRight />
+          </ActionButton>
+        </Footer>
+      </BasicHorizontalCard>
+      <BasicHorizontalCard {...args} styles={style({maxWidth: 400})}>
+        <Image
+          slot="thumbnail"
+          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
+        />
+        <Content>
+          <Text slot="title">Card title</Text>
+          <Text slot="description">Card description.</Text>
+        </Content>
+      </BasicHorizontalCard>
+      <BasicHorizontalCard {...args} styles={style({maxWidth: 400})}>
+        <Image
+          slot="thumbnail"
+          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
+        />
+        <Content>
+          <Text slot="title">Card title</Text>
+          <Text slot="description">Card description.</Text>
+        </Content>
+      </BasicHorizontalCard>
+      <BasicHorizontalCard {...args} aria-label="Demo file.pdf">
+        <Image
+          slot="thumbnail"
+          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
+        />
+      </BasicHorizontalCard>
+    </div>
+  ),
+  argTypes: {
+    variant: {
+      control: 'radio',
+      options: ['primary', 'secondary', 'tertiary', 'quiet']
+    }
+  }
+};
diff --git a/packages/@react-spectrum/ai/stories/Chat.stories.tsx b/packages/@react-spectrum/ai/stories/Chat.stories.tsx
index e04ded54106..aab79d76610 100644
--- a/packages/@react-spectrum/ai/stories/Chat.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/Chat.stories.tsx
@@ -13,7 +13,7 @@
 import {ActionButton} from '@react-spectrum/s2/ActionButton';
 import {ActionMenu} from '@react-spectrum/s2/ActionMenu';
 import {AssetCard, CardPreview} from '@react-spectrum/s2/Card';
-import {Chat, Thread, ThreadItem, ThreadScrollButton} from '../src/Chat';
+import {Chat} from '../src/Chat';
 import ChevronDown from '@react-spectrum/s2/icons/ChevronDown';
 import {Content} from '@react-spectrum/s2/Content';
 import {focusRing, style} from '@react-spectrum/s2/style' with {type: 'macro'};
@@ -21,16 +21,28 @@ import {GridList} from 'react-aria-components';
 import {Image} from '@react-spectrum/s2/Image';
 import {ListLayout} from 'react-stately/useVirtualizerState';
 import {MenuItem} from '@react-spectrum/s2/Menu';
-import {MessageFeedback} from '../src/MessageFeedback';
-import {MessageSource, SourceList, SourceListItem} from '../src/MessageSource';
-import {MessageSuggestion, MessageSuggestionList} from '../src/MessageSuggestion';
+import {
+  MessageFeedback,
+  MessageSource,
+  MessageSuggestion,
+  MessageSuggestionList,
+  PromptField,
+  PromptFieldSubmitButton,
+  PromptTokenField,
+  ResponseStatus,
+  ResponseStatusPanel,
+  ResponseStatusTitle,
+  SourceList,
+  SourceListItem,
+  Thread,
+  ThreadItem,
+  ThreadScrollButton,
+  TokenSegmentList,
+  UserMessage
+} from '@react-spectrum/ai';
 import type {Meta} from '@storybook/react';
-import {PromptField, PromptFieldSubmitButton, PromptTokenField} from '../src/PromptField';
 import {ReactNode, useRef, useState} from 'react';
-import {ResponseStatus, ResponseStatusPanel, ResponseStatusTitle} from '../src/ResponseStatus';
 import {Text} from '@react-spectrum/s2/Text';
-import type {TokenSegmentList} from '../src/TokenSegmentList';
-import {UserMessage} from '../src/UserMessage';
 import {Virtualizer} from 'react-aria-components/Virtualizer';
 
 const meta: Meta<typeof Chat> = {
@@ -359,7 +371,9 @@ export function StreamingChat() {
           overflow: 'hidden',
           flexGrow: 1,
           gap: 16,
-          paddingX: 16
+          paddingX: 16,
+          boxSizing: 'border-box',
+          minWidth: 0
         })}>
         <div
           className={style({
@@ -367,7 +381,8 @@ export function StreamingChat() {
             flexGrow: 1,
             overflow: 'hidden',
             display: 'flex',
-            flexDirection: 'column'
+            flexDirection: 'column',
+            minWidth: 0
           })}>
           <div
             className={style({
@@ -389,7 +404,8 @@ export function StreamingChat() {
             aria-label="Chat thread"
             className={style({
               flexGrow: 1,
-              overflow: 'auto',
+              overflowX: 'hidden',
+              overflowY: 'auto',
               padding: 8,
               scrollPadding: 8,
               rowGap: 16
@@ -518,7 +534,9 @@ export function VirtualizedChat() {
         display: 'flex',
         flexDirection: 'column',
         overflow: 'hidden',
-        flexGrow: 1
+        flexGrow: 1,
+        boxSizing: 'border-box',
+        minWidth: 0
       })}>
       <Virtualizer layout={ListLayout} layoutOptions={{estimatedRowHeight: 100}}>
         <GridList
@@ -529,8 +547,12 @@ export function VirtualizedChat() {
           className={style({
             height: 400,
             paddingX: 4,
-            overflow: 'auto',
-            marginBottom: 8
+            overflowX: 'hidden',
+            overflowY: 'auto',
+            marginBottom: 8,
+            boxSizing: 'border-box',
+            minWidth: 0,
+            width: 'full'
           })}>
           {msg => {
             if (msg.type === 'user') {
diff --git a/packages/@react-spectrum/ai/stories/HorizontalCard.stories.tsx b/packages/@react-spectrum/ai/stories/HorizontalCard.stories.tsx
index 52ba672e8b8..24ce57a4d17 100644
--- a/packages/@react-spectrum/ai/stories/HorizontalCard.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/HorizontalCard.stories.tsx
@@ -10,35 +10,29 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/s2/ActionButton';
-import {ActionMenu} from '@react-spectrum/s2/ActionMenu';
-import {Attachment as AttachmentComponent, AttachmentList} from '@react-spectrum/ai/AttachmentList';
-import {
-  BasicHorizontalCard,
-  CardPreview,
-  type CardProps,
-  HorizontalCard
-} from '@react-spectrum/ai/HorizontalCard';
-import ChevronRight from '@react-spectrum/s2/icons/ChevronRight';
+import {CardPreview, HorizontalCard, type HorizontalCardProps} from '@react-spectrum/ai';
+import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
 import {Content} from '@react-spectrum/s2/Content';
-import {Footer} from '@react-spectrum/s2/Footer';
 import {Image} from '@react-spectrum/s2/Image';
-import {MenuItem} from '@react-spectrum/s2/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
 import {Skeleton} from '@react-spectrum/s2/Skeleton';
 import {style} from '@react-spectrum/s2/style' with {type: 'macro'};
 import {Text} from '@react-spectrum/s2/Text';
 
-const meta: Meta<CardProps & {isLoading?: boolean}> = {
+const events = ['onAction'];
+
+const meta: Meta<HorizontalCardProps & {isLoading?: boolean}> = {
   component: HorizontalCard,
   parameters: {
     layout: 'centered'
   },
   tags: ['autodocs'],
   args: {
-    isLoading: false
+    isLoading: false,
+    ...getActionArgs(events)
   },
   argTypes: {
+    ...categorizeArgTypes('Events', events),
     href: {table: {disable: true}},
     download: {table: {disable: true}},
     hrefLang: {table: {disable: true}},
@@ -49,7 +43,7 @@ const meta: Meta<CardProps & {isLoading?: boolean}> = {
     target: {table: {disable: true}},
     value: {table: {disable: true}},
     textValue: {table: {disable: true}},
-    onAction: {table: {disable: true}},
+    onAction: {table: {disable: true, category: 'Events'}},
     isDisabled: {table: {disable: true}},
     children: {table: {disable: true}}
   },
@@ -62,7 +56,6 @@ const meta: Meta<CardProps & {isLoading?: boolean}> = {
 export default meta;
 
 type Story = StoryObj<typeof HorizontalCard>;
-type BasicStory = StoryObj<typeof BasicHorizontalCard>;
 
 export const Horizontal: Story = {
   render: args => (
@@ -117,130 +110,3 @@ export const Horizontal: Story = {
     </div>
   )
 };
-
-export const Basic: BasicStory = {
-  render: args => (
-    <div
-      className={style({
-        display: 'flex',
-        gap: 16,
-        flexWrap: 'wrap',
-        alignItems: 'start',
-        justifyContent: 'center',
-        padding: 16,
-        backgroundColor: {
-          default: 'layer-1',
-          variant: {
-            secondary: 'layer-2'
-          }
-        }
-      })({variant: args.variant})}>
-      <BasicHorizontalCard {...args} styles={style({maxWidth: 400})}>
-        <Image
-          slot="thumbnail"
-          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
-        />
-        <Content>
-          <Text slot="title">Card title</Text>
-          <Text slot="description">Card description.</Text>
-        </Content>
-        <Footer>
-          <ActionMenu>
-            <MenuItem>Test</MenuItem>
-          </ActionMenu>
-        </Footer>
-      </BasicHorizontalCard>
-      <BasicHorizontalCard {...args} styles={style({maxWidth: 400})}>
-        <Image
-          slot="thumbnail"
-          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
-        />
-        <Content>
-          <Text slot="title">Card title</Text>
-          <Text slot="description">Card description.</Text>
-        </Content>
-        <Footer>
-          <ActionButton isQuiet>
-            <ChevronRight />
-          </ActionButton>
-        </Footer>
-      </BasicHorizontalCard>
-      <BasicHorizontalCard {...args} styles={style({maxWidth: 400})}>
-        <Image
-          slot="thumbnail"
-          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
-        />
-        <Content>
-          <Text slot="title">Card title</Text>
-          <Text slot="description">Card description.</Text>
-        </Content>
-      </BasicHorizontalCard>
-      <BasicHorizontalCard {...args} styles={style({maxWidth: 400})}>
-        <Image
-          slot="thumbnail"
-          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
-        />
-        <Content>
-          <Text slot="title">Card title</Text>
-          <Text slot="description">Card description.</Text>
-        </Content>
-      </BasicHorizontalCard>
-      <BasicHorizontalCard {...args} aria-label="Demo file.pdf">
-        <Image
-          slot="thumbnail"
-          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
-        />
-      </BasicHorizontalCard>
-    </div>
-  ),
-  argTypes: {
-    variant: {
-      control: 'radio',
-      options: ['primary', 'secondary', 'tertiary', 'quiet']
-    }
-  }
-};
-
-export const AIAttachmentList = {
-  render: args => (
-    <AttachmentList {...(args as any)} styles={style({width: 500})}>
-      <AttachmentComponent aria-label="Demo file.pdf" uploadProgress={args.uploadProgress}>
-        <Image
-          slot="thumbnail"
-          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
-        />
-      </AttachmentComponent>
-      <AttachmentComponent aria-label="Alligator.pdf" uploadProgress={args.uploadProgress}>
-        <Image
-          slot="thumbnail"
-          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
-        />
-      </AttachmentComponent>
-      <AttachmentComponent aria-label="Rules.pdf" uploadProgress={args.uploadProgress}>
-        <Image
-          slot="thumbnail"
-          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
-        />
-      </AttachmentComponent>
-      <AttachmentComponent aria-label="Echidna.pdf" uploadProgress={args.uploadProgress}>
-        <Image
-          slot="thumbnail"
-          src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
-        />
-        <Content>
-          <Text slot="title">Card title</Text>
-          <Text slot="description">Card description.</Text>
-        </Content>
-      </AttachmentComponent>
-    </AttachmentList>
-  ),
-  argTypes: {
-    uploadProgress: {
-      control: {
-        type: 'range',
-        min: 0,
-        max: 100
-      }
-    }
-  }
-};
diff --git a/packages/@react-spectrum/ai/stories/MessageFeedback.stories.tsx b/packages/@react-spectrum/ai/stories/MessageFeedback.stories.tsx
index fe613cc2a9a..fc87ff6bca6 100644
--- a/packages/@react-spectrum/ai/stories/MessageFeedback.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/MessageFeedback.stories.tsx
@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
+import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
 import {ComponentProps, ReactElement, useState} from 'react';
-import {fn} from 'storybook/test';
-import {MessageFeedback} from '@react-spectrum/ai/MessageFeedback';
+import {MessageFeedback} from '@react-spectrum/ai';
 import type {Meta, StoryObj} from '@storybook/react';
 
+const events = ['onChange'];
+
 const meta: Meta<typeof MessageFeedback> = {
   component: MessageFeedback,
   parameters: {
@@ -22,13 +24,13 @@ const meta: Meta<typeof MessageFeedback> = {
   },
   tags: ['autodocs'],
   argTypes: {
-    onChange: {table: {category: 'Events'}},
+    ...categorizeArgTypes('Events', events),
     value: {table: {disable: true}},
     defaultValue: {table: {disable: true}}
   },
   args: {
     'aria-label': 'Rate this response',
-    onChange: fn()
+    ...getActionArgs(events)
   },
   title: 'AI/MessageFeedback'
 };
diff --git a/packages/@react-spectrum/ai/stories/MessageSource.stories.tsx b/packages/@react-spectrum/ai/stories/MessageSource.stories.tsx
index ccde02a1048..604941e6694 100644
--- a/packages/@react-spectrum/ai/stories/MessageSource.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/MessageSource.stories.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {MessageSource, SourceList, SourceListItem} from '../src/MessageSource';
+import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
+import {MessageSource, SourceList, SourceListItem} from '@react-spectrum/ai';
 import type {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 import {style} from '@react-spectrum/s2/style' with {type: 'macro'};
 
+const events = ['onExpandedChange'];
+
 const meta: Meta<typeof MessageSource> = {
   component: MessageSource,
   parameters: {
@@ -22,6 +25,7 @@ const meta: Meta<typeof MessageSource> = {
   },
   tags: ['autodocs'],
   argTypes: {
+    ...categorizeArgTypes('Events', events),
     size: {
       control: 'radio',
       options: ['S', 'M', 'L', 'XL']
@@ -35,6 +39,7 @@ const meta: Meta<typeof MessageSource> = {
     },
     children: {table: {disable: true}}
   },
+  args: {...getActionArgs(events)},
   title: 'AI/MessageSource'
 };
 
diff --git a/packages/@react-spectrum/ai/stories/MessageSuggestion.stories.tsx b/packages/@react-spectrum/ai/stories/MessageSuggestion.stories.tsx
index 51a3c302d96..41daf48113f 100644
--- a/packages/@react-spectrum/ai/stories/MessageSuggestion.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/MessageSuggestion.stories.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {getActionArgs} from '../../s2/stories/utils';
-import {MessageSuggestion, MessageSuggestionList} from '@react-spectrum/ai/MessageSuggestion';
+import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
+import {MessageSuggestion, MessageSuggestionList} from '@react-spectrum/ai';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const events = ['onPress'];
@@ -22,6 +22,9 @@ const meta: Meta<typeof MessageSuggestionList> = {
     layout: 'centered'
   },
   tags: ['autodocs'],
+  argTypes: {
+    ...categorizeArgTypes('Events', events)
+  },
   args: {
     ...getActionArgs(events)
   },
diff --git a/packages/@react-spectrum/ai/stories/PromptField.stories.tsx b/packages/@react-spectrum/ai/stories/PromptField.stories.tsx
index 1724f92c2cf..4c838a12e1f 100644
--- a/packages/@react-spectrum/ai/stories/PromptField.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/PromptField.stories.tsx
@@ -23,6 +23,7 @@ import {
 } from '../src/PromptField';
 import {Attachment} from '../src/AttachmentList';
 import Brand from '@react-spectrum/s2/icons/Brand';
+import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
 import {
   Collection,
   Header,
@@ -44,12 +45,19 @@ import SocialNetwork from '@react-spectrum/s2/icons/SocialNetwork';
 import UserGroup from '@react-spectrum/s2/icons/UserGroup';
 import {useState} from 'react';
 
+const events = ['onSubmit', 'onStop', 'onAddAttachments', 'onRemoveAttachments'];
+
 const meta: Meta<typeof PromptField> = {
   component: PromptField,
   parameters: {
     layout: 'centered'
   },
   tags: ['autodocs'],
+  argTypes: {
+    ...categorizeArgTypes('Events', events),
+    children: {table: {disable: true}}
+  },
+  args: {...getActionArgs(events)},
   title: 'AI/PromptField',
   decorators: [
     Story => (
diff --git a/packages/@react-spectrum/ai/stories/ResponseStatus.stories.tsx b/packages/@react-spectrum/ai/stories/ResponseStatus.stories.tsx
index db71b09640b..3b68f172946 100644
--- a/packages/@react-spectrum/ai/stories/ResponseStatus.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/ResponseStatus.stories.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
+import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
 import type {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {ResponseStatus, ResponseStatusPanel, ResponseStatusTitle} from '../src/ResponseStatus';
+import {ResponseStatus, ResponseStatusPanel, ResponseStatusTitle} from '@react-spectrum/ai';
 import {style} from '@react-spectrum/s2/style' with {type: 'macro'};
 
+const events = ['onExpandedChange'];
+
 const meta: Meta<typeof ResponseStatus> = {
   component: ResponseStatus,
   parameters: {
@@ -22,6 +25,7 @@ const meta: Meta<typeof ResponseStatus> = {
   },
   tags: ['autodocs'],
   argTypes: {
+    ...categorizeArgTypes('Events', events),
     size: {
       control: 'radio',
       options: ['S', 'M', 'L', 'XL']
@@ -36,7 +40,8 @@ const meta: Meta<typeof ResponseStatus> = {
     children: {table: {disable: true}}
   },
   args: {
-    isLoading: true
+    isLoading: true,
+    ...getActionArgs(events)
   },
   title: 'AI/ResponseStatus'
 };
diff --git a/packages/@react-spectrum/ai/stories/TokenField.stories.tsx b/packages/@react-spectrum/ai/stories/TokenField.stories.tsx
index 7c107d4cb42..53398386050 100644
--- a/packages/@react-spectrum/ai/stories/TokenField.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/TokenField.stories.tsx
@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
+import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {useContext, useMemo, useRef, useState} from 'react';
 import './styles.global.css';
@@ -27,9 +28,17 @@ import 'vanilla-starter/TagGroup.css';
 import {Text} from 'react-aria-components/Text';
 import {useSlottedContext} from 'react-aria-components/slots';
 
+const events = ['onChange', 'onPaste', 'onSubmit', 'onFocus', 'onBlur', 'onFocusChange'];
+
 export default {
   title: 'AI/TokenField',
-  component: TokenField
+  component: TokenField,
+  tags: ['autodocs'],
+  argTypes: {
+    ...categorizeArgTypes('Events', events),
+    children: {table: {disable: true}}
+  },
+  args: {...getActionArgs(events)}
 } as Meta<typeof TokenField>;
 
 export type TokenFieldStory = StoryFn<typeof TokenField>;
diff --git a/packages/@react-spectrum/ai/stories/UserMessage.stories.tsx b/packages/@react-spectrum/ai/stories/UserMessage.stories.tsx
index 9b71bf2582c..c848346bc42 100644
--- a/packages/@react-spectrum/ai/stories/UserMessage.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/UserMessage.stories.tsx
@@ -11,13 +11,16 @@
  */
 
 import {ActionMenu} from '@react-spectrum/s2/ActionMenu';
+import {categorizeArgTypes} from '../../s2/stories/utils';
 import {Heading} from '@react-spectrum/s2/Heading';
 import {Image} from '@react-spectrum/s2/Image';
 import {MenuItem} from '@react-spectrum/s2/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '@react-spectrum/s2/style' with {type: 'macro'};
 import {Text} from '@react-spectrum/s2/Text';
-import {UserMessage} from '@react-spectrum/ai/UserMessage';
+import {UserMessage} from '@react-spectrum/ai';
+
+const events: string[] = [];
 
 const meta: Meta<typeof UserMessage> = {
   component: UserMessage,
@@ -25,6 +28,7 @@ const meta: Meta<typeof UserMessage> = {
     layout: 'centered'
   },
   argTypes: {
+    ...categorizeArgTypes('Events', events),
     children: {table: {disable: true}}
   },
   tags: ['autodocs'],
diff --git a/packages/@react-spectrum/ai/test/AttachmentList.test.tsx b/packages/@react-spectrum/ai/test/AttachmentList.test.tsx
index 4027d66a962..44afe580c4c 100644
--- a/packages/@react-spectrum/ai/test/AttachmentList.test.tsx
+++ b/packages/@react-spectrum/ai/test/AttachmentList.test.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Attachment, AttachmentList} from '@react-spectrum/ai/AttachmentList';
+import {Attachment, AttachmentList} from '@react-spectrum/ai';
 import {Image} from '@react-spectrum/s2/Image';
+import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
-describe('AttachmentList', () => {
+// Conditionally skip the suite
+const describeOrSkip = parseInt(React.version, 10) < 19 ? describe.skip : describe;
+describeOrSkip('AttachmentList', () => {
   it('should render', () => {
     let {getByRole} = render(
       <AttachmentList aria-label="Uploaded files">
diff --git a/packages/@react-spectrum/ai/test/MessageFeedback.test.tsx b/packages/@react-spectrum/ai/test/MessageFeedback.test.tsx
index 86721c5252a..aeeb2bba767 100644
--- a/packages/@react-spectrum/ai/test/MessageFeedback.test.tsx
+++ b/packages/@react-spectrum/ai/test/MessageFeedback.test.tsx
@@ -10,12 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {MessageFeedback} from '@react-spectrum/ai/MessageFeedback';
+import {MessageFeedback} from '@react-spectrum/ai';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React, {useState} from 'react';
 import userEvent from '@testing-library/user-event';
 
-describe('MessageFeedback', () => {
+// Conditionally skip the suite
+const describeOrSkip = parseInt(React.version, 10) < 19 ? describe.skip : describe;
+describeOrSkip('MessageFeedback', () => {
   let user;
   beforeAll(() => {
     user = userEvent.setup({delay: null, pointerMap});
diff --git a/packages/@react-spectrum/ai/test/TokenField.browser.test.tsx b/packages/@react-spectrum/ai/test/TokenField.browser.test.tsx
index 9ac340d9fe3..59418fd84b6 100644
--- a/packages/@react-spectrum/ai/test/TokenField.browser.test.tsx
+++ b/packages/@react-spectrum/ai/test/TokenField.browser.test.tsx
@@ -38,6 +38,7 @@ import {
 import {commands, userEvent} from 'vitest/browser';
 import {describe, expect, it} from 'vitest';
 import {isFirefox, isWebKit} from 'react-aria/private/utils/platform';
+import React from 'react';
 import {render} from 'vitest-browser-react';
 import {Token, TokenField} from '../src/TokenField';
 
@@ -48,7 +49,9 @@ declare module 'vitest/browser' {
   }
 }
 
-describe('TokenField browser interactions', () => {
+// Conditionally skip the suite
+const describeOrSkip = parseInt(React.version, 10) < 19 ? describe.skip : describe;
+describeOrSkip('TokenField browser interactions', () => {
   describe('rendering', () => {
     it('should render textbox and tokens', async () => {
       let screen = await render(
diff --git a/packages/@react-spectrum/ai/test/TokenSegmentList.test.ts b/packages/@react-spectrum/ai/test/TokenSegmentList.test.ts
index 1b5c46ea5d0..a8275cefa72 100644
--- a/packages/@react-spectrum/ai/test/TokenSegmentList.test.ts
+++ b/packages/@react-spectrum/ai/test/TokenSegmentList.test.ts
@@ -11,6 +11,7 @@
  */
 
 import {Direction, Position, TokenFieldSegment, TokenSegmentList} from '../src/TokenSegmentList';
+import React from 'react';
 
 function text(s: string): TokenFieldSegment {
   return {type: 'text', text: s};
@@ -98,7 +99,9 @@ function replaceSegWithRegex(
   return new TokenizingSegmentList(segments, regex).replaceRangeWithSegments(start, end, insert);
 }
 
-describe('TokenSegmentList', () => {
+// Conditionally skip the suite
+const describeOrSkip = parseInt(React.version, 10) < 19 ? describe.skip : describe;
+describeOrSkip('TokenSegmentList', () => {
   let graphemeSegmenter: Intl.Segmenter;
   let wordSegmenter: Intl.Segmenter;