@oxyhq/services 16.0.0 → 17.0.0

package/lib/module/ui/hooks/mutations/useAccountMutations.js

@@ -99,7 +99,7 @@ export const useUpdateProfile = () => {
         refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
       }
 
-      // Invalidate all related queries so every consumer (AccountSwitcher,
+      // Invalidate all related queries so every consumer (the account dialog,
       // session lists, managed accounts, etc.) refetches the fresh profile.
       // This is critical right after `username` is set the first time, when
       // every cached "session profile" still reports the user as unnamed.

package/lib/module/ui/hooks/useAuth.js

@@ -28,7 +28,6 @@
 import { useCallback } from 'react';
 import { useOxy } from "../context/OxyContext.js";
 import { isWebBrowser } from "../utils/isWebBrowser.js";
-import { showSignInModal } from "../components/SignInModal.js";
 /**
  * Unified auth hook for all Oxy apps
  *
@@ -57,43 +56,33 @@ export function useAuth() {
     hasIdentity,
     getPublicKey,
     showBottomSheet,
-    openAvatarPicker
+    openAvatarPicker,
+    openAccountDialog
   } = useOxy();
   const signIn = useCallback(async publicKey => {
-    // Web (no key): open the in-app "Sign in with Oxy" modal. There is NO
-    // automatic navigation to any login page — the device-first cold boot
-    // already restored a session if one existed; an explicit click presents the
-    // SDK sign-in surface (password / QR device flow / add account).
-    if (isWebBrowser() && !publicKey) {
-      showSignInModal();
-      // Resolves when the modal commits a session; the caller typically reacts
-      // to `isAuthenticated` rather than this promise.
-      return new Promise(() => undefined);
-    }
-
-    // Native: use the cryptographic identity directly when a public key is given.
+    // Native: sign in directly with the cryptographic identity when a public key
+    // is provided, or an existing keychain identity is found.
     if (publicKey) {
       return oxySignIn(publicKey);
     }
-
-    // Native with an existing keychain identity: sign in with it.
-    const hasExisting = await hasIdentity();
-    if (hasExisting) {
-      const existingKey = await getPublicKey();
-      if (existingKey) {
-        return oxySignIn(existingKey);
+    if (!isWebBrowser()) {
+      const hasExisting = await hasIdentity();
+      if (hasExisting) {
+        const existingKey = await getPublicKey();
+        if (existingKey) {
+          return oxySignIn(existingKey);
+        }
       }
     }
 
-    // Native with no identity: open the auth sheet (password / QR device flow).
-    if (showBottomSheet) {
-      showBottomSheet('OxyAuth');
-      return new Promise((_, reject) => {
-        reject(new Error('Please complete sign-in in the auth sheet'));
-      });
-    }
-    throw new Error('No authentication method available');
-  }, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet]);
+    // Web, or native without a keychain identity: open the unified account dialog
+    // on its sign-in view (device flow / QR / password hand-off). There is NO
+    // automatic navigation to a login page — the device-first cold boot already
+    // restored a session if one existed. The caller reacts to `isAuthenticated`,
+    // so this promise intentionally never resolves.
+    openAccountDialog('signin');
+    return new Promise(() => undefined);
+  }, [oxySignIn, hasIdentity, getPublicKey, openAccountDialog]);
   const signOut = useCallback(async () => {
     await logout();
   }, [logout]);

package/lib/module/ui/hooks/useAuth.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useOxy","isWebBrowser","showSignInModal","useAuth","user","isAuthenticated","isLoading","isTokenReady","hasAccessToken","canUsePrivateApi","isPrivateApiPending","isAuthResolved","error","signIn","oxySignIn","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","openAvatarPicker","publicKey","Promise","undefined","hasExisting","existingKey","_","reject","Error","signOut","signOutAll","refresh","isReady"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuth.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,WAAW,QAAkB,OAAO;AAC7C,SAASC,MAAM,QAAQ,0BAAuB;AAE9C,SAASC,YAAY,QAAQ,0BAAuB;AACpD,SAASC,eAAe,QAAQ,8BAA2B;AAkF3D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,OAAOA,CAAA,EAAkB;EACvC,MAAM;IACJC,IAAI;IACJC,eAAe;IACfC,SAAS;IACTC,YAAY;IACZC,cAAc;IACdC,gBAAgB;IAChBC,mBAAmB;IACnBC,cAAc;IACdC,KAAK;IACLC,MAAM,EAAEC,SAAS;IACjBC,MAAM;IACNC,SAAS;IACTC,eAAe;IACfC,WAAW;IACXC,WAAW;IACXC,YAAY;IACZC,eAAe;IACfC;EACF,CAAC,GAAGtB,MAAM,CAAC,CAAC;EAEZ,MAAMa,MAAM,GAAGd,WAAW,CAAC,MAAOwB,SAAkB,IAAoB;IACtE;IACA;IACA;IACA;IACA,IAAItB,YAAY,CAAC,CAAC,IAAI,CAACsB,SAAS,EAAE;MAChCrB,eAAe,CAAC,CAAC;MACjB;MACA;MACA,OAAO,IAAIsB,OAAO,CAAO,MAAMC,SAAS,CAAC;IAC3C;;IAEA;IACA,IAAIF,SAAS,EAAE;MACb,OAAOT,SAAS,CAACS,SAAS,CAAC;IAC7B;;IAEA;IACA,MAAMG,WAAW,GAAG,MAAMP,WAAW,CAAC,CAAC;IACvC,IAAIO,WAAW,EAAE;MACf,MAAMC,WAAW,GAAG,MAAMP,YAAY,CAAC,CAAC;MACxC,IAAIO,WAAW,EAAE;QACf,OAAOb,SAAS,CAACa,WAAW,CAAC;MAC/B;IACF;;IAEA;IACA,IAAIN,eAAe,EAAE;MACnBA,eAAe,CAAC,SAAS,CAAC;MAC1B,OAAO,IAAIG,OAAO,CAAC,CAACI,CAAC,EAAEC,MAAM,KAAK;QAChCA,MAAM,CAAC,IAAIC,KAAK,CAAC,2CAA2C,CAAC,CAAC;MAChE,CAAC,CAAC;IACJ;IAEA,MAAM,IAAIA,KAAK,CAAC,oCAAoC,CAAC;EACvD,CAAC,EAAE,CAAChB,SAAS,EAAEK,WAAW,EAAEC,YAAY,EAAEC,eAAe,CAAC,CAAC;EAE3D,MAAMU,OAAO,GAAGhC,WAAW,CAAC,YAA2B;IACrD,MAAMgB,MAAM,CAAC,CAAC;EAChB,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMiB,UAAU,GAAGjC,WAAW,CAAC,YAA2B;IACxD,MAAMiB,SAAS,CAAC,CAAC;EACnB,CAAC,EAAE,CAACA,SAAS,CAAC,CAAC;EAEf,MAAMiB,OAAO,GAAGlC,WAAW,CAAC,YAA2B;IACrD,MAAMkB,eAAe,CAAC,CAAC;EACzB,CAAC,EAAE,CAACA,eAAe,CAAC,CAAC;EAErB,OAAO;IACL;IACAb,IAAI;IACJC,eAAe;IACfC,SAAS,EAAEA,SAAS,IAAI,CAACK,cAAc;IACvCuB,OAAO,EAAE3B,YAAY;IACrBC,cAAc;IACdC,gBAAgB;IAChBC,mBAAmB;IACnBC,cAAc;IACdC,KAAK;IAEL;IACAC,MAAM;IACNkB,OAAO;IACPC,UAAU;IACVC,OAAO;IAEP;IACAf,WAAW;IACXG,eAAe;IACfC;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["useCallback","useOxy","isWebBrowser","useAuth","user","isAuthenticated","isLoading","isTokenReady","hasAccessToken","canUsePrivateApi","isPrivateApiPending","isAuthResolved","error","signIn","oxySignIn","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","openAvatarPicker","openAccountDialog","publicKey","hasExisting","existingKey","Promise","undefined","signOut","signOutAll","refresh","isReady"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuth.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,MAAM,QAAQ,0BAAuB;AAE9C,SAASC,YAAY,QAAQ,0BAAuB;AAkFpD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,OAAOA,CAAA,EAAkB;EACvC,MAAM;IACJC,IAAI;IACJC,eAAe;IACfC,SAAS;IACTC,YAAY;IACZC,cAAc;IACdC,gBAAgB;IAChBC,mBAAmB;IACnBC,cAAc;IACdC,KAAK;IACLC,MAAM,EAAEC,SAAS;IACjBC,MAAM;IACNC,SAAS;IACTC,eAAe;IACfC,WAAW;IACXC,WAAW;IACXC,YAAY;IACZC,eAAe;IACfC,gBAAgB;IAChBC;EACF,CAAC,GAAGtB,MAAM,CAAC,CAAC;EAEZ,MAAMY,MAAM,GAAGb,WAAW,CAAC,MAAOwB,SAAkB,IAAoB;IACtE;IACA;IACA,IAAIA,SAAS,EAAE;MACb,OAAOV,SAAS,CAACU,SAAS,CAAC;IAC7B;IACA,IAAI,CAACtB,YAAY,CAAC,CAAC,EAAE;MACnB,MAAMuB,WAAW,GAAG,MAAMN,WAAW,CAAC,CAAC;MACvC,IAAIM,WAAW,EAAE;QACf,MAAMC,WAAW,GAAG,MAAMN,YAAY,CAAC,CAAC;QACxC,IAAIM,WAAW,EAAE;UACf,OAAOZ,SAAS,CAACY,WAAW,CAAC;QAC/B;MACF;IACF;;IAEA;IACA;IACA;IACA;IACA;IACAH,iBAAiB,CAAC,QAAQ,CAAC;IAC3B,OAAO,IAAII,OAAO,CAAO,MAAMC,SAAS,CAAC;EAC3C,CAAC,EAAE,CAACd,SAAS,EAAEK,WAAW,EAAEC,YAAY,EAAEG,iBAAiB,CAAC,CAAC;EAE7D,MAAMM,OAAO,GAAG7B,WAAW,CAAC,YAA2B;IACrD,MAAMe,MAAM,CAAC,CAAC;EAChB,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMe,UAAU,GAAG9B,WAAW,CAAC,YAA2B;IACxD,MAAMgB,SAAS,CAAC,CAAC;EACnB,CAAC,EAAE,CAACA,SAAS,CAAC,CAAC;EAEf,MAAMe,OAAO,GAAG/B,WAAW,CAAC,YAA2B;IACrD,MAAMiB,eAAe,CAAC,CAAC;EACzB,CAAC,EAAE,CAACA,eAAe,CAAC,CAAC;EAErB,OAAO;IACL;IACAb,IAAI;IACJC,eAAe;IACfC,SAAS,EAAEA,SAAS,IAAI,CAACK,cAAc;IACvCqB,OAAO,EAAEzB,YAAY;IACrBC,cAAc;IACdC,gBAAgB;IAChBC,mBAAmB;IACnBC,cAAc;IACdC,KAAK;IAEL;IACAC,MAAM;IACNgB,OAAO;IACPC,UAAU;IACVC,OAAO;IAEP;IACAb,WAAW;IACXG,eAAe;IACfC;EACF,CAAC;AACH","ignoreList":[]}

package/lib/module/ui/hooks/useSwitchableAccounts.js

@@ -1,283 +1,54 @@
 "use strict";
 
-import { useMemo } from 'react';
-import { useQuery } from '@tanstack/react-query';
-import { getAccountDisplayName, getAccountFallbackHandle } from '@oxyhq/core';
+import { useCallback, useMemo, useSyncExternalStore } from 'react';
 import { useOxy } from "../context/OxyContext.js";
-import { useI18n } from "./useI18n.js";
-import { queryKeys } from "./queries/queryKeys.js";
-
-/**
- * The per-account user shape carried by a {@link SwitchableAccount}. The SDK's
- * canonical {@link User} document — either the freshest `useOxy().user` (the
- * active row), a profile resolved via `oxyServices.getUsersByIds()` (every other
- * device row), or the `account` document embedded in an account-graph node.
- */
-
-/**
- * One account the signed-in user can switch INTO, in the uniform switch model.
- *
- * A switchable account is either a device sign-in, an account-graph node (owned
- * org / shared-with-you), or BOTH (an account that has been switched into
- * becomes a device session while still being a graph node — the two are deduped
- * into a single row). Every row carries a canonical `accountId` (the uniform
- * switch key passed to `switchToAccount`); `sessionId` is present IFF the
- * account is currently signed in on THIS device.
- */
-
-/** The minimal device-session shape {@link buildSwitchableAccounts} reads. */
-
 /**
- * Resolve which entries are the current account, robustly.
- *
- * Primary signal: `entry.sessionId === activeSessionId` — both are projected
- * from the same `SessionClient` state, so this normally matches exactly.
- * Fallbacks exist only to bridge the brief window between the two sequential
- * `updateSessions` / `setActiveSessionId` calls in `OxyContext.syncFromClient`,
- * applied only when the `sessionId` match found nothing AND the user is
- * authenticated:
- *  1. Match the live `user.id` against each entry's per-account user id.
- *  2. If still nothing and there is exactly one account, mark that one current.
- *
- * At most ONE entry is ever marked current. Runs over DEVICE rows only (graph
- * rows are never active — the active account is always a device session), so the
- * single-account fallback counts device rows.
- *
- * Pure & side-effect free so it is unit-testable without rendering React.
+ * Stable empty snapshot for the no-provider loading state, so `useSyncExternalStore`
+ * always has a getSnapshot that returns a constant reference before mount.
  */
