@the-portland-company/shell 0.35.4 → 0.36.1

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.36.0 — 2026-07-24
+
+### Added — cross-subdomain active-org + favicon cache-busting
+
+`ChromeStateProvider` now seeds the active org from a shared cross-subdomain
+signal (`active-org` module: URL `?org=<uuid>` → `.politogyvrm.com` cookie
+`politogy_active_org`) before falling back to host-only localStorage, and stamps
+`?org=<full-uuid>` into the address bar on every page. Previously each app +
+subdomain restored from its own host-only localStorage and otherwise defaulted
+to the earliest-joined org, so apps diverged onto different orgs and campaign
+apps could land on a Relationship-only org and lock themselves. `setOrgId` now
+writes the shared cookie so the last-used org follows the user across every app,
+and cross-app/core links carry the FULL org uuid (not the lossy last-6 suffix),
+the only collision-free selector for contacts-api membership matching.
+
+`toMetadataIcons` stamps the Brand revision onto every favicon URL as
+`?v=<version>` (falling back to `updatedAt`) so an aggressively-cached browser
+picks up a new Brand publish even when the stored filename is unchanged.
+
 ## 0.32.0 — 2026-07-23
 
 ### Added — mode-aware navigation (Campaign Mode) with zero new chrome config

package/dist/active-org.cjs

@@ -0,0 +1,74 @@
+'use strict';
+
+// src/active-org.ts
+var ACTIVE_ORG_COOKIE = "politogy_active_org";
+var ACTIVE_ORG_QUERY_PARAM = "org";
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function isOrgId(v) {
+  return typeof v === "string" && UUID_RE.test(v.trim());
+}
+function readActiveOrgCookie() {
+  if (typeof document === "undefined") return null;
+  try {
+    const m = document.cookie.match(
+      new RegExp(`(?:^|;\\s*)${ACTIVE_ORG_COOKIE}=([^;]+)`)
+    );
+    const v = m ? decodeURIComponent(m[1]) : null;
+    return isOrgId(v) ? v : null;
+  } catch {
+    return null;
+  }
+}
+function writeActiveOrgCookie(orgId) {
+  if (typeof document === "undefined" || typeof window === "undefined") return;
+  if (!isOrgId(orgId)) return;
+  const host = window.location.hostname;
+  const domainAttr = /(^|\.)politogyvrm\.com$/i.test(host) ? "; Domain=.politogyvrm.com" : "";
+  const secure = window.location.protocol === "https:" ? "; Secure" : "";
+  document.cookie = `${ACTIVE_ORG_COOKIE}=${encodeURIComponent(
+    orgId
+  )}; Path=/; Max-Age=31536000; SameSite=Lax${domainAttr}${secure}`;
+}
+function readActiveOrgFromUrl(search) {
+  if (!search) return null;
+  try {
+    const qs = search.includes("?") ? search.slice(search.indexOf("?") + 1) : search;
+    const v = new URLSearchParams(qs).get(ACTIVE_ORG_QUERY_PARAM);
+    return isOrgId(v) ? v : null;
+  } catch {
+    return null;
+  }
+}
+function resolveActiveOrg(search) {
+  const fromUrl = readActiveOrgFromUrl(
+    search ?? (typeof window !== "undefined" ? window.location.search : null)
+  );
+  if (fromUrl) return fromUrl;
+  return readActiveOrgCookie();
+}
+function activeOrgParam(orgId) {
+  return isOrgId(orgId) ? `${ACTIVE_ORG_QUERY_PARAM}=${orgId}` : "";
+}
+function withActiveOrgParam(url, orgId) {
+  if (!isOrgId(orgId)) return url;
+  try {
+    const base = typeof window !== "undefined" ? window.location.origin : "https://politogyvrm.com";
+    const u = new URL(url, base);
+    u.searchParams.set(ACTIVE_ORG_QUERY_PARAM, orgId);
+    return /^https?:\/\//i.test(url) ? u.toString() : `${u.pathname}${u.search}${u.hash}`;
+  } catch {
+    return url;
+  }
+}
+
+exports.ACTIVE_ORG_COOKIE = ACTIVE_ORG_COOKIE;
+exports.ACTIVE_ORG_QUERY_PARAM = ACTIVE_ORG_QUERY_PARAM;
+exports.activeOrgParam = activeOrgParam;
+exports.isOrgId = isOrgId;
+exports.readActiveOrgCookie = readActiveOrgCookie;
+exports.readActiveOrgFromUrl = readActiveOrgFromUrl;
+exports.resolveActiveOrg = resolveActiveOrg;
+exports.withActiveOrgParam = withActiveOrgParam;
+exports.writeActiveOrgCookie = writeActiveOrgCookie;
+//# sourceMappingURL=active-org.cjs.map
+//# sourceMappingURL=active-org.cjs.map

