@the-portland-company/shell 0.75.2 → 0.76.1

package/dist/app-chrome.d.cts

@@ -188,6 +188,8 @@ type PolitogyFrameData = {
     devNotes?: ChromeDevNotesConfig;
     /** Controlled org state for apps that own active-org + switching. */
     org?: ControlledOrgState;
+    /** Auth-owned active org from verified token claims (v2). Wins over `org`. */
+    tokenOrg?: TokenOrgState;
     /**
      * App-owned children for a standard nav entry this app owns (Contacts).
      * `count` is the live contact total, pre-formatted ("31.9K"), drawn
@@ -393,6 +395,34 @@ type ControlledOrgState = {
      */
     onExternalSwitch?: (id: string) => void;
 };
+/**
+ * Auth-owned active org (Global-Rules v38, UI-Platform v46). The app server
+ * passes the VERIFIED token claims; the shell never resolves the org itself.
+ */
+type TokenOrgState = {
+    /** `org_id` claim from the app's verified token (full uuid). */
+    orgId: string | null;
+    /** `org_role` claim (raw VRM Core role). */
+    orgRole?: string | null;
+    /**
+     * The switcher list from the app server (names for the pill). When given,
+     * the chrome `/api/orgs` call is skipped. When absent it is the fallback.
+     */
+    orgs?: (NavOrgOption & {
+        rawRole?: string | null;
+    })[];
+    /**
+     * Server action that re-exchanges for tokens on `orgId`. Called after the
+     * IdP accepted the switch (shared) or for a per-tab override (`perTab`).
+     */
+    onReexchange: (orgId: string, opts: {
+        perTab: boolean;
+    }) => void | Promise<void>;
+    /** IdP base override (default: auth / auth-staging by host). */
+    authBaseUrl?: string;
+    /** Called when the IdP refuses a switch (403 not a member, 401 no session). */
+    onSwitchError?: (err: unknown) => void;
+};
 type ChromeDevNotesConfig = {
     /** Override the DevNotes API base (default: `${proxyBasePath}/devnotes`). */
     basePath?: string;
@@ -417,7 +447,7 @@ type ChromeDevNotesConfig = {
  *     <ShellFrame …/>
  *   </PolitogyAppChrome>
  */
-declare function PolitogyAppChrome({ storagePrefix, proxyBasePath, fetchJson: fetchJsonOverride, devNotes, org, identity, children, }: {
+declare function PolitogyAppChrome({ storagePrefix, proxyBasePath, fetchJson: fetchJsonOverride, devNotes, org, tokenOrg, identity, children, }: {
     storagePrefix: string;
     proxyBasePath?: string;
     /**
@@ -430,6 +460,8 @@ declare function PolitogyAppChrome({ storagePrefix, proxyBasePath, fetchJson: fe
     devNotes?: ChromeDevNotesConfig;
     /** Controlled org state — the app owns active-org + switching (Contacts). */
     org?: ControlledOrgState;
+    /** Auth-owned active org from verified token claims (v2). Wins over `org`. */
+    tokenOrg?: TokenOrgState;
     identity: ChromeIdentity;
     children: ReactNode;
 }): react_jsx_runtime.JSX.Element;
@@ -502,4 +534,4 @@ type UseChromeModeArg = ModeId | {
  */
 declare function useChromeMode(arg?: UseChromeModeArg): NavMode;
 
-export { type BootPhase, type BootProgress, type BootStageId, type ChromeDevNotesConfig, type ChromeIdentity, ChromeTopBarActions, type ControlledOrgState, LoadingScreen, POLITOGY_APPS, PolitogyAppChrome, PolitogyAppFrame, type PolitogyAppKey, type PolitogyAppMode, type PolitogyAppSession, type PolitogyBuildMeta, type PolitogyFrameData, type PolitogyFrameGrant, type PolitogyGrantedFrame, type ResolvedIdentity, deriveBreadcrumbs, looksLikeEmail, resolveIdentity, standardNavIcons, useChromeFooter, useChromeIdentity, useChromeMode, useChromeState, useChromeUserMenu, useIsSuperAdmin };
+export { type BootPhase, type BootProgress, type BootStageId, type ChromeDevNotesConfig, type ChromeIdentity, ChromeTopBarActions, type ControlledOrgState, LoadingScreen, POLITOGY_APPS, PolitogyAppChrome, PolitogyAppFrame, type PolitogyAppKey, type PolitogyAppMode, type PolitogyAppSession, type PolitogyBuildMeta, type PolitogyFrameData, type PolitogyFrameGrant, type PolitogyGrantedFrame, type ResolvedIdentity, type TokenOrgState, deriveBreadcrumbs, looksLikeEmail, resolveIdentity, standardNavIcons, useChromeFooter, useChromeIdentity, useChromeMode, useChromeState, useChromeUserMenu, useIsSuperAdmin };

package/dist/app-chrome.d.ts

@@ -188,6 +188,8 @@ type PolitogyFrameData = {
     devNotes?: ChromeDevNotesConfig;
     /** Controlled org state for apps that own active-org + switching. */
     org?: ControlledOrgState;
+    /** Auth-owned active org from verified token claims (v2). Wins over `org`. */
+    tokenOrg?: TokenOrgState;
     /**
      * App-owned children for a standard nav entry this app owns (Contacts).
      * `count` is the live contact total, pre-formatted ("31.9K"), drawn
@@ -393,6 +395,34 @@ type ControlledOrgState = {
      */
     onExternalSwitch?: (id: string) => void;
 };
+/**
+ * Auth-owned active org (Global-Rules v38, UI-Platform v46). The app server
+ * passes the VERIFIED token claims; the shell never resolves the org itself.
+ */
+type TokenOrgState = {
+    /** `org_id` claim from the app's verified token (full uuid). */
+    orgId: string | null;
+    /** `org_role` claim (raw VRM Core role). */
+    orgRole?: string | null;
+    /**
+     * The switcher list from the app server (names for the pill). When given,
+     * the chrome `/api/orgs` call is skipped. When absent it is the fallback.
+     */
+    orgs?: (NavOrgOption & {
+        rawRole?: string | null;
+    })[];
+    /**
+     * Server action that re-exchanges for tokens on `orgId`. Called after the
+     * IdP accepted the switch (shared) or for a per-tab override (`perTab`).
+     */
+    onReexchange: (orgId: string, opts: {
+        perTab: boolean;
+    }) => void | Promise<void>;
+    /** IdP base override (default: auth / auth-staging by host). */
+    authBaseUrl?: string;
+    /** Called when the IdP refuses a switch (403 not a member, 401 no session). */
+    onSwitchError?: (err: unknown) => void;
+};
 type ChromeDevNotesConfig = {
     /** Override the DevNotes API base (default: `${proxyBasePath}/devnotes`). */
     basePath?: string;
@@ -417,7 +447,7 @@ type ChromeDevNotesConfig = {
  *     <ShellFrame …/>
  *   </PolitogyAppChrome>
  */
-declare function PolitogyAppChrome({ storagePrefix, proxyBasePath, fetchJson: fetchJsonOverride, devNotes, org, identity, children, }: {
+declare function PolitogyAppChrome({ storagePrefix, proxyBasePath, fetchJson: fetchJsonOverride, devNotes, org, tokenOrg, identity, children, }: {
     storagePrefix: string;
     proxyBasePath?: string;
     /**
@@ -430,6 +460,8 @@ declare function PolitogyAppChrome({ storagePrefix, proxyBasePath, fetchJson: fe
     devNotes?: ChromeDevNotesConfig;
     /** Controlled org state — the app owns active-org + switching (Contacts). */
     org?: ControlledOrgState;
+    /** Auth-owned active org from verified token claims (v2). Wins over `org`. */
+    tokenOrg?: TokenOrgState;
     identity: ChromeIdentity;
     children: ReactNode;
 }): react_jsx_runtime.JSX.Element;
@@ -502,4 +534,4 @@ type UseChromeModeArg = ModeId | {
  */
 declare function useChromeMode(arg?: UseChromeModeArg): NavMode;
 
-export { type BootPhase, type BootProgress, type BootStageId, type ChromeDevNotesConfig, type ChromeIdentity, ChromeTopBarActions, type ControlledOrgState, LoadingScreen, POLITOGY_APPS, PolitogyAppChrome, PolitogyAppFrame, type PolitogyAppKey, type PolitogyAppMode, type PolitogyAppSession, type PolitogyBuildMeta, type PolitogyFrameData, type PolitogyFrameGrant, type PolitogyGrantedFrame, type ResolvedIdentity, deriveBreadcrumbs, looksLikeEmail, resolveIdentity, standardNavIcons, useChromeFooter, useChromeIdentity, useChromeMode, useChromeState, useChromeUserMenu, useIsSuperAdmin };
+export { type BootPhase, type BootProgress, type BootStageId, type ChromeDevNotesConfig, type ChromeIdentity, ChromeTopBarActions, type ControlledOrgState, LoadingScreen, POLITOGY_APPS, PolitogyAppChrome, PolitogyAppFrame, type PolitogyAppKey, type PolitogyAppMode, type PolitogyAppSession, type PolitogyBuildMeta, type PolitogyFrameData, type PolitogyFrameGrant, type PolitogyGrantedFrame, type ResolvedIdentity, type TokenOrgState, deriveBreadcrumbs, looksLikeEmail, resolveIdentity, standardNavIcons, useChromeFooter, useChromeIdentity, useChromeMode, useChromeState, useChromeUserMenu, useIsSuperAdmin };

package/dist/app-chrome.js

@@ -1,11 +1,11 @@
 "use client";
 import { broadcastLogout, watchLogout } from './chunk-LL6LSJAH.js';
-import { clearBetaBannerDismissal, standardPolitogyNav, standardNavIcons, isNavItemActive, NavAppShell, NavChromeProvider, TopBarWidgetSlot, FuelAction, SpecOverlayAction, NotificationsAction, SupportAction, useChromeMe, useThemePreference, useNavChromeFetcher, useChromeOrgs } from './chunk-2DXTSTII.js';
-export { standardNavIcons } from './chunk-2DXTSTII.js';
+import { clearBetaBannerDismissal, standardPolitogyNav, standardNavIcons, isNavItemActive, NavAppShell, NavChromeProvider, TopBarWidgetSlot, FuelAction, SpecOverlayAction, NotificationsAction, SupportAction, useChromeMe, useThemePreference, useNavChromeDedupedFetch, useChromeOrgs, useNavChromeFetcher } from './chunk-6KX3DWBC.js';
+export { standardNavIcons } from './chunk-6KX3DWBC.js';
 import { warnDeprecated } from './chunk-MY6G3LMN.js';
 import './chunk-BHRVZPZ7.js';
-import { NAV_DISPLAY_DEFAULT, resolveNavDisplay, isNavDisplayPreference, writeNavDisplayCookie, writeNavDisplayLocal, NAV_DISPLAY_STORAGE_KEY, readNavDisplayCookie } from './chunk-7YVJ7HQG.js';
-import { resolveActiveOrg, isOrgId, writeActiveOrgCookie, ACTIVE_ORG_QUERY_PARAM, readActiveOrgCookie } from './chunk-W2HITMV5.js';
+import { NAV_DISPLAY_DEFAULT, resolveNavDisplay, writeNavDisplayLocal, writeNavDisplayCookie, isNavDisplayPreference, NAV_DISPLAY_STORAGE_KEY, readNavDisplayCookie } from './chunk-7YVJ7HQG.js';
+import { readOrgSelectorFromUrl, matchOrgSelector, isOrgId, switchActiveOrg, ACTIVE_ORG_QUERY_PARAM, ORG_ID_QUERY_PARAM, orgIdTail, writeActiveOrgCookie, resolveActiveOrg, readActiveOrgCookie } from './chunk-BWV52AT6.js';
 import { createContext, useMemo, useRef, useEffect, useState, useCallback, useContext } from 'react';
 import { DevNotesMenu, createDevNotesClient, DevNotesProvider, DevNotesTaskListModal, DevNotesOverlay } from '@the-portland-company/devnotes';
 import { LuNotebookPen, LuContactRound, LuMegaphone, LuFilePenLine } from 'react-icons/lu';
@@ -605,6 +605,7 @@ function PolitogyAppFrame({
       fetchJson: data?.fetchJson,
       devNotes: data?.devNotes,
       org: data?.org,
+      tokenOrg: data?.tokenOrg,
       identity: {
         userId: session.userId,
         userName: session.userName ?? null,
@@ -885,6 +886,107 @@ var ChromeStateContext = createContext(null);
 function useChromeState() {
   return useContext(ChromeStateContext);
 }
+function TokenChromeStateProvider({
+  tokenOrg,
+  children
+}) {
+  const { orgs: fetchedOrgs, loading: orgsFetching, error: orgsError } = useChromeOrgs({
+    enabled: !tokenOrg.orgs
+  });
+  const [navDisplay, setNavDisplayState] = useState(NAV_DISPLAY_DEFAULT);
+  const [pendingOrg, setPendingOrg] = useState(null);
+  const tokenOrgRef = useRef(tokenOrg);
+  tokenOrgRef.current = tokenOrg;
+  useEffect(() => {
+    setNavDisplayState(resolveNavDisplay());
+  }, []);
+  const orgs = useMemo(
+    () => tokenOrg.orgs ?? (fetchedOrgs ?? []).map((o) => ({
+      id: o.id,
+      name: o.name,
+      logoUrl: o.logoUrl,
+      brandColor: o.brandColor,
+      role: o.role,
+      rawRole: o.rawRole ?? null
+    })),
+    [tokenOrg.orgs, fetchedOrgs]
+  );
+  const [urlSelector] = useState(
+    () => typeof window === "undefined" ? null : readOrgSelectorFromUrl(window.location.search)
+  );
+  const overrideOrg = useMemo(
+    () => urlSelector ? matchOrgSelector(urlSelector, orgs)?.id ?? null : null,
+    [urlSelector, orgs]
+  );
+  const orgId = pendingOrg ?? (tokenOrg.orgId && overrideOrg ? overrideOrg : tokenOrg.orgId);
+  const reexchangedFor = useRef(null);
+  useEffect(() => {
+    if (!overrideOrg || !tokenOrg.orgId || overrideOrg === tokenOrg.orgId) return;
+    if (reexchangedFor.current === overrideOrg) return;
+    reexchangedFor.current = overrideOrg;
+    void Promise.resolve(tokenOrgRef.current.onReexchange(overrideOrg, { perTab: true })).catch(
+      () => {
+      }
+    );
+  }, [overrideOrg, tokenOrg.orgId]);
+  useEffect(() => {
+    if (pendingOrg && tokenOrg.orgId === pendingOrg) setPendingOrg(null);
+  }, [pendingOrg, tokenOrg.orgId]);
+  const setOrgId = useCallback((id) => {
+    const current = tokenOrgRef.current;
+    if (!isOrgId(id) || id === (current.orgId ?? null)) return;
+    setPendingOrg(id);
+    void (async () => {
+      try {
+        const claims = await switchActiveOrg(id, { authBaseUrl: current.authBaseUrl });
+        try {
+          const url = new URL(window.location.href);
+          url.searchParams.delete(ACTIVE_ORG_QUERY_PARAM);
+          url.searchParams.set(ORG_ID_QUERY_PARAM, orgIdTail(claims.orgId));
+          window.history.replaceState(window.history.state, "", url.toString());
+        } catch {
+        }
+        await tokenOrgRef.current.onReexchange(claims.orgId, { perTab: false });
+      } catch (err) {
+        setPendingOrg(null);
+        tokenOrgRef.current.onSwitchError?.(err);
+      }
+    })();
+  }, []);
+  const setNavDisplay = useCallback((m) => {
+    setNavDisplayState(m);
+    writeNavDisplayLocal(m);
+    writeNavDisplayCookie(m);
+  }, []);
+  useEffect(() => {
+    if (!isOrgId(orgId)) return;
+    try {
+      const url = new URL(window.location.href);
+      const tail = orgIdTail(orgId);
+      if (url.searchParams.has(ACTIVE_ORG_QUERY_PARAM) || url.searchParams.get(ORG_ID_QUERY_PARAM) !== tail) {
+        url.searchParams.delete(ACTIVE_ORG_QUERY_PARAM);
+        url.searchParams.set(ORG_ID_QUERY_PARAM, tail);
+        window.history.replaceState(window.history.state, "", url.toString());
+      }
+    } catch {
+    }
+  }, [orgId]);
+  useEffect(() => {
+    if (isOrgId(tokenOrg.orgId) && !pendingOrg) writeActiveOrgCookie(tokenOrg.orgId);
+  }, [tokenOrg.orgId, pendingOrg]);
+  const value = useMemo(
+    () => ({
+      orgId,
+      setOrgId,
+      orgs,
+      orgsLoading: !tokenOrg.orgs && orgsFetching && !orgsError && !fetchedOrgs,
+      navDisplay,
+      setNavDisplay
+    }),
+    [orgId, setOrgId, orgs, tokenOrg.orgs, orgsFetching, orgsError, fetchedOrgs, navDisplay, setNavDisplay]
+  );
+  return /* @__PURE__ */ jsx(ChromeStateContext.Provider, { value, children });
+}
 function ChromeStateProvider({
   controlledOrg,
   children
@@ -1188,6 +1290,7 @@ function PolitogyAppChrome({
   fetchJson: fetchJsonOverride,
   devNotes,
   org,
+  tokenOrg,
   identity,
   children
 }) {
@@ -1206,7 +1309,7 @@ function PolitogyAppChrome({
     [proxyBasePath]
   );
   const fetchJson = fetchJsonOverride ?? proxyFetchJson;
-  return /* @__PURE__ */ jsx(NavChromeProvider, { fetchJson, children: /* @__PURE__ */ jsx(ChromeStateProvider, { controlledOrg: org, children: /* @__PURE__ */ jsx(
+  const devNotesTree = /* @__PURE__ */ jsx(
     AppDevNotes,
     {
       storagePrefix,
@@ -1215,11 +1318,13 @@ function PolitogyAppChrome({
       identity,
       children
     }
-  ) }) });
+  );
+  return /* @__PURE__ */ jsx(NavChromeProvider, { fetchJson, children: tokenOrg ? /* @__PURE__ */ jsx(TokenChromeStateProvider, { tokenOrg, children: devNotesTree }) : /* @__PURE__ */ jsx(ChromeStateProvider, { controlledOrg: org, children: devNotesTree }) });
 }
 function ChromeTopBarActions() {
   const state = useChromeState();
   if (!state) return null;
+  const settledOrgId = state.orgsLoading ? null : state.orgId;
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(
       TopBarWidgetSlot,
@@ -1229,10 +1334,10 @@ function ChromeTopBarActions() {
         children: /* @__PURE__ */ jsx(ChromeDevNotesMenu, {})
       }
     ),
-    /* @__PURE__ */ jsx(FuelAction, { orgId: state.orgId }),
+    /* @__PURE__ */ jsx(FuelAction, { orgId: settledOrgId }),
     /* @__PURE__ */ jsx(SpecOverlayAction, { orgId: state.orgId, orgName: state.orgs.find((o) => o.id === state.orgId)?.name ?? null }),
-    /* @__PURE__ */ jsx(NotificationsAction, { orgId: state.orgId }),
-    /* @__PURE__ */ jsx(SupportAction, { orgId: state.orgId })
+    /* @__PURE__ */ jsx(NotificationsAction, { orgId: settledOrgId }),
+    /* @__PURE__ */ jsx(SupportAction, { orgId: state.orgId, orgs: state.orgs.length ? state.orgs : void 0 })
   ] });
 }
 function ChromeDevNotesMenu() {
@@ -1318,7 +1423,8 @@ var MODE_DEFS = [
 function useChromeMode(arg = {}) {
   const { fallbackModeId = "relationship", pinnedModeId } = typeof arg === "string" ? { fallbackModeId: arg, pinnedModeId: void 0 } : arg;
   const ctx = useContext(ChromeStateContext);
-  const nav = useNavChromeFetcher();
+  const dedupedFetch = useNavChromeDedupedFetch();
+  const { me, loaded: meLoaded } = useChromeMe();
   const orgId = ctx?.orgId ?? null;
   const [entitled, setEntitled] = useState(null);
   const [selectedModeId, setSelectedModeId] = useState(null);
@@ -1330,9 +1436,14 @@ function useChromeMode(arg = {}) {
     }
   }, []);
   useEffect(() => {
-    if (!nav || !orgId) return;
+    if (!dedupedFetch || !orgId || !meLoaded) return;
+    const bootMe = me;
+    if (bootMe && bootMe.account === orgId && bootMe.modes !== void 0) {
+      setEntitled(bootMe.modes ?? null);
+      return;
+    }
     let cancelled = false;
-    nav("me", { headers: { "x-contacts-org": orgId } }).then((data) => {
+    dedupedFetch("me", { headers: { "x-contacts-org": orgId } }, { orgId }).then((data) => {
       if (cancelled) return;
       const modes = data?.modes ?? null;
       setEntitled(modes);
@@ -1341,7 +1452,7 @@ function useChromeMode(arg = {}) {
     return () => {
       cancelled = true;
     };
-  }, [nav, orgId]);
+  }, [dedupedFetch, me, meLoaded, orgId]);
   const options = MODE_DEFS.filter((m) => entitled?.[m.id]);
   const pinned = pinnedModeId ? MODE_DEFS.find((m) => m.id === pinnedModeId) ?? null : null;
   const selected = selectedModeId ? options.find((m) => m.id === selectedModeId) ?? null : null;