@open-mercato/core 0.6.6-develop.6367.1.2321ccacd4 → 0.6.6-develop.6373.1.5bece5409d

package/src/modules/customer_accounts/i18n/de.json

@@ -103,88 +103,88 @@
   "customer_accounts.admin.flash.deactivated": "User deactivated",
   "customer_accounts.admin.flash.deleted": "User deleted",
   "customer_accounts.admin.inactive": "Inactive",
-  "customer_accounts.admin.portalFeatures.addresses.manage": "Manage addresses",
-  "customer_accounts.admin.portalFeatures.addresses.view": "View addresses",
-  "customer_accounts.admin.portalFeatures.groups.addresses": "Addresses",
-  "customer_accounts.admin.portalFeatures.groups.invoices": "Invoices",
-  "customer_accounts.admin.portalFeatures.groups.orders": "Orders",
-  "customer_accounts.admin.portalFeatures.groups.profile": "Profile",
-  "customer_accounts.admin.portalFeatures.groups.quotes": "Quotes",
-  "customer_accounts.admin.portalFeatures.groups.users": "Users",
-  "customer_accounts.admin.portalFeatures.invoices.view": "View invoices",
-  "customer_accounts.admin.portalFeatures.orders.create": "Create orders",
-  "customer_accounts.admin.portalFeatures.orders.view": "View orders",
-  "customer_accounts.admin.portalFeatures.profile.edit": "Edit profile",
-  "customer_accounts.admin.portalFeatures.profile.view": "View profile",
-  "customer_accounts.admin.portalFeatures.quotes.request": "Request quotes",
-  "customer_accounts.admin.portalFeatures.quotes.view": "View quotes",
-  "customer_accounts.admin.portalFeatures.users.invite": "Invite team members",
-  "customer_accounts.admin.portalFeatures.users.manage": "Manage team members",
-  "customer_accounts.admin.portalFeatures.users.view": "View team members",
+  "customer_accounts.admin.portalFeatures.addresses.manage": "Adressen verwalten",
+  "customer_accounts.admin.portalFeatures.addresses.view": "Adressen anzeigen",
+  "customer_accounts.admin.portalFeatures.groups.addresses": "Adressen",
+  "customer_accounts.admin.portalFeatures.groups.invoices": "Rechnungen",
+  "customer_accounts.admin.portalFeatures.groups.orders": "Bestellungen",
+  "customer_accounts.admin.portalFeatures.groups.profile": "Profil",
+  "customer_accounts.admin.portalFeatures.groups.quotes": "Angebote",
+  "customer_accounts.admin.portalFeatures.groups.users": "Benutzer",
+  "customer_accounts.admin.portalFeatures.invoices.view": "Rechnungen anzeigen",
+  "customer_accounts.admin.portalFeatures.orders.create": "Bestellungen erstellen",
+  "customer_accounts.admin.portalFeatures.orders.view": "Bestellungen anzeigen",
+  "customer_accounts.admin.portalFeatures.profile.edit": "Profil bearbeiten",
+  "customer_accounts.admin.portalFeatures.profile.view": "Profil anzeigen",
+  "customer_accounts.admin.portalFeatures.quotes.request": "Angebote anfordern",
+  "customer_accounts.admin.portalFeatures.quotes.view": "Angebote anzeigen",
+  "customer_accounts.admin.portalFeatures.users.invite": "Teammitglieder einladen",
+  "customer_accounts.admin.portalFeatures.users.manage": "Teammitglieder verwalten",
+  "customer_accounts.admin.portalFeatures.users.view": "Teammitglieder anzeigen",
   "customer_accounts.admin.portalInfo.credentials": "Demo credentials: alice.johnson@example.com / Password123!",
   "customer_accounts.admin.portalInfo.description": "Manage customer portal accounts. Customers can self-register, log in, and access orders, quotes, and invoices through the portal.",
   "customer_accounts.admin.portalInfo.open": "Open Portal",
   "customer_accounts.admin.portalInfo.openConfiguration": "Open Configuration",
   "customer_accounts.admin.portalInfo.title": "Customer Portal",
   "customer_accounts.admin.portalInfo.url": "Portal URL: {url}",