package/dist/active-org.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/active-org.ts"],"names":[],"mappings":"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","file":"active-org.cjs","sourcesContent":["// Universal active-organization selection — the ONE cross-app contract.\n//\n// A user belongs to many orgs; ONE active-org choice must follow them across\n// every Politogy app + subdomain so all apps resolve the SAME org (and campaign\n// apps don't land on a rel-only org and lock themselves). Layers cooperate,\n// mirroring the theme-preference contract:\n//   1. URL `?org=<uuid>` — the authoritative per-request selector. The shared\n//      chrome stamps it onto every route so it is bookmarkable + shareable, and\n//      each app forwards it to the chrome API as `x-contacts-org`.\n//   2. `.politogyvrm.com` cookie `politogy_active_org` — cross-subdomain vehicle\n//      (auth session cookies are host-only) that remembers the LAST USED org so\n//      a bare URL in the next app opens on the same org.\n//\n// The stored/most-authoritative value is the FULL org UUID: contacts-api\n// (auth/vrmMembership.selectRequestedMembership) matches the selector by EXACT\n// id first, then falls back to a short suffix that can COLLIDE across a user's\n// orgs — so the full UUID is the only collision-free selector.\n//\n// Server-safe (no 'use client'): constants/resolve helpers are importable from\n// server layouts; the cookie read/write helpers no-op on the server.\n\nexport const ACTIVE_ORG_COOKIE = 'politogy_active_org'\nexport const ACTIVE_ORG_QUERY_PARAM = 'org'\n\n// Loose UUID shape check — we only ever store ids that came from the user's own\n// authoritative membership list, so this just rejects obvious garbage.\nconst UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i\n\nexport function isOrgId(v: unknown): v is string {\n  return typeof v === 'string' && UUID_RE.test(v.trim())\n}\n\n/** Read the shared active-org cookie (browser only; null on server or unset). */\nexport function readActiveOrgCookie(): string | null {\n  if (typeof document === 'undefined') return null\n  try {\n    const m = document.cookie.match(\n      new RegExp(`(?:^|;\\\\s*)${ACTIVE_ORG_COOKIE}=([^;]+)`),\n    )\n    const v = m ? decodeURIComponent(m[1]) : null\n    return isOrgId(v) ? v : null\n  } catch {\n    return null\n  }\n}\n\n// Write the cross-subdomain cookie with the SAME scoping rules as the theme\n// cookie: on a *.politogyvrm.com host scope to the parent domain so every app\n// subdomain reads it; on any other host (localhost, *.pages.dev preview) fall\n// back to a host-only cookie. 1-year, SameSite=Lax, Secure on https.\nexport function writeActiveOrgCookie(orgId: string): void {\n  if (typeof document === 'undefined' || typeof window === 'undefined') return\n  if (!isOrgId(orgId)) return\n  const host = window.location.hostname\n  const domainAttr = /(^|\\.)politogyvrm\\.com$/i.test(host) ? '; Domain=.politogyvrm.com' : ''\n  const secure = window.location.protocol === 'https:' ? '; Secure' : ''\n  document.cookie = `${ACTIVE_ORG_COOKIE}=${encodeURIComponent(\n    orgId,\n  )}; Path=/; Max-Age=31536000; SameSite=Lax${domainAttr}${secure}`\n}\n\n/**\n * Read the `?org=` selector from a URL search string (full UUID only). Accepts a\n * `location.search`-style string or a full URL.\n */\nexport function readActiveOrgFromUrl(search: string | null | undefined): string | null {\n  if (!search) return null\n  try {\n    const qs = search.includes('?') ? search.slice(search.indexOf('?') + 1) : search\n    const v = new URLSearchParams(qs).get(ACTIVE_ORG_QUERY_PARAM)\n    return isOrgId(v) ? v : null\n  } catch {\n    return null\n  }\n}\n\n/**\n * Resolve the active org with the cross-app precedence:\n *   1. `?org=<uuid>` in the current URL (explicit per-request selector)\n *   2. the `.politogyvrm.com` cookie (last used, cross-subdomain)\n *   3. null  → let the app fall back to the chrome-API default (earliest-joined)\n * Pass `search` on the server (from the request URL); it defaults to\n * `window.location.search` in the browser.\n */\nexport function resolveActiveOrg(search?: string | null): string | null {\n  const fromUrl = readActiveOrgFromUrl(\n    search ?? (typeof window !== 'undefined' ? window.location.search : null),\n  )\n  if (fromUrl) return fromUrl\n  return readActiveOrgCookie()\n}\n\n/** The canonical `?org=` query fragment for a full org id (no leading `?`/`&`). */\nexport function activeOrgParam(orgId: string | null | undefined): string {\n  return isOrgId(orgId) ? `${ACTIVE_ORG_QUERY_PARAM}=${orgId}` : ''\n}\n\n/**\n * Return `url` with `?org=<uuid>` set/replaced. Used by the shared chrome to\n * stamp the active org onto every route so it is always present in the address\n * bar. Leaves the URL unchanged when `orgId` is not a valid id.\n */\nexport function withActiveOrgParam(url: string, orgId: string | null | undefined): string {\n  if (!isOrgId(orgId)) return url\n  try {\n    // Support both absolute and relative URLs.\n    const base = typeof window !== 'undefined' ? window.location.origin : 'https://politogyvrm.com'\n    const u = new URL(url, base)\n    u.searchParams.set(ACTIVE_ORG_QUERY_PARAM, orgId as string)\n    // Preserve relative form when the input was relative.\n    return /^https?:\\/\\//i.test(url) ? u.toString() : `${u.pathname}${u.search}${u.hash}`\n  } catch {\n    return url\n  }\n}\n"]}