-export function markCurrentAccount(accounts, activeSessionId, liveUserId, isAuthenticated) {
-  const bySession = accounts.map(account => ({
-    ...account,
-    isCurrent: Boolean(activeSessionId) && account.sessionId === activeSessionId
-  }));
-  if (bySession.some(account => account.isCurrent) || !isAuthenticated) {
-    return bySession;
-  }
-
-  // No row matched by session id: fall back to the live user's id, marking at
-  // most the FIRST matching entry current (never more than one).
-  if (liveUserId) {
-    let matched = false;
-    const byUser = bySession.map(account => {
-      if (!matched && account.user.id === liveUserId) {
-        matched = true;
-        return {
-          ...account,
-          isCurrent: true
-        };
-      }
-      return account;
-    });
-    if (matched) {
-      return byUser;
-    }
-  }
-
-  // Authenticated, nothing matched, but there is exactly one account → it must
-  // be the current one.
-  if (bySession.length === 1) {
-    return [{
-      ...bySession[0],
-      isCurrent: true
-    }];
+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
   }
-  return bySession;
-}
+};
 
 /**
- * Pure union of device sign-ins and account-graph nodes into the flat
- * {@link SwitchableAccount}[] the switchers render. Extracted so the merge /
- * dedup semantics are unit-testable without rendering React.
- *
- * Order: device rows first (in session order, current flagged), then graph-only
- * rows (in graph order). An account present as BOTH a device session and a graph
- * node is deduped into ONE device row enriched with the graph metadata
- * (relationship / kind / parent / membership).
- */
-export function buildSwitchableAccounts(input) {
-  const {
-    sessions,
-    activeSessionId,
-    liveUser,
-    isAuthenticated,
-    graph,
-    profilesById,
-    locale,
-    resolveAvatarUrl
-  } = input;
-
-  // Nothing is switchable when signed out — never surface a lingering device
-  // session or graph node once the user is unauthenticated.
-  if (!isAuthenticated) {
-    return [];
-  }
-  const toRow = (accountUser, opts) => {
-    const displayName = getAccountDisplayName(accountUser, locale);
-    const handle = getAccountFallbackHandle(accountUser);
-    const secondaryHandle = handle ? `@${handle}` : null;
-    return {
-      accountId: accountUser.id?.toString() ?? '',
-      sessionId: opts.sessionId,
-      authuser: opts.authuser,
-      isCurrent: Boolean(opts.sessionId) && opts.sessionId === activeSessionId,
-      onDevice: Boolean(opts.sessionId),
-      relationship: opts.relationship,
-      kind: opts.kind,
-      parentAccountId: opts.parentAccountId,
-      callerMembership: opts.callerMembership,
-      displayName,
-      // Real email, or the `@handle` fallback (NEVER synthesized).
-      email: accountUser.email ?? secondaryHandle,
-      avatarUrl: resolveAvatarUrl(accountUser.avatar),
-      color: accountUser.color ?? null,
-      user: accountUser
-    };
-  };
-
-  // --- Device rows ---
-  const built = sessions.flatMap(session => {
-    const isCurrent = session.sessionId === activeSessionId;
-    // The active row always uses the live `user` — freshest available —
-    // regardless of whether the batch profile fetch has resolved yet.
-    const accountUser = isCurrent && liveUser ? liveUser : session.userId ? profilesById.get(session.userId) : undefined;
-    if (!accountUser) {
-      return [];
-    }
-    return [toRow(accountUser, {
-      sessionId: session.sessionId,
-      authuser: session.authuser
-    })];
-  });
-  const flagged = markCurrentAccount(built, activeSessionId, liveUser?.id ?? null, isAuthenticated);
-
-  // The signed-in user must ALWAYS be represented, even before the device
-  // session set has synced (e.g. immediately after cold boot). Synthesize a
-  // single current row from the live `useOxy().user` in that case.
-  const deviceRows = flagged.length === 0 && isAuthenticated && liveUser && activeSessionId ? [toRow(liveUser, {
-    sessionId: activeSessionId
-  })] : flagged;
-
-  // --- Merge graph nodes, deduping by account id ---
-  const byAccountId = new Map();
-  const order = [];
-  const remember = row => {
-    if (!row.accountId || byAccountId.has(row.accountId)) {
-      return;
-    }
-    byAccountId.set(row.accountId, row);
-    order.push(row.accountId);
-  };
-  for (const row of deviceRows) {
-    remember(row);
-  }
-  for (const node of graph) {
-    const existing = byAccountId.get(node.accountId);
-    if (existing) {
-      // On-device account that is ALSO in the graph: enrich the device row
-      // with graph metadata; keep its (freshest) profile + sessionId.
-      byAccountId.set(node.accountId, {
-        ...existing,
-        relationship: node.relationship,
-        kind: node.kind,
-        parentAccountId: node.parentAccountId,
-        callerMembership: node.callerMembership
-      });
-      continue;
-    }
-    // Graph-only account (owned org / shared, not yet a device session).
-    remember(toRow(node.account, {
-      relationship: node.relationship,
-      kind: node.kind,
-      parentAccountId: node.parentAccountId,
-      callerMembership: node.callerMembership
-    }));
-  }
-  return order.flatMap(id => {
-    const row = byAccountId.get(id);
-    return row ? [row] : [];
-  });
-}
-
-/**
- * Resolve every account the signed-in user can switch into — device sign-ins
- * AND linked graph accounts (owned orgs + shared-with-you) — as one flat list
- * with real per-account name / email / avatar / color, deduped by account id.
- *
- * ## Data sources
- *
- * - Device sign-ins: `useOxy().sessions` — a `ClientSession[]` projected by
- *   `OxyContext.syncFromClient` from the server-authoritative `SessionClient`.
- *   Each session carries only `sessionId` + `userId`, so this hook additionally
- *   fetches every device account's profile via `oxyServices.getUsersByIds()`.
- *   The ACTIVE row always uses `useOxy().user` directly (the freshest copy).
- * - Linked accounts: `useOxy().accounts` — the `AccountNode[]` graph the context
- *   loads from `GET /accounts`. Each node already embeds its `account` `User`
- *   document, so graph-only rows need no extra fetch.
- *
- * An account present as BOTH a device session and a graph node is deduped into
- * ONE row (see {@link buildSwitchableAccounts}). EVERY row switches the same
- * way — through `useOxy().switchToAccount(row.accountId)`.
- *
- * ## Error handling
- *
- * `getUsersByIds()` resolves to `[]` on a failed chunk (logged internally)
- * rather than throwing. Device accounts whose profile could not be resolved are
- * omitted until a subsequent fetch succeeds (except the active one, which never
- * depends on this fetch); graph accounts are unaffected.
+ * Every account the signed-in user can switch into — device sign-ins AND linked
+ * graph accounts (owned orgs + shared-with-you) — as one flat, deduped list with
+ * real per-account name / email / avatar / color.
+ *
+ * This is a thin binding over the shared `AccountDialogController` in
+ * `@oxyhq/core` (the SAME headless source the {@link OxyAccountDialog} renders),
+ * so there is ONE projection (`projectSwitchableAccounts`) and one switch path
+ * (`controller.switchTo`) across the whole SDK — the local duplicate projection
+ * this hook used to own has been removed. Every switch routes through
+ * `useOxy().switchToAccount(accountId)` (or the dialog's row press).
  */
 export function useSwitchableAccounts() {
   const {
-    oxyServices,
-    sessions,
-    activeSessionId,
-    user,
-    isAuthenticated,
-    accounts: graph
+    accountDialogController: controller
   } = useOxy();
-  const {
-    locale
-  } = useI18n();
-
-  // Every distinct account id carried by the device's session set, sorted for
-  // a stable query key regardless of session ordering.
-  const accountIds = useMemo(() => {
-    const ids = new Set();
-    for (const session of sessions ?? []) {
-      if (session.userId) {
-        ids.add(session.userId);
-      }
-    }
-    return Array.from(ids).sort();
-  }, [sessions]);
-  const profilesQuery = useQuery({
-    queryKey: queryKeys.users.list(accountIds),
-    queryFn: () => oxyServices.getUsersByIds(accountIds),
-    enabled: isAuthenticated && accountIds.length > 0,
-    staleTime: 5 * 60 * 1000,
-    // 5 minutes — matches useUserProfile's convention
-    gcTime: 30 * 60 * 1000 // 30 minutes
-  });
-  const profilesById = useMemo(() => {
-    const map = new Map();
-    for (const profile of profilesQuery.data ?? []) {
-      map.set(profile.id, profile);
-    }
-    return map;
-  }, [profilesQuery.data]);
-  const accounts = useMemo(() => buildSwitchableAccounts({
-    sessions: sessions ?? [],
-    activeSessionId: activeSessionId ?? null,
-    liveUser: user ?? null,
-    isAuthenticated,
-    graph: graph ?? [],
-    profilesById,
-    locale,
-    resolveAvatarUrl: avatar => avatar ? oxyServices.getFileDownloadUrl(avatar, 'thumb') : undefined
-  }), [sessions, activeSessionId, user, isAuthenticated, graph, profilesById, locale, oxyServices]);
+  const subscribe = useCallback(listener => controller ? controller.subscribe(listener) : () => undefined, [controller]);
+  const getSnapshot = useCallback(() => controller ? controller.getSnapshot() : EMPTY_SNAPSHOT, [controller]);
+  const snapshot = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  const currentSessionId = useMemo(() => {
+    const active = snapshot.accounts.find(account => account.accountId === snapshot.activeAccountId);
+    return active?.sessionId ?? null;
+  }, [snapshot]);
   return {
-    accounts,
-    isLoading: isAuthenticated && accountIds.length > 0 && profilesQuery.isLoading,
-    currentSessionId: activeSessionId ?? null
+    accounts: snapshot.accounts,
+    isLoading: snapshot.loading,
+    currentSessionId
   };
 }
 //# sourceMappingURL=useSwitchableAccounts.js.map

