@oxyhq/services 29.0.0 → 30.0.1

package/src/ui/components/OxyAuthChooser.tsx

@@ -286,7 +286,7 @@ const OxyAuthChooser: React.FC<OxyAuthChooserProps> = ({
       if (!group || !context) return;
       const confirmed = await surfaces.confirm({
         title: t('accountSwitcher.confirms.removeContextTitle'),
-        message: t('accountSwitcher.confirms.removeContext', {
+        description: t('accountSwitcher.confirms.removeContext', {
           person: group.displayName,
           account: context.displayName,
         }),
@@ -313,7 +313,7 @@ const OxyAuthChooser: React.FC<OxyAuthChooserProps> = ({
       if (!group) return;
       const confirmed = await surfaces.confirm({
         title: t('accountSwitcher.confirms.removePrincipalTitle'),
-        message: t('accountSwitcher.confirms.removePrincipal', { name: group.displayName }),
+        description: t('accountSwitcher.confirms.removePrincipal', { name: group.displayName }),
         confirmLabel: t('common.actions.signOut'),
         cancelLabel: t('common.cancel'),
         destructive: true,

package/src/ui/components/OxyConsentScreen.tsx

@@ -96,8 +96,13 @@ const SCOPE_LABEL_KEYS: Readonly<Record<string, string>> = {
   'files:write': 'consent.scopes.filesWrite',
   'files:delete': 'consent.scopes.filesDelete',
   'webhooks:receive': 'consent.scopes.webhooksReceive',
-  'chat:completions': 'consent.scopes.chatCompletions',
-  'models:read': 'consent.scopes.modelsRead',
+  'inference:invoke': 'consent.scopes.inferenceInvoke',
+  'inference:models:read': 'consent.scopes.inferenceModelsRead',
+  'inference:usage:read': 'consent.scopes.inferenceUsageRead',
+  'inference:routing:read': 'consent.scopes.inferenceRoutingRead',
+  'inference:routing:write': 'consent.scopes.inferenceRoutingWrite',
+  'inference:providers:read': 'consent.scopes.inferenceProvidersRead',
+  'inference:providers:write': 'consent.scopes.inferenceProvidersWrite',
   'federation:write': 'consent.scopes.federationWrite',
 };
 

package/src/ui/components/OxyProvider.tsx

@@ -5,7 +5,6 @@ import { SafeAreaProvider } from 'react-native-safe-area-context';
 import type { OxyProviderProps } from '../types/navigation';
 import { OxyRuntimeProvider, type OxyRuntimeProviderProps } from '../context/OxyContext';
 import { QueryClientProvider, focusManager, onlineManager } from '@tanstack/react-query';
-import { BloomDialogProvider } from '@oxyhq/bloom/dialog';
 import { SurfaceProvider } from '@oxyhq/bloom/surfaces';
 import { ToastOutlet } from '@oxyhq/bloom/toast';
 import { logger as loggerUtil } from '@oxyhq/core';
@@ -284,31 +283,29 @@ const OxyProvider: FC<OxyProviderProps> = ({
     // duplicate scope that silently shadows the consumer's configuration.
     const coreContent = (
         <QueryClientProvider client={queryClient}>
-            <BloomDialogProvider>
-                <OxyRuntimeProvider
-                    oxyServices={oxyServices as OxyRuntimeProviderProps['oxyServices']}
-                    baseURL={baseURL}
-                    authWebUrl={authWebUrl}
-                    authRedirectUri={authRedirectUri}
-                    authorizeBaseUrl={authorizeBaseUrl}
-                    storageKeyPrefix={storageKeyPrefix}
-                    clientId={clientId}
-                    sessionMode={sessionMode}
-                    webAuthMode={webAuthMode}
-                    backgroundSession={backgroundSession}
-                    deviceCredentialStorage={deviceCredentialStorage}
-                    onAuthStateChange={onAuthStateChange as OxyRuntimeProviderProps['onAuthStateChange']}
-                >
-                    <SurfaceProvider>
-                        {requireAuth === 'off' ? (
-                            children
-                        ) : (
-                            <RequireOxyAuth prompt={requireAuth}>{children}</RequireOxyAuth>
-                        )}
-                    </SurfaceProvider>
-                    <ToastOutlet />
-                </OxyRuntimeProvider>
-            </BloomDialogProvider>
+            <OxyRuntimeProvider
+                oxyServices={oxyServices as OxyRuntimeProviderProps['oxyServices']}
+                baseURL={baseURL}
+                authWebUrl={authWebUrl}
+                authRedirectUri={authRedirectUri}
+                authorizeBaseUrl={authorizeBaseUrl}
+                storageKeyPrefix={storageKeyPrefix}
+                clientId={clientId}
+                sessionMode={sessionMode}
+                webAuthMode={webAuthMode}
+                backgroundSession={backgroundSession}
+                deviceCredentialStorage={deviceCredentialStorage}
+                onAuthStateChange={onAuthStateChange as OxyRuntimeProviderProps['onAuthStateChange']}
+            >
+                <SurfaceProvider>
+                    {requireAuth === 'off' ? (
+                        children
+                    ) : (
+                        <RequireOxyAuth prompt={requireAuth}>{children}</RequireOxyAuth>
+                    )}
+                </SurfaceProvider>
+                <ToastOutlet />
+            </OxyRuntimeProvider>
         </QueryClientProvider>
     );
 

package/src/ui/components/authChooser/TroubleDisclosure.tsx

@@ -6,21 +6,24 @@
  * creating an account — lives here, hidden until the user asks for it or the
  * chosen primary route fails.
  *
- * Two renderings, deliberately not one controlled component:
+ * Two renderings:
  *  - `revealed` (the primary route failed, or there IS no primary route): the
  *    alternatives ARE the surface's content now, so they render plainly. There
  *    is nothing left to hide them behind.
- *  - otherwise: Bloom's own `Collapsible`, whose trigger is the small
+ *  - otherwise: a single-item Bloom `Accordion`, whose trigger is the small
  *    "Having trouble?" affordance.
  *
- * Splitting on `revealed` is what keeps the open state where it belongs — inside
- * Bloom's uncontrolled disclosure — instead of forcing a hand-rolled controlled
- * copy of it here.
+ * The disclosure is CONTROLLED because Bloom 1.0.0's `Accordion` — which
+ * replaced the deleted `Collapsible` — takes `value`/`onValueChange` and has no
+ * uncontrolled mode. Splitting on `revealed` still matters: it decides whether
+ * a disclosure exists at all, so the open state below only ever describes the
+ * collapsed rendering.
  */
 
 import type React from 'react';
+import { useState } from 'react';
 import { View } from 'react-native';
-import { Collapsible } from '@oxyhq/bloom/collapsible';
+import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@oxyhq/bloom/accordion';
 import { SubtleLink } from './primitives';
 import { authChooserStyles as styles } from './styles';
 import type { OxySignInSurfaceAction, Theme, Translate } from './types';
@@ -38,7 +41,13 @@ interface TroubleDisclosureProps {
   t: Translate;
 }
 
+/** The accordion's single item. Its identity is never shown to the user. */
+const TROUBLE_ITEM = 'trouble';
+
 const TroubleDisclosure: React.FC<TroubleDisclosureProps> = ({ actions, revealed, theme, t }) => {
+  // Declared above the early return: hooks may not sit behind a conditional.
+  const [openItem, setOpenItem] = useState<string | string[] | undefined>(undefined);
+
   if (actions.length === 0) return null;
 
   const links = (
@@ -59,14 +68,20 @@ const TroubleDisclosure: React.FC<TroubleDisclosureProps> = ({ actions, revealed
   if (revealed) return links;
 
   return (
-    <Collapsible
-      title={t('accountSwitcher.havingTrouble')}
+    <Accordion
+      type="single"
+      value={openItem}
+      onValueChange={setOpenItem}
       style={styles.troubleTrigger}
-      titleStyle={[styles.linkText, { color: theme.colors.textSecondary }]}
       testID="trouble-disclosure"
     >
-      {links}
-    </Collapsible>
+      <AccordionItem value={TROUBLE_ITEM}>
+        <AccordionTrigger textStyle={[styles.linkText, { color: theme.colors.textSecondary }]}>
+          {t('accountSwitcher.havingTrouble')}
+        </AccordionTrigger>
+        <AccordionContent>{links}</AccordionContent>
+      </AccordionItem>
+    </Accordion>
   );
 };
 

package/src/ui/screens/AccountMembersScreen.tsx

@@ -218,7 +218,7 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
   const confirmRemove = useCallback(async (member: AccountMember) => {
     const confirmed = await surfaces.confirm({
       title: t('accounts.members.removeConfirm.title') || 'Remove member',
-      message:
+      description:
         t('accounts.members.removeConfirm.description')
         || 'Remove this member from the account? They will lose all access.',
       confirmLabel: t('accounts.members.actions.remove') || 'Remove',
@@ -231,7 +231,7 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
   const confirmTransfer = useCallback(async (member: AccountMember) => {
     const confirmed = await surfaces.confirm({
       title: t('accounts.members.transferConfirm.title') || 'Transfer ownership',
-      message:
+      description:
         t('accounts.members.transferConfirm.description')
         || 'Transfer ownership of this account to this member? You will be demoted to admin. This cannot be undone.',
       confirmLabel: t('accounts.members.actions.transfer') || 'Transfer ownership',

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -120,7 +120,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, nav
   const handleArchive = useCallback(async () => {
     const confirmed = await surfaces.confirm({
       title: t('accounts.settings.archive.confirmTitle') || 'Archive account',
-      message:
+      description:
         t('accounts.settings.archive.confirmDescription')
         || 'Archive this account? It will be deactivated and its members will lose access.',
       confirmLabel: t('accounts.settings.archive.title') || 'Archive account',

package/src/ui/screens/AccountVerificationScreen.tsx

@@ -54,7 +54,7 @@ const AccountVerificationScreen: React.FC<BaseScreenProps> = ({
             // returns; there is no negative action.
             await surfaces.confirm({
                 title: t('accountVerification.successTitle') || 'Request Submitted',
-                message:
+                description:
                     t('accountVerification.successMessage') || `Your verification request has been submitted. Request ID: ${result.requestId}`,
                 confirmLabel: t('accountVerification.ok') || 'OK',
                 hideCancel: true,

package/src/ui/screens/ChangeAvatarScreen.tsx

@@ -282,7 +282,7 @@ const ChangeAvatarScreen: React.FC<BaseScreenProps> = ({ navigate, dismiss }) =>
     const removeCurrentPhoto = useCallback(async () => {
         const confirmed = await bloomSurfaces.confirm({
             title: t('changeAvatar.remove.confirmTitle'),
-            message: t('changeAvatar.remove.confirmMessage'),
+            description: t('changeAvatar.remove.confirmMessage'),
             confirmLabel: t('changeAvatar.remove.confirmLabel'),
             cancelLabel: t('common.cancel'),
             destructive: true,

package/src/ui/screens/ConnectedAppsScreen.tsx

@@ -65,7 +65,7 @@ const ConnectedAppsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) =>
         async (app: ConnectedApp) => {
             const confirmed = await surfaces.confirm({
                 title: t('connectedApps.confirm.title') || 'Revoke access',
-                message:
+                description:
                     t('connectedApps.confirm.message', { name: app.name })
                     || `Revoke ${app.name}'s access to your Oxy account?`,
                 confirmLabel: t('common.revoke') || 'Revoke',

package/src/ui/screens/FileManagementScreen.tsx

@@ -447,7 +447,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
     const confirmFileDelete = useCallback(async (fileId: string, filename: string) => {
         const confirmed = await surfaces.confirm({
             title: t('fileManagement.deleteFile') || 'Delete File',
-            message: t('fileManagement.confirms.deleteFile', { filename }),
+            description: t('fileManagement.confirms.deleteFile', { filename }),
             confirmLabel: t('fileManagement.confirm') || 'Delete',
             cancelLabel: t('common.cancel') || 'Cancel',
             destructive: true,
@@ -484,7 +484,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
 
         const confirmed = await surfaces.confirm({
             title: t('fileManagement.deleteFiles') || 'Delete Files',
-            message: t('fileManagement.confirms.deleteFiles', { count: selectedIds.size }),
+            description: t('fileManagement.confirms.deleteFiles', { count: selectedIds.size }),
             confirmLabel: t('fileManagement.confirm') || 'Delete',
             cancelLabel: t('common.cancel') || 'Cancel',
             destructive: true,

package/src/ui/screens/HistoryViewScreen.tsx

@@ -43,7 +43,7 @@ const HistoryViewScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => {
     const handleDeleteLast15Minutes = useCallback(async () => {
         const confirmed = await surfaces.confirm({
             title: t('history.deleteLast15Minutes.title') || 'Delete Last 15 Minutes',
-            message: t('history.deleteLast15Minutes.confirm') || 'Delete last 15 minutes of history?',
+            description: t('history.deleteLast15Minutes.confirm') || 'Delete last 15 minutes of history?',
             confirmLabel: t('common.actions.delete') || 'Delete',
             cancelLabel: t('common.cancel') || 'Cancel',
             destructive: true,
@@ -64,7 +64,7 @@ const HistoryViewScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => {
     const handleClearAll = useCallback(async () => {
         const confirmed = await surfaces.confirm({
             title: t('history.clearAll.title') || 'Clear All History',
-            message: t('history.clearAll.confirm') || 'Clear all history? This cannot be undone.',
+            description: t('history.clearAll.confirm') || 'Clear all history? This cannot be undone.',
             confirmLabel: t('history.clearAll.title') || 'Clear All',
             cancelLabel: t('common.cancel') || 'Cancel',
             destructive: true,

package/src/ui/screens/ManageAccountScreen.tsx

@@ -141,7 +141,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
         }
         const confirmed = await surfaces.confirm({
             title: t('common.actions.signOut') || 'Sign out',
-            message: t('common.confirms.signOut') || 'Are you sure you want to sign out?',
+            description: t('common.confirms.signOut') || 'Are you sure you want to sign out?',
             confirmLabel: t('common.actions.signOut') || 'Sign out',
             cancelLabel: t('common.cancel') || 'Cancel',
             destructive: true,
@@ -168,7 +168,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
         }
         const confirmed = await surfaces.confirm({
             title: t('manageAccount.confirms.removeDeviceTitle') || 'Remove device',
-            message:
+            description:
                 t('manageAccount.confirms.removeDevice', { name: device.deviceName })
                 || `Sign out from "${device.deviceName}"?`,
             confirmLabel: t('common.remove') || 'Remove',
@@ -203,7 +203,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
         ).length;
         const confirmed = await surfaces.confirm({
             title: t('manageAccount.confirms.signOutAllDevicesTitle') || 'Sign out of all other devices',
-            message:
+            description:
                 t('manageAccount.confirms.signOutAllDevices', { count: otherDeviceCount })
                 || `End ${otherDeviceCount} other device session(s)? This won't sign you out here.`,
             confirmLabel: t('common.actions.signOut') || 'Sign out',

package/src/ui/screens/PremiumSubscriptionScreen.tsx

@@ -441,7 +441,7 @@ const PremiumSubscriptionScreen: React.FC<BaseScreenProps> = ({
     const handleCancelSubscription = useCallback(async () => {
         const confirmed = await surfaces.confirm({
             title: t('premium.confirms.cancelSubTitle') || 'Cancel Subscription',
-            message: t('premium.confirms.cancelSub') || 'Are you sure you want to cancel your subscription? You will lose access to premium features at the end of your current billing period.',
+            description: t('premium.confirms.cancelSub') || 'Are you sure you want to cancel your subscription? You will lose access to premium features at the end of your current billing period.',
             confirmLabel: t('premium.actions.cancelSubBtn') || 'Cancel Subscription',
             cancelLabel: t('common.cancel') || 'Cancel',
             destructive: true,
@@ -532,7 +532,7 @@ const PremiumSubscriptionScreen: React.FC<BaseScreenProps> = ({
         const feature = individualFeatures.find(f => f.id === featureId);
         const confirmed = await surfaces.confirm({
             title: t('premium.confirms.unsubscribeFeatureTitle') || 'Unsubscribe from Feature',
-            message: feature
+            description: feature
                 ? (t('premium.confirms.unsubscribeFeature', { name: feature.name }) ?? `Are you sure you want to unsubscribe from ${feature.name}?`)
                 : '',
             confirmLabel: t('premium.actions.unsubscribe') || 'Unsubscribe',

package/src/ui/screens/trust/TrustCenterScreen.tsx

@@ -89,7 +89,7 @@ const TrustCenterScreen: React.FC<BaseScreenProps> = ({
                     </Text>
                     {resolvedTrustTierLabel ? (
                         <Chip
-                            variant="soft"
+                            variant="subtle"
                             color="primary"
                             startIcon={
                                 <Ionicons
@@ -217,7 +217,7 @@ const TrustCenterScreen: React.FC<BaseScreenProps> = ({
                                 }
                                 rightElement={
                                     <Chip
-                                        variant="soft"
+                                        variant="subtle"
                                         size="small"
                                         color={entry.points > 0 ? 'success' : 'error'}
                                     >

package/src/ui/screens/trust/TrustLeaderboardScreen.tsx

@@ -104,7 +104,7 @@ const TrustLeaderboardScreen: React.FC<BaseScreenProps> = ({ navigate }) => {
                             {displayName}
                         </Text>
                         <View style={styles.tierRow} className="mt-space-4">
-                            <Chip size="small" variant="soft" color={isPodium ? 'primary' : 'default'}>
+                            <Chip size="small" variant="subtle" color={isPodium ? 'primary' : 'default'}>
                                 {trustTierLabel(locale, item.trustTier)}
                             </Chip>
                         </View>

package/src/ui/screens/trust/TrustRulesScreen.tsx

@@ -92,7 +92,7 @@ const TrustRulesScreen: React.FC<BaseScreenProps> = () => {
                                         showChevron={false}
                                         rightElement={
                                             <Chip
-                                                variant="soft"
+                                                variant="subtle"
                                                 size="small"
                                                 color={rule.points > 0 ? 'success' : rule.points < 0 ? 'error' : 'default'}
                                             >