-  "customer_accounts.admin.roleCreate.actions.cancel": "Cancel",
-  "customer_accounts.admin.roleCreate.actions.create": "Create Role",
-  "customer_accounts.admin.roleCreate.actions.saving": "Creating...",
-  "customer_accounts.admin.roleCreate.error.nameRequired": "Name is required",
-  "customer_accounts.admin.roleCreate.error.required": "Name and slug are required",
-  "customer_accounts.admin.roleCreate.error.save": "Failed to create role",
-  "customer_accounts.admin.roleCreate.error.slugFormat": "Slug must contain only lowercase letters, numbers, hyphens, and underscores",
-  "customer_accounts.admin.roleCreate.error.slugRequired": "Slug is required",
-  "customer_accounts.admin.roleCreate.fields.customerAssignable": "Customers can self-assign",
-  "customer_accounts.admin.roleCreate.fields.description": "Description",
-  "customer_accounts.admin.roleCreate.fields.isDefault": "Default role (auto-assigned to new users)",
+  "customer_accounts.admin.roleCreate.actions.cancel": "Abbrechen",
+  "customer_accounts.admin.roleCreate.actions.create": "Rolle erstellen",
+  "customer_accounts.admin.roleCreate.actions.saving": "Erstellen...",
+  "customer_accounts.admin.roleCreate.error.nameRequired": "Name ist erforderlich",
+  "customer_accounts.admin.roleCreate.error.required": "Name und Slug sind erforderlich",
+  "customer_accounts.admin.roleCreate.error.save": "Rolle konnte nicht erstellt werden",
+  "customer_accounts.admin.roleCreate.error.slugFormat": "Slug darf nur Kleinbuchstaben, Zahlen, Bindestriche und Unterstriche enthalten",
+  "customer_accounts.admin.roleCreate.error.slugRequired": "Slug ist erforderlich",
+  "customer_accounts.admin.roleCreate.fields.customerAssignable": "Kunden können sich selbst zuweisen",
+  "customer_accounts.admin.roleCreate.fields.description": "Beschreibung",
+  "customer_accounts.admin.roleCreate.fields.isDefault": "Standardrolle (wird neuen Benutzern automatisch zugewiesen)",
   "customer_accounts.admin.roleCreate.fields.name": "Name",
-  "customer_accounts.admin.roleCreate.fields.namePlaceholder": "e.g. Buyer",
+  "customer_accounts.admin.roleCreate.fields.namePlaceholder": "z. B. Käufer",
   "customer_accounts.admin.roleCreate.fields.slug": "Slug",