package/lib/module/ui/hooks/useSwitchableAccounts.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useQuery","getAccountDisplayName","getAccountFallbackHandle","useOxy","useI18n","queryKeys","markCurrentAccount","accounts","activeSessionId","liveUserId","isAuthenticated","bySession","map","account","isCurrent","Boolean","sessionId","some","matched","byUser","user","id","length","buildSwitchableAccounts","input","sessions","liveUser","graph","profilesById","locale","resolveAvatarUrl","toRow","accountUser","opts","displayName","handle","secondaryHandle","accountId","toString","authuser","onDevice","relationship","kind","parentAccountId","callerMembership","email","avatarUrl","avatar","color","built","flatMap","session","userId","get","undefined","flagged","deviceRows","byAccountId","Map","order","remember","row","has","set","push","node","existing","useSwitchableAccounts","oxyServices","accountIds","ids","Set","add","Array","from","sort","profilesQuery","queryKey","users","list","queryFn","getUsersByIds","enabled","staleTime","gcTime","profile","data","getFileDownloadUrl","isLoading","currentSessionId"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSwitchableAccounts.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useMemo","useSyncExternalStore","useOxy","EMPTY_SNAPSHOT","view","accounts","activeAccountId","loading","error","switchingAccountId","signIn","phase","authorizeCode","qrPayload","expiresAt","useSwitchableAccounts","accountDialogController","controller","subscribe","listener","undefined","getSnapshot","snapshot","currentSessionId","active","find","account","accountId","sessionId","isLoading"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSwitchableAccounts.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,OAAO,EAAEC,oBAAoB,QAAQ,OAAO;AAElE,SAASC,MAAM,QAAQ,0BAAuB;AAW9C;AACA;AACA;AACA;AACA,MAAMC,cAAqC,GAAG;EAC1CC,IAAI,EAAE,UAAU;EAChBC,QAAQ,EAAE,EAAE;EACZC,eAAe,EAAE,IAAI;EACrBC,OAAO,EAAE,KAAK;EACdC,KAAK,EAAE,IAAI;EACXC,kBAAkB,EAAE,IAAI;EACxBC,MAAM,EAAE;IAAEC,KAAK,EAAE,MAAM;IAAEC,aAAa,EAAE,IAAI;IAAEC,SAAS,EAAE,IAAI;IAAEC,SAAS,EAAE,IAAI;IAAEN,KAAK,EAAE;EAAK;AAChG,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASO,qBAAqBA,CAAA,EAAgC;EACjE,MAAM;IAAEC,uBAAuB,EAAEC;EAAW,CAAC,GAAGf,MAAM,CAAC,CAAC;EAExD,MAAMgB,SAAS,GAAGnB,WAAW,CACxBoB,QAAoB,IAAMF,UAAU,GAAGA,UAAU,CAACC,SAAS,CAACC,QAAQ,CAAC,GAAG,MAAMC,SAAU,EACzF,CAACH,UAAU,CACf,CAAC;EACD,MAAMI,WAAW,GAAGtB,WAAW,CAC3B,MAAOkB,UAAU,GAAGA,UAAU,CAACI,WAAW,CAAC,CAAC,GAAGlB,cAAe,EAC9D,CAACc,UAAU,CACf,CAAC;EACD,MAAMK,QAAQ,GAAGrB,oBAAoB,CAACiB,SAAS,EAAEG,WAAW,EAAEA,WAAW,CAAC;EAE1E,MAAME,gBAAgB,GAAGvB,OAAO,CAAgB,MAAM;IAClD,MAAMwB,MAAM,GAAGF,QAAQ,CAACjB,QAAQ,CAACoB,IAAI,CAAEC,OAAO,IAAKA,OAAO,CAACC,SAAS,KAAKL,QAAQ,CAAChB,eAAe,CAAC;IAClG,OAAOkB,MAAM,EAAEI,SAAS,IAAI,IAAI;EACpC,CAAC,EAAE,CAACN,QAAQ,CAAC,CAAC;EAEd,OAAO;IACHjB,QAAQ,EAAEiB,QAAQ,CAACjB,QAAQ;IAC3BwB,SAAS,EAAEP,QAAQ,CAACf,OAAO;IAC3BgB;EACJ,CAAC;AACL","ignoreList":[]}