package/dist/active-org.d.cts

@@ -0,0 +1,30 @@
+declare const ACTIVE_ORG_COOKIE = "politogy_active_org";
+declare const ACTIVE_ORG_QUERY_PARAM = "org";
+declare function isOrgId(v: unknown): v is string;
+/** Read the shared active-org cookie (browser only; null on server or unset). */
+declare function readActiveOrgCookie(): string | null;
+declare function writeActiveOrgCookie(orgId: string): void;
+/**
+ * Read the `?org=` selector from a URL search string (full UUID only). Accepts a
+ * `location.search`-style string or a full URL.
+ */
+declare function readActiveOrgFromUrl(search: string | null | undefined): string | null;
+/**
+ * Resolve the active org with the cross-app precedence:
+ *   1. `?org=<uuid>` in the current URL (explicit per-request selector)
+ *   2. the `.politogyvrm.com` cookie (last used, cross-subdomain)
+ *   3. null  → let the app fall back to the chrome-API default (earliest-joined)
+ * Pass `search` on the server (from the request URL); it defaults to
+ * `window.location.search` in the browser.
+ */
+declare function resolveActiveOrg(search?: string | null): string | null;
+/** The canonical `?org=` query fragment for a full org id (no leading `?`/`&`). */
+declare function activeOrgParam(orgId: string | null | undefined): string;
+/**
+ * Return `url` with `?org=<uuid>` set/replaced. Used by the shared chrome to
+ * stamp the active org onto every route so it is always present in the address
+ * bar. Leaves the URL unchanged when `orgId` is not a valid id.
+ */
+declare function withActiveOrgParam(url: string, orgId: string | null | undefined): string;
+
+export { ACTIVE_ORG_COOKIE, ACTIVE_ORG_QUERY_PARAM, activeOrgParam, isOrgId, readActiveOrgCookie, readActiveOrgFromUrl, resolveActiveOrg, withActiveOrgParam, writeActiveOrgCookie };

package/dist/active-org.d.ts

@@ -0,0 +1,30 @@
+declare const ACTIVE_ORG_COOKIE = "politogy_active_org";
+declare const ACTIVE_ORG_QUERY_PARAM = "org";
+declare function isOrgId(v: unknown): v is string;
+/** Read the shared active-org cookie (browser only; null on server or unset). */
+declare function readActiveOrgCookie(): string | null;
+declare function writeActiveOrgCookie(orgId: string): void;
+/**
+ * Read the `?org=` selector from a URL search string (full UUID only). Accepts a
+ * `location.search`-style string or a full URL.
+ */
+declare function readActiveOrgFromUrl(search: string | null | undefined): string | null;
+/**
+ * Resolve the active org with the cross-app precedence:
+ *   1. `?org=<uuid>` in the current URL (explicit per-request selector)
+ *   2. the `.politogyvrm.com` cookie (last used, cross-subdomain)
+ *   3. null  → let the app fall back to the chrome-API default (earliest-joined)
+ * Pass `search` on the server (from the request URL); it defaults to
+ * `window.location.search` in the browser.
+ */
+declare function resolveActiveOrg(search?: string | null): string | null;
+/** The canonical `?org=` query fragment for a full org id (no leading `?`/`&`). */
+declare function activeOrgParam(orgId: string | null | undefined): string;
+/**
+ * Return `url` with `?org=<uuid>` set/replaced. Used by the shared chrome to
+ * stamp the active org onto every route so it is always present in the address
+ * bar. Leaves the URL unchanged when `orgId` is not a valid id.
+ */
+declare function withActiveOrgParam(url: string, orgId: string | null | undefined): string;
+
+export { ACTIVE_ORG_COOKIE, ACTIVE_ORG_QUERY_PARAM, activeOrgParam, isOrgId, readActiveOrgCookie, readActiveOrgFromUrl, resolveActiveOrg, withActiveOrgParam, writeActiveOrgCookie };

package/dist/active-org.js

@@ -0,0 +1,3 @@
+export { ACTIVE_ORG_COOKIE, ACTIVE_ORG_QUERY_PARAM, activeOrgParam, isOrgId, readActiveOrgCookie, readActiveOrgFromUrl, resolveActiveOrg, withActiveOrgParam, writeActiveOrgCookie } from './chunk-W2HITMV5.js';
+//# sourceMappingURL=active-org.js.map
+//# sourceMappingURL=active-org.js.map

package/dist/active-org.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"active-org.js"}

package/dist/app-chrome.cjs

@@ -1397,7 +1397,7 @@ function standardPolitogyNav(opts) {
     href: abs(c.path),
     children: c.children ? leaves(c.children) : void 0
   }));