-  "customer_accounts.admin.roleCreate.fields.slugHint": "Lowercase letters, numbers, hyphens, and underscores only.",
-  "customer_accounts.admin.roleCreate.fields.slugPlaceholder": "e.g. buyer",
-  "customer_accounts.admin.roleCreate.flash.created": "Role created",
-  "customer_accounts.admin.roleCreate.sections.details": "Role Details",
-  "customer_accounts.admin.roleCreate.sections.options": "Options",
-  "customer_accounts.admin.roleCreate.title": "Create Customer Role",
-  "customer_accounts.admin.roleDetail.actions.backToList": "Back to roles",
-  "customer_accounts.admin.roleDetail.actions.cancel": "Cancel",
-  "customer_accounts.admin.roleDetail.actions.delete": "Delete",
-  "customer_accounts.admin.roleDetail.actions.save": "Save Changes",
-  "customer_accounts.admin.roleDetail.actions.saving": "Saving...",
-  "customer_accounts.admin.roleDetail.error.load": "Failed to load role",
-  "customer_accounts.admin.roleDetail.error.notFound": "Role not found",
-  "customer_accounts.admin.roleDetail.error.save": "Failed to save role",
-  "customer_accounts.admin.roleDetail.error.saveAcl": "Failed to save permissions",
-  "customer_accounts.admin.roleDetail.fields.customerAssignable": "Customers can self-assign",
-  "customer_accounts.admin.roleDetail.fields.description": "Description",
-  "customer_accounts.admin.roleDetail.fields.isDefault": "Default role (auto-assigned to new users)",
+  "customer_accounts.admin.roleCreate.fields.slugHint": "Nur Kleinbuchstaben, Zahlen, Bindestriche und Unterstriche.",
+  "customer_accounts.admin.roleCreate.fields.slugPlaceholder": "z. B. kaeufer",
+  "customer_accounts.admin.roleCreate.flash.created": "Rolle erstellt",
+  "customer_accounts.admin.roleCreate.sections.details": "Rollendetails",
+  "customer_accounts.admin.roleCreate.sections.options": "Optionen",
+  "customer_accounts.admin.roleCreate.title": "Kundenrolle erstellen",
+  "customer_accounts.admin.roleDetail.actions.backToList": "Zurück zu Rollen",
+  "customer_accounts.admin.roleDetail.actions.cancel": "Abbrechen",
+  "customer_accounts.admin.roleDetail.actions.delete": "Löschen",
+  "customer_accounts.admin.roleDetail.actions.save": "Änderungen speichern",
+  "customer_accounts.admin.roleDetail.actions.saving": "Speichern...",
+  "customer_accounts.admin.roleDetail.error.load": "Rolle konnte nicht geladen werden",
+  "customer_accounts.admin.roleDetail.error.notFound": "Rolle nicht gefunden",
+  "customer_accounts.admin.roleDetail.error.save": "Rolle konnte nicht gespeichert werden",
+  "customer_accounts.admin.roleDetail.error.saveAcl": "Berechtigungen konnten nicht gespeichert werden",
+  "customer_accounts.admin.roleDetail.fields.customerAssignable": "Kunden können sich selbst zuweisen",
+  "customer_accounts.admin.roleDetail.fields.description": "Beschreibung",
+  "customer_accounts.admin.roleDetail.fields.isDefault": "Standardrolle (wird neuen Benutzern automatisch zugewiesen)",
   "customer_accounts.admin.roleDetail.fields.name": "Name",
-  "customer_accounts.admin.roleDetail.flash.saved": "Role updated",
-  "customer_accounts.admin.roleDetail.loading": "Loading role...",
-  "customer_accounts.admin.roleDetail.sections.details": "Role Details",
-  "customer_accounts.admin.roleDetail.sections.options": "Options",
-  "customer_accounts.admin.roleDetail.sections.permissions": "Portal Permissions",
-  "customer_accounts.admin.roleDetail.selectAll": "Select all",
-  "customer_accounts.admin.roles": "Roles",
-  "customer_accounts.admin.roles.actions.create": "Create Role",
-  "customer_accounts.admin.roles.actions.delete": "Delete",
-  "customer_accounts.admin.roles.actions.edit": "Edit",
-  "customer_accounts.admin.roles.assignable": "Yes",
-  "customer_accounts.admin.roles.columns.customerAssignable": "Self-assignable",
-  "customer_accounts.admin.roles.columns.description": "Description",
-  "customer_accounts.admin.roles.columns.isDefault": "Default",
+  "customer_accounts.admin.roleDetail.flash.saved": "Rolle aktualisiert",
+  "customer_accounts.admin.roleDetail.loading": "Rolle wird geladen...",
+  "customer_accounts.admin.roleDetail.sections.details": "Rollendetails",
+  "customer_accounts.admin.roleDetail.sections.options": "Optionen",
+  "customer_accounts.admin.roleDetail.sections.permissions": "Portal-Berechtigungen",
+  "customer_accounts.admin.roleDetail.selectAll": "Alle auswählen",
+  "customer_accounts.admin.roles": "Rollen",
+  "customer_accounts.admin.roles.actions.create": "Rolle erstellen",
+  "customer_accounts.admin.roles.actions.delete": "Löschen",
+  "customer_accounts.admin.roles.actions.edit": "Bearbeiten",
+  "customer_accounts.admin.roles.assignable": "Ja",
+  "customer_accounts.admin.roles.columns.customerAssignable": "Selbst zuweisbar",
+  "customer_accounts.admin.roles.columns.description": "Beschreibung",
+  "customer_accounts.admin.roles.columns.isDefault": "Standard",
   "customer_accounts.admin.roles.columns.isSystem": "System",
   "customer_accounts.admin.roles.columns.name": "Name",
   "customer_accounts.admin.roles.columns.slug": "Slug",