package/lib/module/ui/index.js

@@ -22,16 +22,13 @@ export { default as OxyProvider } from "./components/OxyProvider.js";
 export { default as OxySignInButton } from "./components/OxySignInButton.js";
 export { default as OxyAuthPrompt } from "./components/OxyAuthPrompt.js";
 export { default as OxyLogo } from "./components/OxyLogo.js";
+export { RequireOxyAuth } from "./components/RequireOxyAuth.js";
 export { default as Avatar } from "./components/Avatar.js";
 export { default as FollowButton } from "./components/FollowButton.js";
 export { default as OxyPayButton } from "./components/OxyPayButton.js";
 export { FontLoader, setupFonts } from "./components/FontLoader.js";
 export { default as OxyIcon } from "./components/icon/OxyIcon.js";
-export { default as AccountMenu } from "./components/AccountMenu.js";
-export { default as AccountMenuButton } from "./components/AccountMenuButton.js";
 export { default as ProfileButton } from "./components/ProfileButton.js";
-export { default as ProfileMenu } from "./components/ProfileMenu.js";
-export { default as AccountSwitcher, AccountSwitcherView } from "./components/AccountSwitcher.js";
 
 // Context + hooks
 export { useOxy } from "./context/OxyContext.js";
@@ -41,7 +38,6 @@ export { useStorage } from "./hooks/useStorage.js";
 // Screens
 export { default as ProfileScreen } from "./screens/ProfileScreen.js";
 export { default as ManageAccountScreen } from "./screens/ManageAccountScreen.js";
