@open-mercato/ui 0.6.7-develop.6775.1.c2313bb8a3 → 0.6.7-develop.6785.1.1dd7cfac55

package/dist/portal/utils/nav.js

@@ -26,8 +26,7 @@ function pickPreferredRoute(existing, candidate) {
 function buildPortalNav({
   routes,
   orgSlug,
-  grantedFeatures,
-  isPortalAdmin = false
+  grantedFeatures
 }) {
   const mainItems = [];
   const accountItems = [];
@@ -45,7 +44,7 @@ function buildPortalNav({
     const pattern = route.pattern ?? route.path;
     const nav = route.nav;
     const requireFeatures = route.requireCustomerFeatures ?? [];
-    if (!isPortalAdmin && requireFeatures.length) {
+    if (requireFeatures.length) {
       if (!hasAllFeatures(grantedFeatures, requireFeatures)) continue;
     }
     const href = resolveHref(pattern, orgSlug);

package/dist/portal/utils/nav.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/portal/utils/nav.ts"],
-  "sourcesContent": ["import type { FrontendRouteManifestEntry } from '@open-mercato/shared/modules/registry'\nimport { hasAllFeatures } from '@open-mercato/shared/security/features'\n\nexport type PortalNavGroupId = 'main' | 'account'\n\nexport type PortalNavItem = {\n  id: string\n  label: string\n  labelKey?: string\n  href: string\n  icon?: string\n  order: number\n}\n\nexport type PortalNavGroup = {\n  id: PortalNavGroupId\n  items: PortalNavItem[]\n}\n\nexport type BuildPortalNavOptions = {\n  /** Route manifest to inspect (typically `getFrontendRouteManifests()`). */\n  routes: readonly FrontendRouteManifestEntry[]\n  /** Current customer org slug \u2014 substituted into `[orgSlug]` patterns. */\n  orgSlug: string\n  /** Feature strings granted to the current customer (may include wildcards). */\n  grantedFeatures: readonly string[]\n  /** If true, bypass feature checks (portal admin). Defaults to false. */\n  isPortalAdmin?: boolean\n}\n\nfunction isPortalPattern(pattern: string | undefined): pattern is string {\n  if (!pattern) return false\n  return pattern.startsWith('/[orgSlug]/portal/') || pattern === '/[orgSlug]/portal'\n}\n\nfunction hasNoUnresolvedParams(href: string): boolean {\n  return !href.includes('[')\n}\n\nfunction resolveHref(pattern: string, orgSlug: string): string {\n  return pattern.replace('[orgSlug]', orgSlug)\n}\n\nfunction pickGroup(group: unknown): PortalNavGroupId {\n  if (group === 'main' || group === 'account') return group\n  return 'main'\n}\n\nfunction pickPreferredRoute(\n  existing: FrontendRouteManifestEntry,\n  candidate: FrontendRouteManifestEntry,\n): FrontendRouteManifestEntry {\n  const existingFeatures = existing.requireCustomerFeatures ?? []\n  const candidateFeatures = candidate.requireCustomerFeatures ?? []\n  if (existingFeatures.length === 0 && candidateFeatures.length > 0) return candidate\n  if (candidateFeatures.length === 0 && existingFeatures.length > 0) return existing\n  if (existingFeatures.length !== candidateFeatures.length) {\n    return candidateFeatures.length > existingFeatures.length ? candidate : existing\n  }\n  return existing\n}\n\n/**\n * Build the portal sidebar from the frontend route manifest.\n *\n * Mirrors `buildAdminNav()` for the portal surface: selects routes under\n * `/[orgSlug]/portal/*` that declare a `nav` block, applies\n * `requireCustomerFeatures` against the caller's grants (wildcards honored),\n * and returns ordered sidebar groups.\n *\n * Absence of `nav` on a metadata file means the page is routable but not\n * auto-listed \u2014 useful for detail/create pages.\n */\nexport function buildPortalNav({\n  routes,\n  orgSlug,\n  grantedFeatures,\n  isPortalAdmin = false,\n}: BuildPortalNavOptions): PortalNavGroup[] {\n  const mainItems: PortalNavItem[] = []\n  const accountItems: PortalNavItem[] = []\n\n  const dedupedByPattern = new Map<string, FrontendRouteManifestEntry>()\n  for (const route of routes) {\n    const pattern = route.pattern ?? route.path\n    if (!isPortalPattern(pattern)) continue\n    if (route.navHidden) continue\n    const nav = route.nav\n    if (!nav || typeof nav.label !== 'string' || nav.label.length === 0) continue\n    const existing = dedupedByPattern.get(pattern)\n    dedupedByPattern.set(pattern, existing ? pickPreferredRoute(existing, route) : route)\n  }\n\n  for (const route of dedupedByPattern.values()) {\n    const pattern = (route.pattern ?? route.path) as string\n    const nav = route.nav!\n\n    const requireFeatures = route.requireCustomerFeatures ?? []\n    if (!isPortalAdmin && requireFeatures.length) {\n      if (!hasAllFeatures(grantedFeatures as string[], requireFeatures as string[])) continue\n    }\n\n    const href = resolveHref(pattern, orgSlug)\n    if (!hasNoUnresolvedParams(href)) continue\n\n    const group = pickGroup(nav.group)\n    const item: PortalNavItem = {\n      id: `portal-nav:${pattern}`,\n      label: nav.label,\n      labelKey: nav.labelKey,\n      href,\n      icon: nav.icon,\n      order: typeof nav.order === 'number' ? nav.order : 100,\n    }\n    if (group === 'account') accountItems.push(item)\n    else mainItems.push(item)\n  }\n\n  const sortItems = (items: PortalNavItem[]) =>\n    items.sort((a, b) => {\n      if (a.order !== b.order) return a.order - b.order\n      return a.label.localeCompare(b.label)\n    })\n\n  sortItems(mainItems)\n  sortItems(accountItems)\n\n  const groups: PortalNavGroup[] = []\n  if (mainItems.length) groups.push({ id: 'main', items: mainItems })\n  if (accountItems.length) groups.push({ id: 'account', items: accountItems })\n  return groups\n}\n\n/**\n * Merge sidebar groups from the portal nav endpoint with items contributed via\n * `usePortalInjectedMenuItems`. Auto-discovered entries take precedence \u2014\n * injected items with matching `id` or `href` are dropped as duplicates.\n */\nexport function mergePortalSidebarGroupsWithInjected<TInjected extends { id: string; href?: string }>(\n  discovered: readonly PortalNavGroup[],\n  injected: {\n    main: readonly TInjected[]\n    account: readonly TInjected[]\n  },\n): {\n  main: Array<PortalNavItem | TInjected>\n  account: Array<PortalNavItem | TInjected>\n} {\n  const mergeGroup = <T extends PortalNavItem | TInjected>(\n    base: readonly PortalNavItem[],\n    extra: readonly TInjected[],\n  ): Array<PortalNavItem | TInjected> => {\n    const knownIds = new Set(base.map((item) => item.id))\n    const knownHrefs = new Set(base.map((item) => item.href).filter((href): href is string => Boolean(href)))\n    const merged: Array<PortalNavItem | TInjected> = [...base]\n    for (const item of extra) {\n      if (knownIds.has(item.id)) continue\n      if (item.href && knownHrefs.has(item.href)) continue\n      merged.push(item)\n      knownIds.add(item.id)\n      if (item.href) knownHrefs.add(item.href)\n    }\n    return merged\n  }\n\n  const mainBase = discovered.find((g) => g.id === 'main')?.items ?? []\n  const accountBase = discovered.find((g) => g.id === 'account')?.items ?? []\n  return {\n    main: mergeGroup(mainBase, injected.main),\n    account: mergeGroup(accountBase, injected.account),\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { FrontendRouteManifestEntry } from '@open-mercato/shared/modules/registry'\nimport { hasAllFeatures } from '@open-mercato/shared/security/features'\n\nexport type PortalNavGroupId = 'main' | 'account'\n\nexport type PortalNavItem = {\n  id: string\n  label: string\n  labelKey?: string\n  href: string\n  icon?: string\n  order: number\n}\n\nexport type PortalNavGroup = {\n  id: PortalNavGroupId\n  items: PortalNavItem[]\n}\n\nexport type BuildPortalNavOptions = {\n  /** Route manifest to inspect (typically `getFrontendRouteManifests()`). */\n  routes: readonly FrontendRouteManifestEntry[]\n  /** Current customer org slug \u2014 substituted into `[orgSlug]` patterns. */\n  orgSlug: string\n  /** Concrete effective features granted to the current customer. */\n  grantedFeatures: readonly string[]\n  /** @deprecated Portal admins must receive concrete effective features. */\n  isPortalAdmin?: boolean\n}\n\nfunction isPortalPattern(pattern: string | undefined): pattern is string {\n  if (!pattern) return false\n  return pattern.startsWith('/[orgSlug]/portal/') || pattern === '/[orgSlug]/portal'\n}\n\nfunction hasNoUnresolvedParams(href: string): boolean {\n  return !href.includes('[')\n}\n\nfunction resolveHref(pattern: string, orgSlug: string): string {\n  return pattern.replace('[orgSlug]', orgSlug)\n}\n\nfunction pickGroup(group: unknown): PortalNavGroupId {\n  if (group === 'main' || group === 'account') return group\n  return 'main'\n}\n\nfunction pickPreferredRoute(\n  existing: FrontendRouteManifestEntry,\n  candidate: FrontendRouteManifestEntry,\n): FrontendRouteManifestEntry {\n  const existingFeatures = existing.requireCustomerFeatures ?? []\n  const candidateFeatures = candidate.requireCustomerFeatures ?? []\n  if (existingFeatures.length === 0 && candidateFeatures.length > 0) return candidate\n  if (candidateFeatures.length === 0 && existingFeatures.length > 0) return existing\n  if (existingFeatures.length !== candidateFeatures.length) {\n    return candidateFeatures.length > existingFeatures.length ? candidate : existing\n  }\n  return existing\n}\n\n/**\n * Build the portal sidebar from the frontend route manifest.\n *\n * Mirrors `buildAdminNav()` for the portal surface: selects routes under\n * `/[orgSlug]/portal/*` that declare a `nav` block, applies\n * `requireCustomerFeatures` against the caller's grants (wildcards honored),\n * and returns ordered sidebar groups.\n *\n * Absence of `nav` on a metadata file means the page is routable but not\n * auto-listed \u2014 useful for detail/create pages.\n */\nexport function buildPortalNav({\n  routes,\n  orgSlug,\n  grantedFeatures,\n}: BuildPortalNavOptions): PortalNavGroup[] {\n  const mainItems: PortalNavItem[] = []\n  const accountItems: PortalNavItem[] = []\n\n  const dedupedByPattern = new Map<string, FrontendRouteManifestEntry>()\n  for (const route of routes) {\n    const pattern = route.pattern ?? route.path\n    if (!isPortalPattern(pattern)) continue\n    if (route.navHidden) continue\n    const nav = route.nav\n    if (!nav || typeof nav.label !== 'string' || nav.label.length === 0) continue\n    const existing = dedupedByPattern.get(pattern)\n    dedupedByPattern.set(pattern, existing ? pickPreferredRoute(existing, route) : route)\n  }\n\n  for (const route of dedupedByPattern.values()) {\n    const pattern = (route.pattern ?? route.path) as string\n    const nav = route.nav!\n\n    const requireFeatures = route.requireCustomerFeatures ?? []\n    if (requireFeatures.length) {\n      if (!hasAllFeatures(grantedFeatures as string[], requireFeatures as string[])) continue\n    }\n\n    const href = resolveHref(pattern, orgSlug)\n    if (!hasNoUnresolvedParams(href)) continue\n\n    const group = pickGroup(nav.group)\n    const item: PortalNavItem = {\n      id: `portal-nav:${pattern}`,\n      label: nav.label,\n      labelKey: nav.labelKey,\n      href,\n      icon: nav.icon,\n      order: typeof nav.order === 'number' ? nav.order : 100,\n    }\n    if (group === 'account') accountItems.push(item)\n    else mainItems.push(item)\n  }\n\n  const sortItems = (items: PortalNavItem[]) =>\n    items.sort((a, b) => {\n      if (a.order !== b.order) return a.order - b.order\n      return a.label.localeCompare(b.label)\n    })\n\n  sortItems(mainItems)\n  sortItems(accountItems)\n\n  const groups: PortalNavGroup[] = []\n  if (mainItems.length) groups.push({ id: 'main', items: mainItems })\n  if (accountItems.length) groups.push({ id: 'account', items: accountItems })\n  return groups\n}\n\n/**\n * Merge sidebar groups from the portal nav endpoint with items contributed via\n * `usePortalInjectedMenuItems`. Auto-discovered entries take precedence \u2014\n * injected items with matching `id` or `href` are dropped as duplicates.\n */\nexport function mergePortalSidebarGroupsWithInjected<TInjected extends { id: string; href?: string }>(\n  discovered: readonly PortalNavGroup[],\n  injected: {\n    main: readonly TInjected[]\n    account: readonly TInjected[]\n  },\n): {\n  main: Array<PortalNavItem | TInjected>\n  account: Array<PortalNavItem | TInjected>\n} {\n  const mergeGroup = <T extends PortalNavItem | TInjected>(\n    base: readonly PortalNavItem[],\n    extra: readonly TInjected[],\n  ): Array<PortalNavItem | TInjected> => {\n    const knownIds = new Set(base.map((item) => item.id))\n    const knownHrefs = new Set(base.map((item) => item.href).filter((href): href is string => Boolean(href)))\n    const merged: Array<PortalNavItem | TInjected> = [...base]\n    for (const item of extra) {\n      if (knownIds.has(item.id)) continue\n      if (item.href && knownHrefs.has(item.href)) continue\n      merged.push(item)\n      knownIds.add(item.id)\n      if (item.href) knownHrefs.add(item.href)\n    }\n    return merged\n  }\n\n  const mainBase = discovered.find((g) => g.id === 'main')?.items ?? []\n  const accountBase = discovered.find((g) => g.id === 'account')?.items ?? []\n  return {\n    main: mergeGroup(mainBase, injected.main),\n    account: mergeGroup(accountBase, injected.account),\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/ui",
-  "version": "0.6.7-develop.6775.1.c2313bb8a3",
+  "version": "0.6.7-develop.6785.1.1dd7cfac55",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -155,13 +155,13 @@
     "remark-gfm": "^4.0.1"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.7-develop.6775.1.c2313bb8a3",
+    "@open-mercato/shared": "0.6.7-develop.6785.1.1dd7cfac55",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
     "react-is": ">=18.0.0"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.7-develop.6775.1.c2313bb8a3",
+    "@open-mercato/shared": "0.6.7-develop.6785.1.1dd7cfac55",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/ai/AiChat.tsx

@@ -304,10 +304,39 @@ function mapErrorCodeToVariant(
     'tool_not_whitelisted',
     'tool_features_denied',
     'attachment_type_not_accepted',
+    // Content-safety rejections are soft: the user can rephrase and retry.
+    'moderation_blocked',
+    'moderation_unavailable',
   ])
   return warningCodes.has(code) ? 'warning' : 'destructive'
 }
 
+/**
+ * Maps known error codes to a translated, user-safe message. For content-safety
+ * codes the raw server message is intentionally generic (no category oracle);
+ * the UI shows the friendly localized copy instead of the internal text.
+ */
+function resolveChatErrorMessage(
+  code: string | undefined,
+  fallback: string,
+  translate: (key: string, fallbackText?: string) => string,
+): string {
+  switch (code) {
+    case 'moderation_blocked':
+      return translate(
+        'ai_assistant.errors.moderationBlocked',
+        'Your message was blocked by the content safety filter. Please rephrase and try again.',
+      )
+    case 'moderation_unavailable':
+      return translate(
+        'ai_assistant.errors.moderationUnavailable',
+        'The content safety check is temporarily unavailable. Please try again in a moment.',
+      )
+    default:
+      return fallback
+  }
+}
+
 const MARKDOWN_TYPOGRAPHY_CLASS = cn(
   '[&_p]:my-1 [&_p:first-child]:mt-0 [&_p:last-child]:mb-0',
   '[&_ul]:my-2 [&_ol]:my-2 [&_ul]:ml-4 [&_ol]:ml-4 [&_ul]:list-disc [&_ol]:list-decimal',
@@ -1630,7 +1659,7 @@ export function AiChat({
             {chat.error.code ? (
               <span className="mr-2 font-mono text-xs">{chat.error.code}</span>
             ) : null}
-            {chat.error.message}
+            {resolveChatErrorMessage(chat.error.code, chat.error.message, t)}
           </AlertDescription>
         </Alert>
       ) : null}

package/src/ai/__tests__/AiChat.test.tsx

@@ -93,6 +93,8 @@ const dict = {
   'ai_assistant.chat.emptyTranscript':
     'No messages yet. Ask the agent anything to get started.',
   'ai_assistant.chat.errorTitle': 'Agent dispatch failed',
+  'ai_assistant.errors.moderationBlocked':
+    'Your message was blocked by the content safety filter. Please rephrase and try again.',
   'ai_assistant.chat.agentTasksTitle': 'Tool calls',
   'ai_assistant.chat.regionLabel': 'AI chat',
   'ai_assistant.chat.send': 'Send message',
@@ -577,6 +579,35 @@ describe('<AiChat>', () => {
     expect(screen.getByText('agent_unknown')).toBeInTheDocument()
   })
 
+  it('renders the translated message (not the raw server text) for a moderation_blocked envelope', async () => {
+    const fetchMock = apiFetch as unknown as jest.Mock
+    fetchMock.mockResolvedValueOnce(
+      createErrorResponse(400, {
+        error: 'Input rejected by the content safety filter.',
+        code: 'moderation_blocked',
+      }),
+    )
+
+    renderWithProviders(<AiChat agent="customers.account_assistant" />, { dict })
+
+    const textarea = screen.getByLabelText('Message composer') as HTMLTextAreaElement
+    fireEvent.change(textarea, { target: { value: 'flagged input' } })
+    await act(async () => {
+      fireEvent.keyDown(textarea, { key: 'Enter', ctrlKey: true })
+    })
+
+    await waitFor(() => {
+      expect(screen.getByText('moderation_blocked')).toBeInTheDocument()
+    })
+    // The friendly localized copy is shown; the internal server text is not.
+    expect(
+      screen.getByText(/blocked by the content safety filter/i),
+    ).toBeInTheDocument()
+    expect(screen.queryByText('Input rejected by the content safety filter.')).toBeNull()
+    // Content-safety rejections render as a soft warning, not destructive.
+    expect(document.querySelector('[data-ai-chat-error="moderation_blocked"]')).not.toBeNull()
+  })
+
   it('Escape aborts an in-flight streaming response', async () => {
     const fetchMock = apiFetch as unknown as jest.Mock
     // Build a stream we can keep open until the component aborts it.

package/src/backend/AppShell.tsx

@@ -87,6 +87,7 @@ function isBooleanRecord(value: unknown): value is Record<string, boolean> {
 export type ShellLogo = {
   src: string
   alt?: string
+  preserveAspectRatio?: boolean
 }
 
 export type AppShellProps = {
@@ -186,6 +187,56 @@ function shouldBypassLogoOptimization(src?: string | null): boolean {
   return /^https?:\/\//.test(value) || /^\/api\/attachments\/(?:image|file)\//.test(value)
 }
 
+function ShellBrandLogo({
+  logo,
+  brandName,
+  unoptimized,
+  compact = false,
+  mobile = false,
+}: {
+  logo?: ShellLogo
+  brandName: string
+  unoptimized?: boolean
+  compact?: boolean
+  mobile?: boolean
+}) {
+  const src = logo?.src ?? '/open-mercato.svg'
+  const alt = logo?.alt ?? brandName
+  const isCustomLogo = Boolean(logo?.src)
+  const preserveAspectRatio = Boolean(logo?.preserveAspectRatio)
+  if (!isCustomLogo || !preserveAspectRatio) {
+    return (
+      <Image
+        src={src}
+        alt={alt}
+        width={mobile ? 28 : 40}
+        height={mobile ? 28 : 40}
+        className={`${mobile ? 'rounded' : 'rounded-full'} shrink-0 object-cover`}
+        unoptimized={unoptimized ? true : undefined}
+      />
+    )
+  }
+
+  const width = compact ? 40 : mobile ? 96 : 120
+  const height = mobile ? 28 : 40
+  const className = compact
+    ? 'h-10 max-w-10 w-auto shrink-0 object-contain'
+    : mobile
+      ? 'h-7 max-w-24 w-auto shrink-0 object-contain'
+      : 'h-10 max-w-[120px] w-auto shrink-0 object-contain'
+
+  return (
+    <Image
+      src={src}
+      alt={alt}
+      width={width}
+      height={height}
+      className={className}
+      unoptimized={unoptimized ? true : undefined}
+    />
+  )
+}
+
 function mergeSidebarItemsWithInjected(
   items: SidebarItem[],
   injectedItems: InjectionMenuItem[],
@@ -760,7 +811,7 @@ function AppShellBody({ productName, logo, email, canManageUpgradeActions = fals
               className={`flex items-center gap-3 rounded-xl transition-colors hover:bg-muted ${compact ? 'p-2 justify-center' : 'p-3'}`}
               aria-label={t('appShell.goToDashboard')}
             >
-              <Image src={resolvedLogo?.src ?? "/open-mercato.svg"} alt={resolvedLogo?.alt ?? resolvedBrandName} width={40} height={40} className="rounded-full shrink-0" unoptimized={resolvedLogoBypassesOptimization ? true : undefined} />
+              <ShellBrandLogo logo={resolvedLogo} brandName={resolvedBrandName} compact={compact} unoptimized={resolvedLogoBypassesOptimization} />
               {!compact && <span className="truncate text-sm font-medium text-foreground">{resolvedBrandName}</span>}
             </Link>
           </div>
@@ -893,7 +944,7 @@ function AppShellBody({ productName, logo, email, canManageUpgradeActions = fals
                 className={`flex items-center gap-3 rounded-xl transition-colors hover:bg-muted ${compact ? 'p-2 justify-center' : 'p-3'}`}
                 aria-label={t('appShell.goToDashboard')}
               >
-                <Image src={resolvedLogo?.src ?? "/open-mercato.svg"} alt={resolvedLogo?.alt ?? resolvedBrandName} width={40} height={40} className="rounded-full shrink-0" unoptimized={resolvedLogoBypassesOptimization ? true : undefined} />
+                <ShellBrandLogo logo={resolvedLogo} brandName={resolvedBrandName} compact={compact} unoptimized={resolvedLogoBypassesOptimization} />
                 {!compact && <span className="truncate text-sm font-medium text-foreground">{resolvedBrandName}</span>}
               </Link>
             </div>
@@ -959,7 +1010,7 @@ function AppShellBody({ productName, logo, email, canManageUpgradeActions = fals
               className={`flex items-center gap-3 rounded-xl transition-colors hover:bg-muted ${compact ? 'p-2 justify-center' : 'p-3'}`}
               aria-label={t('appShell.goToDashboard')}
             >
-              <Image src={resolvedLogo?.src ?? "/open-mercato.svg"} alt={resolvedLogo?.alt ?? resolvedBrandName} width={40} height={40} className="rounded-full shrink-0" unoptimized={resolvedLogoBypassesOptimization ? true : undefined} />
+              <ShellBrandLogo logo={resolvedLogo} brandName={resolvedBrandName} compact={compact} unoptimized={resolvedLogoBypassesOptimization} />
               {!compact && <span className="truncate text-sm font-medium text-foreground">{resolvedBrandName}</span>}
             </Link>
           </div>
@@ -1458,7 +1509,7 @@ function AppShellBody({ productName, logo, email, canManageUpgradeActions = fals
           <aside className="absolute left-0 top-0 flex h-full w-[280px] max-w-[85vw] flex-col bg-background border-r shadow-lg overflow-hidden">
             <div className="shrink-0 flex items-center justify-between gap-2 border-b px-4 py-3">
               <Link href="/backend" className="flex items-center gap-2 min-w-0 text-sm font-semibold" onClick={() => setMobileOpen(false)} aria-label={t('appShell.goToDashboard')}>
-                <Image src={resolvedLogo?.src ?? "/open-mercato.svg"} alt={resolvedLogo?.alt ?? resolvedBrandName} width={28} height={28} className="rounded shrink-0" unoptimized={resolvedLogoBypassesOptimization ? true : undefined} />
+                <ShellBrandLogo logo={resolvedLogo} brandName={resolvedBrandName} mobile unoptimized={resolvedLogoBypassesOptimization} />
                 <span className="truncate">{resolvedBrandName}</span>
               </Link>
               <IconButton variant="ghost" size="sm" onClick={() => setMobileOpen(false)} aria-label={t('appShell.closeMenu')}>

package/src/backend/__tests__/AppShell.test.tsx

@@ -226,7 +226,11 @@ describe('AppShell', () => {
     expect(screen.getByTestId('injection-spot:backend:layout:footer')).toBeInTheDocument()
   })
 
-  it('uses backend chrome brand logo when the selected organization has one', async () => {
+  it.each([
+    ['internal-file', '/api/attachments/file/aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'],
+    ['internal-image-query', '/api/attachments/image/aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa/acme.svg?width=320&height=320'],
+    ['external-webp', 'https://example.com/acme-wide-logo.webp'],
+  ])('uses an aspect-ratio-preserving backend chrome brand logo when enabled for %s', async (variant, logoSrc) => {
     const previousFetch = global.fetch
     const previousWindowFetch = window.fetch
     const previousOriginalFetch = (window as Window & { __omOriginalFetch?: typeof fetch }).__omOriginalFetch
@@ -235,8 +239,9 @@ describe('AppShell', () => {
         brand: {
           name: 'Acme',
           logo: {
-            src: '/api/attachments/image/aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa/acme.png?width=320',
+            src: logoSrc,
             alt: 'Acme logo',
+            preserveAspectRatio: true,
           },
         },
         groups,
@@ -257,7 +262,7 @@ describe('AppShell', () => {
         <AppShell
           email="demo@example.com"
           groups={[]}
-          adminNavApi="/api/auth/admin/nav-brand-logo"
+          adminNavApi={`/api/auth/admin/nav-brand-logo-${variant}`}
         >
           <div>Child content</div>
         </AppShell>,
@@ -266,11 +271,10 @@ describe('AppShell', () => {
 
       await waitFor(() => {
         const logo = screen.getByAltText('Acme logo')
-        expect(logo).toHaveAttribute(
-          'src',
-          '/api/attachments/image/aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa/acme.png?width=320',
-        )
+        expect(logo).toHaveAttribute('src', logoSrc)
         expect(logo).toHaveAttribute('data-unoptimized', 'true')
+        expect(logo).toHaveClass('object-contain')
+        expect(logo).not.toHaveClass('rounded-full')
       })
       expect(screen.getByText('Acme')).toBeInTheDocument()
     } finally {
@@ -280,6 +284,60 @@ describe('AppShell', () => {
     }
   })
 
+  it('uses the cropped icon treatment for backend chrome brand logos by default', async () => {
+    const previousFetch = global.fetch
+    const previousWindowFetch = window.fetch
+    const previousOriginalFetch = (window as Window & { __omOriginalFetch?: typeof fetch }).__omOriginalFetch
+    const logoSrc = 'https://example.com/acme-wide-logo.webp'
+    const fetchMock = jest.fn().mockResolvedValue(
+      new Response(JSON.stringify({
+        brand: {
+          name: 'Acme',
+          logo: {
+            src: logoSrc,
+            alt: 'Acme logo',
+          },
+        },
+        groups,
+        settingsSections: [],
+        settingsPathPrefixes: [],
+        profileSections: [],
+        profilePathPrefixes: [],
+        grantedFeatures: [],
+        roles: [],
+      }), { status: 200, headers: { 'content-type': 'application/json' } }),
+    ) as typeof fetch
+    global.fetch = fetchMock
+    window.fetch = fetchMock
+    ;(window as Window & { __omOriginalFetch?: typeof fetch }).__omOriginalFetch = fetchMock
+
+    try {
+      renderWithProviders(
+        <AppShell
+          email="demo@example.com"
+          groups={[]}
+          adminNavApi="/api/auth/admin/nav-brand-logo-cropped"
+        >
+          <div>Child content</div>
+        </AppShell>,
+        { dict },
+      )
+
+      await waitFor(() => {
+        const logo = screen.getByAltText('Acme logo')
+        expect(logo).toHaveAttribute('src', logoSrc)
+        expect(logo).toHaveAttribute('data-unoptimized', 'true')
+        expect(logo).toHaveClass('object-cover')
+        expect(logo).toHaveClass('rounded-full')
+        expect(logo).not.toHaveClass('object-contain')
+      })
+    } finally {
+      global.fetch = previousFetch
+      window.fetch = previousWindowFetch
+      ;(window as Window & { __omOriginalFetch?: typeof fetch }).__omOriginalFetch = previousOriginalFetch
+    }
+  })
+
   it('renders nested settings links when settings parent route is active', async () => {
     mockPathname = '/backend/entities/user'
 

package/src/portal/PortalContext.tsx

@@ -91,7 +91,7 @@ export function PortalProvider({ orgSlug, children, initialAuth, initialTenant }
         },
         roles: [],
         resolvedFeatures: initialAuth.resolvedFeatures,
-        isPortalAdmin: initialAuth.resolvedFeatures.some((f) => f === 'portal.*'),
+        isPortalAdmin: initialAuth.isPortalAdmin === true,
         loading: false,
         error: null,
       }

package/src/portal/utils/__tests__/nav.test.ts

@@ -97,7 +97,7 @@ describe('buildPortalNav', () => {
     expect(groups).toEqual([{ id: 'main', items: [expect.objectContaining({ label: 'Orders' })] }])
   })
 
-  it('bypasses feature checks when isPortalAdmin is true', () => {
+  it('does not let the deprecated portal-admin flag bypass effective features', () => {
     const routes: FrontendRouteManifestEntry[] = [
       makeRoute({
         pattern: '/[orgSlug]/portal/orders',
@@ -107,7 +107,7 @@ describe('buildPortalNav', () => {
     ]
 
     const groups = buildPortalNav({ routes, orgSlug: 'my-org', grantedFeatures: [], isPortalAdmin: true })
-    expect(groups[0].items[0].label).toBe('Orders')
+    expect(groups).toEqual([])
   })
 
   it('ignores navHidden pages even when nav is declared', () => {

package/src/portal/utils/nav.ts

@@ -22,9 +22,9 @@ export type BuildPortalNavOptions = {
   routes: readonly FrontendRouteManifestEntry[]
   /** Current customer org slug — substituted into `[orgSlug]` patterns. */
   orgSlug: string
-  /** Feature strings granted to the current customer (may include wildcards). */
+  /** Concrete effective features granted to the current customer. */
   grantedFeatures: readonly string[]
-  /** If true, bypass feature checks (portal admin). Defaults to false. */
+  /** @deprecated Portal admins must receive concrete effective features. */
   isPortalAdmin?: boolean
 }
 
@@ -75,7 +75,6 @@ export function buildPortalNav({
   routes,
   orgSlug,
   grantedFeatures,
-  isPortalAdmin = false,
 }: BuildPortalNavOptions): PortalNavGroup[] {
   const mainItems: PortalNavItem[] = []
   const accountItems: PortalNavItem[] = []
@@ -96,7 +95,7 @@ export function buildPortalNav({
     const nav = route.nav!
 
     const requireFeatures = route.requireCustomerFeatures ?? []
-    if (!isPortalAdmin && requireFeatures.length) {
+    if (requireFeatures.length) {
       if (!hasAllFeatures(grantedFeatures as string[], requireFeatures as string[])) continue
     }