-  "customer_accounts.admin.roles.confirm.delete": "Delete role \"{{name}}\"?",
-  "customer_accounts.admin.roles.default": "Default",
-  "customer_accounts.admin.roles.error.delete": "Failed to delete role",
-  "customer_accounts.admin.roles.error.deleteSystem": "System roles cannot be deleted",
-  "customer_accounts.admin.roles.error.load": "Failed to load roles",
-  "customer_accounts.admin.roles.flash.deleted": "Role deleted",
-  "customer_accounts.admin.roles.notAssignable": "No",
-  "customer_accounts.admin.roles.searchPlaceholder": "Search roles...",
+  "customer_accounts.admin.roles.confirm.delete": "Rolle \"{{name}}\" löschen?",
+  "customer_accounts.admin.roles.default": "Standard",
+  "customer_accounts.admin.roles.error.delete": "Rolle konnte nicht gelöscht werden",
+  "customer_accounts.admin.roles.error.deleteSystem": "Systemrollen können nicht gelöscht werden",
+  "customer_accounts.admin.roles.error.load": "Rollen konnten nicht geladen werden",
+  "customer_accounts.admin.roles.flash.deleted": "Rolle gelöscht",
+  "customer_accounts.admin.roles.notAssignable": "Nein",
+  "customer_accounts.admin.roles.searchPlaceholder": "Rollen suchen...",
   "customer_accounts.admin.roles.system": "System",
   "customer_accounts.admin.roles.title": "Rollen",
   "customer_accounts.admin.searchPlaceholder": "Search by name or email...",
@@ -263,8 +263,8 @@
   "customer_accounts.domainMapping.tls.retryButton": "Retry SSL",
   "customer_accounts.domainMapping.verifyNow": "Check Now",
   "customer_accounts.nav.group": "Customers",
-  "customer_accounts.nav.role_create": "Create Role",
-  "customer_accounts.nav.role_detail": "Role Detail",
+  "customer_accounts.nav.role_create": "Rolle erstellen",
+  "customer_accounts.nav.role_detail": "Rollendetails",
   "customer_accounts.nav.roles": "Kundenrollen",
   "customer_accounts.nav.user_detail": "User Detail",
   "customer_accounts.nav.users": "Kundenbenutzer",

package/src/modules/customers/api/companies/[id]/route.ts

@@ -50,6 +50,13 @@ import {
 } from '../../../lib/personCompanyLinkTable'
 import { normalizeCustomerDetailCustomFields } from '../../detailCustomFields'
 import { isOrganizationReadAccessAllowed } from '@open-mercato/core/modules/directory/utils/organizationScopeGuard'
+import { runWithCacheTenant } from '@open-mercato/cache'
+import {
+  buildCollectionTags,
+  canonicalizeResourceTag,
+  isCrudCacheEnabled,
+  resolveCrudCache,
+} from '@open-mercato/shared/lib/crud/cache'
 
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['customers.companies.view'] },
@@ -59,6 +66,66 @@ const paramsSchema = z.object({
   id: z.string().uuid(),
 })
 
