[pull] main from adobe:main

.oxlintrc.json

@@ -375,7 +375,7 @@
       "files": [
         "packages/@react-spectrum/s2/**",
         "packages/dev/s2-docs/**",
-        "packages/@react-spectrum/s2-ai/**"
+        "packages/@react-spectrum/ai/**"
       ],
       "rules": {
         "react/react-in-jsx-scope": "off"

.storybook-s2/main.ts

@@ -21,7 +21,7 @@ const config: StorybookConfig = {
   stories: [
     './docs/*.mdx',
     '../packages/@react-spectrum/s2/stories/*.stories.@(js|jsx|mjs|ts|tsx)',
-    '../packages/@react-spectrum/s2-ai/stories/*.stories.@(js|jsx|mjs|ts|tsx)'
+    '../packages/@react-spectrum/ai/stories/*.stories.@(js|jsx|mjs|ts|tsx)'
   ],
   addons: [
     localAddon('./custom-addons/provider/preset.ts'),

package.json

@@ -277,8 +277,8 @@
         "packages/@adobe/react-spectrum/src/color/*.tsx",
         "packages/@react-spectrum/s2/**/*.{js,ts,tsx}",
         "packages/@react-spectrum/s2/stories/**",
-        "packages/@react-spectrum/s2-ai/**/*.{js,ts,tsx}",
-        "packages/@react-spectrum/s2-ai/stories/**",
+        "packages/@react-spectrum/ai/**/*.{js,ts,tsx}",
+        "packages/@react-spectrum/ai/stories/**",
         ".storybook-s2/**",
         "packages/dev/s2-docs/**",
         "starters/**"

packages/@react-spectrum/s2-ai/README.md → packages/@react-spectrum/ai/README.md

@@ -1,3 +1,3 @@
-# @react-spectrum/s2-ai
+# @react-spectrum/ai
 
 This package is part of [react-spectrum](https://github.com/adobe/react-spectrum). See the repo for more details.

packages/@react-spectrum/s2-ai/package.json → packages/@react-spectrum/ai/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@react-spectrum/s2-ai",
+  "name": "@react-spectrum/ai",
   "version": "1.0.0-alpha.1",
   "description": "Spectrum 2 UI AI components in React",
   "license": "Apache-2.0",

packages/@react-spectrum/s2-ai/src/MessageFeedback.tsx → packages/@react-spectrum/ai/src/MessageFeedback.tsx

@@ -57,7 +57,7 @@ export const MessageFeedback = forwardRef(function MessageFeedback(
   props: MessageFeedbackProps,
   ref: DOMRef<HTMLDivElement>
 ) {
-  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/s2-ai');
+  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/ai');
   let domRef = useDOMRef(ref);
   let {value, defaultValue, onChange, isDisabled, thumbUpLabel, thumbDownLabel, styles} = props;
 

packages/@react-spectrum/s2-ai/stories/HorizontalCard.stories.tsx → packages/@react-spectrum/ai/stories/HorizontalCard.stories.tsx

@@ -12,15 +12,8 @@
 
 import {ActionButton} from '@react-spectrum/s2/ActionButton';
 import {ActionMenu} from '@react-spectrum/s2/ActionMenu';
-import {
-  Attachment as AttachmentComponent,
-  AttachmentList
-} from '/packages/@react-spectrum/s2-ai/exports/AttachmentList';
-import {
-  BasicHorizontalCard,
-  CardPreview,
-  HorizontalCard
-} from '@react-spectrum/s2-ai/HorizontalCard';
+import {Attachment as AttachmentComponent, AttachmentList} from '@react-spectrum/ai/AttachmentList';
+import {BasicHorizontalCard, CardPreview, HorizontalCard} from '@react-spectrum/ai/HorizontalCard';
 import {Card, CardProps} from '@react-spectrum/s2/Card';
 import ChevronRight from '@react-spectrum/s2/icons/ChevronRight';
 import {Content} from '@react-spectrum/s2/Content';
@@ -59,7 +52,7 @@ const meta: Meta<CardProps & {isLoading?: boolean}> = {
   decorators: (children, {args}) => (
     <Skeleton isLoading={args.isLoading || false}>{children(args)}</Skeleton>
   ),
-  title: 'S2-AI/HorizontalCard'
+  title: 'AI/HorizontalCard'
 };
 
 export default meta;

packages/@react-spectrum/s2-ai/stories/MessageFeedback.stories.tsx → packages/@react-spectrum/ai/stories/MessageFeedback.stories.tsx

@@ -12,7 +12,7 @@
 
 import {ComponentProps, ReactElement, useState} from 'react';
 import {fn} from 'storybook/test';
-import {MessageFeedback} from '@react-spectrum/s2-ai/MessageFeedback';
+import {MessageFeedback} from '@react-spectrum/ai/MessageFeedback';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const meta: Meta<typeof MessageFeedback> = {
@@ -30,7 +30,7 @@ const meta: Meta<typeof MessageFeedback> = {
     'aria-label': 'Rate this response',
     onChange: fn()
   },
-  title: 'S2-AI/MessageFeedback'
+  title: 'AI/MessageFeedback'
 };
 
 export default meta;

packages/@react-spectrum/s2-ai/stories/MessageSource.stories.tsx → packages/@react-spectrum/ai/stories/MessageSource.stories.tsx

@@ -35,7 +35,7 @@ const meta: Meta<typeof MessageSource> = {
     },
     children: {table: {disable: true}}
   },
-  title: 'S2-AI/MessageSource'
+  title: 'AI/MessageSource'
 };
 
 export default meta;

packages/@react-spectrum/s2-ai/stories/MessageSuggestion.stories.tsx → packages/@react-spectrum/ai/stories/MessageSuggestion.stories.tsx

@@ -11,7 +11,7 @@
  */
 
 import {getActionArgs} from '../../s2/stories/utils';
-import {MessageSuggestion, MessageSuggestionList} from '@react-spectrum/s2-ai/MessageSuggestion';
+import {MessageSuggestion, MessageSuggestionList} from '@react-spectrum/ai/MessageSuggestion';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const events = ['onPress'];
@@ -25,7 +25,7 @@ const meta: Meta<typeof MessageSuggestionList> = {
   args: {
     ...getActionArgs(events)
   },
-  title: 'S2-AI/MessageSuggestionList'
+  title: 'AI/MessageSuggestionList'
 };
 
 export default meta;

packages/@react-spectrum/s2-ai/stories/ResponseStatus.stories.tsx → packages/@react-spectrum/ai/stories/ResponseStatus.stories.tsx

@@ -38,7 +38,7 @@ const meta: Meta<typeof ResponseStatus> = {
   args: {
     isLoading: true
   },
-  title: 'S2-AI/ResponseStatus'
+  title: 'AI/ResponseStatus'
 };
 
 export default meta;

packages/@react-spectrum/s2-ai/stories/Thread.stories.tsx → packages/@react-spectrum/ai/stories/Thread.stories.tsx

@@ -54,7 +54,7 @@ const meta: Meta<typeof Thread> = {
     layout: 'centered'
   },
   tags: ['autodocs'],
-  title: 'S2-AI/Thread',
+  title: 'AI/Thread',
   decorators: [
     Story => (
       <div style={{width: '800px', height: '700px'}}>

packages/@react-spectrum/s2-ai/stories/UserMessage.stories.tsx → packages/@react-spectrum/ai/stories/UserMessage.stories.tsx

@@ -17,7 +17,7 @@ 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/s2-ai/UserMessage';
+import {UserMessage} from '@react-spectrum/ai/UserMessage';
 
 const meta: Meta<typeof UserMessage> = {
   component: UserMessage,
@@ -28,7 +28,7 @@ const meta: Meta<typeof UserMessage> = {
     children: {table: {disable: true}}
   },
   tags: ['autodocs'],
-  title: 'S2-AI/UserMessage'
+  title: 'AI/UserMessage'
 };
 
 export default meta;

packages/@react-spectrum/s2-ai/test/AttachmentList.test.tsx → packages/@react-spectrum/ai/test/AttachmentList.test.tsx

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Attachment, AttachmentList} from '../exports/AttachmentList';
+import {Attachment, AttachmentList} from '@react-spectrum/ai/AttachmentList';
 import {Image} from '@react-spectrum/s2/Image';
 import {render} from '@react-spectrum/test-utils-internal';
 

packages/@react-spectrum/s2-ai/test/MessageFeedback.test.tsx → packages/@react-spectrum/ai/test/MessageFeedback.test.tsx

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {MessageFeedback} from '@react-spectrum/s2-ai/MessageFeedback';
+import {MessageFeedback} from '@react-spectrum/ai/MessageFeedback';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React, {useState} from 'react';
 import userEvent from '@testing-library/user-event';

yarn.config.cjs

@@ -27,7 +27,7 @@ function enforceConsistentDependenciesAcrossTheProject({Yarn}) {
         } else if (
           dependency.workspace.ident === '@react-spectrum/s2' ||
           dependency.workspace.ident === '@react-spectrum/s2-icon-builder' ||
-          dependency.workspace.ident === '@react-spectrum/s2-ai'
+          dependency.workspace.ident === '@react-spectrum/ai'
         ) {
           dependency.update('^19.0.0-rc.1');
         } else if (dependency.workspace.ident === '@react-spectrum/codemods') {
@@ -58,7 +58,7 @@ function enforceConsistentDependenciesAcrossTheProject({Yarn}) {
       workspace.ident !== '@internationalized/string-compiler' &&
       workspace.ident !== 'tailwindcss-react-aria-components' &&
       workspace.ident !== '@react-spectrum/s2' &&
-      workspace.ident !== '@react-spectrum/s2-ai' &&
+      workspace.ident !== '@react-spectrum/ai' &&
       workspace.manifest.rsp?.type !== 'cli'
     ) {
       workspace.set('dependencies.@swc/helpers', '^0.5.0');

yarn.lock

@@ -7370,6 +7370,30 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@react-spectrum/ai@workspace:packages/@react-spectrum/ai":
+  version: 0.0.0-use.local
+  resolution: "@react-spectrum/ai@workspace:packages/@react-spectrum/ai"
+  dependencies:
+    "@react-aria/test-utils": "npm:^1.0.0-alpha.8"
+    "@storybook/jest": "npm:^0.2.3"
+    "@testing-library/dom": "npm:^10.1.0"
+    "@testing-library/react": "npm:^16.0.0"
+    "@testing-library/user-event": "npm:^14.0.0"
+    react: "npm:^19.0.0-rc.1"
+    react-dom: "npm:^19.0.0-rc.1"
+  peerDependencies:
+    "@internationalized/date": ^3.12.2
+    "@internationalized/number": ^3.6.7
+    "@react-spectrum/s2": ^1.4.0
+    "@react-types/shared": ^3.35.0
+    react: ^19.0.0-rc.1
+    react-aria: 3.49.0
+    react-aria-components: 1.18.0
+    react-dom: ^19.0.0-rc.1
+    react-stately: 3.47.0
+  languageName: unknown
+  linkType: soft
+
 "@react-spectrum/autocomplete@npm:^3.0.0-alpha.54, @react-spectrum/autocomplete@npm:^3.0.0-alpha.55, @react-spectrum/autocomplete@workspace:packages/@react-spectrum/autocomplete":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/autocomplete@workspace:packages/@react-spectrum/autocomplete"
@@ -8006,30 +8030,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/s2-ai@workspace:packages/@react-spectrum/s2-ai":
-  version: 0.0.0-use.local
-  resolution: "@react-spectrum/s2-ai@workspace:packages/@react-spectrum/s2-ai"
-  dependencies:
-    "@react-aria/test-utils": "npm:^1.0.0-alpha.8"
-    "@storybook/jest": "npm:^0.2.3"
-    "@testing-library/dom": "npm:^10.1.0"
-    "@testing-library/react": "npm:^16.0.0"
-    "@testing-library/user-event": "npm:^14.0.0"
-    react: "npm:^19.0.0-rc.1"
-    react-dom: "npm:^19.0.0-rc.1"
-  peerDependencies:
-    "@internationalized/date": ^3.12.2
-    "@internationalized/number": ^3.6.7
-    "@react-spectrum/s2": ^1.4.0
-    "@react-types/shared": ^3.35.0
-    react: ^19.0.0-rc.1
-    react-aria: 3.49.0
-    react-aria-components: 1.18.0
-    react-dom: ^19.0.0-rc.1
-    react-stately: 3.47.0
-  languageName: unknown
-  linkType: soft
-
 "@react-spectrum/s2-docs@workspace:packages/dev/s2-docs":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/s2-docs@workspace:packages/dev/s2-docs"