@the-portland-company/shell 0.35.0 → 0.35.1

package/dist/app-chrome.cjs

@@ -1569,9 +1569,25 @@ function NavSidebar({
       org ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mb-3", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mb-2 flex items-center justify-between px-1", children: [
           /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-[11px] font-semibold uppercase tracking-[0.08em] text-[color:var(--muted)]", children: "Organization" }),
-          org.id ? /* @__PURE__ */ jsxRuntime.jsx(OrgIdCopyButton, { id: org.id }) : null
+          org.id && !org.loading ? /* @__PURE__ */ jsxRuntime.jsx(OrgIdCopyButton, { id: org.id }) : null
         ] }),
-        org.organizations && org.organizations.length > 0 && org.onSwitch ? /* @__PURE__ */ jsxRuntime.jsxs("details", { "data-nav-details": true, className: "group relative", children: [
+        org.loading ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-full items-center gap-2.5 rounded-md border border-[color:var(--line)] bg-[color:var(--panel-elevated)] px-2.5 py-2 shadow-sm", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            "span",
+            {
+              "aria-hidden": true,
+              className: "h-7 w-7 shrink-0 animate-pulse rounded-full bg-[color:var(--panel)]"
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            "span",
+            {
+              "aria-hidden": true,
+              className: "h-4 flex-1 animate-pulse rounded bg-[color:var(--panel)]"
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Loading organization" })
+        ] }) : org.organizations && org.organizations.length > 0 && org.onSwitch ? /* @__PURE__ */ jsxRuntime.jsxs("details", { "data-nav-details": true, className: "group relative", children: [
           /* @__PURE__ */ jsxRuntime.jsxs("summary", { className: "flex w-full cursor-pointer list-none items-center justify-between gap-2 rounded-md border border-[color:var(--line)] bg-[color:var(--panel-elevated)] px-2.5 py-2 text-left text-[color:var(--foreground)] shadow-sm transition hover:bg-[color:var(--panel)] [&::-webkit-details-marker]:hidden", children: [
             /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex min-w-0 items-center gap-2.5", children: [
               /* @__PURE__ */ jsxRuntime.jsx(
@@ -2604,6 +2620,11 @@ function FrameBody({
         nav: {
           items: navDisplay === "tabs" ? navItems.map(({ children: _sub, ...item }) => item) : navItems
         },
+        // The app's own workspace is NOT the organization — it is a per-app
+        // bootstrap account with a different id in every app. Showing it while
+        // the chrome API resolves flashed the wrong org on every load ("not
+        // connected to the account"). Shimmer while in flight; only fall back
+        // to the app label once the chrome lookup has actually failed.
         org: activeCoreOrg ? {
           name: activeCoreOrg.name,
           id: activeCoreOrg.id,
@@ -2611,7 +2632,7 @@ function FrameBody({
           brandColor: activeCoreOrg.brandColor,
           organizations: coreOrgs,
           onSwitch: chrome?.setOrgId
-        } : { name: session.accountName, id: session.accountId },
+        } : chrome?.orgsLoading ? { name: null, id: null, loading: true } : { name: session.accountName, id: session.accountId },
         mode,
         footer,
         linkComponent
@@ -2686,7 +2707,7 @@ function ChromeStateProvider({
   controlledOrg,
   children
 }) {
-  const { orgs } = useChromeOrgs();
+  const { orgs, loading: orgsFetching, error: orgsError } = useChromeOrgs();
   const [orgId, setOrgIdState] = react.useState(null);
   const [navDisplay, setNavDisplayState] = react.useState("both");
   react.useEffect(() => {
@@ -2731,6 +2752,7 @@ function ChromeStateProvider({
           role: o.role,
           rawRole: o.rawRole ?? null
         })),
+        orgsLoading: false,
         navDisplay,
         setNavDisplay
       };
@@ -2746,10 +2768,13 @@ function ChromeStateProvider({
         role: o.role,
         rawRole: o.rawRole ?? null
       })),
+      // Loading until the fetch settles. On error we stop loading so the frame
+      // falls back to the app label rather than shimmering forever.
+      orgsLoading: orgsFetching && !orgsError && !orgs,
       navDisplay,
       setNavDisplay
     };
-  }, [controlledOrg, orgId, setOrgId, orgs, navDisplay, setNavDisplay]);
+  }, [controlledOrg, orgId, setOrgId, orgs, orgsFetching, orgsError, navDisplay, setNavDisplay]);
   return /* @__PURE__ */ jsxRuntime.jsx(ChromeStateContext.Provider, { value, children });
 }
 function AppDevNotes({