-export { default as AccountSwitcherScreen } from "./screens/AccountSwitcherScreen.js";
 export { default as CreateAccountScreen } from "./screens/CreateAccountScreen.js";
 export { default as AccountMembersScreen } from "./screens/AccountMembersScreen.js";
 export { default as AccountSettingsScreen } from "./screens/AccountSettingsScreen.js";

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

@@ -1 +1 @@
-{"version":3,"names":["default","OxyProvider","OxySignInButton","OxyAuthPrompt","OxyLogo","Avatar","FollowButton","OxyPayButton","FontLoader","setupFonts","OxyIcon","AccountMenu","AccountMenuButton","ProfileButton","ProfileMenu","AccountSwitcher","AccountSwitcherView","useOxy","useAuth","useFollow","useStorage","ProfileScreen","ManageAccountScreen","AccountSwitcherScreen","CreateAccountScreen","AccountMembersScreen","AccountSettingsScreen","useAuthStore","useAccountStore","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage"],"sourceRoot":"../../../src","sources":["ui/index.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA,SAASA,OAAO,IAAIC,WAAW,QAAQ,6BAA0B;AACjE,SAASD,OAAO,IAAIE,eAAe,QAAQ,iCAA8B;AACzE,SAASF,OAAO,IAAIG,aAAa,QAAQ,+BAA4B;AAErE,SAASH,OAAO,IAAII,OAAO,QAAQ,yBAAsB;AACzD,SAASJ,OAAO,IAAIK,MAAM,QAAQ,wBAAqB;AACvD,SAASL,OAAO,IAAIM,YAAY,QAAQ,8BAA2B;AACnE,SAASN,OAAO,IAAIO,YAAY,QAAQ,8BAA2B;AACnE,SAASC,UAAU,EAAEC,UAAU,QAAQ,4BAAyB;AAChE,SAAST,OAAO,IAAIU,OAAO,QAAQ,8BAA2B;AAC9D,SAASV,OAAO,IAAIW,WAAW,QAAQ,6BAA0B;AACjE,SAASX,OAAO,IAAIY,iBAAiB,QAAQ,mCAAgC;AAC7E,SAASZ,OAAO,IAAIa,aAAa,QAAQ,+BAA4B;AACrE,SAASb,OAAO,IAAIc,WAAW,QAAQ,6BAA0B;AACjE,SAASd,OAAO,IAAIe,eAAe,EAAEC,mBAAmB,QAAQ,iCAA8B;;AAE9F;AACA,SAASC,MAAM,QAAQ,yBAAsB;AAC7C,SAASC,OAAO,QAAQ,oBAAiB;AACzC,SAASC,SAAS,QAAQ,sBAAmB;AAC7C,SAASC,UAAU,QAAQ,uBAAoB;AAG/C;AACA,SAASpB,OAAO,IAAIqB,aAAa,QAAQ,4BAAyB;AAClE,SAASrB,OAAO,IAAIsB,mBAAmB,QAAQ,kCAA+B;AAC9E,SAAStB,OAAO,IAAIuB,qBAAqB,QAAQ,oCAAiC;AAClF,SAASvB,OAAO,IAAIwB,mBAAmB,QAAQ,kCAA+B;AAC9E,SAASxB,OAAO,IAAIyB,oBAAoB,QAAQ,mCAAgC;AAChF,SAASzB,OAAO,IAAI0B,qBAAqB,QAAQ,oCAAiC;;AAElF;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","OxyLogo","RequireOxyAuth","Avatar","FollowButton","OxyPayButton","FontLoader","setupFonts","OxyIcon","ProfileButton","useOxy","useAuth","useFollow","useStorage","ProfileScreen","ManageAccountScreen","CreateAccountScreen","AccountMembersScreen","AccountSettingsScreen","useAuthStore","useAccountStore","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage"],"sourceRoot":"../../../src","sources":["ui/index.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA,SAASA,OAAO,IAAIC,WAAW,QAAQ,6BAA0B;AACjE,SAASD,OAAO,IAAIE,eAAe,QAAQ,iCAA8B;AACzE,SAASF,OAAO,IAAIG,aAAa,QAAQ,+BAA4B;AAErE,SAASH,OAAO,IAAII,OAAO,QAAQ,yBAAsB;AACzD,SAASC,cAAc,QAAQ,gCAA6B;AAE5D,SAASL,OAAO,IAAIM,MAAM,QAAQ,wBAAqB;AACvD,SAASN,OAAO,IAAIO,YAAY,QAAQ,8BAA2B;AACnE,SAASP,OAAO,IAAIQ,YAAY,QAAQ,8BAA2B;AACnE,SAASC,UAAU,EAAEC,UAAU,QAAQ,4BAAyB;AAChE,SAASV,OAAO,IAAIW,OAAO,QAAQ,8BAA2B;AAC9D,SAASX,OAAO,IAAIY,aAAa,QAAQ,+BAA4B;;AAErE;AACA,SAASC,MAAM,QAAQ,yBAAsB;AAC7C,SAASC,OAAO,QAAQ,oBAAiB;AACzC,SAASC,SAAS,QAAQ,sBAAmB;AAC7C,SAASC,UAAU,QAAQ,uBAAoB;AAG/C;AACA,SAAShB,OAAO,IAAIiB,aAAa,QAAQ,4BAAyB;AAClE,SAASjB,OAAO,IAAIkB,mBAAmB,QAAQ,kCAA+B;AAC9E,SAASlB,OAAO,IAAImB,mBAAmB,QAAQ,kCAA+B;AAC9E,SAASnB,OAAO,IAAIoB,oBAAoB,QAAQ,mCAAgC;AAChF,SAASpB,OAAO,IAAIqB,qBAAqB,QAAQ,oCAAiC;;AAElF;AACA,SAASC,YAAY,QAAQ,uBAAoB;AACjD,SAASC,eAAe,QAAQ,0BAAuB;;AAEvD;AACA,SACIC,eAAe,EACfC,qBAAqB,EACrBC,uBAAuB,EACvBC,mBAAmB,QAChB,0BAAuB","ignoreList":[]}

package/lib/module/ui/navigation/accountDialogManager.js

@@ -0,0 +1,81 @@
+"use strict";
+
+/**
+ * Imperative bridge for the unified {@link OxyAccountDialog}.
+ *
+ * Mirrors `bottomSheetManager` — a tiny module-level indirection so any caller
+ * (even outside React, e.g. an app's imperative "sign in" handler) can open the
+ * single account dialog without a ref. `OxyContext` registers the live open/close
+ * controls on mount via {@link registerAccountDialogControls} and reports the
+ * dialog's visibility here via {@link notifyAccountDialogVisibility}; the exported
+ * `openAccountDialog` / `closeAccountDialog` drive those controls.
+ *
+ * `showSignInModal` / `hideSignInModal` / `subscribeToSignInModal` are the stable
+ * public surface the previous `SignInModal` module owned — kept so existing
+ * consumers (inbox, accounts) keep working while the sign-in surface is now the
+ * unified dialog opened on its `signin` view.
+ */
+
+/** Live open/close handles registered by the mounted provider. */
+
+let controls = null;
+const visibilityListeners = new Set();
+
+/**
+ * Register the provider's live open/close controls. Returns an unregister
+ * function that only clears the slot if it still owns it (guards against a late
+ * unmount clobbering a newer provider).
+ */
+export function registerAccountDialogControls(next) {
+  controls = next;
+  return () => {
+    if (controls === next) {
+      controls = null;
+    }
+  };
+}
+
+/** Open the account dialog on `view` (default `accounts`). No-op before mount. */
+export function openAccountDialog(view) {
+  controls?.open(view);
+}
+
+/** Close the account dialog. No-op before mount. */
+export function closeAccountDialog() {
+  controls?.close();
+}
+
+/**
+ * Report the dialog's current visibility so subscribers (e.g. `OxySignInButton`)
+ * can reflect an in-flight "Signing in…" state. Called by the provider whenever
+ * the open flag changes, so listeners stay accurate regardless of what triggered
+ * the change (imperative open, backdrop dismiss, completed sign-in).
+ */
+export function notifyAccountDialogVisibility(visible) {
+  for (const listener of visibilityListeners) {
+    listener(visible);
+  }
+}
+
+/**
+ * Subscribe to dialog visibility changes. Returns an unsubscribe function.
+ * Retains the name the old `SignInModal` exposed so `OxySignInButton` keeps its
+ * "Signing in…" affordance.
+ */
+export function subscribeToSignInModal(listener) {
+  visibilityListeners.add(listener);
+  return () => {
+    visibilityListeners.delete(listener);
+  };
+}
+
+/** Open the unified dialog on its sign-in view. Public back-compat entry point. */
+export function showSignInModal() {
+  openAccountDialog('signin');
+}
+
+/** Close the unified dialog. Public back-compat entry point. */
+export function hideSignInModal() {
+  closeAccountDialog();
+}
+//# sourceMappingURL=accountDialogManager.js.map

package/lib/module/ui/navigation/accountDialogManager.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["controls","visibilityListeners","Set","registerAccountDialogControls","next","openAccountDialog","view","open","closeAccountDialog","close","notifyAccountDialogVisibility","visible","listener","subscribeToSignInModal","add","delete","showSignInModal","hideSignInModal"],"sourceRoot":"../../../../src","sources":["ui/navigation/accountDialogManager.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;;AAMA,IAAIA,QAAsC,GAAG,IAAI;AACjD,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAA6B,CAAC;;AAEjE;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,6BAA6BA,CAACC,IAA2B,EAAc;EACrFJ,QAAQ,GAAGI,IAAI;EACf,OAAO,MAAM;IACX,IAAIJ,QAAQ,KAAKI,IAAI,EAAE;MACrBJ,QAAQ,GAAG,IAAI;IACjB;EACF,CAAC;AACH;;AAEA;AACA,OAAO,SAASK,iBAAiBA,CAACC,IAAwB,EAAQ;EAChEN,QAAQ,EAAEO,IAAI,CAACD,IAAI,CAAC;AACtB;;AAEA;AACA,OAAO,SAASE,kBAAkBA,CAAA,EAAS;EACzCR,QAAQ,EAAES,KAAK,CAAC,CAAC;AACnB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,6BAA6BA,CAACC,OAAgB,EAAQ;EACpE,KAAK,MAAMC,QAAQ,IAAIX,mBAAmB,EAAE;IAC1CW,QAAQ,CAACD,OAAO,CAAC;EACnB;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,sBAAsBA,CAACD,QAAoC,EAAc;EACvFX,mBAAmB,CAACa,GAAG,CAACF,QAAQ,CAAC;EACjC,OAAO,MAAM;IACXX,mBAAmB,CAACc,MAAM,CAACH,QAAQ,CAAC;EACtC,CAAC;AACH;;AAEA;AACA,OAAO,SAASI,eAAeA,CAAA,EAAS;EACtCX,iBAAiB,CAAC,QAAQ,CAAC;AAC7B;;AAEA;AACA,OAAO,SAASY,eAAeA,CAAA,EAAS;EACtCT,kBAAkB,CAAC,CAAC;AACtB","ignoreList":[]}

package/lib/module/ui/navigation/routes.js

@@ -11,7 +11,6 @@
 // Lazy screen loaders - functions that return screen components on-demand
 // This breaks the require cycle by deferring imports until screens are actually needed
 const screenLoaders = {
-  OxyAuth: () => require('../screens/OxyAuthScreen').default,
   ManageAccount: () => require('../screens/ManageAccountScreen').default,
   AccountVerification: () => require('../screens/AccountVerificationScreen').default,
   PaymentGateway: () => require('../screens/PaymentGatewayScreen').default,
@@ -44,7 +43,6 @@ const screenLoaders = {
   // User list screens (followers/following)
   FollowersList: () => require('../screens/FollowersListScreen').default,
   FollowingList: () => require('../screens/FollowingListScreen').default,
-  AccountSwitcher: () => require('../screens/AccountSwitcherScreen').default,
   CreateAccount: () => require('../screens/CreateAccountScreen').default,
   AccountMembers: () => require('../screens/AccountMembersScreen').default,
   AccountSettings: () => require('../screens/AccountSettingsScreen').default,

package/lib/module/ui/navigation/routes.js.map

@@ -1 +1 @@
-{"version":3,"names":["screenLoaders","OxyAuth","require","default","ManageAccount","AccountVerification","PaymentGateway","Profile","LanguageSelector","PrivacySettings","SearchSettings","FileManagement","HelpSupport","FAQ","Feedback","LegalDocuments","AppInfo","PremiumSubscription","WelcomeNewUser","UserLinks","HistoryView","SavesCollections","EditProfile","EditProfileField","LearnMoreUsernames","TrustCenter","TrustLeaderboard","TrustRewards","TrustRules","AboutTrust","TrustFAQ","FollowersList","FollowingList","AccountSwitcher","CreateAccount","AccountMembers","AccountSettings","AvatarCrop","Notifications","ConnectedApps","Preferences","screenCache","Map","getScreenComponent","routeName","has","get","loader","component","set","error","__DEV__","console","undefined","isValidRoute","isFileManagementImageOnlyPicker","props","selectMode","disabled","disabledMimeTypes","Array","isArray","length","predicate","some","mt","blocksVideos","startsWith","blocksAudio","blocksDocs","DEFAULT_SHEET_CONFIG","scrollable","manualActivation","dynamicBackdrop","getSheetConfig","screenProps"],"sourceRoot":"../../../../src","sources":["ui/navigation/routes.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["screenLoaders","ManageAccount","require","default","AccountVerification","PaymentGateway","Profile","LanguageSelector","PrivacySettings","SearchSettings","FileManagement","HelpSupport","FAQ","Feedback","LegalDocuments","AppInfo","PremiumSubscription","WelcomeNewUser","UserLinks","HistoryView","SavesCollections","EditProfile","EditProfileField","LearnMoreUsernames","TrustCenter","TrustLeaderboard","TrustRewards","TrustRules","AboutTrust","TrustFAQ","FollowersList","FollowingList","CreateAccount","AccountMembers","AccountSettings","AvatarCrop","Notifications","ConnectedApps","Preferences","screenCache","Map","getScreenComponent","routeName","has","get","loader","component","set","error","__DEV__","console","undefined","isValidRoute","isFileManagementImageOnlyPicker","props","selectMode","disabled","disabledMimeTypes","Array","isArray","length","predicate","some","mt","blocksVideos","startsWith","blocksAudio","blocksDocs","DEFAULT_SHEET_CONFIG","scrollable","manualActivation","dynamicBackdrop","getSheetConfig","screenProps"],"sourceRoot":"../../../../src","sources":["ui/navigation/routes.ts"],"mappings":";;AAGA;AACA;AACA;;AAEA;;AAqCqB;;AAErB;AACA;AACA,MAAMA,aAAsE,GAAG;EAC3EC,aAAa,EAAEA,CAAA,KAAMC,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtEC,mBAAmB,EAAEA,CAAA,KAAMF,OAAO,CAAC,sCAAsC,CAAC,CAACC,OAAO;EAClFE,cAAc,EAAEA,CAAA,KAAMH,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxEG,OAAO,EAAEA,CAAA,KAAMJ,OAAO,CAAC,0BAA0B,CAAC,CAACC,OAAO;EAC1DI,gBAAgB,EAAEA,CAAA,KAAML,OAAO,CAAC,mCAAmC,CAAC,CAACC,OAAO;EAC5EK,eAAe,EAAEA,CAAA,KAAMN,OAAO,CAAC,kCAAkC,CAAC,CAACC,OAAO;EAC1EM,cAAc,EAAEA,CAAA,KAAMP,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxEO,cAAc,EAAEA,CAAA,KAAMR,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxEQ,WAAW,EAAEA,CAAA,KAAMT,OAAO,CAAC,8BAA8B,CAAC,CAACC,OAAO;EAClES,GAAG,EAAEA,CAAA,KAAMV,OAAO,CAAC,sBAAsB,CAAC,CAACC,OAAO;EAClDU,QAAQ,EAAEA,CAAA,KAAMX,OAAO,CAAC,2BAA2B,CAAC,CAACC,OAAO;EAC5DW,cAAc,EAAEA,CAAA,KAAMZ,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxEY,OAAO,EAAEA,CAAA,KAAMb,OAAO,CAAC,0BAA0B,CAAC,CAACC,OAAO;EAC1Da,mBAAmB,EAAEA,CAAA,KAAMd,OAAO,CAAC,sCAAsC,CAAC,CAACC,OAAO;EAClFc,cAAc,EAAEA,CAAA,KAAMf,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxEe,SAAS,EAAEA,CAAA,KAAMhB,OAAO,CAAC,4BAA4B,CAAC,CAACC,OAAO;EAC9DgB,WAAW,EAAEA,CAAA,KAAMjB,OAAO,CAAC,8BAA8B,CAAC,CAACC,OAAO;EAClEiB,gBAAgB,EAAEA,CAAA,KAAMlB,OAAO,CAAC,mCAAmC,CAAC,CAACC,OAAO;EAC5EkB,WAAW,EAAEA,CAAA,KAAMnB,OAAO,CAAC,8BAA8B,CAAC,CAACC,OAAO;EAClEmB,gBAAgB,EAAEA,CAAA,KAAMpB,OAAO,CAAC,mCAAmC,CAAC,CAACC,OAAO;EAC5E;EACAoB,kBAAkB,EAAEA,CAAA,KAAMrB,OAAO,CAAC,qCAAqC,CAAC,CAACC,OAAO;EAChF;EACAqB,WAAW,EAAEA,CAAA,KAAMtB,OAAO,CAAC,oCAAoC,CAAC,CAACC,OAAO;EACxEsB,gBAAgB,EAAEA,CAAA,KAAMvB,OAAO,CAAC,yCAAyC,CAAC,CAACC,OAAO;EAClFuB,YAAY,EAAEA,CAAA,KAAMxB,OAAO,CAAC,qCAAqC,CAAC,CAACC,OAAO;EAC1EwB,UAAU,EAAEA,CAAA,KAAMzB,OAAO,CAAC,mCAAmC,CAAC,CAACC,OAAO;EACtEyB,UAAU,EAAEA,CAAA,KAAM1B,OAAO,CAAC,mCAAmC,CAAC,CAACC,OAAO;EACtE0B,QAAQ,EAAEA,CAAA,KAAM3B,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EAClE;EACA2B,aAAa,EAAEA,CAAA,KAAM5B,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtE4B,aAAa,EAAEA,CAAA,KAAM7B,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtE6B,aAAa,EAAEA,CAAA,KAAM9B,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtE8B,cAAc,EAAEA,CAAA,KAAM/B,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxE+B,eAAe,EAAEA,CAAA,KAAMhC,OAAO,CAAC,kCAAkC,CAAC,CAACC,OAAO;EAC1EgC,UAAU,EAAEA,CAAA,KAAMjC,OAAO,CAAC,6BAA6B,CAAC,CAACC,OAAO;EAChEiC,aAAa,EAAEA,CAAA,KAAMlC,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtEkC,aAAa,EAAEA,CAAA,KAAMnC,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtEmC,WAAW,EAAEA,CAAA,KAAMpC,OAAO,CAAC,8BAA8B,CAAC,CAACC;AAC/D,CAAC;;AAED;AACA,MAAMoC,WAAW,GAAG,IAAIC,GAAG,CAA4C,CAAC;;AAExE;AACA,OAAO,MAAMC,kBAAkB,GAAIC,SAAoB,IAAiD;EACpG;EACA,IAAIH,WAAW,CAACI,GAAG,CAACD,SAAS,CAAC,EAAE;IAC5B,OAAOH,WAAW,CAACK,GAAG,CAACF,SAAS,CAAC;EACrC;;EAEA;EACA,MAAMG,MAAM,GAAG7C,aAAa,CAAC0C,SAAS,CAAC;EACvC,IAAIG,MAAM,EAAE;IACR,IAAI;MACA,MAAMC,SAAS,GAAGD,MAAM,CAAC,CAAC;MAC1BN,WAAW,CAACQ,GAAG,CAACL,SAAS,EAAEI,SAAS,CAAC;MACrC,OAAOA,SAAS;IACpB,CAAC,CAAC,OAAOE,KAAK,EAAE;MACZ,IAAIC,OAAO,EAAE;QACTC,OAAO,CAACF,KAAK,CAAC,mCAAmCN,SAAS,EAAE,EAAEM,KAAK,CAAC;MACxE;MACA,OAAOG,SAAS;IACpB;EACJ;EAEA,OAAOA,SAAS;AACpB,CAAC;;AAED;AACA;AACA,OAAO,MAAMC,YAAY,GAAIV,SAAiB,IAA6B;EACvE,OAAOA,SAAS,IAAI1C,aAAa;AACrC,CAAC;;AAED;AACA;AACA;AACA;AACA;;AAqCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMqD,+BAA+B,GAAIC,KAA8B,IAAc;EACjF,IAAI,CAACA,KAAK,CAACC,UAAU,EAAE,OAAO,KAAK;EACnC,MAAMC,QAAQ,GAAGF,KAAK,CAACG,iBAAiB;EACxC,IAAI,CAACC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,IAAIA,QAAQ,CAACI,MAAM,KAAK,CAAC,EAAE,OAAO,KAAK;EACnE,MAAMjB,GAAG,GAAIkB,SAAkC,IAC3CL,QAAQ,CAACM,IAAI,CAAEC,EAAE,IAAK,OAAOA,EAAE,KAAK,QAAQ,IAAIF,SAAS,CAACE,EAAE,CAAC,CAAC;EAClE,MAAMC,YAAY,GAAGrB,GAAG,CAAEoB,EAAE,IAAKA,EAAE,KAAK,QAAQ,IAAIA,EAAE,CAACE,UAAU,CAAC,QAAQ,CAAC,CAAC;EAC5E,MAAMC,WAAW,GAAGvB,GAAG,CAAEoB,EAAE,IAAKA,EAAE,KAAK,QAAQ,IAAIA,EAAE,CAACE,UAAU,CAAC,QAAQ,CAAC,CAAC;EAC3E,MAAME,UAAU,GAAGxB,GAAG,CACjBoB,EAAE,IAAKA,EAAE,KAAK,iBAAiB,IAAIA,EAAE,KAAK,cAAc,IAAIA,EAAE,CAACE,UAAU,CAAC,cAAc,CAC7F,CAAC;EACD,OAAOD,YAAY,IAAIE,WAAW,IAAIC,UAAU;AACpD,CAAC;;AAED;AACA,MAAMC,oBAAsC,GAAG;EAC3CC,UAAU,EAAE,IAAI;EAChBC,gBAAgB,EAAE,IAAI;EACtBC,eAAe,EAAE;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAGA,CAC1B9B,SAA2B,EAC3B+B,WAAoC,KACjB;EACnB,IAAI,CAAC/B,SAAS,EAAE,OAAO0B,oBAAoB;EAC3C,IAAI1B,SAAS,KAAK,gBAAgB,IAAIW,+BAA+B,CAACoB,WAAW,CAAC,EAAE;IAChF;IACA;IACA;IACA,OAAO;MAAE,GAAGL,oBAAoB;MAAEC,UAAU,EAAE;IAAM,CAAC;EACzD;EACA,OAAOD,oBAAoB;AAC/B,CAAC","ignoreList":[]}