@eifi1/ui-kit 0.42.0 → 0.43.0

package/src/i18n/locales/it.ts

@@ -613,6 +613,34 @@ export function uiKitLabelsIt(numberLocale = "it-IT"): UiKitLabels {
       awaitClickHint: "Faccia clic sull’elemento evidenziato per continuare",
       step: (current, total) => `${n(current)} / ${n(total)}`,
     },
+    // 0.43.0 — docs/tours-harmonization.md §3, §8: the tours page. keksdose's reviewed words.
+    tourCatalogue: {
+      searchLabel: "Cerca tour",
+      searchPlaceholder: "Cerca tour…",
+      groupLabel: "Argomento",
+      groupAll: (count) => `Tutti gli argomenti (${n(count)})`,
+      groupOption: (group, count) => `${group} (${n(count)})`,
+      stateLabel: "Filtra i tour",
+      stateAll: (count) => `Tutti (${n(count)})`,
+      stateTodo: (count) => `Da fare (${n(count)})`,
+      stateDone: (count) => `Completati (${n(count)})`,
+      showing: (shown, total) => `${n(shown)} di ${n(total)} tour`,
+      noMatches: "Nessun tour corrisponde",
+      noMatchesHint: "Provi un’altra parola o cancelli i filtri.",
+      clearFilters: "Cancella filtri",
+      badgeNew: "Nuovo",
+      badgeUpdated: "Aggiornato",
+      resetOn: (date, reason) => (reason ? `Reimpostato il ${date}: ${reason}` : `Reimpostato il ${date}`),
+      points: (count) => `+${n(count)} pt`,
+      steps: (count) => (count === 1 ? `${n(count)} passaggio` : `${n(count)} passaggi`),
+      duration: (minutes) => `Circa ${n(minutes)} min`,
+      completedOn: (date) => `Completato il ${date}`,
+      completed: "Completato",
+      notCompleted: "Non completato",
+      markUndone: "Segna come non completato",
+      start: "Avvia",
+      replay: "Ripeti",
+    },
     commandPalette: {
       clear: "Cancella ricerca",
       submit: "Cerca",
@@ -1744,6 +1772,8 @@ export function uiKitLabelsIt(numberLocale = "it-IT"): UiKitLabels {
         `Il Suo abbonamento termina il ${date}. Fino ad allora tutto funziona come prima.`,
       cancelConfirmAction: "Disdici ora",
       keepSubscription: "Mantieni l’abbonamento",
+      portalOpensNewTab: (provider, app) =>
+        `Pagamenti e fatture si aprono su ${provider} in una nuova scheda; ${app ? `${app} resta aperto qui` : "questa pagina resta aperta"}.`,
       grantWarningTitle: "Il Suo accesso gratuito continua",
       grantWarningBody:
         "Il Suo accesso gratuito non ha una data di fine. Finché dura, un acquisto non cambia il Suo piano: pagherebbe per un piano che non si applica.",
@@ -1831,7 +1861,7 @@ export function uiKitLabelsIt(numberLocale = "it-IT"): UiKitLabels {
       sections: {
         overview: { title: "Panoramica", help: "Ciò che è in attesa, a colpo d’occhio." },
         users: { title: "Utenti", help: "Chi ha un account e cosa può fare ciascuno." },
-        invitations: { title: "Inviti", help: "I link con cui entra una persona nuova." },
+        invitations: { title: "Inviti", help: "Inviti persone via e-mail nella loro lingua; reinvii o revochi gli inviti ancora aperti." },
         billing: { title: "Fatturazione", help: "Il piano, il pagamento e le fatture." },
         activity: { title: "Attività", help: "Ciò che hanno fatto gli amministratori, dal più recente." },
       },
@@ -1842,6 +1872,8 @@ export function uiKitLabelsIt(numberLocale = "it-IT"): UiKitLabels {
         users: "Utenti",
         usersNew: (count) => `${n(count)} ${plural(count, "nuovo", "nuovi")} in 7 giorni`,
       },
+      overviewError: "Non è stato possibile caricare la panoramica.",
+      retry: "Riprova",
       tools: "Strumenti",
     },
     // 0.42.0 — docs/top-bar-harmonization.md §3.1: the top bar's shared parts, keksdose's
@@ -1855,6 +1887,9 @@ export function uiKitLabelsIt(numberLocale = "it-IT"): UiKitLabels {
         allTours: "Tutti i tour…",
         badgeNew: "Nuovo",
         completed: "Completato",
+        badgeUpdated: "Aggiornato",
+        updatedDot: "Tour aggiornati",
+        newAndUpdated: "Nuovi e aggiornati",
       },
       sync: {
         blocked: (count) =>

package/src/i18n/locales/zh.ts

@@ -592,6 +592,34 @@ export function uiKitLabelsZh(numberLocale = "zh-CN"): UiKitLabels {
       awaitClickHint: "点击高亮的元素以继续",
       step: (current, total) => `${n(current)} / ${n(total)}`,
     },
+    // 0.43.0 — docs/tours-harmonization.md §3, §8: the tours page.
+    tourCatalogue: {
+      searchLabel: "搜索导览",
+      searchPlaceholder: "搜索导览…",
+      groupLabel: "主题",
+      groupAll: (count) => `全部主题（${n(count)}）`,
+      groupOption: (group, count) => `${group}（${n(count)}）`,
+      stateLabel: "筛选导览",
+      stateAll: (count) => `全部（${n(count)}）`,
+      stateTodo: (count) => `待完成（${n(count)}）`,
+      stateDone: (count) => `已完成（${n(count)}）`,
+      showing: (shown, total) => `显示 ${n(shown)} / ${n(total)} 个导览`,
+      noMatches: "没有匹配的导览",
+      noMatchesHint: "请换个关键词，或清除筛选条件。",
+      clearFilters: "清除筛选",
+      badgeNew: "新",
+      badgeUpdated: "已更新",
+      resetOn: (date, reason) => (reason ? `已于 ${date} 重置：${reason}` : `已于 ${date} 重置`),
+      points: (count) => `+${n(count)} 分`,
+      steps: (count) => `${n(count)} 步`,
+      duration: (minutes) => `约 ${n(minutes)} 分钟`,
+      completedOn: (date) => `完成于 ${date}`,
+      completed: "已完成",
+      notCompleted: "未完成",
+      markUndone: "标记为未完成",
+      start: "开始",
+      replay: "再来一次",
+    },
     commandPalette: {
       clear: "清除搜索",
       submit: "搜索",
@@ -1655,6 +1683,8 @@ export function uiKitLabelsZh(numberLocale = "zh-CN"): UiKitLabels {
       cancelConfirmBody: (date) => `您的订阅将于 ${date} 结束。在此之前，一切照常使用。`,
       cancelConfirmAction: "立即取消订阅",
       keepSubscription: "保留订阅",
+      portalOpensNewTab: (provider, app) =>
+        `付款和发票将在新标签页中于 ${provider} 打开；${app ? `${app} 仍在此保持打开` : "本页面仍保持打开"}。`,
       grantWarningTitle: "您的免费使用权仍然有效",
       grantWarningBody: "您的免费使用权没有结束日期。在此期间，购买不会改变您的套餐：您将为一个不生效的套餐付费。",
       grantWarningAction: "仍然购买",
@@ -1734,7 +1764,7 @@ export function uiKitLabelsZh(numberLocale = "zh-CN"): UiKitLabels {
       sections: {
         overview: { title: "概览", help: "一眼看清待处理的事项。" },
         users: { title: "用户", help: "谁拥有账户，以及每个人可以做什么。" },
-        invitations: { title: "邀请", help: "让新成员加入的链接。" },
+        invitations: { title: "邀请", help: "通过电子邮件以对方的语言邀请他人；可重新发送或撤销尚未处理的邀请。" },
         billing: { title: "账单", help: "套餐、付款和发票。" },
         activity: { title: "活动", help: "管理员的操作记录，最新的在前。" },
       },
@@ -1745,6 +1775,8 @@ export function uiKitLabelsZh(numberLocale = "zh-CN"): UiKitLabels {
         users: "用户",
         usersNew: (count) => `近 7 天新增 ${n(count)} 人`,
       },
+      overviewError: "无法加载概览。",
+      retry: "重试",
       tools: "工具",
     },
     // 0.42.0 — docs/top-bar-harmonization.md §3.1: the top bar's shared parts; "套餐" as
@@ -1758,6 +1790,9 @@ export function uiKitLabelsZh(numberLocale = "zh-CN"): UiKitLabels {
         allTours: "全部导览…",
         badgeNew: "新",
         completed: "已完成",
+        badgeUpdated: "已更新",
+        updatedDot: "有更新的导览",
+        newAndUpdated: "新增和更新",
       },
       sync: {
         blocked: (count) => `${n(count)} 项修改无法从此设备发送`,

package/src/i18n/review.ts

@@ -397,6 +397,7 @@ export const KIT_LABEL_SAMPLES: Readonly<Record<string, readonly (readonly unkno
   "billing.buyerHolds": [["{{buyer}}"], [undefined]],
   "billing.paymentFailedAskBuyer": [["{{buyer}}"], [undefined]],
   "billing.cancelConfirmBody": [["{{date}}"]],
+  "billing.portalOpensNewTab": [["{{provider}}", "{{app}}"], ["{{provider}}", undefined]],
   "planChange.current": [["{{plan}}"]],
   "planChange.changed": [["{{from}}", "{{to}}"]],
   "planChange.set": [["{{to}}"]],
@@ -417,4 +418,17 @@ export const KIT_LABEL_SAMPLES: Readonly<Record<string, readonly (readonly unkno
   "topBarParts.sync.waitingShort": one,
   "topBarParts.dev.plan": [["{{plan}}"]],
   "topBarParts.dev.backTo": [["{{role}}"]],
+  // 0.43.0 (docs/tours-harmonization.md §3, §8): the tours page's counts, its group
+  // option, the completion day and a reset's day and reason.
+  "tourCatalogue.groupAll": one,
+  "tourCatalogue.groupOption": [["{{group}}", 1], ["{{group}}", 3]],
+  "tourCatalogue.stateAll": one,
+  "tourCatalogue.stateTodo": one,
+  "tourCatalogue.stateDone": one,
+  "tourCatalogue.showing": [[3, 16]],
+  "tourCatalogue.resetOn": [["{{date}}", "{{reason}}"]],
+  "tourCatalogue.points": one,
+  "tourCatalogue.steps": one,
+  "tourCatalogue.duration": one,
+  "tourCatalogue.completedOn": [["{{date}}"]],
 };

package/src/index.ts

@@ -796,6 +796,9 @@ export { DEFAULT_ADMIN_AREA_LABELS, useAdminAreaLabels } from "./admin/admin-are
 export type { AdminAreaLabels, AdminTileLabels, AdminSharedSection } from "./admin/admin-area-labels";
 export { ADMIN_SECTIONS, adminSections } from "./admin/admin-sections";
 export type { AdminSectionDefinition, AdminOwnSection, AdminSectionsOptions } from "./admin/admin-sections";
+// 0.43.0 (keksdose): the section order as ids, and the narrowed `leaveOut`.
+export { adminSectionOrder } from "./admin/admin-sections";
+export type { AdminSectionPlace, AdminSectionOrderOptions, AdminKeptSection } from "./admin/admin-sections";
 export { AdminForbidden } from "./admin/admin-forbidden";
 export type { AdminForbiddenProps } from "./admin/admin-forbidden";
 export { AdminOverview, AttentionTile, adminWaitingCount, DEFAULT_ADMIN_ATTENTION_HREFS } from "./admin/admin-overview";
@@ -883,6 +886,11 @@ export { isPermanentGrant } from "./billing/billing-overview";
 export type { BillingPortalAccess } from "./billing/billing-overview";
 export { CancelSubscriptionConfirm } from "./billing/cancel-subscription";
 export type { CancelSubscriptionConfirmProps } from "./billing/cancel-subscription";
+// 0.43 (§17): the provider's portal in a new tab; the in-app cancel's follow-up.
+export { openProviderPage } from "./billing/provider-page";
+export type { OpenProviderPageOptions, ProviderPageWay } from "./billing/provider-page";
+export { useCancelRequest } from "./billing/cancel-request";
+export type { CancelRequest, CancelRequested, CancelRequestView } from "./billing/cancel-request";
 // The operator's plan parts (§14.12) are admin/plan-change, in the admin section.
 
 // ── settings ─────────────────────────────────────────────────────────────────

package/src/search/global-search.tsx

@@ -188,6 +188,9 @@ export interface GlobalSearchProps {
   labels?: LabelOverride<GlobalSearchLabels>;
   /** Passed through to the palette (`empty`, `loading`, `error`, `hint`, …). */
   paletteLabels?: Partial<CommandPaletteLabels>;
+  /** 0.43: `data-*` attributes go on the kit's trigger button (`trigger="button"`) — a
+   *  tour's anchor (`data-tour="search"`), a test hook. A function trigger is the app's. */
+  [key: `data-${string}`]: string | number | boolean | undefined;
 }
 
 function isApplePlatform(): boolean {
@@ -290,6 +293,7 @@ function GlobalSearchImpl({
   density,
   labels,
   paletteLabels,
+  ...attributes
 }: GlobalSearchProps & { navigate: (href: string) => void; hrefFor: (href: string) => string }) {
   const l = useKitLabels("globalSearch", DEFAULT_GLOBAL_SEARCH_LABELS, labels);
   const pl = useKitLabels("commandPalette", DEFAULT_COMMAND_PALETTE_LABELS, paletteLabels);
@@ -563,6 +567,7 @@ function GlobalSearchImpl({
               className={hideTriggerOnPhone ? "hidden sm:block" : undefined}
             >
               <button
+                {...Object.fromEntries(Object.entries(attributes).filter(([k]) => k.startsWith("data-")))}
                 type="button"
                 onClick={openSearch}
                 aria-label={triggerLabel}

package/src/settings/settings-catalogue.ts

@@ -29,6 +29,13 @@ export interface SettingsGroup<G extends string = string> {
    * kastlan's `/admin/billing` while billing is off. Default: visible.
    */
   visible?: boolean;
+  /**
+   * 0.43: the group shows with no visible entry — a page of its own rather than of setting
+   * cards (the admin area's Overview, whose tiles are no settings; `adminSections` sets
+   * it). `visible: false` still hides it. Default: a group shows only with an entry once
+   * `entries` are given (§4.1).
+   */
+  standalone?: boolean;
 }
 
 /** One setting, and the card that holds it (§4.1). */
@@ -57,7 +64,8 @@ export interface SettingsEntry<G extends string = string> {
 /**
  * The groups that show, in their order: not `visible: false`, and — when `entries` is
  * given — holding at least one visible entry (§4.1: Kurvenschmiede's notifications group
- * stays hidden until it has a card). Without `entries` only the groups' own flag counts.
+ * stays hidden until it has a card) or `standalone` (0.43). Without `entries` only the
+ * groups' own flag counts.
  */
 export function visibleSettingsGroups<G extends string>(
   groups: readonly SettingsGroup<G>[],
@@ -66,7 +74,7 @@ export function visibleSettingsGroups<G extends string>(
   if (!entries) return groups.filter((g) => g.visible !== false);
   const filled = new Set<G>();
   for (const e of entries) if (e.visible !== false) filled.add(e.group);
-  return groups.filter((g) => g.visible !== false && filled.has(g.id));
+  return groups.filter((g) => g.visible !== false && (g.standalone === true || filled.has(g.id)));
 }
 
 /** The visible entries of the visible groups — what search may find. */

package/src/shell/admin-menu.tsx

@@ -2,8 +2,8 @@ import { Link } from "react-router";
 import { ShieldCheck } from "lucide-react";
 import { Chip } from "../components/chip";
 import { MenuItem } from "../components/menu-item";
-import { useKitLabels, type LabelOverride } from "../i18n/kit-labels";
-import { DEFAULT_ADMIN_AREA_LABELS } from "../admin/admin-area-labels";
+import type { LabelOverride } from "../i18n/kit-labels";
+import { DEFAULT_ADMIN_AREA_LABELS, useAdminAreaLabels } from "../admin/admin-area-labels";
 import type { AdminAreaLabels } from "../admin/admin-area-labels";
 import type { TopBarMenuEntry } from "./topbar-action-menu";
 
@@ -45,8 +45,12 @@ export interface AdminMenuEntryOptions {
    * `adminWaitingCount(attention, […])`. `0`, `null` or none shows no badge.
    */
   badge?: number | null;
-  /** The resolved `adminArea` words (`useAdminAreaLabels()`); default English. Builds no
-   *  hook, so the entry can be made in the list of entries. */
+  /**
+   * The resolved `adminArea` words — pass `useAdminAreaLabels()`, or the row is ENGLISH
+   * in every language: a plain function reads no provider (kastlan, 0.42 adoption). Builds
+   * no hook, so the entry can be made in the list of entries. {@link useAdminMenuEntry}
+   * (0.43) is the same entry with the provider's words read for you.
+   */
   labels?: AdminAreaLabels;
   /** The entry's `key`. Default `"administration"`. */
   key?: string;
@@ -59,7 +63,12 @@ export interface AdminMenuEntryOptions {
  * the kit's word and the waiting count as its badge. Put it in the entries for an admin
  * only — the menu closes on the way, as any link row:
  *
+ *     const labels = useAdminAreaLabels();
  *     entries={[…, ...(isAdmin ? [adminMenuEntry({ badge: waiting, labels })] : []), …]}
+ *
+ * A function, not a hook: it reads NO provider, so pass `labels` (`useAdminAreaLabels()`)
+ * or the row says "Administration" in every language — or call {@link useAdminMenuEntry}
+ * at the component's top.
  */
 export function adminMenuEntry({
   href = "/admin",
@@ -79,6 +88,25 @@ export function adminMenuEntry({
   };
 }
 
+export interface UseAdminMenuEntryOptions extends Omit<AdminMenuEntryOptions, "labels"> {
+  /** Over the provider's `adminArea` words: prop > `<UiKitProvider labels={{ adminArea }}>`
+   *  > English. */
+  labels?: LabelOverride<AdminAreaLabels>;
+}
+
+/**
+ * {@link adminMenuEntry} with the provider's words (0.43, kastlan): the hook reads
+ * `useAdminAreaLabels()` itself, so the row is in the app's language without a `labels`
+ * to remember. Call it at the component's top, then put it in the entries:
+ *
+ *     const admin = useAdminMenuEntry({ badge: waiting });
+ *     entries={[…, ...(isAdmin ? [admin] : []), …]}
+ */
+export function useAdminMenuEntry({ labels: labelsProp, ...options }: UseAdminMenuEntryOptions = {}): TopBarMenuEntry {
+  const labels = useAdminAreaLabels(labelsProp);
+  return adminMenuEntry({ ...options, labels });
+}
+
 export interface AdminMenuRowProps {
   /** The admin area. Default `/admin`. */
   href?: string;
@@ -99,7 +127,8 @@ export interface AdminMenuRowProps {
  *     {(close) => <ul>… {isAdmin && <AdminMenuRow badge={waiting} onNavigate={close} />} …</ul>}
  */
 export function AdminMenuRow({ href = "/admin", badge, onNavigate, current, labels: labelsProp }: AdminMenuRowProps) {
-  const labels = useKitLabels("adminArea", DEFAULT_ADMIN_AREA_LABELS, labelsProp);
+  // The provider's words, as every kit part (0.43: through the namespace's own hook).
+  const labels = useAdminAreaLabels(labelsProp);
   return (
     <li>
       <MenuItem

package/src/shell/dev-switchers.tsx

@@ -97,6 +97,14 @@ export function DevSwitchers<R extends string, P extends string>({
   const bar = useKitLabels("topBar", DEFAULT_TOP_BAR_LABELS);
   const words = useTopBarPartsLabels(labelsProp ? { dev: labelsProp } : undefined).dev;
   const [kept, setKept] = useState<string | null>(() => (enabled ? readKey(storageKey) : null));
+  // 0.43 (keksdose): `enabled` may start false and turn true — an app's GET probe of the
+  // dev route — so the kept role is read again then, or "Back to {role}" is lost after a
+  // reload. Adjusted during render, React's pattern for state that follows a prop.
+  const [wasEnabled, setWasEnabled] = useState(enabled);
+  if (wasEnabled !== enabled) {
+    setWasEnabled(enabled);
+    if (enabled) setKept(readKey(storageKey));
+  }
   if (!enabled) return null;
 
   const original = (originalRole ?? kept ?? undefined) as R | undefined;

package/src/shell/top-bar-parts-labels.ts

@@ -24,6 +24,12 @@ export interface TourMenuLabels {
   badgeNew: string;
   /** What the ✓ on a taken tour's row says to a reader. */
   completed: string;
+  /** The chip on a tour reset by an update (0.43, docs/tours-harmonization.md §8). */
+  badgeUpdated: string;
+  /** The dot on the compass while only updated tours light it, for a reader. */
+  updatedDot: string;
+  /** The heading over the untaken new tours when updated ones are among them. */
+  newAndUpdated: string;
 }
 
 /** `SyncStatusIndicator`'s words (§2.6). The "waiting for a plan" state is
@@ -94,6 +100,9 @@ export const DEFAULT_TOP_BAR_PARTS_LABELS: TopBarPartsLabels = {
     allTours: "All tours…",
     badgeNew: "New",
     completed: "Completed",
+    badgeUpdated: "Updated",
+    updatedDot: "Updated tours",
+    newAndUpdated: "New and updated",
   },
   sync: {
     blocked: (count) =>

package/src/shell/tour-menu.tsx

@@ -2,6 +2,7 @@ import type { ReactNode } from "react";
 import { useLocation } from "react-router";
 import { Check, Compass } from "lucide-react";
 import { Chip } from "../components/chip";
+import { isTourDone, isTourNew, isTourReset, type TourCompletions, type TourInfo } from "../tour/tour-info";
 import type { LabelOverride } from "../i18n/kit-labels";
 import { TopBarActionMenu, type TopBarMenuEntry } from "./topbar-action-menu";
 import { useTopBarPartsLabels, type TourMenuLabels } from "./top-bar-parts-labels";
@@ -11,28 +12,36 @@ import { useTopBarPartsLabels, type TourMenuLabels } from "./top-bar-parts-label
  * The kit's tour engine (`TourProvider`) runs steps and keeps none; which tours exist,
  * which are new and which are taken is the app's (keksdose: `useTours`, `useIsNewTour`,
  * its progress store).
+ *
+ * Since 0.43 it is a subset of the catalogue's `TourInfo` (docs/tours-harmonization.md
+ * §3), so an app keeps ONE list: hand the menu the catalogue's tours with `completed`
+ * and `joined`, and it works out ✓, NEW and "Updated" itself. Given the record, the kit's
+ * ✓ and "Updated" win over a row's `completed` and `reset`; given `joined`, its NEW wins
+ * over `isNew` — so a row built from an app's own booleans cannot hide an update (§8,
+ * build review kastlan A3, keksdose K-S6). The booleans are for a menu with neither.
  */
-export interface TourMenuTour {
+export type TourMenuTour = Partial<Pick<TourInfo, "route" | "since" | "updated">> & {
   id: string;
   title: ReactNode;
-  /** The page the tour starts on. Its first segment decides "On this page":
-   *  "/reports/spending" belongs to "/reports". */
-  route?: string;
+  /** The row's icon, drawn at 16px. */
+  icon?: ReactNode;
   /** Shipped after this account was opened and not yet taken: a NEW chip on the row,
    *  and the dot on the compass. */
   isNew?: boolean;
   /** Taken: a ✓ on the row. */
   completed?: boolean;
-  /** The row's icon, drawn at 16px. */
-  icon?: ReactNode;
-  /** When the tour shipped, as an ISO date: the newest of the new come first. */
-  since?: string;
-}
+  /** Taken before its last update (§8): an "Updated" chip, and the dot, as for NEW. */
+  reset?: boolean;
+};
 
 export interface TourMenuProps {
   tours: readonly TourMenuTour[];
   /** Start a tour — `useTour().start(steps, { id })` with the app's steps. */
   onLaunch: (id: string) => void;
+  /** The device's completions (`useTourProgress().completed`): ✓ and "Updated" from them. */
+  completed?: TourCompletions;
+  /** The account's `created_at`: NEW from it, by `isTourNew`. */
+  joined?: string | null;
   /**
    * The app's tours page (keksdose `/tours`). With it the compass is a LINK there plus a
    * hover menu, and the menu ends in "All tours…". Without it (§6.7, Kurvenschmiede) the
@@ -59,7 +68,9 @@ export interface TourMenuProps {
 /** A path's first segment — "/reports/spending?g=month" → "/reports". */
 const pageOf = (path: string) => `/${path.split(/[?#]/)[0].split("/")[1] ?? ""}`;
 
-const isFresh = (t: TourMenuTour) => !!t.isNew && !t.completed;
+const isFresh = (t: TourMenuTour) => (!!t.isNew && !t.completed) || !!t.reset;
+/** When it last became news: its update, else its ship date. */
+const newsOf = (t: TourMenuTour) => (t.reset ? t.updated?.date : undefined) ?? t.since ?? "";
 
 /**
  * The top bar's guided-tours control (docs/top-bar-harmonization.md §2.4, §6.7), lifted
@@ -68,8 +79,10 @@ const isFresh = (t: TourMenuTour) => !!t.isNew && !t.completed;
  * and "All tours…". A taken tour's row carries a ✓, a new one a NEW chip.
  */
 export function TourMenu({
-  tours,
+  tours: toursProp,
   onLaunch,
+  completed: completions,
+  joined,
   href,
   pathname: pathnameProp,
   maxNew = 3,
@@ -80,13 +93,27 @@ export function TourMenu({
   const words = useTopBarPartsLabels(labelsProp ? { tours: labelsProp } : undefined).tours;
   const location = useLocation();
   const here = pageOf(pathnameProp ?? location.pathname);
+  const tours =
+    completions === undefined && joined === undefined
+      ? toursProp
+      : toursProp.map((t) => {
+          const at = completions?.[t.id];
+          // Ever completed: the record when there is one, else the row's own word.
+          const ever = completions ? at !== undefined : !!t.completed;
+          return {
+            ...t,
+            completed: completions ? isTourDone(t, at) : t.completed,
+            reset: completions ? isTourReset(t, at) : t.reset,
+            isNew: joined !== undefined ? isTourNew({ since: t.since, joined, completed: ever }) : t.isNew,
+          };
+        });
 
   const forThisPage = tours.filter((t) => t.route !== undefined && pageOf(t.route) === here);
   const fresh = tours.filter(isFresh);
   // ISO dates sort as text; a stable sort keeps one day's tours in the app's order.
   const newRows = fresh
     .filter((t) => !forThisPage.includes(t))
-    .sort((a, b) => (b.since ?? "").localeCompare(a.since ?? ""))
+    .sort((a, b) => newsOf(b).localeCompare(newsOf(a)))
     .slice(0, maxNew);
   const rest = href && list !== "all" ? [] : tours.filter((t) => !forThisPage.includes(t) && !newRows.includes(t));
 
@@ -96,7 +123,11 @@ export function TourMenu({
     key: tour.id,
     icon: tour.icon,
     label: tour.title,
-    trailing: tour.completed ? (
+    trailing: tour.reset ? (
+      <Chip size="sm" tone="brand" caps className="px-1.5">
+        {words.badgeUpdated}
+      </Chip>
+    ) : tour.completed ? (
       <>
         <Check aria-hidden className="size-4 text-success" />
         <span className="sr-only">{words.completed}</span>
@@ -112,7 +143,7 @@ export function TourMenu({
 
   const blocks = [
     { key: "this-page", label: words.thisPage, tours: forThisPage },
-    { key: "new", label: words.newTours, tours: newRows },
+    { key: "new", label: newRows.some((t) => t.reset) ? words.newAndUpdated : words.newTours, tours: newRows },
   ].filter((b) => b.tours.length > 0);
   const tail: TopBarMenuEntry[] = [
     ...rest.map(entryFor),
@@ -133,7 +164,11 @@ export function TourMenu({
   return (
     <TopBarActionMenu
       icon={<Compass className="size-5" />}
-      iconBadge={fresh.length > 0 ? { label: words.newDot, tone: "brand" } : null}
+      iconBadge={
+        fresh.length > 0
+          ? { label: fresh.some((t) => !t.reset) ? words.newDot : words.updatedDot, tone: "brand" }
+          : null
+      }
       aria-label={words.menu}
       href={href}
       panelClassName="w-72 max-h-[70vh] overflow-y-auto"

package/src/shell.ts

@@ -17,6 +17,9 @@ export type { FillHeightProps } from "./shell/fill-height";
 // (docs/admin-harmonization.md §2.1, §6.6).
 export { adminMenuEntry, AdminMenuRow } from "./shell/admin-menu";
 export type { AdminMenuEntryOptions, AdminMenuRowProps } from "./shell/admin-menu";
+// 0.43.0 (kastlan): the entry with the provider's words.
+export { useAdminMenuEntry } from "./shell/admin-menu";
+export type { UseAdminMenuEntryOptions } from "./shell/admin-menu";
 // 0.31.0: the settings and admin pages' shell (docs/settings-harmonization.md §3, §5).
 export { SettingsLayout, SETTINGS_SEARCH_THRESHOLD } from "./settings/settings-layout";
 export type { SettingsLayoutProps, SettingsLayoutWidth, SettingsDocumentTitleParts } from "./settings/settings-layout";

package/src/tour/tour-catalogue-labels.ts

@@ -0,0 +1,75 @@
+// The English words of `TourCatalogue` and `TourCatalogueCard` (docs/tours-harmonization.md
+// §3), in a module with no component code, like every `*-labels.ts` (0.34, KS U8).
+// keksdose's reviewed words (tour.* in its en.json) where it had them.
+
+/** The `tourCatalogue` namespace. Counts arrive as numbers, dates already formatted. */
+export interface TourCatalogueLabels {
+  /** The search box's name. */
+  searchLabel: string;
+  searchPlaceholder: string;
+  /** The group select's name (keksdose: "Topic"). */
+  groupLabel: string;
+  /** The select's first option, with the count the other filters leave. */
+  groupAll: (count: number) => string;
+  /** A group's option: its title and its count. */
+  groupOption: (group: string, count: number) => string;
+  /** The all / to do / done toggle's name. */
+  stateLabel: string;
+  stateAll: (count: number) => string;
+  stateTodo: (count: number) => string;
+  stateDone: (count: number) => string;
+  /** Under the filter bar while a filter is on. */
+  showing: (shown: number, total: number) => string;
+  noMatches: string;
+  noMatchesHint: string;
+  clearFilters: string;
+  /** The NEW pill. */
+  badgeNew: string;
+  /** The pill on a tour reset by an update (§8). */
+  badgeUpdated: string;
+  /** A reset tour's line: the update's day (formatted) and its reason (§8); `reason` is
+   *  left out when the tour's update carries none. */
+  resetOn: (date: string, reason?: string) => string;
+  /** The points chip. */
+  points: (count: number) => string;
+  steps: (count: number) => string;
+  /** The duration, in minutes. */
+  duration: (minutes: number) => string;
+  /** Completed, with the day (formatted). */
+  completedOn: (date: string) => string;
+  /** Completed without a date (kastlan's old id list, §6.2). */
+  completed: string;
+  /** Not taken yet — the state icon, for a reader. */
+  notCompleted: string;
+  markUndone: string;
+  start: string;
+  replay: string;
+}
+
+export const DEFAULT_TOUR_CATALOGUE_LABELS: TourCatalogueLabels = {
+  searchLabel: "Search tours",
+  searchPlaceholder: "Search tours…",
+  groupLabel: "Topic",
+  groupAll: (count) => `All topics (${count})`,
+  groupOption: (group, count) => `${group} (${count})`,
+  stateLabel: "Filter tours",
+  stateAll: (count) => `All (${count})`,
+  stateTodo: (count) => `To do (${count})`,
+  stateDone: (count) => `Completed (${count})`,
+  showing: (shown, total) => `Showing ${shown} of ${total} tours`,
+  noMatches: "No tour matches",
+  noMatchesHint: "Try another word, or clear the filters.",
+  clearFilters: "Clear filters",
+  badgeNew: "New",
+  badgeUpdated: "Updated",
+  resetOn: (date, reason) => (reason ? `Reset on ${date}: ${reason}` : `Reset on ${date}`),
+  points: (count) => `+${count} pts`,
+  steps: (count) => (count === 1 ? "1 step" : `${count} steps`),
+  duration: (minutes) => `About ${minutes} min`,
+  completedOn: (date) => `Completed on ${date}`,
+  completed: "Completed",
+  notCompleted: "Not completed",
+  markUndone: "Mark as not done",
+  start: "Start",
+  replay: "Replay",
+};