@igstack/app-catalog-frontend-core 2.0.4 → 3.0.0

package/dist/esm/ui/components/header/Header.js.map

@@ -1 +1 @@
-{"version":3,"file":"Header.js","sources":["../../../../../src/ui/components/header/Header.tsx"],"sourcesContent":["import type {\n  AppVersionInfo,\n  VersionInfo,\n} from '@igstack/app-catalog-backend-core'\nimport { Link } from '@tanstack/react-router'\nimport { useQuery } from '@tanstack/react-query'\nimport { LogOut, X } from 'lucide-react'\nimport React, { use } from 'react'\nimport AppCatalogLogo from '~/assets/app-catalog.svg?react'\nimport { useTRPC } from '~/api/infra/trpc'\nimport { ThemeSwitcher } from '~/components/ThemeSwitcher'\nimport { AppCatalogContext } from '~/modules/appCatalog/context/AppCatalogContext'\nimport {\n  useAuth,\n  useAuthActions,\n  useIsAuthenticated,\n  useUser,\n} from '~/modules/auth'\nimport { Button } from '~/ui/button'\nimport {\n  DropdownMenu,\n  DropdownMenuContent,\n  DropdownMenuItem,\n  DropdownMenuSeparator,\n  DropdownMenuTrigger,\n} from '~/ui/dropdown-menu'\nimport {\n  Popover,\n  PopoverClose,\n  PopoverContent,\n  PopoverTrigger,\n} from '~/ui/popover'\nimport { Skeleton } from '~/ui/skeleton'\n\nfunction ShaSuffix({ version }: { version: VersionInfo }) {\n  if (!version.sha) return null\n  if (version.shaUrl) {\n    return (\n      <>\n        {' '}\n        <a\n          href={version.shaUrl}\n          target=\"_blank\"\n          rel=\"noopener noreferrer\"\n          className=\"text-muted-foreground hover:text-primary\"\n          onClick={(e) => e.stopPropagation()}\n        >\n          ({version.sha})\n        </a>\n      </>\n    )\n  }\n  return <span className=\"text-muted-foreground\"> ({version.sha})</span>\n}\n\nfunction VersionItem({\n  label,\n  version,\n}: {\n  label: string\n  version: VersionInfo\n}) {\n  return (\n    <div className=\"flex items-center justify-between gap-4 py-1\">\n      <span className=\"text-xs text-muted-foreground\">{label}</span>\n      <span className=\"text-sm font-medium text-right\">\n        {version.url ? (\n          <a\n            href={version.url}\n            target=\"_blank\"\n            rel=\"noopener noreferrer\"\n            className=\"text-primary hover:text-primary/80 transition-colors\"\n            onClick={(e) => e.stopPropagation()}\n          >\n            {version.displayName}\n          </a>\n        ) : (\n          version.displayName\n        )}\n        <ShaSuffix version={version} />\n      </span>\n    </div>\n  )\n}\n\nexport function VersionDisplay({ versions }: { versions: AppVersionInfo }) {\n  const isLocal =\n    versions.backend?.displayName === 'local' && !versions.coreVersion\n\n  if (isLocal) {\n    return (\n      <span className=\"text-xs text-muted-foreground\" title=\"Local\">\n        local\n      </span>\n    )\n  }\n\n  return (\n    <div className=\"flex flex-col divide-y\">\n      {versions.backend && (\n        <VersionItem label=\"Pipeline\" version={versions.backend} />\n      )}\n      {versions.coreVersion && (\n        <VersionItem label=\"Core\" version={versions.coreVersion} />\n      )}\n      {versions.frontend && (\n        <VersionItem label=\"FE\" version={versions.frontend} />\n      )}\n    </div>\n  )\n}\n\n/**\n * Version detail moved behind an on-demand popover (same click-to-reveal\n * pattern as PersonBadge's approver chips) instead of always-visible text —\n * keeps the header compact. Content is unchanged: same Pipeline/Core/FE\n * lines, links, and SHA suffix as before, just revealed on click.\n */\nexport function VersionPopover({ versions }: { versions: AppVersionInfo }) {\n  const isLocal =\n    versions.backend?.displayName === 'local' && !versions.coreVersion\n\n  if (isLocal) {\n    return (\n      <span className=\"text-xs text-muted-foreground\" title=\"Local\">\n        local\n      </span>\n    )\n  }\n\n  return (\n    <Popover>\n      <PopoverTrigger asChild>\n        <button\n          type=\"button\"\n          className=\"inline-flex items-center gap-1 rounded-full bg-muted px-2 py-0.5 text-[10px] font-mono leading-none text-muted-foreground hover:bg-primary/15 hover:text-primary transition-colors\"\n          aria-label=\"Show version details\"\n          title=\"Version details\"\n          data-testid=\"version-info-trigger\"\n        >\n          {versions.backend?.displayName ?? '?'}\n        </button>\n      </PopoverTrigger>\n      <PopoverContent align=\"start\" className=\"w-72 p-0 overflow-hidden\">\n        <div className=\"flex items-center justify-between px-3 py-2 border-b bg-muted/40\">\n          <span className=\"text-sm font-semibold\">Version details</span>\n          <PopoverClose\n            className=\"rounded p-1 text-muted-foreground hover:text-foreground hover:bg-muted transition-colors\"\n            aria-label=\"Close\"\n          >\n            <X className=\"size-3.5\" />\n          </PopoverClose>\n        </div>\n        <div className=\"px-3 py-1\">\n          <VersionDisplay versions={versions} />\n        </div>\n      </PopoverContent>\n    </Popover>\n  )\n}\n\nexport interface HeaderProps {\n  middle?: React.ReactNode\n}\n\nexport function Header({ middle }: HeaderProps) {\n  const { isLoading } = useAuth()\n  const isAuthenticated = useIsAuthenticated()\n  const user = useUser()\n  const { logout, devLogin } = useAuthActions()\n  const appCatalogContextMaybe = use(AppCatalogContext)\n  const trpc = useTRPC()\n  const { data: providersData } = useQuery(\n    trpc.auth.getProviders.queryOptions(),\n  )\n\n  const handleLogout = async () => {\n    try {\n      await logout()\n    } catch (error) {\n      console.error('Logout failed:', error)\n    }\n  }\n\n  return (\n    <div className=\"flex items-center mb-4 pb-4 gap-4 border-b\">\n      <div className=\"flex items-center gap-4\">\n        <div className=\"flex items-center gap-2\">\n          <Link to=\"/\">\n            <AppCatalogLogo className=\"h-16 w-16\" />\n          </Link>\n          <div className=\"flex flex-col\">\n            <Link to=\"/\" className=\"font-serif text-lg font-semibold\">\n              App Catalog\n            </Link>\n            <div className=\"flex items-center gap-1.5\">\n              <span className=\"text-[10px] text-muted-foreground/60\">\n                by Igor Golovin\n              </span>\n              {appCatalogContextMaybe?.versions && (\n                <VersionPopover versions={appCatalogContextMaybe.versions} />\n              )}\n            </div>\n          </div>\n        </div>\n      </div>\n      {middle && <div className=\"flex-1\">{middle}</div>}\n      <div className=\"flex items-center gap-3 ml-auto\">\n        <ThemeSwitcher />\n        {isLoading ? (\n          <Skeleton className=\"w-8 h-8 rounded-full\" />\n        ) : !isAuthenticated ? (\n          // No Login button: the catalog is fully browsable without signing in,\n          // so it mostly advertised a flow most visitors have no reason to\n          // enter. Auth itself is untouched -- the modal, the login route, the\n          // client and session handling all still work, so anyone who reaches\n          // the flow by URL or by calling `useAuthModal().open()` can sign in,\n          // and this branch flips to the user menu below once they do. `git\n          // revert` of the commit that removed it restores the button as-is.\n          // DEV Login stays: it is gated behind `devLoginEnabled`, so it never\n          // reaches a real deployment.\n          providersData?.devLoginEnabled && (\n            <button\n              type=\"button\"\n              onClick={devLogin}\n              className=\"text-xs font-medium px-2 py-1 rounded bg-amber-500/20 text-amber-600 dark:text-amber-400 hover:bg-amber-500/30 border border-amber-500/30 cursor-pointer\"\n            >\n              DEV Login\n            </button>\n          )\n        ) : (\n          <DropdownMenu>\n            <DropdownMenuTrigger asChild>\n              <Button\n                variant=\"ghost\"\n                size=\"sm\"\n                className=\"w-8 h-8 rounded-full p-0 hover:bg-accent hover:text-accent-foreground cursor-pointer\"\n                aria-label={`User menu for ${user?.name || 'User'}`}\n                data-testid=\"user-avatar-button\"\n              >\n                {user?.image ? (\n                  <img\n                    src={user.image}\n                    alt={user.name || 'User'}\n                    className=\"w-full h-full rounded-full object-cover\"\n                  />\n                ) : (\n                  <div className=\"flex items-center justify-center w-full h-full rounded-full bg-primary text-primary-foreground text-xs font-semibold\">\n                    {(user?.name || user?.email || '?').charAt(0).toUpperCase()}\n                  </div>\n                )}\n              </Button>\n            </DropdownMenuTrigger>\n            <DropdownMenuContent align=\"end\" className=\"w-56\">\n              <div className=\"px-2 py-3 flex items-center gap-3\">\n                {user?.image ? (\n                  <img\n                    src={user.image}\n                    alt={user.name || 'User'}\n                    className=\"w-10 h-10 rounded-full object-cover shrink-0\"\n                  />\n                ) : (\n                  <div className=\"flex items-center justify-center w-10 h-10 rounded-full bg-primary text-primary-foreground text-sm font-semibold shrink-0\">\n                    {(user?.name || user?.email || '?').charAt(0).toUpperCase()}\n                  </div>\n                )}\n                <div className=\"flex flex-col min-w-0\">\n                  <p className=\"text-xs text-muted-foreground truncate\">\n                    @{user?.email?.split('@')[0] || 'user'}\n                  </p>\n                  <p className=\"text-sm font-medium truncate\">\n                    {user?.name || 'User'}\n                  </p>\n                </div>\n              </div>\n              <DropdownMenuSeparator />\n              <DropdownMenuItem onClick={handleLogout}>\n                <LogOut className=\"h-4 w-4 mr-2\" />\n                <span>Sign out</span>\n              </DropdownMenuItem>\n            </DropdownMenuContent>\n          </DropdownMenu>\n        )}\n      </div>\n    </div>\n  )\n}\n"],"names":["AppCatalogLogo"],"mappings":";;;;;;;;;;;;;;;AAkCA,SAAS,UAAU,EAAE,WAAqC;AACxD,MAAI,CAAC,QAAQ,IAAK,QAAO;AACzB,MAAI,QAAQ,QAAQ;AAClB,WACE,qBAAA,UAAA,EACG,UAAA;AAAA,MAAA;AAAA,MACD;AAAA,QAAC;AAAA,QAAA;AAAA,UACC,MAAM,QAAQ;AAAA,UACd,QAAO;AAAA,UACP,KAAI;AAAA,UACJ,WAAU;AAAA,UACV,SAAS,CAAC,MAAM,EAAE,gBAAA;AAAA,UACnB,UAAA;AAAA,YAAA;AAAA,YACG,QAAQ;AAAA,YAAI;AAAA,UAAA;AAAA,QAAA;AAAA,MAAA;AAAA,IAChB,GACF;AAAA,EAEJ;AACA,SAAO,qBAAC,QAAA,EAAK,WAAU,yBAAwB,UAAA;AAAA,IAAA;AAAA,IAAG,QAAQ;AAAA,IAAI;AAAA,EAAA,GAAC;AACjE;AAEA,SAAS,YAAY;AAAA,EACnB;AAAA,EACA;AACF,GAGG;AACD,SACE,qBAAC,OAAA,EAAI,WAAU,gDACb,UAAA;AAAA,IAAA,oBAAC,QAAA,EAAK,WAAU,iCAAiC,UAAA,OAAM;AAAA,IACvD,qBAAC,QAAA,EAAK,WAAU,kCACb,UAAA;AAAA,MAAA,QAAQ,MACP;AAAA,QAAC;AAAA,QAAA;AAAA,UACC,MAAM,QAAQ;AAAA,UACd,QAAO;AAAA,UACP,KAAI;AAAA,UACJ,WAAU;AAAA,UACV,SAAS,CAAC,MAAM,EAAE,gBAAA;AAAA,UAEjB,UAAA,QAAQ;AAAA,QAAA;AAAA,MAAA,IAGX,QAAQ;AAAA,MAEV,oBAAC,aAAU,QAAA,CAAkB;AAAA,IAAA,EAAA,CAC/B;AAAA,EAAA,GACF;AAEJ;AAEO,SAAS,eAAe,EAAE,YAA0C;;AACzE,QAAM,YACJ,cAAS,YAAT,mBAAkB,iBAAgB,WAAW,CAAC,SAAS;AAEzD,MAAI,SAAS;AACX,+BACG,QAAA,EAAK,WAAU,iCAAgC,OAAM,SAAQ,UAAA,SAE9D;AAAA,EAEJ;AAEA,SACE,qBAAC,OAAA,EAAI,WAAU,0BACZ,UAAA;AAAA,IAAA,SAAS,WACR,oBAAC,aAAA,EAAY,OAAM,YAAW,SAAS,SAAS,SAAS;AAAA,IAE1D,SAAS,eACR,oBAAC,aAAA,EAAY,OAAM,QAAO,SAAS,SAAS,aAAa;AAAA,IAE1D,SAAS,YACR,oBAAC,aAAA,EAAY,OAAM,MAAK,SAAS,SAAS,SAAA,CAAU;AAAA,EAAA,GAExD;AAEJ;AAQO,SAAS,eAAe,EAAE,YAA0C;;AACzE,QAAM,YACJ,cAAS,YAAT,mBAAkB,iBAAgB,WAAW,CAAC,SAAS;AAEzD,MAAI,SAAS;AACX,+BACG,QAAA,EAAK,WAAU,iCAAgC,OAAM,SAAQ,UAAA,SAE9D;AAAA,EAEJ;AAEA,8BACG,SAAA,EACC,UAAA;AAAA,IAAA,oBAAC,gBAAA,EAAe,SAAO,MACrB,UAAA;AAAA,MAAC;AAAA,MAAA;AAAA,QACC,MAAK;AAAA,QACL,WAAU;AAAA,QACV,cAAW;AAAA,QACX,OAAM;AAAA,QACN,eAAY;AAAA,QAEX,YAAA,cAAS,YAAT,mBAAkB,gBAAe;AAAA,MAAA;AAAA,IAAA,GAEtC;AAAA,IACA,qBAAC,gBAAA,EAAe,OAAM,SAAQ,WAAU,4BACtC,UAAA;AAAA,MAAA,qBAAC,OAAA,EAAI,WAAU,oEACb,UAAA;AAAA,QAAA,oBAAC,QAAA,EAAK,WAAU,yBAAwB,UAAA,mBAAe;AAAA,QACvD;AAAA,UAAC;AAAA,UAAA;AAAA,YACC,WAAU;AAAA,YACV,cAAW;AAAA,YAEX,UAAA,oBAAC,GAAA,EAAE,WAAU,WAAA,CAAW;AAAA,UAAA;AAAA,QAAA;AAAA,MAC1B,GACF;AAAA,0BACC,OAAA,EAAI,WAAU,aACb,UAAA,oBAAC,gBAAA,EAAe,UAAoB,EAAA,CACtC;AAAA,IAAA,EAAA,CACF;AAAA,EAAA,GACF;AAEJ;AAMO,SAAS,OAAO,EAAE,UAAuB;;AAC9C,QAAM,EAAE,UAAA,IAAc,QAAA;AACtB,QAAM,kBAAkB,mBAAA;AACxB,QAAM,OAAO,QAAA;AACb,QAAM,EAAE,QAAQ,SAAA,IAAa,eAAA;AAC7B,QAAM,yBAAyB,IAAI,iBAAiB;AACpD,QAAM,OAAO,QAAA;AACb,QAAM,EAAE,MAAM,cAAA,IAAkB;AAAA,IAC9B,KAAK,KAAK,aAAa,aAAA;AAAA,EAAa;AAGtC,QAAM,eAAe,YAAY;AAC/B,QAAI;AACF,YAAM,OAAA;AAAA,IACR,SAAS,OAAO;AACd,cAAQ,MAAM,kBAAkB,KAAK;AAAA,IACvC;AAAA,EACF;AAEA,SACE,qBAAC,OAAA,EAAI,WAAU,8CACb,UAAA;AAAA,IAAA,oBAAC,SAAI,WAAU,2BACb,UAAA,qBAAC,OAAA,EAAI,WAAU,2BACb,UAAA;AAAA,MAAA,oBAAC,QAAK,IAAG,KACP,8BAACA,eAAA,EAAe,WAAU,aAAY,EAAA,CACxC;AAAA,MACA,qBAAC,OAAA,EAAI,WAAU,iBACb,UAAA;AAAA,QAAA,oBAAC,MAAA,EAAK,IAAG,KAAI,WAAU,oCAAmC,UAAA,eAE1D;AAAA,QACA,qBAAC,OAAA,EAAI,WAAU,6BACb,UAAA;AAAA,UAAA,oBAAC,QAAA,EAAK,WAAU,wCAAuC,UAAA,mBAEvD;AAAA,WACC,iEAAwB,aACvB,oBAAC,gBAAA,EAAe,UAAU,uBAAuB,SAAA,CAAU;AAAA,QAAA,EAAA,CAE/D;AAAA,MAAA,EAAA,CACF;AAAA,IAAA,EAAA,CACF,EAAA,CACF;AAAA,IACC,UAAU,oBAAC,OAAA,EAAI,WAAU,UAAU,UAAA,QAAO;AAAA,IAC3C,qBAAC,OAAA,EAAI,WAAU,mCACb,UAAA;AAAA,MAAA,oBAAC,eAAA,EAAc;AAAA,MACd,YACC,oBAAC,UAAA,EAAS,WAAU,uBAAA,CAAuB,IACzC,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,SAUH,+CAAe,oBACb;AAAA,UAAC;AAAA,UAAA;AAAA,YACC,MAAK;AAAA,YACL,SAAS;AAAA,YACT,WAAU;AAAA,YACX,UAAA;AAAA,UAAA;AAAA,QAAA;AAAA,+BAKF,cAAA,EACC,UAAA;AAAA,QAAA,oBAAC,qBAAA,EAAoB,SAAO,MAC1B,UAAA;AAAA,UAAC;AAAA,UAAA;AAAA,YACC,SAAQ;AAAA,YACR,MAAK;AAAA,YACL,WAAU;AAAA,YACV,cAAY,kBAAiB,6BAAM,SAAQ,MAAM;AAAA,YACjD,eAAY;AAAA,YAEX,wCAAM,SACL;AAAA,cAAC;AAAA,cAAA;AAAA,gBACC,KAAK,KAAK;AAAA,gBACV,KAAK,KAAK,QAAQ;AAAA,gBAClB,WAAU;AAAA,cAAA;AAAA,YAAA,IAGZ,oBAAC,OAAA,EAAI,WAAU,wHACX,YAAA,6BAAM,UAAQ,6BAAM,UAAS,KAAK,OAAO,CAAC,EAAE,cAAY,CAC5D;AAAA,UAAA;AAAA,QAAA,GAGN;AAAA,QACA,qBAAC,qBAAA,EAAoB,OAAM,OAAM,WAAU,QACzC,UAAA;AAAA,UAAA,qBAAC,OAAA,EAAI,WAAU,qCACZ,UAAA;AAAA,aAAA,6BAAM,SACL;AAAA,cAAC;AAAA,cAAA;AAAA,gBACC,KAAK,KAAK;AAAA,gBACV,KAAK,KAAK,QAAQ;AAAA,gBAClB,WAAU;AAAA,cAAA;AAAA,YAAA,IAGZ,oBAAC,OAAA,EAAI,WAAU,6HACX,YAAA,6BAAM,UAAQ,6BAAM,UAAS,KAAK,OAAO,CAAC,EAAE,eAChD;AAAA,YAEF,qBAAC,OAAA,EAAI,WAAU,yBACb,UAAA;AAAA,cAAA,qBAAC,KAAA,EAAE,WAAU,0CAAyC,UAAA;AAAA,gBAAA;AAAA,kBAClD,kCAAM,UAAN,mBAAa,MAAM,KAAK,OAAM;AAAA,cAAA,GAClC;AAAA,kCACC,KAAA,EAAE,WAAU,gCACV,WAAA,6BAAM,SAAQ,OAAA,CACjB;AAAA,YAAA,EAAA,CACF;AAAA,UAAA,GACF;AAAA,8BACC,uBAAA,EAAsB;AAAA,UACvB,qBAAC,kBAAA,EAAiB,SAAS,cACzB,UAAA;AAAA,YAAA,oBAAC,QAAA,EAAO,WAAU,eAAA,CAAe;AAAA,YACjC,oBAAC,UAAK,UAAA,WAAA,CAAQ;AAAA,UAAA,EAAA,CAChB;AAAA,QAAA,EAAA,CACF;AAAA,MAAA,EAAA,CACF;AAAA,IAAA,EAAA,CAEJ;AAAA,EAAA,GACF;AAEJ;"}
+{"version":3,"file":"Header.js","sources":["../../../../../src/ui/components/header/Header.tsx"],"sourcesContent":["import type {\n  AppVersionInfo,\n  VersionInfo,\n} from '@igstack/app-catalog-backend-core'\nimport { Link } from '@tanstack/react-router'\nimport { useQuery } from '@tanstack/react-query'\nimport { LogOut, X } from 'lucide-react'\nimport React, { use } from 'react'\nimport AppCatalogLogo from '~/assets/app-catalog.svg?react'\nimport { useTRPC } from '~/api/infra/trpc'\nimport { ThemeSwitcher } from '~/components/ThemeSwitcher'\nimport { AppCatalogContext } from '~/modules/appCatalog/context/AppCatalogContext'\nimport {\n  useAuth,\n  useAuthActions,\n  useIsAuthenticated,\n  useUser,\n} from '~/modules/auth'\nimport { Button } from '~/ui/button'\nimport {\n  DropdownMenu,\n  DropdownMenuContent,\n  DropdownMenuItem,\n  DropdownMenuSeparator,\n  DropdownMenuTrigger,\n} from '~/ui/dropdown-menu'\nimport {\n  Popover,\n  PopoverClose,\n  PopoverContent,\n  PopoverTrigger,\n} from '~/ui/popover'\nimport { Skeleton } from '~/ui/skeleton'\n\nfunction ShaSuffix({ version }: { version: VersionInfo }) {\n  if (!version.sha) return null\n  if (version.shaUrl) {\n    return (\n      <>\n        {' '}\n        <a\n          href={version.shaUrl}\n          target=\"_blank\"\n          rel=\"noopener noreferrer\"\n          className=\"text-muted-foreground hover:text-primary\"\n          onClick={(e) => e.stopPropagation()}\n        >\n          ({version.sha})\n        </a>\n      </>\n    )\n  }\n  return <span className=\"text-muted-foreground\"> ({version.sha})</span>\n}\n\nfunction VersionItem({\n  label,\n  version,\n}: {\n  label: string\n  version: VersionInfo\n}) {\n  return (\n    <div className=\"flex items-center justify-between gap-4 py-1\">\n      <span className=\"text-xs text-muted-foreground\">{label}</span>\n      <span className=\"text-sm font-medium text-right\">\n        {version.url ? (\n          <a\n            href={version.url}\n            target=\"_blank\"\n            rel=\"noopener noreferrer\"\n            className=\"text-primary hover:text-primary/80 transition-colors\"\n            onClick={(e) => e.stopPropagation()}\n          >\n            {version.displayName}\n          </a>\n        ) : (\n          version.displayName\n        )}\n        <ShaSuffix version={version} />\n      </span>\n    </div>\n  )\n}\n\nexport function VersionDisplay({ versions }: { versions: AppVersionInfo }) {\n  const isLocal =\n    versions.backend?.displayName === 'local' && !versions.coreVersion\n\n  if (isLocal) {\n    return (\n      <span className=\"text-xs text-muted-foreground\" title=\"Local\">\n        local\n      </span>\n    )\n  }\n\n  return (\n    <div className=\"flex flex-col divide-y\">\n      {versions.backend && (\n        <VersionItem label=\"Pipeline\" version={versions.backend} />\n      )}\n      {versions.coreVersion && (\n        <VersionItem label=\"Core\" version={versions.coreVersion} />\n      )}\n      {versions.frontend && (\n        <VersionItem label=\"FE\" version={versions.frontend} />\n      )}\n    </div>\n  )\n}\n\n/**\n * Version detail moved behind an on-demand popover (same click-to-reveal\n * pattern as PersonBadge's approver chips) instead of always-visible text —\n * keeps the header compact. Content is unchanged: same Pipeline/Core/FE\n * lines, links, and SHA suffix as before, just revealed on click.\n */\nexport function VersionPopover({ versions }: { versions: AppVersionInfo }) {\n  const isLocal =\n    versions.backend?.displayName === 'local' && !versions.coreVersion\n\n  if (isLocal) {\n    return (\n      <span className=\"text-xs text-muted-foreground\" title=\"Local\">\n        local\n      </span>\n    )\n  }\n\n  return (\n    <Popover>\n      <PopoverTrigger asChild>\n        <button\n          type=\"button\"\n          className=\"inline-flex items-center gap-1 rounded-full bg-muted px-2 py-0.5 text-[10px] font-mono leading-none text-muted-foreground hover:bg-primary/15 hover:text-primary transition-colors\"\n          aria-label=\"Show version details\"\n          title=\"Version details\"\n          data-testid=\"version-info-trigger\"\n        >\n          {versions.backend?.displayName ?? '?'}\n        </button>\n      </PopoverTrigger>\n      <PopoverContent align=\"start\" className=\"w-72 p-0 overflow-hidden\">\n        <div className=\"flex items-center justify-between px-3 py-2 border-b bg-muted/40\">\n          <span className=\"text-sm font-semibold\">Version details</span>\n          <PopoverClose\n            className=\"rounded p-1 text-muted-foreground hover:text-foreground hover:bg-muted transition-colors\"\n            aria-label=\"Close\"\n          >\n            <X className=\"size-3.5\" />\n          </PopoverClose>\n        </div>\n        <div className=\"px-3 py-1\">\n          <VersionDisplay versions={versions} />\n        </div>\n      </PopoverContent>\n    </Popover>\n  )\n}\n\nexport interface HeaderProps {\n  middle?: React.ReactNode\n}\n\nexport function Header({ middle }: HeaderProps) {\n  const { isLoading } = useAuth()\n  const isAuthenticated = useIsAuthenticated()\n  const user = useUser()\n  const { logout, devLogin } = useAuthActions()\n  const appCatalogContextMaybe = use(AppCatalogContext)\n  const trpc = useTRPC()\n  const { data: providersData } = useQuery(\n    trpc.auth.getProviders.queryOptions(),\n  )\n\n  const handleLogout = async () => {\n    try {\n      await logout()\n    } catch (error) {\n      console.error('Logout failed:', error)\n    }\n  }\n\n  return (\n    <div className=\"flex items-center mb-4 pb-4 gap-4 border-b\">\n      <div className=\"flex items-center gap-4\">\n        <div className=\"flex items-center gap-2\">\n          <Link to=\"/\">\n            <AppCatalogLogo className=\"h-16 w-16\" />\n          </Link>\n          <div className=\"flex flex-col\">\n            <Link to=\"/\" className=\"font-serif text-lg font-semibold\">\n              App Catalog\n            </Link>\n            <div className=\"flex items-center gap-1.5\">\n              <span className=\"text-[10px] text-muted-foreground/60\">\n                by Igor Golovin\n              </span>\n              {appCatalogContextMaybe?.versions && (\n                <VersionPopover versions={appCatalogContextMaybe.versions} />\n              )}\n            </div>\n          </div>\n        </div>\n      </div>\n      {middle && <div className=\"flex-1\">{middle}</div>}\n      <div className=\"flex items-center gap-3 ml-auto\">\n        <ThemeSwitcher />\n        {isLoading ? (\n          <Skeleton className=\"w-8 h-8 rounded-full\" />\n        ) : !isAuthenticated ? (\n          // No Login button: the catalog is fully browsable without signing in,\n          // so it mostly advertised a flow most visitors have no reason to\n          // enter. Auth itself is untouched -- the modal, the login route, the\n          // client and session handling all still work, so anyone who reaches\n          // the flow by URL or by calling `useAuthModal().open()` can sign in,\n          // and this branch flips to the user menu below once they do. `git\n          // revert` of the commit that removed it restores the button as-is.\n          // DEV Login stays: it is gated behind `devLoginEnabled`, so it never\n          // reaches a real deployment.\n          providersData?.devLoginEnabled && (\n            <button\n              type=\"button\"\n              onClick={devLogin}\n              className=\"text-xs font-medium px-2 py-1 rounded bg-amber-500/20 text-amber-600 dark:text-amber-400 hover:bg-amber-500/30 border border-amber-500/30 cursor-pointer\"\n            >\n              DEV Login\n            </button>\n          )\n        ) : (\n          <DropdownMenu>\n            <DropdownMenuTrigger asChild>\n              <Button\n                variant=\"ghost\"\n                size=\"sm\"\n                className=\"w-8 h-8 rounded-full p-0 hover:bg-accent hover:text-accent-foreground cursor-pointer\"\n                aria-label={`User menu for ${user?.name || 'User'}`}\n                data-testid=\"user-avatar-button\"\n              >\n                {user?.image ? (\n                  <img\n                    src={user.image}\n                    alt={user.name || 'User'}\n                    className=\"w-full h-full rounded-full object-cover\"\n                  />\n                ) : (\n                  <div className=\"flex items-center justify-center w-full h-full rounded-full bg-primary text-primary-foreground text-xs font-semibold\">\n                    {(user?.name || user?.email || '?').charAt(0).toUpperCase()}\n                  </div>\n                )}\n              </Button>\n            </DropdownMenuTrigger>\n            <DropdownMenuContent align=\"end\" className=\"w-56\">\n              <div className=\"px-2 py-3 flex items-center gap-3\">\n                {user?.image ? (\n                  <img\n                    src={user.image}\n                    alt={user.name || 'User'}\n                    className=\"w-10 h-10 rounded-full object-cover shrink-0\"\n                  />\n                ) : (\n                  <div className=\"flex items-center justify-center w-10 h-10 rounded-full bg-primary text-primary-foreground text-sm font-semibold shrink-0\">\n                    {(user?.name || user?.email || '?').charAt(0).toUpperCase()}\n                  </div>\n                )}\n                <div className=\"flex flex-col min-w-0\">\n                  <p className=\"text-xs text-muted-foreground truncate\">\n                    @{user?.email?.split('@')[0] || 'user'}\n                  </p>\n                  <p className=\"text-sm font-medium truncate\">\n                    {user?.name || 'User'}\n                  </p>\n                </div>\n              </div>\n              <DropdownMenuSeparator />\n              <DropdownMenuItem onClick={handleLogout}>\n                <LogOut className=\"h-4 w-4 mr-2\" />\n                <span>Sign out</span>\n              </DropdownMenuItem>\n            </DropdownMenuContent>\n          </DropdownMenu>\n        )}\n      </div>\n    </div>\n  )\n}\n"],"names":["AppCatalogLogo"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igstack/app-catalog-frontend-core",
-  "version": "2.0.4",
+  "version": "3.0.0",
   "description": "Frontend core library for App Catalog",
   "homepage": "https://github.com/lislon/app-catalog",
   "repository": {
@@ -113,7 +113,7 @@
     "tailwindcss": "^4.1.7",
     "tiptap-markdown": "^0.8.0",
     "tslib": "^2.3.0",
-    "@igstack/app-catalog-shared-core": "2.0.4"
+    "@igstack/app-catalog-shared-core": "3.0.0"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.0.5",
@@ -140,7 +140,7 @@
     "vite-plugin-static-copy": "^3.1.4",
     "vite-plugin-svgr": "^4.2.0",
     "vitest": "^4.1.2",
-    "@igstack/app-catalog-backend-core": "2.0.4"
+    "@igstack/app-catalog-backend-core": "3.0.0"
   },
   "peerDependencies": {
     "react": "19.1.2",
@@ -149,7 +149,7 @@
     "vite": "^6.3.5",
     "vite-plugin-svgr": "^4.2.0"
   },
-  "gitHead": "d52df9105e77a6e1efdecc74faf291b237bd0363",
+  "gitHead": "9762dd89f7623b15f0507f9936308720b58527ab",
   "scripts": {
     "build": "vite build",
     "build:lenient": "vite build --mode lenient",

package/src/__tests__/modules/appCatalog/utils/areaGrouping.test.ts

@@ -0,0 +1,83 @@
+import { describe, expect, it } from 'vitest'
+import type {
+  GroupingTagDefinition,
+  Resource,
+} from '@igstack/app-catalog-backend-core'
+import {
+  DAY_TO_DAY_AREA_KEY,
+  areaLabel,
+  categoryOf,
+  groupByArea,
+} from '~/modules/appCatalog/utils/areaGrouping'
+
+const app = (slug: string, tags: string[] = []) =>
+  ({ slug, displayName: slug, tags }) as Resource
+
+const definitions: GroupingTagDefinition[] = [
+  {
+    prefix: 'category',
+    displayName: 'Category',
+    description: '',
+    values: [
+      { value: 'finance', displayName: 'Money things', description: '' },
+      { value: 'perks', displayName: 'Perks', description: '' },
+    ],
+  },
+]
+
+describe('categoryOf', () => {
+  it('falls back to "other" without a category tag', () => {
+    expect(categoryOf(app('a', ['universality:common']))).toBe('other')
+  })
+})
+
+describe('groupByArea', () => {
+  it('puts the day-to-day group first, then areas biggest-first', () => {
+    const groups = groupByArea([
+      app('f1', ['category:finance']),
+      app('s1', ['category:security']),
+      app('f2', ['category:finance']),
+      app('everyone', ['category:security', 'universality:everyone']),
+    ])
+    expect(groups.map(([key, list]) => [key, list.length])).toEqual([
+      [DAY_TO_DAY_AREA_KEY, 1],
+      ['finance', 2],
+      ['security', 1],
+    ])
+  })
+
+  it('folds a configured category into the day-to-day group', () => {
+    const groups = groupByArea(
+      [app('lunch', ['category:perks']), app('bank', ['category:finance'])],
+      ['perks'],
+    )
+    expect(groups.map(([key]) => key)).toEqual([DAY_TO_DAY_AREA_KEY, 'finance'])
+  })
+
+  it('omits the day-to-day group when nothing belongs there', () => {
+    expect(groupByArea([app('bank', ['category:finance'])])).toEqual([
+      ['finance', [expect.objectContaining({ slug: 'bank' })]],
+    ])
+  })
+})
+
+describe('areaLabel', () => {
+  it('uses the catalog display name for a known category', () => {
+    expect(areaLabel('finance', definitions)).toBe('Money things')
+  })
+
+  it('humanizes an unknown category slug', () => {
+    expect(areaLabel('field_service', definitions)).toBe('Field service')
+  })
+
+  it('labels the day-to-day group, overridable', () => {
+    expect(areaLabel(DAY_TO_DAY_AREA_KEY, definitions)).toBe('Day-to-day tools')
+    expect(areaLabel(DAY_TO_DAY_AREA_KEY, definitions, 'Everyday')).toBe(
+      'Everyday',
+    )
+  })
+
+  it('works with no definitions at all', () => {
+    expect(areaLabel('finance')).toBe('Finance')
+  })
+})

package/src/__tests__/modules/pwa/PwaAutoUpdateController.test.ts

@@ -0,0 +1,61 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { PwaAutoUpdateController } from '~/modules/pwa/PwaAutoUpdateController'
+
+function makeRegistration(hasWaiting: boolean) {
+  const postMessage = vi.fn()
+  const registration = {
+    update: vi.fn().mockResolvedValue(undefined),
+    waiting: hasWaiting ? { postMessage } : null,
+  } as unknown as ServiceWorkerRegistration
+
+  return { registration, postMessage }
+}
+
+function makeController(registration: ServiceWorkerRegistration) {
+  const updateSW = vi.fn()
+  const controller = new PwaAutoUpdateController(
+    { updateSW, registration },
+    { minCheckIntervalMs: 0 },
+  )
+  return { controller, updateSW }
+}
+
+describe('PwaAutoUpdateController', () => {
+  beforeEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('asks a waiting worker to take over after checking for an update', async () => {
+    const { registration, postMessage } = makeRegistration(true)
+    const { controller } = makeController(registration)
+
+    // @ts-expect-error -- exercising the private check the timers/visibility call
+    await controller.checkForUpdate()
+
+    expect(registration.update).toHaveBeenCalledOnce()
+    expect(postMessage).toHaveBeenCalledWith({ type: 'SKIP_WAITING' })
+  })
+
+  it('does nothing extra when no new worker is waiting', async () => {
+    const { registration } = makeRegistration(false)
+    const { controller } = makeController(registration)
+
+    // @ts-expect-error -- exercising the private check the timers/visibility call
+    await expect(controller.checkForUpdate()).resolves.toBeUndefined()
+
+    expect(registration.update).toHaveBeenCalledOnce()
+  })
+
+  it('activates a waiting worker before the error-triggered reload', async () => {
+    const { registration, postMessage } = makeRegistration(true)
+    const { controller, updateSW } = makeController(registration)
+
+    vi.useFakeTimers()
+    const done = controller.triggerUpdateOnError()
+    await vi.runAllTimersAsync()
+    await done
+
+    expect(postMessage).toHaveBeenCalledWith({ type: 'SKIP_WAITING' })
+    expect(updateSW).toHaveBeenCalledWith(true)
+  })
+})

package/src/index.tsx

@@ -1,6 +1,7 @@
 export { appPropsFactory } from './appPropsFactory.js'
 export { App } from './App'
 export type { AppProps } from './App'
-export type { UiSettings } from './types/uiSettings'
+export type { AreaIcon, AreasSettings, UiSettings } from './types/uiSettings'
+export { DAY_TO_DAY_AREA_KEY } from './modules/appCatalog/utils/areaGrouping'
 export { PwaAutoUpdateProvider, usePwaAutoUpdate } from './modules/pwa'
 export type { PwaAutoUpdateOptions, PwaUpdateHandle } from './modules/pwa'

package/src/modules/appCatalog/ui/catalog/AppCatalogGrid.tsx

@@ -1,6 +1,6 @@
 import type { Resource } from '@igstack/app-catalog-backend-core'
 import { ArrowUpRight, Search, X } from 'lucide-react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { use, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { cn } from '~/lib/utils'
 import { useAppClickHistory } from '../../hooks/useAppClickHistory'
 import { markdownToPlainText } from '../../utils/markdownToPlainText'
@@ -10,11 +10,15 @@ import { ResourceIcon } from './ResourceIcon'
 import { searchResources } from '@igstack/app-catalog-shared-core'
 import { Highlight } from '../components/Highlight'
 import { displayUrl } from '~/modules/appCatalog/utils/displayUrl'
+import { useUiSettings } from '~/context/UiSettingsContext'
+import type { AreaIcon } from '~/types/uiSettings'
+import { AppCatalogContext } from '../../context/AppCatalogContext'
+import { areaLabel, groupByArea } from '../../utils/areaGrouping'
 
 /**
  * Adaptive-home discovery spine (issue #38, increment 1) — matches the
  * option-a-launcher prototype:
- *   Your apps (frequent) → New this week → Browse all
+ *   Your apps (frequent) → New this week → all areas, grouped
  *
  * This is the PERSISTENT shell for the catalog: idle browse, active search and
  * an open detail overlay all render inside it. Only the area below the hero
@@ -47,8 +51,11 @@ export interface AppCatalogGridProps {
   /** Opens a matched sub-resource: its parent's detail, singled out to it. */
   onSubClick: (parentSlug: string, subSlug: string) => void
   onLaunch: (app: Resource) => void
-  /** Total resource count for the "Browse all" label. */
-  totalCount: number
+  /**
+   * @deprecated Unused — it labelled the removed "Browse all" header. Still
+   * accepted so existing callers keep compiling; drop it on the next major.
+   */
+  totalCount?: number
   /**
    * True while an app/sub-resource detail overlay is open above the launcher.
    * The results list then stops binding ↑↓/↵/Esc so the overlay owns the
@@ -118,7 +125,7 @@ function SectionHead({
   )
 }
 
-/** Small row used by "New this week" and "Browse all". */
+/** Small row used by "New this week" and the search results. */
 function ResourceRow({
   app,
   onAppClick,
@@ -167,6 +174,129 @@ function ResourceRow({
   )
 }
 
+/**
+ * Wide area card: icon on the left, name and description beside it.
+ *
+ * The grid cell keeps a fixed footprint and the visible panel is absolute inside
+ * it, so a card growing on hover OVERLAYS the row below instead of reflowing the
+ * whole grid. Hover reveals the rest of the description and nothing else — an
+ * earlier version staggered a delayed tag block in behind the growth, which read
+ * as jitter. Keyboard focus expands the same way, and `motion-reduce` drops the
+ * animation.
+ *
+ * The footprint is a fixed height rather than an aspect ratio: at two or three
+ * columns a ratio makes the card grow taller as the window widens, and the
+ * description — three lines at most — leaves the bottom half empty.
+ */
+function AppCard({
+  app,
+  onAppClick,
+  onLaunch,
+}: {
+  app: Resource
+  onAppClick: (app: Resource) => void
+  onLaunch: (app: Resource) => void
+}) {
+  return (
+    <div className="relative h-[92px]">
+      <button
+        type="button"
+        onClick={() => onAppClick(app)}
+        title={`View ${app.displayName}`}
+        className={cn(
+          'group absolute inset-x-0 top-0 min-h-full max-h-full overflow-hidden',
+          'flex gap-3.5 text-left bg-card border border-border',
+          'rounded-[var(--radius)] p-[15px] pr-11 outline-none',
+          'transition-[max-height,box-shadow,border-color] duration-200',
+          'hover:max-h-96 hover:border-ring hover:shadow-lg hover:z-10',
+          'focus-visible:max-h-96 focus-visible:border-ring focus-visible:shadow-lg focus-visible:z-10',
+          'motion-reduce:transition-none',
+        )}
+      >
+        <LaunchButton
+          app={app}
+          onLaunch={onLaunch}
+          className="absolute top-3 right-3 size-[26px] opacity-0 group-hover:opacity-100 group-focus-visible:opacity-100"
+        />
+        <div className="shrink-0">
+          <ResourceIcon app={app} size={40} />
+        </div>
+        {/* min-w-0 so a long unbroken word truncates instead of pushing the
+            column wider than the card. */}
+        <div className="flex min-w-0 flex-col gap-1.5">
+          {/* shrink-0: while max-height animates, the un-clamped description
+              overflows the panel for a few frames. Without it flexbox squeezes
+              this line to 0 and back, which reads as the title flickering. */}
+          <span className="block shrink-0 text-[14.5px] font-bold leading-tight line-clamp-1 group-hover:line-clamp-2 group-focus-visible:line-clamp-2">
+            {app.displayName}
+          </span>
+          {app.description && (
+            <span
+              className={cn(
+                'block shrink-0 text-[12.5px] leading-snug text-muted-foreground',
+                'line-clamp-2 group-hover:line-clamp-none group-focus-visible:line-clamp-none',
+              )}
+            >
+              {markdownToPlainText(app.description)}
+            </span>
+          )}
+        </div>
+      </button>
+    </div>
+  )
+}
+
+/**
+ * One area: icon, big title, count, then its cards. The icon stands in for the
+ * accent bar the header used to carry — it does the same colour job and also
+ * says which area you are in. It is decorative: the `h3` carries the name.
+ */
+function AreaSection({
+  label,
+  Icon,
+  apps,
+  onAppClick,
+  onLaunch,
+}: {
+  label: string
+  Icon?: AreaIcon
+  apps: Resource[]
+  onAppClick: (app: Resource) => void
+  onLaunch: (app: Resource) => void
+}) {
+  return (
+    <section className="mt-11">
+      <div className="flex items-center gap-2.5 mb-4">
+        {Icon ? (
+          <Icon
+            size={26}
+            strokeWidth={1.75}
+            className="text-primary shrink-0"
+          />
+        ) : (
+          <div className="h-[3px] w-11 rounded-full bg-primary" />
+        )}
+        <h3 className="font-serif font-semibold text-[27px] leading-tight tracking-tight m-0">
+          {label}
+        </h3>
+        <span className="text-[13px] text-muted-foreground">
+          {apps.length} {apps.length === 1 ? 'tool' : 'tools'}
+        </span>
+      </div>
+      <div className="grid gap-3 grid-cols-1 md:grid-cols-2 xl:grid-cols-3">
+        {apps.map((app) => (
+          <AppCard
+            key={app.slug}
+            app={app}
+            onAppClick={onAppClick}
+            onLaunch={onLaunch}
+          />
+        ))}
+      </div>
+    </section>
+  )
+}
+
 /** Matched sub-resources listed under a parent before the "… N more" row. */
 const COLLAPSED_SUB_LIMIT = 5
 
@@ -487,12 +617,15 @@ export function AppCatalogGrid({
   onAppClick,
   onSubClick,
   onLaunch,
-  totalCount,
   detailOpen = false,
   selectedSubSlug,
 }: AppCatalogGridProps) {
   const { getTopApps } = useAppClickHistory()
   const [topSlugs, setTopSlugs] = useState<string[]>([])
+  // Area labels are data (the catalog's own `category` tag definition); only the
+  // icons and the day-to-day fold are deployment config.
+  const { areas } = useUiSettings()
+  const tagsDefinitions = use(AppCatalogContext)?.tagsDefinitions
 
   useEffect(() => {
     void getTopApps(5).then(setTopSlugs)
@@ -517,7 +650,7 @@ export function AppCatalogGrid({
   // New this week: apps ADDED in the last 7 days — see pickNewThisWeek (#96).
   const fresh = useMemo(() => pickNewThisWeek(apps), [apps])
 
-  // Browse all: everything not already promoted to "Your apps", alpha by name.
+  // Everything not already promoted to "Your apps", alpha by name.
   const browse = useMemo(() => {
     const promoted = new Set(frequent.map((a) => a.slug))
     return [...apps]
@@ -525,8 +658,12 @@ export function AppCatalogGrid({
       .sort((a, b) => a.displayName.localeCompare(b.displayName))
   }, [apps, frequent])
 
-  const browseLeft = browse.filter((_, i) => i % 2 === 0)
-  const browseRight = browse.filter((_, i) => i % 2 === 1)
+  // Grouped: day-to-day tools first, then areas biggest-first so the page opens
+  // on the areas most people need. Within an area, alpha (from browse).
+  const browseGroups = useMemo(
+    () => groupByArea(browse, areas?.dayToDayCategories),
+    [browse, areas?.dayToDayCategories],
+  )
 
   const isSearching = searchValue.trim() !== ''
   const searchRef = useRef<HTMLInputElement>(null)
@@ -560,7 +697,7 @@ export function AppCatalogGrid({
               type="text"
               value={searchValue}
               onChange={(e) => onSearchChange(e.target.value)}
-              placeholder="Search apps, databases, cloud accounts, account IDs…"
+              placeholder="Search apps, cloud accounts, or keywords"
               autoComplete="off"
               autoFocus
               ref={searchRef}
@@ -663,31 +800,19 @@ export function AppCatalogGrid({
             </section>
           )}
 
-          {/* Browse all */}
+          {/* Everything else, grouped by area — the area titles carry it, so
+              there is no "Browse all" header above them. */}
           <section className="mt-9">
-            <SectionHead title="Browse all" count={`${totalCount} resources`} />
-            <div className="grid grid-cols-1 md:grid-cols-2 gap-2">
-              <div className="flex flex-col gap-2">
-                {browseLeft.map((app) => (
-                  <ResourceRow
-                    key={app.slug}
-                    app={app}
-                    onAppClick={onAppClick}
-                    onLaunch={onLaunch}
-                  />
-                ))}
-              </div>
-              <div className="flex flex-col gap-2">
-                {browseRight.map((app) => (
-                  <ResourceRow
-                    key={app.slug}
-                    app={app}
-                    onAppClick={onAppClick}
-                    onLaunch={onLaunch}
-                  />
-                ))}
-              </div>
-            </div>
+            {browseGroups.map(([key, list]) => (
+              <AreaSection
+                key={key}
+                label={areaLabel(key, tagsDefinitions, areas?.dayToDayLabel)}
+                Icon={areas?.icons?.[key]}
+                apps={list}
+                onAppClick={onAppClick}
+                onLaunch={onLaunch}
+              />
+            ))}
           </section>
 
           <AttributionFooter />

package/src/modules/appCatalog/ui/pages/AppCatalogPage.tsx

@@ -133,15 +133,6 @@ export function AppCatalogPage({
     )
   }, [subPageSlug, selectedApp, resources])
 
-  // Total resource count for the "Browse all" label (respects ?deprecated=1)
-  const totalAppsCount = useMemo(
-    () =>
-      filterState.showDeprecated
-        ? rootResources.length
-        : rootResources.filter((app) => !app.deprecated).length,
-    [rootResources, filterState.showDeprecated],
-  )
-
   if (isLoadingApps) {
     return <div className="py-6 text-muted-foreground">Loading…</div>
   }
@@ -166,7 +157,6 @@ export function AppCatalogPage({
         onAppClick={handleAppClick}
         onSubClick={handleSubClick}
         onLaunch={handleLaunch}
-        totalCount={totalAppsCount}
         detailOpen={selectedApp !== null}
         selectedSubSlug={highlightSubSlug}
       />

package/src/modules/appCatalog/utils/areaGrouping.ts

@@ -0,0 +1,85 @@
+import type {
+  GroupingTagDefinition,
+  Resource,
+} from '@igstack/app-catalog-backend-core'
+
+/**
+ * Grouping of the full resource list into areas.
+ *
+ * The vocabulary itself is NOT here: which `category:<value>` tags exist, what
+ * they are called and which of them belong on the day-to-day shelf is
+ * deployment-specific. Labels come from the catalog's own tag definitions and
+ * icons from `UiSettings.areas`, so the core only knows the mechanism.
+ */
+
+const CATEGORY_PREFIX = 'category:'
+const EVERYONE_TAG = 'universality:everyone'
+
+/**
+ * Synthetic key for the merged first group. Underscored so it cannot collide
+ * with a real `category:<value>`.
+ */
+export const DAY_TO_DAY_AREA_KEY = '__day-to-day__'
+
+/** Fallback area for resources carrying no `category:` tag. */
+export const OTHER_AREA_KEY = 'other'
+
+export const categoryOf = (app: Resource): string =>
+  app.tags
+    ?.find((t) => t.startsWith(CATEGORY_PREFIX))
+    ?.slice(CATEGORY_PREFIX.length) ?? OTHER_AREA_KEY
+
+const humanize = (key: string): string => {
+  const words = key.replace(/[-_]+/g, ' ').trim()
+  return words.charAt(0).toUpperCase() + words.slice(1)
+}
+
+/**
+ * Day-to-day tools first, then one area per category, biggest area first.
+ * Input order is preserved inside each group.
+ *
+ * `dayToDayCategories` are categories that fold into the day-to-day group
+ * instead of getting an area of their own (perks, office services, …).
+ */
+export function groupByArea(
+  apps: Resource[],
+  dayToDayCategories: readonly string[] = [],
+): [string, Resource[]][] {
+  const folded = new Set(dayToDayCategories)
+  const dayToDay: Resource[] = []
+  const byCategory = new Map<string, Resource[]>()
+
+  for (const app of apps) {
+    const key = categoryOf(app)
+    if (app.tags?.includes(EVERYONE_TAG) || folded.has(key)) {
+      dayToDay.push(app)
+      continue
+    }
+    const list = byCategory.get(key)
+    if (list) list.push(app)
+    else byCategory.set(key, [app])
+  }
+
+  const areas = [...byCategory.entries()].sort(
+    (a, b) => b[1].length - a[1].length,
+  )
+  return dayToDay.length
+    ? [[DAY_TO_DAY_AREA_KEY, dayToDay] as [string, Resource[]], ...areas]
+    : areas
+}
+
+/**
+ * Title for an area. The catalog's `category` tag definition supplies the
+ * display names; an unknown value still gets a readable humanized slug.
+ */
+export function areaLabel(
+  key: string,
+  tagsDefinitions: readonly GroupingTagDefinition[] = [],
+  dayToDayLabel = 'Day-to-day tools',
+): string {
+  if (key === DAY_TO_DAY_AREA_KEY) return dayToDayLabel
+  const defined = tagsDefinitions
+    .find((d) => d.prefix === 'category')
+    ?.values.find((v) => v.value === key)?.displayName
+  return defined || humanize(key)
+}