+const COMPANY_DETAIL_CACHE_TTL_MS = 60_000
+
+// The customers write commands already invalidate these resource collections via
+// invalidateCrudCache using these exact resourceKind strings. Reusing them as
+// cache tags means the cached detail is flushed by those existing commands with
+// no new wiring (#3664, mirroring #3143). Canonicalize each kind the same way
+// invalidateCrudCache does (camelCase split + lowercase) so the tag shapes match.
+const COMPANY_DETAIL_CACHE_RESOURCE_KINDS = [
+  'customers.company',
+  'customers.address',
+  'customers.tagAssignment',
+  'customers.labelAssignment',
+  'customers.personCompanyLink',
+  'customers.interaction',
+  'customers.activity',
+] as const
+
+function buildCompanyDetailCacheTags(tenantId: string | null, organizationId: string | null): string[] {
+  const tags = new Set<string>()
+  for (const resourceKind of COMPANY_DETAIL_CACHE_RESOURCE_KINDS) {
+    const resource = canonicalizeResourceTag(resourceKind) ?? resourceKind
+    for (const tag of buildCollectionTags(resource, tenantId, [organizationId])) {
+      tags.add(tag)
+    }
+  }
+  return Array.from(tags)
+}
+
+function buildCompanyDetailCacheKey(parts: {
+  tenantId: string | null
+  organizationId: string | null
+  companyId: string
+  selectedOrganizationId: string | null
+  filterIds: string[] | null
+  allowedIds: string[] | null
+  isSuperAdmin: boolean
+  viewerUserId: string | null
+  interactionMode: string
+  includeTokens: string[]
+}): string {
+  const sortKeys = (values: string[]): string[] =>
+    [...values].sort((a, b) => (a < b ? -1 : a > b ? 1 : 0))
+  const filterIds = parts.filterIds ? sortKeys(parts.filterIds).join(',') : 'all'
+  const allowedIds = parts.allowedIds ? sortKeys(parts.allowedIds).join(',') : 'all'
+  const includeTokens = sortKeys(parts.includeTokens).join(',')
+  return [
+    'customers:companies:detail',
+    `tenant:${parts.tenantId ?? 'null'}`,
+    `org:${parts.organizationId ?? 'null'}`,
+    `company:${parts.companyId}`,
+    `selected:${parts.selectedOrganizationId ?? 'null'}`,
+    `filter:${filterIds}`,
+    `allowed:${allowedIds}`,
+    `super:${parts.isSuperAdmin ? '1' : '0'}`,
+    `viewer:${parts.viewerUserId ?? 'null'}`,
+    `mode:${parts.interactionMode}`,
+    `include:${includeTokens}`,
+  ].join('|')
+}
+
 function parseIncludeParams(request: Request): Set<string> {
   const url = new URL(request.url)
   const raw = url.searchParams.getAll('include')
@@ -414,6 +481,31 @@ export async function GET(_req: Request, ctx: { params?: { id?: string } }) {
     userFeatures: undefined,
   })
 
+  // Opt-in cache (#3664): the company existence + org read-access checks above
+  // always run, so authorization is never served from cache. Only the expensive
+  // detail sweeps below are cached. Key on tenant/org/company + the RBAC scope,
+  // viewer (email privacy), interaction mode, and the requested include set.
+  const cacheTenantId = companyScope.tenantId
+  const cache = isCrudCacheEnabled() ? resolveCrudCache(container) : null
+  const cacheKey = cache
+    ? buildCompanyDetailCacheKey({
+        tenantId: cacheTenantId,
+        organizationId: companyScope.organizationId,
+        companyId: company.id,
+        selectedOrganizationId: scope?.selectedId ?? auth.orgId ?? null,
+        filterIds: scope?.filterIds ?? null,
+        allowedIds: scope?.allowedIds ?? null,
+        isSuperAdmin: auth.isSuperAdmin === true,
+        viewerUserId,
+        interactionMode,
+        includeTokens: Array.from(includeTokens),
+      })
+    : null
+  if (cache && cacheKey) {
+    const cached = await runWithCacheTenant(cacheTenantId, () => cache.get(cacheKey))
+    if (cached) return NextResponse.json(cached)
+  }
+
   const shouldLoadCanonicalInteractions = includeInteractions || includeActivities || includeTodos
 
   // These reads only depend on the resolved company + scope + email visibility
@@ -961,7 +1053,7 @@ export async function GET(_req: Request, ctx: { params?: { id?: string } }) {
     addresses: addressesCount,
   }
 