-  const orgParam = opts.activeOrgId ? `org=${opts.activeOrgId.slice(-6)}` : "";
+  const orgParam = opts.activeOrgId ? `org=${opts.activeOrgId}` : "";
   const withOrg = (url) => orgParam ? `${url}${url.includes("?") ? "&" : "?"}${orgParam}` : url;
   const buildRelationship = () => {
     const contacts = opts.contactsItem ? {
@@ -2154,116 +2154,118 @@ function NavTopBar({
             }
           ) })
         ] }),
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "absolute right-0 z-30 mt-2 w-72 rounded-xl border border-[color:var(--line)] bg-[color:var(--panel-elevated)] py-1 shadow-[var(--shadow-soft)]", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "absolute right-0 z-30 mt-2 flex max-h-[calc(100vh-5rem)] w-72 flex-col overflow-hidden rounded-xl border border-[color:var(--line)] bg-[color:var(--panel-elevated)] py-1 shadow-[var(--shadow-soft)]", children: [
           /* @__PURE__ */ jsxRuntime.jsx(TopBarPanelArrow, {}),
-          userMenu?.myProfileHref ? /* @__PURE__ */ jsxRuntime.jsxs(
-            "a",
-            {
-              href: safeHref(userMenu.myProfileHref),
-              className: "flex w-full items-center gap-2.5 px-4 py-2.5 text-left text-sm font-medium text-[color:var(--foreground)] hover:bg-[color:var(--panel)]",
-              children: [
-                /* @__PURE__ */ jsxRuntime.jsx(ProfileIcon, {}),
-                "My Profile"
-              ]
-            }
-          ) : null,
-          userMenu?.organizationSettingsHref ? /* @__PURE__ */ jsxRuntime.jsxs(
-            "a",
-            {
-              href: safeHref(userMenu.organizationSettingsHref),
-              className: "flex w-full items-center gap-2.5 border-t border-[color:var(--line)] px-4 py-2.5 text-left text-sm font-medium text-[color:var(--foreground)] hover:bg-[color:var(--panel)]",
-              children: [
-                /* @__PURE__ */ jsxRuntime.jsx(BriefcaseIcon, {}),
-                "Organization Settings"
-              ]
-            }
-          ) : null,
-          userMenu?.roles && userMenu.roles.length > 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "border-t border-[color:var(--line)] px-4 py-3", children: [
-            /* @__PURE__ */ jsxRuntime.jsx("p", { className: "mb-2 text-[11px] font-semibold uppercase tracking-[0.08em] text-[color:var(--muted)]", children: "Roles & Organizations" }),
-            /* @__PURE__ */ jsxRuntime.jsx("ul", { className: "flex flex-col gap-1.5", children: userMenu.roles.map((r, i) => /* @__PURE__ */ jsxRuntime.jsxs("li", { className: "flex flex-wrap items-center gap-1.5 text-sm", children: [
-              /* @__PURE__ */ jsxRuntime.jsx("span", { className: "rounded-md bg-[color:var(--panel)] px-2 py-0.5 text-xs font-bold uppercase tracking-wide text-[color:var(--foreground)]", children: r.role }),
-              r.orgName ? /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-[color:var(--muted)]", children: [
-                "in ",
-                r.orgName
-              ] }) : null
-            ] }, `${r.role}-${i}`)) })
-          ] }) : null,
-          userMenu?.accounts && userMenu.accounts.length > 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "border-t border-[color:var(--line)] px-4 py-3", children: [
-            /* @__PURE__ */ jsxRuntime.jsx("p", { className: "mb-2 text-[11px] font-semibold uppercase tracking-[0.08em] text-[color:var(--muted)]", children: "Accounts" }),
-            /* @__PURE__ */ jsxRuntime.jsx("ul", { className: "flex flex-col gap-1", children: userMenu.accounts.map((a) => /* @__PURE__ */ jsxRuntime.jsxs("li", { className: "flex items-center gap-2.5", children: [
-              /* @__PURE__ */ jsxRuntime.jsxs(
-                "button",
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "min-h-0 flex-1 overflow-y-auto overscroll-contain", children: [
+            userMenu?.myProfileHref ? /* @__PURE__ */ jsxRuntime.jsxs(
+              "a",
+              {
+                href: safeHref(userMenu.myProfileHref),
+                className: "flex w-full items-center gap-2.5 px-4 py-2.5 text-left text-sm font-medium text-[color:var(--foreground)] hover:bg-[color:var(--panel)]",
+                children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(ProfileIcon, {}),
+                  "My Profile"
+                ]
+              }
+            ) : null,
+            userMenu?.organizationSettingsHref ? /* @__PURE__ */ jsxRuntime.jsxs(
+              "a",
+              {
+                href: safeHref(userMenu.organizationSettingsHref),
+                className: "flex w-full items-center gap-2.5 border-t border-[color:var(--line)] px-4 py-2.5 text-left text-sm font-medium text-[color:var(--foreground)] hover:bg-[color:var(--panel)]",
+                children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(BriefcaseIcon, {}),
+                  "Organization Settings"
+                ]
+              }
+            ) : null,
+            userMenu?.roles && userMenu.roles.length > 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "border-t border-[color:var(--line)] px-4 py-3", children: [
+              /* @__PURE__ */ jsxRuntime.jsx("p", { className: "mb-2 text-[11px] font-semibold uppercase tracking-[0.08em] text-[color:var(--muted)]", children: "Roles & Organizations" }),
+              /* @__PURE__ */ jsxRuntime.jsx("ul", { className: "flex flex-col gap-1.5", children: userMenu.roles.map((r, i) => /* @__PURE__ */ jsxRuntime.jsxs("li", { className: "flex flex-wrap items-center gap-1.5 text-sm", children: [
+                /* @__PURE__ */ jsxRuntime.jsx("span", { className: "rounded-md bg-[color:var(--panel)] px-2 py-0.5 text-xs font-bold uppercase tracking-wide text-[color:var(--foreground)]", children: r.role }),
+                r.orgName ? /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-[color:var(--muted)]", children: [
+                  "in ",
+                  r.orgName
+                ] }) : null
+              ] }, `${r.role}-${i}`)) })
+            ] }) : null,
+            userMenu?.accounts && userMenu.accounts.length > 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "border-t border-[color:var(--line)] px-4 py-3", children: [
+              /* @__PURE__ */ jsxRuntime.jsx("p", { className: "mb-2 text-[11px] font-semibold uppercase tracking-[0.08em] text-[color:var(--muted)]", children: "Accounts" }),
+              /* @__PURE__ */ jsxRuntime.jsx("ul", { className: "flex flex-col gap-1", children: userMenu.accounts.map((a) => /* @__PURE__ */ jsxRuntime.jsxs("li", { className: "flex items-center gap-2.5", children: [
+                /* @__PURE__ */ jsxRuntime.jsxs(
+                  "button",
+                  {
+                    type: "button",
+                    onClick: () => {
+                      if (!a.active) userMenu.onSwitchAccount?.(a.id);
+                    },
+                    className: "flex min-w-0 flex-1 items-center gap-2.5 rounded-lg px-1 py-1 text-left hover:bg-[color:var(--panel)]",
+                    children: [
+                      /* @__PURE__ */ jsxRuntime.jsx("span", { className: "flex h-8 w-8 shrink-0 items-center justify-center overflow-hidden rounded-full bg-[color:var(--color-race-red)] text-[11px] font-bold text-white", children: a.avatarUrl ? /* @__PURE__ */ jsxRuntime.jsx("img", { src: a.avatarUrl, alt: "", className: "h-full w-full object-cover" }) : (a.name ?? a.email ?? "?").slice(0, 2).toUpperCase() }),
+                      /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex min-w-0 flex-col leading-tight", children: [
+                        /* @__PURE__ */ jsxRuntime.jsx(
+                          "span",
+                          {
+                            className: [
+                              "truncate text-sm font-semibold",
+                              a.active ? "text-[color:var(--color-race-red)]" : "text-[color:var(--foreground)]"
+                            ].join(" "),
+                            children: a.name ?? a.email ?? a.id.slice(0, 8)
+                          }
+                        ),
+                        /* @__PURE__ */ jsxRuntime.jsx("span", { className: "truncate text-xs text-[color:var(--muted)]", children: a.active ? "Active" : a.email ?? "" })
+                      ] })
+                    ]
+                  }
+                ),
+                !a.active && userMenu.onRemoveAccount ? /* @__PURE__ */ jsxRuntime.jsx(
+                  "button",
+                  {
+                    type: "button",
+                    "aria-label": `Remove ${a.name ?? a.email ?? "account"}`,
+                    onClick: () => userMenu.onRemoveAccount?.(a.id),
+                    className: "shrink-0 rounded p-1 text-[color:var(--color-race-red)] hover:bg-[color:var(--panel)]",
+                    children: /* @__PURE__ */ jsxRuntime.jsx(TrashIcon, {})
+                  }
+                ) : null
+              ] }, a.id)) }),
+              userMenu.addAccountHref || userMenu.onAddAccount ? userMenu.addAccountHref ? /* @__PURE__ */ jsxRuntime.jsxs(
+                "a",
                 {
-                  type: "button",
-                  onClick: () => {
-                    if (!a.active) userMenu.onSwitchAccount?.(a.id);
-                  },
-                  className: "flex min-w-0 flex-1 items-center gap-2.5 rounded-lg px-1 py-1 text-left hover:bg-[color:var(--panel)]",
+                  href: safeHref(userMenu.addAccountHref),
+                  className: "mt-1.5 flex items-center gap-2.5 rounded-lg px-1 py-1.5 text-sm font-semibold text-[color:var(--color-race-red)] hover:bg-[color:var(--panel)]",
                   children: [
-                    /* @__PURE__ */ jsxRuntime.jsx("span", { className: "flex h-8 w-8 shrink-0 items-center justify-center overflow-hidden rounded-full bg-[color:var(--color-race-red)] text-[11px] font-bold text-white", children: a.avatarUrl ? /* @__PURE__ */ jsxRuntime.jsx("img", { src: a.avatarUrl, alt: "", className: "h-full w-full object-cover" }) : (a.name ?? a.email ?? "?").slice(0, 2).toUpperCase() }),
-                    /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex min-w-0 flex-col leading-tight", children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(
-                        "span",
-                        {
-                          className: [
-                            "truncate text-sm font-semibold",
-                            a.active ? "text-[color:var(--color-race-red)]" : "text-[color:var(--foreground)]"
-                          ].join(" "),
-                          children: a.name ?? a.email ?? a.id.slice(0, 8)
-                        }
-                      ),
-                      /* @__PURE__ */ jsxRuntime.jsx("span", { className: "truncate text-xs text-[color:var(--muted)]", children: a.active ? "Active" : a.email ?? "" })
-                    ] })
+                    /* @__PURE__ */ jsxRuntime.jsx(AddUserIcon, {}),
+                    "Add Account"
                   ]
                 }
