@oxyhq/services 27.1.3 → 29.0.0

package/lib/commonjs/ui/stores/followTargetStore.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UNKNOWN_FOLLOW_STATUS = void 0;
+exports.followRecordToStatus = followRecordToStatus;
+exports.followRecordsToStatusMap = followRecordsToStatusMap;
 exports.isCompleteFollowStatus = isCompleteFollowStatus;
 exports.isFollowedGlobally = isFollowedGlobally;
 exports.useFollowTargetStore = void 0;
@@ -108,6 +110,31 @@ function isCompleteFollowStatus(status) {
   return true;
 }
 
+/** Convert one list row into the status shape the follow-target store expects. */
+function followRecordToStatus(record) {
+  return {
+    relationshipId: record.relationshipId,
+    globalState: record.globalState,
+    applicationMode: record.applicationMode,
+    effectiveState: record.effectiveState,
+    ...(record.expiresAt ? {
+      expiresAt: record.expiresAt
+    } : {})
+  };
+}
+
+/**
+ * Bulk-convert a follow list page into a status map keyed by target id — the
+ * input shape for `useFollowTargetStore.getState().seed(...)`.
+ */
+function followRecordsToStatusMap(records) {
+  const entries = {};
+  for (const record of records) {
+    entries[record.target.id] = followRecordToStatus(record);
+  }
+  return entries;
+}
+
 /**
  * Apply a mode change to a cached status without a round trip.
  *

package/lib/commonjs/ui/stores/followTargetStore.js.map

@@ -1 +1 @@
-{"version":3,"names":["_zustand","require","UNKNOWN_FOLLOW_STATUS","exports","globalState","applicationMode","effectiveState","useFollowTargetStore","create","set","statuses","pending","errors","setStatus","targetId","status","s","seed","entries","setPending","setError","error","reset","isFollowedGlobally","isCompleteFollowStatus","Boolean","relationshipId","withApplicationMode","mode"],"sourceRoot":"../../../../src","sources":["ui/stores/followTargetStore.ts"],"mappings":";;;;;;;;;;AAwBA,IAAAA,QAAA,GAAAC,OAAA;AAxBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA;;AAsBA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,qBAAmC,GAAAC,OAAA,CAAAD,qBAAA,GAAG;EACjDE,WAAW,EAAE,MAAM;EACnBC,eAAe,EAAE,SAAS;EAC1BC,cAAc,EAAE;AAClB,CAAC;AAEM,MAAMC,oBAAoB,GAAAJ,OAAA,CAAAI,oBAAA,GAAG,IAAAC,eAAM,EAAqBC,GAAG,KAAM;EACtEC,QAAQ,EAAE,CAAC,CAAC;EACZC,OAAO,EAAE,CAAC,CAAC;EACXC,MAAM,EAAE,CAAC,CAAC;EAEVC,SAAS,EAAEA,CAACC,QAAQ,EAAEC,MAAM,KAC1BN,GAAG,CAAEO,CAAC,KAAM;IAAEN,QAAQ,EAAE;MAAE,GAAGM,CAAC,CAACN,QAAQ;MAAE,CAACI,QAAQ,GAAGC;IAAO;EAAE,CAAC,CAAC,CAAC;EAEnEE,IAAI,EAAGC,OAAO,IAAKT,GAAG,CAAEO,CAAC,KAAM;IAAEN,QAAQ,EAAE;MAAE,GAAGM,CAAC,CAACN,QAAQ;MAAE,GAAGQ;IAAQ;EAAE,CAAC,CAAC,CAAC;EAE5EC,UAAU,EAAEA,CAACL,QAAQ,EAAEH,OAAO,KAC5BF,GAAG,CAAEO,CAAC,KAAM;IAAEL,OAAO,EAAE;MAAE,GAAGK,CAAC,CAACL,OAAO;MAAE,CAACG,QAAQ,GAAGH;IAAQ;EAAE,CAAC,CAAC,CAAC;EAElES,QAAQ,EAAEA,CAACN,QAAQ,EAAEO,KAAK,KAAKZ,GAAG,CAAEO,CAAC,KAAM;IAAEJ,MAAM,EAAE;MAAE,GAAGI,CAAC,CAACJ,MAAM;MAAE,CAACE,QAAQ,GAAGO;IAAM;EAAE,CAAC,CAAC,CAAC;EAE3F;EACA;EACA;EACA;EACAC,KAAK,EAAEA,CAAA,KAAMb,GAAG,CAAC;IAAEC,QAAQ,EAAE,CAAC,CAAC;IAAEC,OAAO,EAAE,CAAC,CAAC;IAAEC,MAAM,EAAE,CAAC;EAAE,CAAC;AAC5D,CAAC,CAAC,CAAC;;AAEH;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASW,kBAAkBA,CAACR,MAAoB,EAAW;EAChE,OAAOA,MAAM,CAACX,WAAW,KAAK,QAAQ,IAAIW,MAAM,CAACX,WAAW,KAAK,WAAW;AAC9E;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASoB,sBAAsBA,CAACT,MAAoB,EAAW;EACpE,IAAIQ,kBAAkB,CAACR,MAAM,CAAC,EAAE,OAAOU,OAAO,CAACV,MAAM,CAACW,cAAc,CAAC;EACrE,OAAO,IAAI;AACb;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,mBAAmBA,CACjCZ,MAAoB,EACpBa,IAA2B,EACb;EACd,OAAO;IACL,GAAGb,MAAM;IACTV,eAAe,EAAEuB,IAAI;IACrBtB,cAAc,EACZsB,IAAI,KAAK,UAAU,GACf,eAAe,GACfb,MAAM,CAACX,WAAW,KAAK,QAAQ,GAC7B,WAAW,GACXW,MAAM,CAACX,WAAW,KAAK,WAAW,GAChC,WAAW,GACX;EACZ,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["_zustand","require","UNKNOWN_FOLLOW_STATUS","exports","globalState","applicationMode","effectiveState","useFollowTargetStore","create","set","statuses","pending","errors","setStatus","targetId","status","s","seed","entries","setPending","setError","error","reset","isFollowedGlobally","isCompleteFollowStatus","Boolean","relationshipId","followRecordToStatus","record","expiresAt","followRecordsToStatusMap","records","target","id","withApplicationMode","mode"],"sourceRoot":"../../../../src","sources":["ui/stores/followTargetStore.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/utils/avatarUtils.js

@@ -3,34 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.refreshAvatarInStore = refreshAvatarInStore;
 exports.updateProfileWithAvatar = updateProfileWithAvatar;
 var _core = require("@oxyhq/core");
-var _accountStore = require("../stores/accountStore.js");
 var _authStore = require("../stores/authStore.js");
 var _queryKeys = require("../hooks/queries/queryKeys.js");
 var _userCache = require("../hooks/queries/userCache.js");
 /**
- * Refreshes avatar in accountStore with cache-busted URL to force image reload.
- *
- * @param sessionId - The session ID for the account to update
- * @param avatarFileId - The new avatar file ID
- * @param oxyServices - OxyServices instance to generate download URL
- */
-function refreshAvatarInStore(sessionId, avatarFileId, oxyServices) {
-  const {
-    updateAccount
-  } = _accountStore.useAccountStore.getState();
-  const cacheBustedUrl = `${oxyServices.getFileDownloadUrl(avatarFileId, 'thumb')}?t=${Date.now()}`;
-  updateAccount(sessionId, {
-    avatar: avatarFileId,
-    avatarUrl: cacheBustedUrl
-  });
-}
-
-/**
- * Updates user profile with avatar and handles all side effects (query invalidation, accountStore update).
- * This function can be used from within OxyContext provider without requiring useOxy hook.
+ * Updates user profile with avatar and handles all side effects (cache writes,
+ * query invalidation). Usable from inside the provider without `useOxy`.
  *
  * @param updates - Profile updates including avatar
  * @param oxyServices - OxyServices instance
@@ -55,20 +35,6 @@ async function updateProfileWithAvatar(updates, oxyServices, activeSessionId, qu
     cleared: cleared.length > 0 ? cleared : undefined
   });
 
-  // If avatar was updated, refresh accountStore with a cache-busted URL. An
-  // EMPTY avatar is a removal: clear both fields so the switcher falls back to
-  // initials instead of pointing at a download URL for the empty file id.
-  if (typeof updates.avatar === 'string' && activeSessionId) {
-    if (updates.avatar) {
-      refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
-    } else {
-      _accountStore.useAccountStore.getState().updateAccount(activeSessionId, {
-        avatar: undefined,
-        avatarUrl: undefined
-      });
-    }
-  }
-
   // Invalidate all related queries to refresh everywhere
   (0, _queryKeys.invalidateUserQueries)(queryClient);
   (0, _queryKeys.invalidateAccountQueries)(queryClient);

package/lib/commonjs/ui/utils/avatarUtils.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_accountStore","_authStore","_queryKeys","_userCache","refreshAvatarInStore","sessionId","avatarFileId","oxyServices","updateAccount","useAccountStore","getState","cacheBustedUrl","getFileDownloadUrl","Date","now","avatar","avatarUrl","updateProfileWithAvatar","updates","activeSessionId","queryClient","syncSession","data","authenticatedApiCall","updateProfile","setQueryData","queryKeys","accounts","current","users","profile","useAuthStore","setUser","cleared","clearedFieldsFromProfileUpdate","upsertCachedUser","id","length","undefined","invalidateUserQueries","invalidateAccountQueries"],"sourceRoot":"../../../../src","sources":["ui/utils/avatarUtils.ts"],"mappings":";;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAGA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAEA,IAAAG,UAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASK,oBAAoBA,CAClCC,SAAiB,EACjBC,YAAoB,EACpBC,WAAwB,EAClB;EACN,MAAM;IAAEC;EAAc,CAAC,GAAGC,6BAAe,CAACC,QAAQ,CAAC,CAAC;EACpD,MAAMC,cAAc,GAAG,GAAGJ,WAAW,CAACK,kBAAkB,CAACN,YAAY,EAAE,OAAO,CAAC,MAAMO,IAAI,CAACC,GAAG,CAAC,CAAC,EAAE;EACjGN,aAAa,CAACH,SAAS,EAAE;IACvBU,MAAM,EAAET,YAAY;IACpBU,SAAS,EAAEL;EACb,CAAC,CAAC;AACJ;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeM,uBAAuBA,CAC3CC,OAA0B,EAC1BX,WAAwB,EACxBY,eAA8B,EAC9BC,WAAwB,EACxBC,WAAiC,EAClB;EACf,MAAMC,IAAI,GAAG,MAAM,IAAAC,0BAAoB,EACrChB,WAAW,EACXY,eAAe,EACf,MAAMZ,WAAW,CAACiB,aAAa,CAACN,OAAO,CAAC,EACxCG,WACF,CAAC;;EAED;EACAD,WAAW,CAACK,YAAY,CAACC,oBAAS,CAACC,QAAQ,CAACC,OAAO,CAACT,eAAe,CAAC,EAAEG,IAAI,CAAC;EAC3E,IAAIH,eAAe,EAAE;IACnBC,WAAW,CAACK,YAAY,CAACC,oBAAS,CAACG,KAAK,CAACC,OAAO,CAACX,eAAe,CAAC,EAAEG,IAAI,CAAC;EAC1E;;EAEA;EACAS,uBAAY,CAACrB,QAAQ,CAAC,CAAC,CAACsB,OAAO,CAACV,IAAI,CAAC;EAErC,MAAMW,OAAO,GAAG,IAAAC,yCAA8B,EAAChB,OAAO,CAAC;EACvD,IAAAiB,2BAAgB,EAACf,WAAW,EAAEE,IAAI,EAAEA,IAAI,CAACc,EAAE,EAAE;IAC3CH,OAAO,EAAEA,OAAO,CAACI,MAAM,GAAG,CAAC,GAAGJ,OAAO,GAAGK;EAC1C,CAAC,CAAC;;EAEF;EACA;EACA;EACA,IAAI,OAAOpB,OAAO,CAACH,MAAM,KAAK,QAAQ,IAAII,eAAe,EAAE;IACzD,IAAID,OAAO,CAACH,MAAM,EAAE;MAClBX,oBAAoB,CAACe,eAAe,EAAED,OAAO,CAACH,MAAM,EAAER,WAAW,CAAC;IACpE,CAAC,MAAM;MACLE,6BAAe,CAACC,QAAQ,CAAC,CAAC,CAACF,aAAa,CAACW,eAAe,EAAE;QACxDJ,MAAM,EAAEuB,SAAS;QACjBtB,SAAS,EAAEsB;MACb,CAAC,CAAC;IACJ;EACF;;EAEA;EACA,IAAAC,gCAAqB,EAACnB,WAAW,CAAC;EAClC,IAAAoB,mCAAwB,EAACpB,WAAW,CAAC;EAErC,OAAOE,IAAI;AACb","ignoreList":[]}
+{"version":3,"names":["_core","require","_authStore","_queryKeys","_userCache","updateProfileWithAvatar","updates","oxyServices","activeSessionId","queryClient","syncSession","data","authenticatedApiCall","updateProfile","setQueryData","queryKeys","accounts","current","users","profile","useAuthStore","getState","setUser","cleared","clearedFieldsFromProfileUpdate","upsertCachedUser","id","length","undefined","invalidateUserQueries","invalidateAccountQueries"],"sourceRoot":"../../../../src","sources":["ui/utils/avatarUtils.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAGA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeI,uBAAuBA,CAC3CC,OAA0B,EAC1BC,WAAwB,EACxBC,eAA8B,EAC9BC,WAAwB,EACxBC,WAAiC,EAClB;EACf,MAAMC,IAAI,GAAG,MAAM,IAAAC,0BAAoB,EACrCL,WAAW,EACXC,eAAe,EACf,MAAMD,WAAW,CAACM,aAAa,CAACP,OAAO,CAAC,EACxCI,WACF,CAAC;;EAED;EACAD,WAAW,CAACK,YAAY,CAACC,oBAAS,CAACC,QAAQ,CAACC,OAAO,CAACT,eAAe,CAAC,EAAEG,IAAI,CAAC;EAC3E,IAAIH,eAAe,EAAE;IACnBC,WAAW,CAACK,YAAY,CAACC,oBAAS,CAACG,KAAK,CAACC,OAAO,CAACX,eAAe,CAAC,EAAEG,IAAI,CAAC;EAC1E;;EAEA;EACAS,uBAAY,CAACC,QAAQ,CAAC,CAAC,CAACC,OAAO,CAACX,IAAI,CAAC;EAErC,MAAMY,OAAO,GAAG,IAAAC,yCAA8B,EAAClB,OAAO,CAAC;EACvD,IAAAmB,2BAAgB,EAAChB,WAAW,EAAEE,IAAI,EAAEA,IAAI,CAACe,EAAE,EAAE;IAC3CH,OAAO,EAAEA,OAAO,CAACI,MAAM,GAAG,CAAC,GAAGJ,OAAO,GAAGK;EAC1C,CAAC,CAAC;;EAEF;EACA,IAAAC,gCAAqB,EAACpB,WAAW,CAAC;EAClC,IAAAqB,mCAAwB,EAACrB,WAAW,CAAC;EAErC,OAAOE,IAAI;AACb","ignoreList":[]}

package/lib/module/index.js

@@ -35,6 +35,15 @@ setPlatformOS(Platform.OS);
 // ---------------------------------------------------------------------------
 export { default as OxyProvider } from "./ui/components/OxyProvider.js";
 export { useOxy } from "./ui/context/OxyContext.js";
+// `useOxy()` THROWS when no provider is mounted. `useOptionalOxy()` returns
+// `null` instead, for the rare component that renders on both sides of the
+// provider boundary; there is no fabricated forever-loading runtime.
+export { useOptionalOxy, OxyProviderMissingError } from "./ui/context/OxyContext.js";
+
+// The runtime surface (ADR 0004). These subscribe to the ONE runtime with a
+// selector, so — unlike `useOxy()`, whose value is rebuilt by any of its fifty
+// members moving — a locale change or a dialog opening does not re-render them.
+export { useOxyRuntime, useOxySnapshot, useActiveAccount, useDeviceDirectory, OxyRuntimeMissingError } from "./ui/runtime/index.js";
 export { useAuth } from "./ui/hooks/useAuth.js";
 // Thrown by `switchToAccount` / `switchSession` while `OxyProvider` runs with
 // `sessionMode="identity"` — an identity-bound app authenticates as the owner of
@@ -45,7 +54,6 @@ export { IdentityBoundSessionError } from "./ui/session/identityBinding.js";
 // Zustand stores
 // ---------------------------------------------------------------------------
 export { useAuthStore } from "./ui/stores/authStore.js";
-export { useAccountStore } from "./ui/stores/accountStore.js";
 export { useAssetStore, useAssets as useAssetsStore, useAsset, useUploadProgress, useAssetLoading, useAssetErrors, useAssetsByApp, useAssetsByEntity, useAssetUsageCount, useIsAssetLinked } from "./ui/stores/assetStore.js";
 
 // ---------------------------------------------------------------------------
@@ -158,7 +166,10 @@ export { useFollowTargetStore, UNKNOWN_FOLLOW_STATUS,
 // The answer to "does the user follow this at all". Documented in
 // docs/FOLLOWS.md and, until now, not exported — so the one line of that
 // guide most likely to be reached for did not resolve.
-isFollowedGlobally, withApplicationMode } from "./ui/stores/followTargetStore.js";
+isFollowedGlobally, withApplicationMode,
+// Whether a cached status is safe to act on without a round trip — list rows
+// often carry globalState without relationshipId.
+isCompleteFollowStatus, followRecordToStatus, followRecordsToStatusMap } from "./ui/stores/followTargetStore.js";
 export { default as OxyPayButton } from "./ui/components/OxyPayButton.js";
 export { LogoIcon } from "./ui/components/logo/LogoIcon.js";
 export { LogoText } from "./ui/components/logo/LogoText.js";
@@ -182,13 +193,13 @@ export { default as OxyAuthChooser } from "./ui/components/OxyAuthChooser.js";
 // no controller: `route` + `progress` + `qrPayload` + the failure flags are the
 // whole contract, and none of them is a secret credential.
 export { OxySignInRequestSurface } from "./ui/components/OxySignInRequestSurface.js";
-// Unified switchable-accounts hook — the single source of everything the user
-// can switch into: device sign-ins AND linked graph accounts (owned orgs +
-// shared-with-you), deduped by account id and hydrated with real
-// name/email/avatar/color. Backed by the shared `AccountDialogController` in
-// `@oxyhq/core`. Every switch routes through `useOxy().switchToAccount`.
-// The `SwitchableAccount` type lives in `@oxyhq/core` — import it from there.
-export { useSwitchableAccounts } from "./ui/hooks/useSwitchableAccounts.js";
+// The device switcher — the server's own directory (ADR 0002) of who is signed
+// in here and what each of them may act as, grouped by PERSON, with the two
+// removals an account id cannot name. Backed by the shared
+// `AccountDialogController` in `@oxyhq/core`; selecting a row activates a
+// `contextId`. `DevicePrincipalGroup` and `DeviceContext` live in `@oxyhq/core`
+// — import them from there.
+export { useDeviceSwitcher } from "./ui/hooks/useDeviceSwitcher.js";
 // Unified "Manage your Oxy Account" screen (the caller's own personal account)
 export { default as ProfileScreen } from "./ui/screens/ProfileScreen.js";
 export { default as ManageAccountScreen } from "./ui/screens/ManageAccountScreen.js";

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["setPlatformOS","Platform","OS","default","OxyProvider","useOxy","useAuth","IdentityBoundSessionError","useAuthStore","useAccountStore","useAssetStore","useAssets","useAssetsStore","useAsset","useUploadProgress","useAssetLoading","useAssetErrors","useAssetsByApp","useAssetsByEntity","useAssetUsageCount","useIsAssetLinked","setOxyAssetInstance","useFileDownloadUrl","useFollow","useFollowerCounts","useSeedFollowStatuses","useStorage","useUserProfile","useUserProfiles","useCurrentUser","useUserById","useUserByUsername","useUsersBySessions","usePrivacySettings","useConnectedApps","useSessions","useSession","useDeviceSessions","useUserDevices","useSecurityInfo","useAccountStorageUsage","useSecurityActivity","useRecentSecurityActivity","useInfiniteSecurityActivity","useAuthMethods","useUserSubscription","useUserPayments","useUserWallet","useUserWalletTransactions","useUpdateProfile","useUploadAvatar","useUpdateAccountSettings","useUpdatePrivacySettings","useUpdateNotificationPreferences","useUpdateUserPreferences","useRevokeConnectedApp","useUploadFile","useSwitchSession","useLogoutSession","useLogoutAll","useUpdateDeviceName","useRemoveDevice","createProfileMutation","createGenericMutation","mutationKeys","queryKeys","invalidateAccountQueries","invalidateUserQueries","invalidateSessionQueries","invalidateDeviceQueries","invalidatePrivacyQueries","invalidateSecurityQueries","invalidateStorageQueries","invalidatePaymentsQueries","invalidateConnectedAppsQueries","invalidateAuthMethodsQueries","upsertCachedUser","upsertCachedUsers","CLEARABLE_USER_FIELDS","clearedFieldsFromProfileUpdate","clearedFieldsFromAccountUpdate","useMutationStatus","useOnlineStatus","useOxyEvent","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage","useFileFiltering","OXY_OAUTH_STATE_STORAGE_KEY","OXY_OAUTH_CODE_VERIFIER_STORAGE_KEY","OxySignInButton","openOAuthPopup","OxyAuthPrompt","OxyOAuthCallback","OxyConsentScreen","RequireOxyAuth","FollowButton","FollowTargetButton","buildFollowMenuItems","resolveFollowPrimaryAction","FOLLOW_ACTION_LEAVES_ACTIVE","useFollowTarget","useFollowTargetStore","UNKNOWN_FOLLOW_STATUS","isFollowedGlobally","withApplicationMode","OxyPayButton","LogoIcon","LogoText","ProfileButton","OxyAuthChooser","OxySignInRequestSurface","useSwitchableAccounts","ProfileScreen","ManageAccountScreen","NotificationsScreen","PreferencesScreen","ConnectedAppsScreen","CreateAccountScreen","AccountMembersScreen","AccountSettingsScreen","showBottomSheet","closeBottomSheet","useSurfaceHeader","SurfaceHeaderAction","openAccountDialog","closeAccountDialog","subscribeToAccountDialog"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["setPlatformOS","Platform","OS","default","OxyProvider","useOxy","useOptionalOxy","OxyProviderMissingError","useOxyRuntime","useOxySnapshot","useActiveAccount","useDeviceDirectory","OxyRuntimeMissingError","useAuth","IdentityBoundSessionError","useAuthStore","useAssetStore","useAssets","useAssetsStore","useAsset","useUploadProgress","useAssetLoading","useAssetErrors","useAssetsByApp","useAssetsByEntity","useAssetUsageCount","useIsAssetLinked","setOxyAssetInstance","useFileDownloadUrl","useFollow","useFollowerCounts","useSeedFollowStatuses","useStorage","useUserProfile","useUserProfiles","useCurrentUser","useUserById","useUserByUsername","useUsersBySessions","usePrivacySettings","useConnectedApps","useSessions","useSession","useDeviceSessions","useUserDevices","useSecurityInfo","useAccountStorageUsage","useSecurityActivity","useRecentSecurityActivity","useInfiniteSecurityActivity","useAuthMethods","useUserSubscription","useUserPayments","useUserWallet","useUserWalletTransactions","useUpdateProfile","useUploadAvatar","useUpdateAccountSettings","useUpdatePrivacySettings","useUpdateNotificationPreferences","useUpdateUserPreferences","useRevokeConnectedApp","useUploadFile","useSwitchSession","useLogoutSession","useLogoutAll","useUpdateDeviceName","useRemoveDevice","createProfileMutation","createGenericMutation","mutationKeys","queryKeys","invalidateAccountQueries","invalidateUserQueries","invalidateSessionQueries","invalidateDeviceQueries","invalidatePrivacyQueries","invalidateSecurityQueries","invalidateStorageQueries","invalidatePaymentsQueries","invalidateConnectedAppsQueries","invalidateAuthMethodsQueries","upsertCachedUser","upsertCachedUsers","CLEARABLE_USER_FIELDS","clearedFieldsFromProfileUpdate","clearedFieldsFromAccountUpdate","useMutationStatus","useOnlineStatus","useOxyEvent","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage","useFileFiltering","OXY_OAUTH_STATE_STORAGE_KEY","OXY_OAUTH_CODE_VERIFIER_STORAGE_KEY","OxySignInButton","openOAuthPopup","OxyAuthPrompt","OxyOAuthCallback","OxyConsentScreen","RequireOxyAuth","FollowButton","FollowTargetButton","buildFollowMenuItems","resolveFollowPrimaryAction","FOLLOW_ACTION_LEAVES_ACTIVE","useFollowTarget","useFollowTargetStore","UNKNOWN_FOLLOW_STATUS","isFollowedGlobally","withApplicationMode","isCompleteFollowStatus","followRecordToStatus","followRecordsToStatusMap","OxyPayButton","LogoIcon","LogoText","ProfileButton","OxyAuthChooser","OxySignInRequestSurface","useDeviceSwitcher","ProfileScreen","ManageAccountScreen","NotificationsScreen","PreferencesScreen","ConnectedAppsScreen","CreateAccountScreen","AccountMembersScreen","AccountSettingsScreen","showBottomSheet","closeBottomSheet","useSurfaceHeader","SurfaceHeaderAction","openAccountDialog","closeAccountDialog","subscribeToAccountDialog"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/boot/runProviderColdBoot.js

@@ -2,6 +2,7 @@
 
 import { logger as loggerUtil, runSessionColdBoot } from '@oxyhq/core';
 import { loadPersistedDeviceCredential } from "../utils/deviceCredential.js";
+import { createPlatformSharedDeviceCredentialStore } from "../session/sharedDeviceCredentialStore.js";
 import { tryCompleteOAuthReturn } from "../utils/oauthReturn.js";
 import { isWebBrowser } from "../utils/isWebBrowser.js";
 import { isNetConnectivityExplicitlyOffline } from "../utils/netConnectivity.js";
@@ -126,6 +127,12 @@ export async function runProviderColdBoot(opts) {
       },
       sessionMode,
       identity,
+      // The device-wide shared credential slot, enabling the `shared-device-adopt`
+      // lane: a newly installed official app joins this device's existing session
+      // instead of falling back to signing a challenge with the Commons identity
+      // key. `null` on web, where each origin is its own device by design; the
+      // core lane is also skipped outright in `sessionMode: 'identity'`.
+      sharedDeviceCredential: createPlatformSharedDeviceCredentialStore() ?? undefined,
       overallDeadlineMs: COLD_BOOT_OVERALL_DEADLINE_MS,
       isOffline: () => offline,
       onStepDeadline: stepId => {

package/lib/module/ui/boot/runProviderColdBoot.js.map

@@ -1 +1 @@
-{"version":3,"names":["logger","loggerUtil","runSessionColdBoot","loadPersistedDeviceCredential","tryCompleteOAuthReturn","isWebBrowser","isNetConnectivityExplicitlyOffline","SESSION_HANDOFF_DEADLINE_MS","COLD_BOOT_OVERALL_DEADLINE_MS","OFFLINE_PROBE_TIMEOUT_MS","detectOfflineHint","online","globalThis","navigator","onLine","NetInfo","state","Promise","race","default","fetch","resolve","setTimeout","runProviderColdBoot","opts","oxyServices","authStore","clientId","authRedirectUri","sessionMode","identity","sessionClient","syncDeviceCredentialToHost","commitSession","markAuthResolved","setTokenReady","identityBound","oauthCompleted","input","activate","offline","oxy","store","platform","isWeb","isNative","overallDeadlineMs","isOffline","onStepDeadline","stepId","warn","component","method","onSession","session","handoff","sessionId","accessToken","userId","handoffDeadlineId","finally","undefined","clearTimeout","onSignedOut","cred","start","socketError","__DEV__","debug","onStepError","id","error","Error","String"],"sourceRoot":"../../../../src","sources":["ui/boot/runProviderColdBoot.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["logger","loggerUtil","runSessionColdBoot","loadPersistedDeviceCredential","createPlatformSharedDeviceCredentialStore","tryCompleteOAuthReturn","isWebBrowser","isNetConnectivityExplicitlyOffline","SESSION_HANDOFF_DEADLINE_MS","COLD_BOOT_OVERALL_DEADLINE_MS","OFFLINE_PROBE_TIMEOUT_MS","detectOfflineHint","online","globalThis","navigator","onLine","NetInfo","state","Promise","race","default","fetch","resolve","setTimeout","runProviderColdBoot","opts","oxyServices","authStore","clientId","authRedirectUri","sessionMode","identity","sessionClient","syncDeviceCredentialToHost","commitSession","markAuthResolved","setTokenReady","identityBound","oauthCompleted","input","activate","offline","oxy","store","platform","isWeb","isNative","sharedDeviceCredential","undefined","overallDeadlineMs","isOffline","onStepDeadline","stepId","warn","component","method","onSession","session","handoff","sessionId","accessToken","userId","handoffDeadlineId","finally","clearTimeout","onSignedOut","cred","start","socketError","__DEV__","debug","onStepError","id","error","Error","String"],"sourceRoot":"../../../../src","sources":["ui/boot/runProviderColdBoot.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/client.js

@@ -20,7 +20,7 @@ export { default as FollowButton } from "./components/FollowButton.js";
 export { default as OxyPayButton } from "./components/OxyPayButton.js";
 
 // Context
-export { useOxy } from "./context/OxyContext.js";
+export { useOxy, useOptionalOxy, OxyProviderMissingError } from "./context/OxyContext.js";
 
 // Hooks
 export { useAuth } from "./hooks/useAuth.js";
@@ -32,7 +32,6 @@ export { default as ManageAccountScreen } from "./screens/ManageAccountScreen.js
 
 // Stores
 export { useAuthStore } from "./stores/authStore.js";
-export { useAccountStore } from "./stores/accountStore.js";
 
 // Error handler utilities
 export { handleAuthError, isInvalidSessionError, isTimeoutOrNetworkError, extractErrorMessage } from "./utils/errorHandlers.js";

package/lib/module/ui/client.js.map

@@ -1 +1 @@
-{"version":3,"names":["default","OxyProvider","OxySignInButton","OxyAuthPrompt","LogoIcon","LogoText","FollowButton","OxyPayButton","useOxy","useAuth","useFollow","useStorage","ProfileScreen","ManageAccountScreen","useAuthStore","useAccountStore","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage"],"sourceRoot":"../../../src","sources":["ui/client.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,SAASA,OAAO,IAAIC,WAAW,QAAQ,6BAA0B;AACjE,SAASD,OAAO,IAAIE,eAAe,QAAQ,iCAA8B;AACzE,SAASF,OAAO,IAAIG,aAAa,QAAQ,+BAA4B;AAErE,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASL,OAAO,IAAIM,YAAY,QAAQ,8BAA2B;AACnE,SAASN,OAAO,IAAIO,YAAY,QAAQ,8BAA2B;;AAEnE;AACA,SAASC,MAAM,QAAQ,yBAAsB;;AAE7C;AACA,SAASC,OAAO,QAAQ,oBAAiB;AAEzC,SAASC,SAAS,QAAQ,sBAAmB;AAC7C,SAASC,UAAU,QAAQ,uBAAoB;AAG/C;AACA,SAASX,OAAO,IAAIY,aAAa,QAAQ,4BAAyB;AAClE,SAASZ,OAAO,IAAIa,mBAAmB,QAAQ,kCAA+B;;AAE9E;AACA,SAASC,YAAY,QAAQ,uBAAoB;AACjD,SAASC,eAAe,QAAQ,0BAAuB;;AAEvD;AACA,SACIC,eAAe,EACfC,qBAAqB,EACrBC,uBAAuB,EACvBC,mBAAmB,QAChB,0BAAuB","ignoreList":[]}
+{"version":3,"names":["default","OxyProvider","OxySignInButton","OxyAuthPrompt","LogoIcon","LogoText","FollowButton","OxyPayButton","useOxy","useOptionalOxy","OxyProviderMissingError","useAuth","useFollow","useStorage","ProfileScreen","ManageAccountScreen","useAuthStore","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage"],"sourceRoot":"../../../src","sources":["ui/client.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,SAASA,OAAO,IAAIC,WAAW,QAAQ,6BAA0B;AACjE,SAASD,OAAO,IAAIE,eAAe,QAAQ,iCAA8B;AACzE,SAASF,OAAO,IAAIG,aAAa,QAAQ,+BAA4B;AAErE,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASL,OAAO,IAAIM,YAAY,QAAQ,8BAA2B;AACnE,SAASN,OAAO,IAAIO,YAAY,QAAQ,8BAA2B;;AAEnE;AACA,SAASC,MAAM,EAAEC,cAAc,EAAEC,uBAAuB,QAAQ,yBAAsB;;AAEtF;AACA,SAASC,OAAO,QAAQ,oBAAiB;AAEzC,SAASC,SAAS,QAAQ,sBAAmB;AAC7C,SAASC,UAAU,QAAQ,uBAAoB;AAG/C;AACA,SAASb,OAAO,IAAIc,aAAa,QAAQ,4BAAyB;AAClE,SAASd,OAAO,IAAIe,mBAAmB,QAAQ,kCAA+B;;AAE9E;AACA,SAASC,YAAY,QAAQ,uBAAoB;;AAEjD;AACA,SACIC,eAAe,EACfC,qBAAqB,EACrBC,uBAAuB,EACvBC,mBAAmB,QAChB,0BAAuB","ignoreList":[]}

package/lib/module/ui/components/OxyAccountDialogScreen.js

@@ -30,6 +30,7 @@ import { useI18n } from "../hooks/useI18n.js";
 import { useSurfaceHeader } from "../hooks/useSurfaceHeader.js";
 import LogoText from "./logo/LogoText.js";
 import OxyAuthChooser from "./OxyAuthChooser.js";
+import { EMPTY_ACCOUNT_DIALOG_SNAPSHOT } from "../hooks/accountDialogSnapshot.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * The account MENU's nav bar carries the Oxy wordmark instead of a title — the
@@ -67,14 +68,17 @@ const OxyAccountDialogScreen = ({
 
   // A lightweight, header-only binding to the same controller `OxyAuthChooser`
   // binds independently — cheap, and the established pattern here (
-  // `useSwitchableAccounts` also binds to this controller on its own).
+  // `useDeviceSwitcher` also binds to this controller on its own).
   const subscribe = useCallback(listener => controller ? controller.subscribe(listener) : () => undefined, [controller]);
-  const getSnapshot = useCallback(() => controller ? controller.getSnapshot() : EMPTY_SNAPSHOT, [controller]);
+  const getSnapshot = useCallback(() => controller ? controller.getSnapshot() : EMPTY_ACCOUNT_DIALOG_SNAPSHOT, [controller]);
   const snapshot = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
   const {
     view
   } = snapshot;
-  const showBack = view === 'qr' || view === 'signup' || view === 'add' && snapshot.accounts.length > 0;
+  // "Add another account" only makes sense as a back destination when there IS
+  // another — i.e. somebody is already signed in on this device.
+  const hasSignedInAccounts = (snapshot.directory?.principals.length ?? 0) > 0;
+  const showBack = view === 'qr' || view === 'signup' || view === 'add' && hasSignedInAccounts;
   const goToAccounts = useCallback(() => {
     if (!controller) return;
     const {
@@ -100,7 +104,7 @@ const OxyAccountDialogScreen = ({
   // by the bar. Every OTHER view keeps the SHARED Dialog nav header the rest of
   // the SDK uses — a large in-content title/subtitle that collapses into the bar
   // on scroll — because their copy is informative.
-  const copy = view === 'accounts' ? null : headerCopy(view, snapshot.accounts.length, t);
+  const copy = view === 'accounts' ? null : headerCopy(view, hasSignedInAccounts, t);
   useSurfaceHeader({
     titleContent: copy ? undefined : NAV_LOGO,
     title: copy?.title,
@@ -122,7 +126,7 @@ const OxyAccountDialogScreen = ({
 // Copy + helpers
 // ---------------------------------------------------------------------------
 
-function headerCopy(view, accountCount, t) {
+function headerCopy(view, hasSignedInAccounts, t) {
   switch (view) {
     // The ACTIVE REQUEST. Its header is deliberately route-AGNOSTIC: Oxy picks
     // the delivery route (QR here, a push to the user's phone, or opening
@@ -141,7 +145,7 @@ function headerCopy(view, accountCount, t) {
         subtitle: t('signup.subtitle') || 'One identity for the whole ecosystem.'
       };
     default:
-      return accountCount > 0 ? {
+      return hasSignedInAccounts ? {
         title: t('signin.addAccountTitle') || 'Add another account',
         subtitle: t('signin.addAccountSubtitle') || 'Sign in with another account.'
       } : {
@@ -150,27 +154,6 @@ function headerCopy(view, accountCount, t) {
       };
   }
 }
-const EMPTY_SNAPSHOT = {
-  view: 'accounts',
-  accounts: [],
-  activeAccountId: null,
-  loading: false,
-  error: null,
-  switchingAccountId: null,
-  signIn: {
-    phase: 'idle',
-    authorizeCode: null,
-    qrPayload: null,
-    expiresAt: null,
-    error: null,
-    route: null,
-    routeFailed: false,
-    pushSentAt: null,
-    openedAt: null,
-    progress: 'idle'
-  },
-  commonsAvailability: 'unknown'
-};
 
 /**
  * The screen gutter. In the Dialog's nav-header mode the surface adds NO content

package/lib/module/ui/components/OxyAccountDialogScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useSyncExternalStore","StyleSheet","View","useOxy","useI18n","useSurfaceHeader","LogoText","OxyAuthChooser","jsx","_jsx","NAV_LOGO","height","OxyAccountDialogScreen","canGoBack","accountDialogController","controller","closeAccountDialog","t","subscribe","listener","undefined","getSnapshot","EMPTY_SNAPSHOT","snapshot","view","showBack","accounts","length","goToAccounts","currentView","signIn","phase","cancelSignIn","setView","backsToHost","copy","headerCopy","titleContent","title","subtitle","onBack","style","styles","bodyContent","children","onComplete","accountCount","activeAccountId","loading","error","switchingAccountId","authorizeCode","qrPayload","expiresAt","route","routeFailed","pushSentAt","openedAt","progress","commonsAvailability","SCREEN_MARGIN","create","paddingTop","paddingBottom","paddingHorizontal"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAccountDialogScreen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useSyncExternalStore","StyleSheet","View","useOxy","useI18n","useSurfaceHeader","LogoText","OxyAuthChooser","EMPTY_ACCOUNT_DIALOG_SNAPSHOT","jsx","_jsx","NAV_LOGO","height","OxyAccountDialogScreen","canGoBack","accountDialogController","controller","closeAccountDialog","t","subscribe","listener","undefined","getSnapshot","snapshot","view","hasSignedInAccounts","directory","principals","length","showBack","goToAccounts","currentView","signIn","phase","cancelSignIn","setView","backsToHost","copy","headerCopy","titleContent","title","subtitle","onBack","style","styles","bodyContent","children","onComplete","SCREEN_MARGIN","create","paddingTop","paddingBottom","paddingHorizontal"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAccountDialogScreen.tsx"],"mappings":"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","ignoreList":[]}