-  return NextResponse.json({
+  const payload = {
     interactionMode,
     company: {
       id: company.id,
@@ -1170,7 +1262,22 @@ export async function GET(_req: Request, ctx: { params?: { id?: string } }) {
       name: viewerUserId ? userMap.get(viewerUserId)?.name ?? null : null,
       email: viewerUserId ? userMap.get(viewerUserId)?.email ?? auth.email ?? null : auth.email ?? null,
     },
-  })
+  }
+
+  if (cache && cacheKey) {
+    try {
+      await runWithCacheTenant(cacheTenantId, () =>
+        cache.set(cacheKey, payload, {
+          ttl: COMPANY_DETAIL_CACHE_TTL_MS,
+          tags: buildCompanyDetailCacheTags(cacheTenantId, companyScope.organizationId),
+        }),
+      )
+    } catch (err) {
+      console.warn('[customers:companies] Failed to set company detail cache', err)
+    }
+  }
+
+  return NextResponse.json(payload)
 }
 
 const companyDetailQuerySchema = z.object({

package/src/modules/feature_toggles/components/formConfig.tsx

@@ -13,7 +13,7 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { booleanOverrideSelectValue } from "./overrideFormConfig";
 
 
-export function renderDefaultValueCreateComponent(props: CrudCustomFieldRenderProps) {
+export function DefaultValueField(props: CrudCustomFieldRenderProps) {
     const t = useT()
     const selectedType = props.values?.type as string;
 
@@ -132,7 +132,7 @@ export function createFieldDefinitions(
             id: 'defaultValue',
             label: '',
             type: 'custom',
-            component: renderDefaultValueCreateComponent,
+            component: (props) => <DefaultValueField {...props} />,
             description: t('feature_toggles.form.fields.defaultValue.description'),
         },
     ]

package/src/modules/feature_toggles/components/overrideFormConfig.tsx

@@ -20,7 +20,7 @@ export function booleanOverrideSelectValue(value: unknown): 'true' | 'false' {
   return value === true || value === 'true' ? 'true' : 'false'
 }
 
-export function renderOverrideValueComponent(props: CrudCustomFieldRenderProps) {
+export function OverrideValueField(props: CrudCustomFieldRenderProps) {
     const t = useT()
     const toggleType = props.values?.toggleType as string;
     const isOverride = props.values?.isOverride as boolean;
@@ -119,7 +119,7 @@ export function createOverrideFieldDefinitions(
             id: 'overrideValue',
             label: '',
             type: 'custom',
-            component: renderOverrideValueComponent,
+            component: (props) => <OverrideValueField {...props} />,
             description: t('feature_toggles.override.fields.overrideValue.description'),
         },
     ]

package/src/modules/inbox_ops/components/proposals/ActionCard.tsx

@@ -324,6 +324,29 @@ export function ActionCard({
     )
   }
 
+  if (action.status !== 'pending') {
+    const isProcessing = action.status === 'processing'
+    const statusLabel = action.status === 'accepted'
+      ? t('inbox_ops.status.accepted', 'Accepted')
+      : isProcessing
+        ? t('inbox_ops.status.processing', 'Processing')
+        : action.status
+    return (
+      <div className="border rounded-lg p-3 md:p-4 bg-muted/50">
+        <div className="flex items-center gap-2 mb-2">
+          {isProcessing ? (
+            <RefreshCw className="h-5 w-5 text-muted-foreground flex-shrink-0 animate-spin" />
+          ) : (
+            <CheckCircle className="h-5 w-5 text-muted-foreground flex-shrink-0" />
+          )}
+          <span className="text-sm font-medium">{label}</span>
+          <span className="text-xs text-muted-foreground">{statusLabel}</span>
+        </div>
+        <p className="text-sm text-muted-foreground">{displayDescription}</p>
+      </div>
+    )
+  }
+
   const hasNameIssue = hasContactNameIssue(action)
 
   return (

package/src/modules/messages/components/useMessagesInboxBulkActions.ts

@@ -13,7 +13,7 @@ import { toErrorMessage } from './message-detail/utils'
 
 export type MessageFolder = 'inbox' | 'sent' | 'drafts' | 'archived' | 'all'
 
-export type MessageBulkActionId = 'markRead' | 'markUnread' | 'archive' | 'delete'
+export type MessageBulkActionId = 'markRead' | 'markUnread' | 'archive' | 'unarchive' | 'delete'
 
 type BulkExecutionSummary = {
   action: MessageBulkActionId
@@ -84,6 +84,14 @@ const MESSAGE_BULK_REQUESTS: Record<MessageBulkActionId, MessageBulkRequestConfi
     errorKey: 'messages.errors.stateChangeFailed',
     errorFallback: 'Failed to update message state.',
   },
+  unarchive: {
+    method: 'DELETE',
+    buildUrl: (messageId) => `/api/messages/${encodeURIComponent(messageId)}/archive`,
+    successKey: 'messages.bulk.flash.unarchiveSuccess',
+    successFallback: '{count} messages moved to inbox.',
+    errorKey: 'messages.errors.stateChangeFailed',
+    errorFallback: 'Failed to update message state.',
+  },
   delete: {
     method: 'DELETE',
     buildUrl: (messageId) => `/api/messages/${encodeURIComponent(messageId)}`,
@@ -110,6 +118,11 @@ const MESSAGE_BULK_ACTIONS: Record<MessageBulkActionId, MessageBulkActionDefinit
     labelKey: 'messages.actions.archive',
     labelFallback: 'Archive',
   },
+  unarchive: {
+    id: 'messages-unarchive',
+    labelKey: 'messages.actions.unarchive',
+    labelFallback: 'Unarchive',
+  },
   delete: {
     id: 'messages-delete',
     labelKey: 'messages.actions.delete',
@@ -120,7 +133,7 @@ const MESSAGE_BULK_ACTIONS: Record<MessageBulkActionId, MessageBulkActionDefinit
 
 const MESSAGE_BULK_ACTION_IDS_BY_FOLDER = {
   inbox: ['markRead', 'markUnread', 'archive', 'delete'],
-  archived: ['markRead', 'markUnread', 'delete'],
+  archived: ['markRead', 'markUnread', 'unarchive', 'delete'],
   sent: ['delete'],
   drafts: ['delete'],
   all: [],

package/src/modules/messages/i18n/de.json

@@ -34,6 +34,7 @@
   "messages.bulk.flash.markReadSuccess": "{count} Nachrichten als gelesen markiert.",
   "messages.bulk.flash.markUnreadSuccess": "{count} Nachrichten als ungelesen markiert.",
   "messages.bulk.flash.partial": "{succeeded} von {total} Nachrichten verarbeitet; {failed} fehlgeschlagen.",
+  "messages.bulk.flash.unarchiveSuccess": "{count} Nachrichten in den Posteingang verschoben.",
   "messages.compose": "Nachricht verfassen",
   "messages.composeHint": "Erstelle eine Nachricht, hänge Objekte an und sende sie an ausgewählte Empfänger.",
   "messages.composer.attachmentPicker.confirm": "Auswahl anhängen",

package/src/modules/messages/i18n/en.json

@@ -34,6 +34,7 @@
   "messages.bulk.flash.markReadSuccess": "{count} messages marked as read.",
   "messages.bulk.flash.markUnreadSuccess": "{count} messages marked as unread.",
   "messages.bulk.flash.partial": "{succeeded} of {total} messages processed; {failed} failed.",
+  "messages.bulk.flash.unarchiveSuccess": "{count} messages moved to inbox.",
   "messages.compose": "Compose message",
   "messages.composeHint": "Create a message, attach objects, and send it to selected recipients.",
   "messages.composer.attachmentPicker.confirm": "Attach selected",

package/src/modules/messages/i18n/es.json

@@ -34,6 +34,7 @@
   "messages.bulk.flash.markReadSuccess": "{count} mensajes marcados como leídos.",
   "messages.bulk.flash.markUnreadSuccess": "{count} mensajes marcados como no leídos.",
   "messages.bulk.flash.partial": "Se procesaron {succeeded} de {total} mensajes; {failed} fallaron.",
+  "messages.bulk.flash.unarchiveSuccess": "{count} mensajes movidos a la bandeja de entrada.",
   "messages.compose": "Redactar mensaje",
   "messages.composeHint": "Crea un mensaje, adjunta objetos y envíalo a los destinatarios seleccionados.",
   "messages.composer.attachmentPicker.confirm": "Adjuntar seleccionados",

package/src/modules/messages/i18n/pl.json

@@ -34,6 +34,7 @@
   "messages.bulk.flash.markReadSuccess": "Oznaczono {count} wiadomości jako przeczytane.",
   "messages.bulk.flash.markUnreadSuccess": "Oznaczono {count} wiadomości jako nieprzeczytane.",
   "messages.bulk.flash.partial": "Przetworzono {succeeded} z {total} wiadomości; niepowodzeń: {failed}.",
+  "messages.bulk.flash.unarchiveSuccess": "Przeniesiono {count} wiadomości do skrzynki odbiorczej.",
   "messages.compose": "Napisz wiadomość",
   "messages.composeHint": "Utwórz wiadomość, dołącz obiekty i wyślij do wybranych odbiorców.",
   "messages.composer.attachmentPicker.confirm": "Dołącz wybrane",