-              ),
-              !a.active && userMenu.onRemoveAccount ? /* @__PURE__ */ jsxRuntime.jsx(
+              ) : /* @__PURE__ */ jsxRuntime.jsxs(
                 "button",
                 {
                   type: "button",
-                  "aria-label": `Remove ${a.name ?? a.email ?? "account"}`,
-                  onClick: () => userMenu.onRemoveAccount?.(a.id),
-                  className: "shrink-0 rounded p-1 text-[color:var(--color-race-red)] hover:bg-[color:var(--panel)]",
-                  children: /* @__PURE__ */ jsxRuntime.jsx(TrashIcon, {})
+                  onClick: userMenu.onAddAccount,
+                  className: "mt-1.5 flex w-full items-center gap-2.5 rounded-lg px-1 py-1.5 text-left text-sm font-semibold text-[color:var(--color-race-red)] hover:bg-[color:var(--panel)]",
+                  children: [
+                    /* @__PURE__ */ jsxRuntime.jsx(AddUserIcon, {}),
+                    "Add Account"
+                  ]
                 }
               ) : null
-            ] }, a.id)) }),
-            userMenu.addAccountHref || userMenu.onAddAccount ? userMenu.addAccountHref ? /* @__PURE__ */ jsxRuntime.jsxs(
-              "a",
-              {
-                href: safeHref(userMenu.addAccountHref),
-                className: "mt-1.5 flex items-center gap-2.5 rounded-lg px-1 py-1.5 text-sm font-semibold text-[color:var(--color-race-red)] hover:bg-[color:var(--panel)]",
-                children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(AddUserIcon, {}),
-                  "Add Account"
-                ]
-              }
-            ) : /* @__PURE__ */ jsxRuntime.jsxs(
-              "button",
+            ] }) : null,
+            userMenu?.theme ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-t border-[color:var(--line)]", children: /* @__PURE__ */ jsxRuntime.jsx(
+              NavThemeControl,
               {
-                type: "button",
-                onClick: userMenu.onAddAccount,
-                className: "mt-1.5 flex w-full items-center gap-2.5 rounded-lg px-1 py-1.5 text-left text-sm font-semibold text-[color:var(--color-race-red)] hover:bg-[color:var(--panel)]",
-                children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(AddUserIcon, {}),
-                  "Add Account"
-                ]
+                value: userMenu.theme.value,
+                onChange: userMenu.theme.onChange
               }
