@oxy.so/services 6.1.0 → 8.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxy.so/services",
-  "version": "6.1.0",
+  "version": "8.0.0",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -155,8 +155,7 @@
   },
   "dependencies": {
     "@expo/config-plugins": "57.0.9",
-    "@oxy.so/contracts": "^2.2.0",
-    "@simplewebauthn/browser": "^13.3.0",
+    "@oxy.so/contracts": "^3.0.0",
     "color": "^4.2.3"
   },
   "devDependencies": {
@@ -164,7 +163,7 @@
     "@commitlint/cli": "^21.2.1",
     "@commitlint/config-conventional": "^21.2.0",
     "@expo/vector-icons": "^15.0.3",
-    "@oxy.so/core": "1.18.0",
+    "@oxy.so/core": "3.0.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^12.0.1",
     "@react-native/babel-preset": "^0.86.2",
@@ -216,7 +215,7 @@
   "peerDependencies": {
     "@expo/vector-icons": "^15.0.3",
     "@oxy.so/bloom": "^4.26.0",
-    "@oxy.so/core": "^1.18.0",
+    "@oxy.so/core": "^3.0.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": ">=11.4.1",
     "@tanstack/query-async-storage-persister": "^5.101",

package/src/assets/fonts/icons/manifest.json

@@ -5,15 +5,14 @@
     "ionicons": {
       "fontFamily": "OxyServicesIonicons",
       "file": "src/assets/fonts/icons/OxyServicesIonicons.ttf",
-      "bytes": 44452,
-      "sha256": "97cf3d3cdc13101469ee334ccd9a61d36cb5290094a3ea8c222a05da7ead7530",
+      "bytes": 43004,
+      "sha256": "29d66596f671e64b76f29def45970f78095916e8e24632f6643c2578a286a044",
       "names": [
         "add",
         "add-circle-outline",
         "alert",
         "alert-circle",
         "alert-circle-outline",
-        "analytics",
         "apps",
         "archive",
         "arrow-back",
@@ -21,8 +20,6 @@
         "arrow-forward",
         "arrow-up",
         "at",
-        "bookmark",
-        "briefcase",
         "briefcase-outline",
         "bug",
         "bulb",
@@ -52,7 +49,6 @@
         "code",
         "cog",
         "cog-outline",
-        "color-palette",
         "construct-outline",
         "copy-outline",
         "cube-outline",
@@ -82,7 +78,6 @@
         "grid",
         "hand-left",
         "hardware-chip-outline",
-        "headset",
         "heart",
         "heart-outline",
         "help-circle",
@@ -128,7 +123,6 @@
         "school-outline",
         "search",
         "search-outline",
-        "send",
         "server",
         "settings",
         "share-outline",
@@ -157,8 +151,8 @@
     "materialCommunityIcons": {
       "fontFamily": "OxyServicesMaterialCommunityIcons",
       "file": "src/assets/fonts/icons/OxyServicesMaterialCommunityIcons.ttf",
-      "bytes": 29976,
-      "sha256": "46cbd591663526f6b23df1c721d894a76f1b5a530bd03088795580716811c35b",
+      "bytes": 28904,
+      "sha256": "cec3d91711dbaa11b910569742658d81536567dcba1f4ddb83e1634282f88d8e",
       "names": [
         "account",
         "account-circle",
@@ -185,8 +179,6 @@
         "bell",
         "bell-outline",
         "bio",
-        "bookmark",
-        "briefcase",
         "briefcase-outline",
         "bug",
         "bullhorn",
@@ -205,7 +197,6 @@
         "cellphone-message",
         "cellphone-screenshot",
         "chart-line",
-        "chat",
         "check-all",
         "check-circle",
         "chevron-down",
@@ -262,13 +253,11 @@
         "gift",
         "gift-outline",
         "grid",
-        "headset",
         "heart",
         "heart-outline",
         "help-circle",
         "help-circle-outline",
         "history",
-        "hub",
         "image",
         "image-multiple-outline",
         "image-outline",
@@ -278,7 +267,6 @@
         "label",
         "leaf",
         "library",
-        "lightbulb-on",
         "link",
         "link-variant",
         "loading",
@@ -290,8 +278,6 @@
         "map-marker-outline",
         "message",
         "message-outline",
-        "message-text",
-        "minus",
         "minus-circle",
         "motion",
         "music-note-outline",
@@ -322,7 +308,6 @@
         "scale",
         "school-outline",
         "security",
-        "send",
         "server",
         "share-outline",
         "shield",
@@ -365,5 +350,5 @@
     }
   },
   "glyphMapsFile": "src/ui/icons/subsetGlyphMaps.ts",
-  "glyphMapsSha256": "830b8f898ed83c963906097d4a922941c2ca3b5da4e455ca1c83ea9a9cddb5f3"
+  "glyphMapsSha256": "f8808464ce66ad6b045c08d127f1d8e7cb0215ac562b4bd0afeeea7e3289ec46"
 }

package/src/index.ts

@@ -118,7 +118,7 @@ export {
     useRecentSecurityActivity,
     useInfiniteSecurityActivity,
 } from './ui/hooks/queries/useSecurityQueries';
-export { useAuthMethods } from './ui/hooks/queries/useAuthMethods';
+export { useAuthMethods, useSignInMethods } from './ui/hooks/queries/useAuthMethods';
 export {
     useUserSubscription,
     useUserPayments,
@@ -368,17 +368,17 @@ export { OxySignUpPanel } from './ui/components/signIn/OxySignUpPanel';
 export type { OxySignUpPanelProps } from './ui/components/signIn/OxySignUpPanel';
 export { OxyAccountPicker } from './ui/components/signIn/OxyAccountPicker';
 export type { OxyAccountPickerProps } from './ui/components/signIn/OxyAccountPicker';
-// auth.oxy.so's account pages (ADR 0029 D3): a passkey account is created,
-// recovered through its recovery email, deleted with its passkey, and linked
-// to Commons there.
-export { OxyCreateAccountPanel } from './ui/components/signIn/OxyCreateAccountPanel';
-export type { OxyCreateAccountPanelProps } from './ui/components/signIn/OxyCreateAccountPanel';
-export { OxyRecoverAccountPanel } from './ui/components/signIn/OxyRecoverAccountPanel';
-export type { OxyRecoverAccountPanelProps } from './ui/components/signIn/OxyRecoverAccountPanel';
+// The account's own sign-in security, for its settings (the Accounts app, and
+// the account dialog's "Manage your account" through the `DeleteAccount`,
+// `LinkCommons`, `SignInPassword` and `SignInAuthenticator` routes).
 export { OxyDeleteAccountPanel } from './ui/components/signIn/OxyDeleteAccountPanel';
 export type { OxyDeleteAccountPanelProps } from './ui/components/signIn/OxyDeleteAccountPanel';
 export { OxyLinkCommonsPanel } from './ui/components/signIn/OxyLinkCommonsPanel';
 export type { OxyLinkCommonsPanelProps } from './ui/components/signIn/OxyLinkCommonsPanel';
+export { OxyPasswordPanel } from './ui/components/signIn/OxyPasswordPanel';
+export type { OxyPasswordPanelProps } from './ui/components/signIn/OxyPasswordPanel';
+export { OxyAuthenticatorPanel } from './ui/components/signIn/OxyAuthenticatorPanel';
+export type { OxyAuthenticatorPanelProps } from './ui/components/signIn/OxyAuthenticatorPanel';
 export {
   OxyAuthScreen,
   OxyAuthScreenHeader,

package/src/ui/boot/__tests__/coldBootNoIdpRedirect.test.ts

@@ -18,10 +18,10 @@
  * navigation the boot could ever have performed.
  */
 
-import type { AuthStateStore, PersistedAuthState, SessionClient } from '@oxy.so/core';
+import type { AuthStateStore, PersistedAuthState, SessionClient } from '@oxy.so/core/session';
 
-jest.mock('@oxy.so/core', () => {
-  const actual = jest.requireActual('@oxy.so/core');
+jest.mock('@oxy.so/core/session', () => {
+  const actual = jest.requireActual('@oxy.so/core/session');
   return {
     __esModule: true,
     ...actual,
@@ -43,7 +43,7 @@ jest.mock('../../utils/oauthReturn', () => {
   };
 });
 
-import { runSessionColdBoot } from '@oxy.so/core';
+import { runSessionColdBoot } from '@oxy.so/core/session';
 import { redirectToAuthorize } from '../../components/oauthNavigation';
 import { tryCompleteOAuthReturn } from '../../utils/oauthReturn';
 import { runProviderColdBoot, type RunProviderColdBootOptions } from '../runProviderColdBoot';

package/src/ui/boot/runProviderColdBoot.ts

@@ -1,12 +1,6 @@
-import {
-  logger as loggerUtil,
-  runSessionColdBoot,
-  type AuthStateStore,
-  type IdentityBinding,
-  type OxyServices,
-  type SessionMode,
-} from '@oxy.so/core';
-import type { SessionClient } from '@oxy.so/core';
+import { logger as loggerUtil, type OxyServices } from '@oxy.so/core';
+import { runSessionColdBoot, type AuthStateStore, type IdentityBinding, type SessionMode } from '@oxy.so/core/session';
+import type { SessionClient } from '@oxy.so/core/session';
 import { loadPersistedDeviceCredential } from '../utils/deviceCredential';
 import { createPlatformSharedDeviceCredentialStore } from '../session/sharedDeviceCredentialStore';
 import { tryCompleteOAuthReturn } from '../utils/oauthReturn';

package/src/ui/components/OxyAccountDialogScreen.tsx

@@ -4,9 +4,8 @@
  * The header (title/subtitle per view + back button) around the headless chooser
  * logic, which lives in `OxyAuthChooser` — the account switcher, sign-in,
  * sign-up, and QR views are ALL there, extracted so the same chooser can be
- * mounted bare by a future host with no Dialog chrome (e.g. an auth.oxy.so hub
- * page driving the cross-origin passkey popup, b2). This file owns ONLY the
- * header + the scroll body.
+ * mounted bare by a host with no Dialog chrome (auth.oxy.so's `/login`). This
+ * file owns ONLY the header + the scroll body.
  *
  * It is presented as the `AccountDialog` route on the shared Bloom SURFACE STACK
  * (`@oxy.so/bloom/surfaces`) — `OxyContext.openAccountDialog` calls

package/src/ui/components/OxyAuthChooser.tsx

@@ -6,9 +6,9 @@
  * `@oxy.so/core` (bound via `useSyncExternalStore`) — the same data/state
  * machine {@link OxyAccountDialogScreen} renders, extracted so it can be mounted in
  * TWO places: wrapped in Bloom's `<Dialog>` by `OxyAccountDialogScreen` (the normal
- * in-app surface), and mounted bare by a future auth.oxy.so hub page for the
- * cross-origin passkey popup (b2) — same chooser, two hosts, two completion
- * strategies via the `onComplete` prop. Neither host duplicates view logic.
+ * in-app surface), and mountable bare by any other host — same chooser, two
+ * completion strategies via the `onComplete` prop. Neither host duplicates view
+ * logic.
  *
  * This file owns WIRING only: the controller binding, the action handlers, and
  * which view module renders. Every view lives in `./authChooser/`, one
@@ -16,15 +16,16 @@
  *
  *  - `accounts` → `AccountsMenuView` — the signed-in Oxy account menu.
  *  - `add` / `signin` → `OxySignInPanel` — THE sign-in screen, the one
- *    auth.oxy.so renders too: the device's accounts, then "Continue with
- *    Oxy" (on the web, auth.oxy.so's window over the app).
+ *    auth.oxy.so renders too: the device's accounts, then the Commons way in
+ *    (the embedded QR, or "Continue with Oxy"), then an email or username —
+ *    a code or link by email, a password, the authenticator — all in place.
  *  - `qr` → `SignInRequestView` — the ACTIVE REQUEST: the controller-bound
  *    wiring over the shared, presentational `OxySignInRequestSurface` (the same
  *    component the auth.oxy.so IdP mounts from its OAuth-bound request). It maps
  *    `snapshot.signIn` onto that surface's props; alternatives stay behind
  *    "Having trouble?" until the chosen route reports `routeFailed`.
- *  - `signup` → `OxySignUpPanel` — account creation: auth.oxy.so's window on
- *    the web, Commons on native.
+ *  - `signup` → `OxySignUpPanel` — account creation, in place: a username, an
+ *    email and its code (Commons stays the recommended way to hold a key).
  *
  * Per-account color re-theming uses Bloom's `APP_COLOR_PRESETS` + `BloomColorScope`
  * (same visual language auth.oxy.so uses). Base theming is `useTheme()` + a
@@ -38,7 +39,7 @@ import { Linking, Platform } from 'react-native';
 import { toast } from '@oxy.so/bloom/toast';
 import { surfaces } from '@oxy.so/bloom/surfaces';
 import { useTheme } from '@oxy.so/bloom/theme';
-import { getNormalizedUserHandle, type OxyAuthScreen, type User } from '@oxy.so/core';
+import { getNormalizedUserHandle, type User } from '@oxy.so/core';
 import { useQueryClient } from '@tanstack/react-query';
 import { useOxy } from '../context/OxyContext';
 import { useDeviceSwitcher } from '../hooks/useDeviceSwitcher';
@@ -47,7 +48,6 @@ import {
   getAccountDialogConsumerHooks,
   subscribeToAccountDialogConsumerHooks,
 } from '../navigation/accountDialogManager';
-import { isWebBrowser } from '../utils/isWebBrowser';
 import { getCommonsAcquisitionUrl } from '../utils/commonsStoreLinks';
 import { useAccountStorageUsage } from '../hooks/queries/useServicesQueries';
 import AccountsMenuView from './authChooser/AccountsMenuView';
@@ -59,7 +59,6 @@ import {
   type AccountStorageModel,
   type AccountsMenuActions,
   type OxyAuthChooserHandlers,
-  type PasskeyMode,
   type SignInAlternatives,
 } from './authChooser/types';
 import { EMPTY_ACCOUNT_DIALOG_SNAPSHOT } from '../hooks/accountDialogSnapshot';
@@ -102,7 +101,6 @@ const OxyAuthChooser: React.FC<OxyAuthChooserProps> = ({ onComplete }) => {
     logout,
     openAvatarPicker,
     user,
-    continueOnAuth,
   } = useOxy();
   const theme = useTheme();
   const { t } = useI18n();
@@ -112,23 +110,6 @@ const OxyAuthChooser: React.FC<OxyAuthChooserProps> = ({ onComplete }) => {
   // so the two switchers cannot drift.
   const { principals } = useDeviceSwitcher();
 
-  // On the web every sign-in and sign-up runs in auth.oxy.so's window over the
-  // app (`continueOnAuth`): the passkey belongs to that origin, and the
-  // browser's session lives there, shared by every Oxy app. Native has no
-  // passkey path: Commons owns identity there ('none').
-  const passkeyMode = useMemo<PasskeyMode>(() => (isWebBrowser() ? 'hub' : 'none'), []);
-
-  /** auth.oxy.so's window; this surface closes once it signs the app in. */
-  const openOnOxy = useCallback(
-    (screen: OxyAuthScreen) => {
-      void continueOnAuth(screen).then((result) => {
-        if (result.status === 'signed-in') onComplete?.();
-        else if (result.status === 'failed') toast.error(t('signin.errors.failed'));
-      });
-    },
-    [continueOnAuth, onComplete, t],
-  );
-
   // Bind the headless controller. `getSnapshot` returns a stable reference
   // between changes, so it is `useSyncExternalStore`-safe. Guard the no-provider
   // loading state (`controller` is `null`) with an inert store.
@@ -365,15 +346,12 @@ const OxyAuthChooser: React.FC<OxyAuthChooserProps> = ({ onComplete }) => {
   // surface and hides them behind "Having trouble?" (issue #691).
   const alternatives = useMemo<SignInAlternatives>(
     () => ({
-      passkeyAvailable: passkeyMode !== 'none',
-      // auth.oxy.so asserts the passkey, in its window.
-      onSignInWithPasskey: () => openOnOxy('signin'),
       onShowQr: () => void controller?.showQr(),
       onGetCommons: () => openExternal(getCommonsAcquisitionUrl(Platform.OS)),
-      // Web: the account is made on auth.oxy.so. Native: Commons makes it.
-      onCreateAccount: () => (passkeyMode === 'hub' ? openOnOxy('signup') : controller?.startSignup()),
+      // Made right here, on every platform: a username, an email and its code.
+      onCreateAccount: () => controller?.startSignup(),
     }),
-    [passkeyMode, controller, openExternal, openOnOxy],
+    [controller, openExternal],
   );
 
   // Real storage usage for the account menu's "Oxy storage" block. Disabled
@@ -460,7 +438,7 @@ const OxyAuthChooser: React.FC<OxyAuthChooserProps> = ({ onComplete }) => {
   }
 
   if (view === 'signup') {
-    return <OxySignUpPanel onSignIn={() => controller.setView('signin')} onCreateOnWeb={() => openOnOxy('signup')} />;
+    return <OxySignUpPanel host="dialog" onSignedIn={() => onComplete?.()} onSignIn={() => controller.setView('signin')} />;
   }
 
   return (
@@ -495,7 +473,7 @@ function buildHero(
   return {
     displayName,
     addressLine,
-    avatarUrl: user.avatar ? oxyServices.getFileDownloadUrl(user.avatar, 'thumb') : undefined,
+    avatarUrl: user.avatar ? oxyServices.assets.publicUrl(user.avatar, 'thumb') : undefined,
     accentHex: resolveAccentHex(user.color ?? null, fallbackAccent),
   };
 }

package/src/ui/components/OxySignInButton.tsx

@@ -228,7 +228,7 @@ export const OxySignInButton: React.FC<OxySignInButtonProps> = ({
         if (cached && cached.clientId === clientId && cached.oxyServices === oxyServices) {
             return cached.promise;
         }
-        const promise = oxyServices.getPublicApplication(clientId).catch((error) => {
+        const promise = oxyServices.apps.getPublic(clientId).catch((error) => {
             // Only clear if this is still the live entry (a later resolve may have
             // replaced it after a clientId/oxyServices change).
             if (appResolutionRef.current?.promise === promise) {

package/src/ui/components/OxySignInRequestSurface.tsx

@@ -43,7 +43,8 @@ import { View } from 'react-native';
 import { Button } from '@oxy.so/bloom/button';
 import { useTheme } from '@oxy.so/bloom/theme';
 import { Text } from '@oxy.so/bloom/typography';
-import type { CommonsDeliveryRoute, SignInProgress } from '@oxy.so/core';
+import type { CommonsDeliveryRoute } from '@oxy.so/core';
+import type { SignInProgress } from '@oxy.so/core/session';
 import { useI18n } from '../hooks/useI18n';
 import TroubleDisclosure from './authChooser/TroubleDisclosure';
 import { SubtleLink } from './authChooser/primitives';

package/src/ui/components/ProfileButton.tsx

@@ -91,7 +91,7 @@ const ProfileButton: React.FC<ProfileButtonProps> = ({
     }, [onNavigateManage, onAddAccount, onNavigateProfile, menuItems]);
 
     const avatarUrl = useMemo(
-        () => (user?.avatar ? oxyServices.getFileDownloadUrl(user.avatar, 'thumb') : undefined),
+        () => (user?.avatar ? oxyServices.assets.publicUrl(user.avatar, 'thumb') : undefined),
         [user?.avatar, oxyServices],
     );
 

package/src/ui/components/SurfaceScreen.tsx

@@ -24,6 +24,7 @@ import {
   SurfaceHeaderContext,
   type SurfaceHeaderContent,
 } from '../hooks/useSurfaceHeader';
+import { SurfaceFrameWidthContext } from '../hooks/useSurfaceFrameWidth';
 import type { BaseScreenProps } from '../types/navigation';
 
 /** Error boundary catching screen render failures, so one bad screen cannot blank the surface. */
@@ -213,17 +214,22 @@ function SurfaceScreen({
   // container to a near-full-height, wider card and shrinks back on exit. Resolve
   // its viewport-relative height to px here (the Dialog clamps to the viewport).
   const { height: viewportHeight } = useWindowDimensions();
+  //
+  // A screen may also ask for a width of its own (`useSurfaceFrameWidth`) when
+  // its views differ in width; the width joins the frame's identity so each
+  // change morphs.
+  const [screenWidth, setScreenWidth] = useState<number | null>(null);
   const frameSize = useMemo(() => {
     const spec = config.frameSize;
-    if (!spec) return undefined;
+    if (!spec && screenWidth === null) return undefined;
     const height =
-      spec.heightRatio !== undefined ? Math.round(viewportHeight * spec.heightRatio) : undefined;
-    return { height, maxWidth: spec.maxWidth };
-  }, [config.frameSize, viewportHeight]);
+      spec?.heightRatio !== undefined ? Math.round(viewportHeight * spec.heightRatio) : undefined;
+    return { height, maxWidth: screenWidth ?? spec?.maxWidth };
+  }, [config.frameSize, viewportHeight, screenWidth]);
   useDialogFrame(
     useMemo(
-      () => ({ key: `${top.route}#${top.step}`, morph: config.morph, size: frameSize }),
-      [top.route, top.step, config.morph, frameSize],
+      () => ({ key: `${top.route}#${top.step}#${screenWidth ?? ''}`, morph: config.morph, size: frameSize }),
+      [top.route, top.step, screenWidth, config.morph, frameSize],
     ),
   );
   // Show a back affordance whenever the surface can navigate back — either an
@@ -273,11 +279,13 @@ function SurfaceScreen({
 
   return (
     <SurfaceHeaderContext.Provider value={headerContext}>
-      <ScreenErrorBoundary screenName={top.route}>
-        <Suspense fallback={<ScreenPending />}>
-          <ScreenComponent {...screenProps} />
-        </Suspense>
-      </ScreenErrorBoundary>
+      <SurfaceFrameWidthContext.Provider value={setScreenWidth}>
+        <ScreenErrorBoundary screenName={top.route}>
+          <Suspense fallback={<ScreenPending />}>
+            <ScreenComponent {...screenProps} />
+          </Suspense>
+        </ScreenErrorBoundary>
+      </SurfaceFrameWidthContext.Provider>
     </SurfaceHeaderContext.Provider>
   );
 }

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

@@ -44,12 +44,7 @@ import { PressableScale } from '@oxy.so/bloom/pressable-scale';
 import { CompositionBar, type CompositionCategory } from '@oxy.so/bloom/composition-bar';
 import { SettingsListGroup, SettingsListItem } from '@oxy.so/bloom/settings-list';
 import { Text } from '@oxy.so/bloom/typography';
-import {
-  showsPrincipalHeaders,
-  type AccountDialogSnapshot,
-  type SwitcherContextRow,
-  type SwitcherPrincipalRow,
-} from '@oxy.so/core';
+import { showsPrincipalHeaders, type AccountDialogSnapshot, type SwitcherContextRow, type SwitcherPrincipalRow } from '@oxy.so/core/session';
 import AvatarCameraBadge from '../AvatarCameraBadge';
 import { authChooserStyles as styles } from './styles';
 import {

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

@@ -9,9 +9,8 @@
  * only the account dialog knows:
  *
  *  - which of the controller's facts map onto the surface's props;
- *  - which alternatives are genuine ones for the CURRENT presentation (the
- *    passkey ceremony is pointless once the request is already being confirmed,
- *    and a QR link is redundant while the QR itself is the primary visual);
+ *  - which alternatives are genuine ones for the CURRENT presentation (a QR
+ *    link is redundant while the QR itself is the primary visual);
  *  - the one piece of local intent the controller has no opinion on: leaving the
  *    acquisition surface via "I have Commons on another device".
  *
@@ -22,7 +21,7 @@
 
 import type React from 'react';
 import { useState } from 'react';
-import type { AccountDialogSnapshot } from '@oxy.so/core';
+import type { AccountDialogSnapshot } from '@oxy.so/core/session';
 import OxySignInRequestSurface from '../OxySignInRequestSurface';
 import type { OxySignInSurfaceAction, SignInAlternatives, Translate } from './types';
 
@@ -50,24 +49,9 @@ const SignInRequestView: React.FC<SignInRequestViewProps> = ({
   // leads — until the user explicitly asks for the QR anyway.
   const acquiring = !failed && commonsAvailability === 'unavailable' && !qrRequested;
 
-  // A ceremony is pointless once the request is already being confirmed, and a
-  // ceremony FAILURE is toasted by the container — this link never renders an
-  // error of its own (owner mandate).
-  const passkeyAction: OxySignInSurfaceAction[] =
-    alternatives.passkeyAvailable && signIn.phase !== 'authorized' && signIn.phase !== 'completed'
-      ? [
-          {
-            key: 'passkey-signin-link',
-            label: t('accountSwitcher.useIdentityOnDevice'),
-            onPress: alternatives.onSignInWithPasskey,
-          },
-        ]
-      : [];
-
   const troubleActions = ((): OxySignInSurfaceAction[] => {
-    // Nothing about the chosen route is actionable any more — only the
-    // authentication alternatives are.
-    if (failed) return passkeyAction;
+    // Nothing about the chosen route is actionable any more: "Try again" is.
+    if (failed) return [];
     if (acquiring) {
       return [
         {
@@ -75,7 +59,6 @@ const SignInRequestView: React.FC<SignInRequestViewProps> = ({
           label: t('accountSwitcher.showQrAnyway'),
           onPress: () => setQrRequested(true),
         },
-        ...passkeyAction,
       ];
     }
     return [
@@ -89,7 +72,6 @@ const SignInRequestView: React.FC<SignInRequestViewProps> = ({
               onPress: alternatives.onShowQr,
             },
           ]),
-      ...passkeyAction,
       {
         key: 'get-commons-link',
         label: t('accountSwitcher.getCommons'),

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

@@ -2,7 +2,7 @@
  * The "Having trouble?" progressive disclosure (issue #691, Phase 5).
  *
  * The normal sign-in surface presents ONE primary action. Every alternative —
- * scanning a QR from another device, a passkey on this device, getting Commons,
+ * scanning a QR from another device, getting Commons,
  * creating an account — lives here, hidden until the user asks for it or the
  * chosen primary route fails.
  *

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

@@ -10,7 +10,7 @@ import MaterialCommunityIcons from '../../icons/MaterialCommunityIcons';
 import { Avatar } from '@oxy.so/bloom/avatar';
 import { BloomColorScope } from '@oxy.so/bloom/theme';
 import { Text } from '@oxy.so/bloom/typography';
-import type { SwitcherContextRow } from '@oxy.so/core';
+import type { SwitcherContextRow } from '@oxy.so/core/session';
 import { authChooserStyles as styles } from './styles';
 import { resolveAccentHex, toPreset, type Theme } from './types';
 

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

@@ -19,7 +19,8 @@ import QRCode from 'react-native-qrcode-svg';
 import { Button } from '@oxy.so/bloom/button';
 import { useTheme } from '@oxy.so/bloom/theme';
 import { Text } from '@oxy.so/bloom/typography';
-import type { CommonsDeliveryRoute, SignInProgress } from '@oxy.so/core';
+import type { CommonsDeliveryRoute } from '@oxy.so/core';
+import type { SignInProgress } from '@oxy.so/core/session';
 import { authChooserStyles as styles } from './styles';
 import type { Theme, Translate } from './types';
 

package/src/ui/components/authChooser/signInFailureMessage.ts

@@ -6,7 +6,7 @@
  * raw `signIn.error` is English or a server string, kept for diagnostics only.
  */
 
-import type { SignInFailureReason } from '@oxy.so/core';
+import type { SignInFailureReason } from '@oxy.so/core/session';
 import type { Translate } from './types';
 
 /** The toast for `failure`, or `null` when there is nothing to report. */

package/src/ui/components/authChooser/signInProgress.ts

@@ -16,7 +16,8 @@
  *     Identity confirmed
  */
 
-import type { CommonsDeliveryRoute, SignInProgress } from '@oxy.so/core';
+import type { CommonsDeliveryRoute } from '@oxy.so/core';
+import type { SignInProgress } from '@oxy.so/core/session';
 import type { Translate } from './types';
 
 /**

package/src/ui/components/authChooser/types.ts

@@ -103,15 +103,6 @@ export interface AccountsMenuActions {
   }[];
 }
 
-/**
- * Where a passkey sign-in or sign-up can run from the current surface.
- *
- * `'hub'`  = web: it runs in auth.oxy.so's window over the app
- *            (`continueOnAuth`), on every web origin.
- * `'none'` = native, where Commons owns identity.
- */
-export type PasskeyMode = 'hub' | 'none';
-
 /**
  * Everything that is NOT the sign-in surface's one primary action.
  *
@@ -121,14 +112,11 @@ export type PasskeyMode = 'hub' | 'none';
  * fails). A view never renders one of these as a button.
  */
 export interface SignInAlternatives {
-  /** Whether a WebAuthn ceremony is reachable from this origin at all. */
-  passkeyAvailable: boolean;
-  onSignInWithPasskey: () => void;
   /** Fall back to the cross-device QR handoff (restarts the request). */
   onShowQr: () => void;
   /** Open the Commons store listing / landing page for this platform. */
   onGetCommons: () => void;
-  /** Create an account: the identity-origin window on web, the Commons flow on native. */
+  /** Create an account, in the dialog. */
   onCreateAccount: () => void;
 }
 

package/src/ui/components/signIn/InlineCommonsQr.tsx

@@ -22,7 +22,7 @@ import { RiCheckboxCircleLine } from '@oxy.so/bloom/icons/RiCheckboxCircleLine';
 import { RiRefreshLine } from '@oxy.so/bloom/icons/RiRefreshLine';
 import { useTheme } from '@oxy.so/bloom/theme';
 import { Text } from '@oxy.so/bloom/typography';
-import type { AccountDialogController } from '@oxy.so/core';
+import type { AccountDialogController } from '@oxy.so/core/session';
 import { useI18n } from '../../hooks/useI18n';
 import { useAccountDialogSnapshot } from '../../hooks/accountDialogSnapshot';
 
@@ -46,7 +46,7 @@ export const InlineCommonsQr: React.FC<{ controller: AccountDialogController | n
 
   // One request for as long as the block is on screen. Withdrawn on the way
   // out only while it is still ours and still approvable: an attempt the
-  // person started meanwhile (a passkey window, "Continue with Oxy") is theirs.
+  // person started meanwhile ("Continue with Oxy") is theirs.
   useEffect(() => {
     if (!controller || !shown) return;
     const { signIn: current } = controller.getSnapshot();