-            ) : null
-          ] }) : null,
-          userMenu?.theme ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-t border-[color:var(--line)]", children: /* @__PURE__ */ jsxRuntime.jsx(
-            NavThemeControl,
-            {
-              value: userMenu.theme.value,
-              onChange: userMenu.theme.onChange
-            }
-          ) }) : null,
+            ) }) : null
+          ] }),
           onSignOut ? /* @__PURE__ */ jsxRuntime.jsxs(
             "button",
             {
               type: "button",
               onClick: onSignOut,
-              className: "flex w-full items-center gap-2.5 border-t border-[color:var(--line)] px-4 py-2.5 text-left text-sm font-medium text-[color:var(--foreground)] hover:bg-[color:var(--panel)] hover:text-[color:var(--color-race-red)]",
+              className: "flex w-full shrink-0 items-center gap-2.5 border-t border-[color:var(--line)] px-4 py-2.5 text-left text-sm font-medium text-[color:var(--foreground)] hover:bg-[color:var(--panel)] hover:text-[color:var(--color-race-red)]",
               children: [
                 /* @__PURE__ */ jsxRuntime.jsx(SignOutIcon, {}),
                 "Sign out"
@@ -2486,6 +2488,53 @@ function NavAppShell({
   ] });
 }
 
+// src/active-org.ts
+var ACTIVE_ORG_COOKIE = "politogy_active_org";
+var ACTIVE_ORG_QUERY_PARAM = "org";
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function isOrgId(v) {
+  return typeof v === "string" && UUID_RE.test(v.trim());
+}
+function readActiveOrgCookie() {
+  if (typeof document === "undefined") return null;
+  try {
+    const m = document.cookie.match(
+      new RegExp(`(?:^|;\\s*)${ACTIVE_ORG_COOKIE}=([^;]+)`)
+    );
+    const v = m ? decodeURIComponent(m[1]) : null;
+    return isOrgId(v) ? v : null;
+  } catch {
+    return null;
+  }
+}
+function writeActiveOrgCookie(orgId) {
+  if (typeof document === "undefined" || typeof window === "undefined") return;
+  if (!isOrgId(orgId)) return;
+  const host = window.location.hostname;
+  const domainAttr = /(^|\.)politogyvrm\.com$/i.test(host) ? "; Domain=.politogyvrm.com" : "";
+  const secure = window.location.protocol === "https:" ? "; Secure" : "";
+  document.cookie = `${ACTIVE_ORG_COOKIE}=${encodeURIComponent(
+    orgId
+  )}; Path=/; Max-Age=31536000; SameSite=Lax${domainAttr}${secure}`;
+}
+function readActiveOrgFromUrl(search) {
+  if (!search) return null;
+  try {
+    const qs = search.includes("?") ? search.slice(search.indexOf("?") + 1) : search;
+    const v = new URLSearchParams(qs).get(ACTIVE_ORG_QUERY_PARAM);
+    return isOrgId(v) ? v : null;
+  } catch {
+    return null;
+  }
+}
+function resolveActiveOrg(search) {
+  const fromUrl = readActiveOrgFromUrl(
+    (typeof window !== "undefined" ? window.location.search : null)
+  );
+  if (fromUrl) return fromUrl;
+  return readActiveOrgCookie();
+}
+
 // src/lib/breadcrumbs.ts
 function deriveBreadcrumbs(items, pathname, opts) {
   const search = opts?.search ?? (typeof window !== "undefined" ? window.location.search : "");
@@ -2555,6 +2604,89 @@ function resolveIdentity(input) {
     loaded: input.loaded ?? false
   };
 }
+
+// src/logout-signal.ts
+var LOGOUT_COOKIE = "politogy_logout_at";
+var LOGOUT_CHANNEL = "politogy-logout";
+var POLL_MS = 1e3;
+function parseTimestamp(value) {
+  if (!value) return null;
+  const n = Number(value);
+  return Number.isFinite(n) && n > 0 ? n : null;
+}
+function isSessionRevoked(logoutCookieValue, authTime) {
+  const loggedOutAt = parseTimestamp(logoutCookieValue);
+  if (loggedOutAt === null) return false;
+  if (authTime == null || !Number.isFinite(authTime) || authTime <= 0) return true;
+  const authMs = authTime < 1e12 ? authTime * 1e3 : authTime;
+  return authMs < loggedOutAt;
+}
+function readLogoutCookie() {
+  if (typeof document === "undefined") return null;
+  try {
+    const m = document.cookie.match(new RegExp(`(?:^|;\\s*)${LOGOUT_COOKIE}=([^;]+)`));
+    return parseTimestamp(m ? decodeURIComponent(m[1]) : null);
+  } catch {
+    return null;
+  }
+}
+function broadcastLogout(at = Date.now()) {
+  if (typeof document === "undefined" || typeof window === "undefined") return;
+  const host = window.location.hostname;
+  const domainAttr = /(^|\.)politogyvrm\.com$/i.test(host) ? "; Domain=.politogyvrm.com" : "";
+  const secure = window.location.protocol === "https:" ? "; Secure" : "";
+  document.cookie = `${LOGOUT_COOKIE}=${at}; Path=/; Max-Age=2592000; SameSite=Lax${domainAttr}${secure}`;
+  try {
+    new BroadcastChannel(LOGOUT_CHANNEL).postMessage(at);
+  } catch {
+  }
+}
+function watchLogout(onLogout, options = {}) {
+  if (typeof document === "undefined" || typeof window === "undefined") {
+    return () => {
+    };
+  }
+  const { authTime = null, intervalMs = POLL_MS } = options;
+  const baseline = readLogoutCookie() ?? 0;
+  let done = false;
+  const fire = (at) => {
+    if (done) return;
+    if (at <= baseline) return;
+    if (authTime != null && !isSessionRevoked(String(at), authTime)) return;
+    done = true;
+    cleanup();
+    onLogout();
+  };
+  const check = () => {
+    const at = readLogoutCookie();
+    if (at !== null) fire(at);
+  };
+  let channel = null;
+  try {
+    channel = new BroadcastChannel(LOGOUT_CHANNEL);
+    channel.onmessage = (event) => {
+      const at = typeof event.data === "number" ? event.data : readLogoutCookie();
+      if (at !== null) fire(at);
+    };
+  } catch {
+    channel = null;
+  }
+  const timer = window.setInterval(check, intervalMs);
+  window.addEventListener("visibilitychange", check);
+  window.addEventListener("focus", check);
+  window.addEventListener("pageshow", check);
+  function cleanup() {
+    window.clearInterval(timer);
+    window.removeEventListener("visibilitychange", check);
+    window.removeEventListener("focus", check);
+    window.removeEventListener("pageshow", check);
+    try {
+      channel?.close();
+    } catch {
+    }
+  }
+  return cleanup;
+}
 var CORE_APP = "vrm";
 var POLITOGY_APPS = {
   vrm: { title: "Politogy VRM", origin: "https://app.politogyvrm.com", storagePrefix: "vrm" },
@@ -2631,6 +2763,28 @@ function FrameBody({
 }) {
   const meta = POLITOGY_APPS[app];
   const chrome = useChromeState();
+  const signOutRef = react.useRef(onSignOut);
+  signOutRef.current = onSignOut;
+  const signingOutRef = react.useRef(false);
+  const handleSignOut = react.useCallback(() => {
+    signingOutRef.current = true;
+    broadcastLogout();
+    signOutRef.current();
+  }, []);
+  react.useEffect(
+    () => (
+      // A tab that learns of a sign-out elsewhere ends its OWN session properly
+      // (clear cookie, RP-initiated logout at the IdP) rather than merely
+      // navigating away — otherwise its session cookie would outlive the
+      // sign-out and a later visit would silently resume it. No re-broadcast:
+      // the signal that woke us is already on record for everyone.
+      watchLogout(() => {
+        if (signingOutRef.current) return;
+        signOutRef.current();
+      })
+    ),
+    []
+  );
   const core = app === CORE_APP ? data?.core : void 0;
   const identity = useChromeIdentity({ userName: session.userName, email: session.email });
   const derivedUserMenu = useChromeUserMenu({
@@ -2713,7 +2867,7 @@ function FrameBody({
           role: session.role
         },
         userMenu,
-        onSignOut,
+        onSignOut: handleSignOut,
         // The action cluster is IDENTICAL everywhere — core included. Page
         // actions sit BEFORE it, never inside it, so the Alerts bell keeps its
         // required position: farthest right, immediately before My Account.
@@ -2772,7 +2926,7 @@ function ChromeStateProvider({
   const [navDisplay, setNavDisplayState] = react.useState("both");
   react.useEffect(() => {
     try {
-      const storedOrg = localStorage.getItem(ORG_STORAGE_KEY);
+      const storedOrg = resolveActiveOrg() ?? localStorage.getItem(ORG_STORAGE_KEY);
       if (storedOrg) setOrgIdState(storedOrg);
       const storedNav = localStorage.getItem(NAV_DISPLAY_KEY);
       if (storedNav === "menu" || storedNav === "tabs" || storedNav === "both") {
@@ -2791,6 +2945,7 @@ function ChromeStateProvider({
       localStorage.setItem(ORG_STORAGE_KEY, id);
     } catch {
     }
+    writeActiveOrgCookie(id);
   }, []);
   const setNavDisplay = react.useCallback((m) => {
     setNavDisplayState(m);
@@ -2835,6 +2990,19 @@ function ChromeStateProvider({
       setNavDisplay
     };
   }, [controlledOrg, orgId, setOrgId, orgs, orgsFetching, orgsError, navDisplay, setNavDisplay]);
+  const activeOrgId = value.orgId;
+  react.useEffect(() => {
+    if (!isOrgId(activeOrgId)) return;
+    writeActiveOrgCookie(activeOrgId);
+    try {
+      const url = new URL(window.location.href);
+      if (url.searchParams.get(ACTIVE_ORG_QUERY_PARAM) !== activeOrgId) {
+        url.searchParams.set(ACTIVE_ORG_QUERY_PARAM, activeOrgId);
+        window.history.replaceState(window.history.state, "", url.toString());
+      }
+    } catch {
+    }
+  }, [activeOrgId]);
   return /* @__PURE__ */ jsxRuntime.jsx(ChromeStateContext.Provider, { value, children });
 }
 function AppDevNotes({
@@ -2984,7 +3152,7 @@ function useChromeUserMenu({
   const state = useChromeState();
   const theme = useThemePreference();
   const activeOrg = state?.orgs.find((o) => o.id === state.orgId) ?? null;
-  const orgSuffix = activeOrg ? `?org=${activeOrg.id.slice(-6)}` : "";
+  const orgSuffix = activeOrg ? `?org=${activeOrg.id}` : "";
   return {
     // My Profile is global — NOT org-suffixed (main-app ShellChromeBridge).
     myProfileHref: `${CORE_BASE_URL}/my-profile`,
@@ -3051,7 +3219,7 @@ function useChromeMode(arg = {}) {
   const pinned = pinnedModeId ? MODE_DEFS.find((m) => m.id === pinnedModeId) ?? null : null;
   const selected = selectedModeId ? options.find((m) => m.id === selectedModeId) ?? null : null;
   const current = pinned ?? selected ?? options[0] ?? MODE_DEFS.find((m) => m.id === fallbackModeId) ?? MODE_DEFS[0];
-  const suffix = orgId ? `?org=${orgId.slice(-6)}` : "";
+  const suffix = orgId ? `?org=${orgId}` : "";
   return {
     label: current.label,
     icon: current.icon,