@eifi1/ui-kit 0.39.1 → 0.40.0

package/src/components/inline-entity-combobox.tsx

@@ -14,6 +14,7 @@ import {
   ComboboxFieldLabel,
   DISABLED_ROW_CLASS,
   endHintRowProps,
+  GROUP_HEADING_STICKY,
   isOptionEnabled,
   offersCreate,
   stepEnabled,
@@ -310,13 +311,14 @@ export function InlineEntityCombobox<V extends string | number, C extends ComboC
       const q = foldForSearch(query, locale);
       const hit = (s: string | undefined) => s !== undefined && foldForSearch(s, locale).includes(q);
       // The label's whole name or its start first (`rankMatch` 0 and 1), then a match
-      // anywhere in the label, the sublabel or the group.
+      // anywhere in the label or the sublabel. Not the group (0.40, kk run 79): with
+      // first-letter groups one typed letter matched its whole group.
       const leads = (o: ComboOption<V>) => {
         const rank = rankMatch(o.label, query, { locale });
         return rank === 0 || rank === 1;
       };
       const starts = options.filter(leads);
-      const rest = options.filter((o) => !leads(o) && (hit(o.label) || hit(o.sublabel) || hit(o.group)));
+      const rest = options.filter((o) => !leads(o) && (hit(o.label) || hit(o.sublabel)));
       ranked = [...starts, ...rest];
     }
     if (!ranked.some((o) => o.group)) return ranked;
@@ -647,7 +649,10 @@ export function InlineEntityCombobox<V extends string | number, C extends ComboC
                 {o.group && o.group !== matches[i - 1]?.group && (
                   <li
                     role="presentation"
-                    className="px-4 pb-0.5 pt-3 text-caption font-semibold uppercase tracking-wide text-muted"
+                    className={cn(
+                      GROUP_HEADING_STICKY,
+                      "px-4 pb-0.5 pt-3 text-caption font-semibold uppercase tracking-wide text-muted",
+                    )}
                   >
                     {o.group}
                   </li>
@@ -710,7 +715,10 @@ export function InlineEntityCombobox<V extends string | number, C extends ComboC
               {o.group && o.group !== matches[i - 1]?.group && (
                 <li
                   role="presentation"
-                  className="px-3 pb-0.5 pt-2 text-caption font-semibold uppercase tracking-wide text-muted first:pt-1"
+                  className={cn(
+                    GROUP_HEADING_STICKY,
+                    "px-3 pb-0.5 pt-2 text-caption font-semibold uppercase tracking-wide text-muted first:pt-1",
+                  )}
                 >
                   {o.group}
                 </li>

package/src/components/picker-sheet.tsx

@@ -6,6 +6,7 @@ import { cn } from "../lib/cn";
 import { mergeRefs } from "./field-parts";
 import { CLIPS_ATTRIBUTE } from "../lib/clipping";
 import { DropdownSearchHeader } from "./dropdown";
+import { Button } from "./button";
 import { useBodyScrollLock } from "../hooks/use-body-scroll-lock";
 import { useOverlayHistory } from "../hooks/use-overlay-history";
 import { useFocusTrap } from "../hooks/use-focus-trap";
@@ -46,6 +47,23 @@ export interface PickerSheetProps
   /** The option the arrow keys are on, for the search box's `aria-activedescendant`. */
   activeId?: string;
   children: ReactNode;
+  /**
+   * A row pinned under the scrolling list — {@link FullBleedDialog}'s `footer`, on the
+   * picker's sheet (kk run 79 gap 2). Outside the scroller, so it stays put however long
+   * the list; padded for the home indicator, since it is the sheet's bottom edge.
+   */
+  footer?: ReactNode;
+  /**
+   * The kit's one sticky "Done" at the foot of the sheet (Marcel, keksdose #412): the
+   * button a multi-select sheet is left by once its rows are ticked. Ticks apply as
+   * they are made, so it closes (`onClose`) rather than saves. After any `footer`.
+   * {@link ComboboxPanel} turns it on for every `multi` list — `MultiSelect` and
+   * `MultiEntityCombobox` — and a single-select sheet, which closes on the tap that
+   * picks, has no use for it. Label: `pickerSheet.done`, else "Done" (`doneLabel`).
+   */
+  done?: boolean;
+  /** Default: `pickerSheet.done` from the {@link UiKitProvider}, else "Done". */
+  doneLabel?: string;
   /** The sheet, where the rest of the props go (0.34, API-2, refactor audit 2026-10) —
    *  merged with the sheet's own ref, which its focus trap holds. */
   ref?: Ref<HTMLDivElement>;
@@ -88,6 +106,9 @@ export function PickerSheet({
   listboxId,
   activeId,
   children,
+  footer,
+  done,
+  doneLabel,
   "aria-label": ariaLabel,
   className,
   style,
@@ -98,7 +119,8 @@ export function PickerSheet({
   // their own `closeLabel` through as `undefined` — so this lookup is what makes the
   // one way out of a full-screen sheet speak the app's language without each of
   // them having to (see the prop's note in `EntityCombobox`).
-  const labels = useKitLabels("pickerSheet", DEFAULT_PICKER_SHEET_LABELS, { close: closeLabel });
+  const labels = useKitLabels("pickerSheet", DEFAULT_PICKER_SHEET_LABELS, { close: closeLabel, done: doneLabel });
+  const hasFooter = (footer !== undefined && footer !== null && footer !== false) || Boolean(done);
   useBodyScrollLock(open);
   /**
    * Back closes THE SHEET, not the dialog it was opened from (Keksdose live #309:
@@ -276,6 +298,21 @@ export function PickerSheet({
       <div {...{ [CLIPS_ATTRIBUTE]: "" }} className="min-h-0 flex-1 overflow-y-auto overscroll-contain">
         {children}
       </div>
+      {hasFooter && (
+        <div
+          data-picker-sheet-footer=""
+          className="flex shrink-0 flex-wrap items-center justify-end gap-2 border-t border-subtle bg-surface px-3 pt-3"
+          style={{ paddingBottom: "max(0.75rem, env(safe-area-inset-bottom))" }}
+        >
+          {footer}
+          {done && (
+            // Full width: the one thing left to do on the sheet, under the thumb.
+            <Button type="button" className="flex-1" onClick={onClose}>
+              {labels.done}
+            </Button>
+          )}
+        </div>
+      )}
     </div>,
     document.body,
   );

package/src/components/tabs.tsx

@@ -1,11 +1,12 @@
 import { useLayoutEffect, useMemo, useRef } from "react";
-import { Plus, X } from "lucide-react";
+import { ChevronLeft, ChevronRight, Plus, X } from "lucide-react";
 import type { ComponentPropsWithoutRef, KeyboardEvent, ReactNode, Ref } from "react";
 import { cn } from "../lib/cn";
 import { FOCUS_RING_WIDTH } from "./focus-ring";
 import { scrollIntoStrip, useStripFade } from "../lib/strip-fade";
 import { horizontalStep } from "../lib/direction";
 import { usePhoneLayout } from "../hooks/use-breakpoint";
+import { prefersReducedMotion } from "../lib/reduced-motion";
 import { useKitLabels, type LabelOverride } from "../i18n/kit-labels";
 import { mergeRefs } from "./field-parts";
 import { DEFAULT_TABS_LABELS } from "./ui-labels";
@@ -47,6 +48,10 @@ export interface TabsLabels {
   add: string;
   /** Accessible name of a tab's × — "Remove <tab>". */
   remove: (tab: string) => string;
+  /** The `overflowCue` caret while tabs lie past the strip's end: "More tabs". */
+  more: string;
+  /** The `overflowCue` caret at the strip's end, which goes back to the first tab. */
+  backToFirst: string;
 }
 
 // Defined in ./ui-labels, which holds no component code (0.34, KS U8).
@@ -94,8 +99,28 @@ export interface TabsProps<T extends string>
    *
    *  Opt-in on purpose. The three-tab strips (invoices, statements, bank imports)
    *  already fit a phone row, and turning those into chips would be an unrequested
-   *  redesign of three other pages. */
+   *  redesign of three other pages.
+   *
+   *  @deprecated 0.40 — use the scrolling strip with `overflowCue`; removed in 0.41. No
+   *  consumer is left (keksdose went back to one scrolling row, live #410); the caret
+   *  says a phone's row goes on. */
   wrap?: boolean;
+  /**
+   * The caret beside a SCROLLING strip below `md` (0.40, kk run 79 gap 1): a › while
+   * tabs lie past the strip's end — a tap scrolls it on by three quarters of its width —
+   * turning into a ‹ at the end, which goes back to the first. Shown only while the strip
+   * actually overflows.
+   *
+   * The edge fade alone could read as the end of the row: at the default scroll position
+   * the last visible tab can finish exactly where the fade begins, so nothing looks cut
+   * off (keksdose live #410, whose `tab-strip-more.tsx` this replaces). One button that
+   * turns round rather than two that come and go, so the strip's width never changes
+   * under the thumb. Out of the tab order — the keyboard walks the strip with the arrow
+   * keys, which bring the focused tab into view. From `md` up nothing changes. Ignored on
+   * a `wrap` strip and a vertical one (a side nav is a column, not a row). Names:
+   * `tabs.more` / `tabs.backToFirst`.
+   */
+  overflowCue?: boolean;
   /**
    * `id` of the element the caller renders the open tab's content into — the missing
    * half of `role="tab"`. A tab that controls nothing is a tab in name only: a screen
@@ -266,6 +291,7 @@ export function Tabs<T extends string>({
   onChange,
   className,
   wrap = false,
+  overflowCue = false,
   panelId,
   onRemove,
   removeOn = "every",
@@ -285,6 +311,36 @@ export function Tabs<T extends string>({
   const stripRef = useRef<HTMLDivElement>(null);
   const setStrip = useMemo(() => mergeRefs(stripRef, ref), [ref]);
   const fade = useStripFade(stripRef);
+  // See `overflowCue`. `start` alone means the strip is scrolled to its end.
+  const cue = overflowCue && !wrap && !vertical && fade.overflow !== undefined;
+  const cueAtEnd = fade.overflow === "start";
+  const onCue = () => {
+    const strip = stripRef.current;
+    if (!strip) return;
+    const behavior: ScrollBehavior = prefersReducedMotion() ? "auto" : "smooth";
+    if (cueAtEnd) {
+      strip.scrollTo({ left: 0, behavior });
+      return;
+    }
+    const rtl = getComputedStyle(strip).direction === "rtl";
+    strip.scrollBy({ left: (rtl ? -1 : 1) * Math.round(strip.clientWidth * 0.75), behavior });
+  };
+  const cueButton = cue ? (
+    // The strip's bottom rule continues under the caret, so the row reads as one.
+    <div data-tabs-overflow-cue="" className="flex shrink-0 items-center self-stretch border-b border-subtle md:hidden">
+      <IconButton
+        size="sm"
+        variant="ghost"
+        tone="muted"
+        tabIndex={-1}
+        type="button"
+        aria-label={cueAtEnd ? text.backToFirst : text.more}
+        onClick={onCue}
+      >
+        {cueAtEnd ? <ChevronLeft className="rtl:-scale-x-100" /> : <ChevronRight className="rtl:-scale-x-100" />}
+      </IconButton>
+    </div>
+  ) : null;
   // The OPEN tab is scrolled into the strip whenever it changes — on mount too, for a
   // deep link to the seventh report. A selection behind the cut edge was the worst
   // case of the overflow above: the one tab the panel below belongs to, sliced to
@@ -410,7 +466,7 @@ export function Tabs<T extends string>({
       // — it is the box a caller's margin or width is meant for.
       className={cn(
         vertical ? TABLIST_VERTICAL_CLASSES : wrap ? TABLIST_WRAP_CLASSES : TABLIST_CLASSES,
-        onAdd ? "min-w-0" : className,
+        onAdd ? "min-w-0" : overflowCue && !wrap && !vertical ? "min-w-0 flex-1" : className,
       )}
     >
       {tabs.map((tab) => {
@@ -598,6 +654,19 @@ export function Tabs<T extends string>({
         {text.remove(nameOf(activeTab))}
       </button>
     ) : null;
+  if (!onAdd && overflowCue && !wrap && !vertical) {
+    // The caret needs a row to sit in beside the strip, and `className` goes there — it
+    // is the box a caller's margin or width is meant for, as with an add button. The box
+    // is there whether or not the strip overflows right now, so a resize never moves
+    // the caller's class from one element to another.
+    return (
+      <div className={cn("flex items-end", className)}>
+        {tablist}
+        {removeButton}
+        {cueButton}
+      </div>
+    );
+  }
   if (!onAdd) {
     // No outer box: the strip stays the root, as callers' `className` and tests expect.
     return removeButton ? (
@@ -631,6 +700,7 @@ export function Tabs<T extends string>({
     >
       {tablist}
       {removeButton}
+      {cueButton}
       {/* Outside the tablist: an action, not a tab — and a tablist may own only
           tabs. The rule under the strip carries on beneath it. */}
       <div

package/src/components/translation-review-parts.tsx

@@ -169,7 +169,8 @@ export interface TranslationLocaleTabsProps {
 }
 
 /**
- * One tab per locale with its approved/total, wrapping on a phone. Nothing for a single
+ * One tab per locale with its approved/total, one scrolling row on a phone with the
+ * strip's caret saying it goes on (`overflowCue`; `wrap` is deprecated in 0.40). Nothing for a single
  * locale: a strip with one tab is a heading that looks clickable.
  */
 export function TranslationLocaleTabs({ locales, active, onChange, className, labels: labelsProp }: TranslationLocaleTabsProps) {
@@ -178,7 +179,7 @@ export function TranslationLocaleTabs({ locales, active, onChange, className, la
   return (
     <Tabs
       aria-label={labels.locales}
-      wrap
+      overflowCue
       className={className}
       tabs={locales.map((locale) => {
         const summary = summariseRows(locale.rows);

package/src/components/ui-labels.ts

@@ -19,4 +19,6 @@ export const DEFAULT_CHARACTER_COUNT_LABELS: CharacterCountLabels = {
 export const DEFAULT_TABS_LABELS: TabsLabels = {
   add: "Add tab",
   remove: (tab) => `Remove ${tab}`,
+  more: "More tabs",
+  backToFirst: "Back to the first tab",
 };

package/src/feedback/feedback-comment-thread.tsx

@@ -8,9 +8,10 @@ import { useKitLabels, type LabelOverride } from "../i18n/kit-labels";
 import { FeedbackStatusBadge } from "./feedback-inbox";
 import type { FeedbackComment, FeedbackReply } from "./feedback-public-types";
 import { DEFAULT_FEEDBACK_PUBLIC_LABELS } from "./feedback-public-labels";
-import { FEEDBACK_COMMENT_MAX } from "./feedback-record";
+import { FEEDBACK_COMMENT_MAX, attachmentName } from "./feedback-record";
 import { useFeedbackRepliesLabels } from "./feedback-replies";
 import { FeedbackRepliesDrawnAboveContext } from "./feedback-replies-context";
+import { FeedbackReworkEntryChip } from "./feedback-rework-entry-chip";
 import { ChatComposer, FeedbackThread } from "./feedback-thread";
 import type { FeedbackThreadMessage } from "./feedback-thread";
 import { DEFAULT_FEEDBACK_COMMENTS_LABELS } from "./feedback-thread-parts-labels";
@@ -23,6 +24,10 @@ import { DEFAULT_FEEDBACK_COMMENTS_LABELS } from "./feedback-thread-parts-labels
  *
  * - **Replies** are drawn as staff posts with the status they set ("→ Done"); a reply
  *   without an author is "Admin" (§9.7).
+ * - **Reworks** (0.40, §10.3, `kind: "rework"`) are the report's author's: the
+ *   **Rework** chip, "→ status" when the entry moved one (a migrated one did not), the
+ *   file when the view carries it; at the reading end for the author ({@link
+ *   FeedbackCommentThreadProps.isAuthor}), and a `null` name is "A user", never "Admin".
  * - **Comments**: the viewer's own at the reading end ("You"); someone else's under the
  *   first name the server sent, `null` as "A user" (§9.5, `feedbackPublic.anonymous`).
  * - **Hidden** (§9.8): others see "Hidden by an admin" and no name, no text; the writer
@@ -81,6 +86,9 @@ export interface FeedbackCommentThreadProps {
   comments: readonly FeedbackComment[];
   /** The viewer is the app's admin: Hide / Unhide, the hidden text struck through. */
   isAdmin: boolean;
+  /** 0.40: the viewer filed the report (the record's `mine`) — its rework entries are
+   *  theirs, drawn at the reading end as "You". Default `false`. */
+  isAuthor?: boolean;
   /** `POST /feedback/{id}/comments`. Return the promise: the box clears when it
    *  resolves, and keeps the draft when it rejects. A failure is the app's to toast —
    *  the server's `detail`, else `feedbackToast.commentFailed` (0.38.1). Left out, no
@@ -125,6 +133,7 @@ export function FeedbackCommentThread({
   replies: repliesProp = [],
   comments,
   isAdmin,
+  isAuthor = false,
   onComment,
   onHide,
   onDelete,
@@ -143,6 +152,35 @@ export function FeedbackCommentThread({
 
   const entries: Entry[] = [];
   replies.forEach((reply, order) => {
+    if (reply.kind === "rework") {
+      entries.push({
+        at: instant(reply.created_at),
+        order,
+        message: {
+          id: `reply-${reply.id}`,
+          own: isAuthor,
+          author: isAuthor ? undefined : (reply.author_name ?? anonymous),
+          createdAt: reply.created_at,
+          body: reply.body,
+          attachments: reply.attachment_url
+            ? [{ name: attachmentName(reply.attachment_url), url: reply.attachment_url }]
+            : undefined,
+          badge: (
+            <span className="inline-flex min-w-0 max-w-full flex-wrap items-center gap-1" data-feedback-entry-kind="rework">
+              <FeedbackReworkEntryChip />
+              {reply.status_to && (
+                <span className="inline-flex items-center gap-1" data-feedback-reply-status={reply.status_to}>
+                  <span className="sr-only">{replyLabels.statusChanged}</span>
+                  <span aria-hidden>→</span>
+                  <FeedbackStatusBadge status={reply.status_to} />
+                </span>
+              )}
+            </span>
+          ),
+        },
+      });
+      return;
+    }
     entries.push({
       at: instant(reply.created_at),
       order,

package/src/feedback/feedback-labels.ts

@@ -24,7 +24,8 @@ import type { FeedbackCategory, FeedbackStatus } from "./feedback-vocabulary";
  * `feedbackStatus` — one word per status, keyed by the enum value so
  * `labels[row.status]` is the whole lookup.
  *
- * de-CH canon: OPEN "Offen" · READY "Bereit zur Umsetzung" · IN_PROGRESS "In Bearbeitung" · IN_EVALUATION "Zur Prüfung"
+ * de-CH canon: OPEN "Offen" · READY "Bereit zur Umsetzung" · REWORK "Nacharbeit angefordert"
+ * (0.40, §10.6) · IN_PROGRESS "In Bearbeitung" · IN_EVALUATION "Zur Prüfung"
  * · NEEDS_LIVE_TEST "Live testen" · POSTPONED "Zurückgestellt" · DONE "Erledigt" ·
  * WONT_DO "Wird nicht umgesetzt".
  */
@@ -33,6 +34,7 @@ export type FeedbackStatusLabels = Record<FeedbackStatus, string>;
 export const DEFAULT_FEEDBACK_STATUS_LABELS: FeedbackStatusLabels = {
   OPEN: "Open",
   READY: "Ready to implement",
+  REWORK: "Rework requested",
   IN_PROGRESS: "In progress",
   IN_EVALUATION: "In evaluation",
   NEEDS_LIVE_TEST: "Test when live",

package/src/feedback/feedback-menu-labels.ts

@@ -9,4 +9,6 @@ export const DEFAULT_FEEDBACK_MENU_LABELS: FeedbackMenuLabels = {
   myFeedback: "My feedback",
   viewFeedback: "View feedback",
   allFeedback: "All feedback",
+  discussion: "Feedback discussion",
+  inbox: "Feedback inbox",
 };

package/src/feedback/feedback-menu.tsx

@@ -1,4 +1,4 @@
-import { Inbox, MessageSquare, Users } from "lucide-react";
+import { Inbox, MessageSquare, User, Users } from "lucide-react";
 import type { UserAvatarBadge } from "../components/user-avatar";
 import { useKitLabels, type LabelOverride } from "../i18n/kit-labels";
 import { TopBarActionMenu, type TopBarMenuEntry } from "../shell/topbar-action-menu";
@@ -13,21 +13,26 @@ import { DEFAULT_FEEDBACK_MENU_LABELS } from "./feedback-menu-labels";
 /**
  * `feedbackMenu` — the top-bar feedback menu's own words (0.27.0). The four category rows
  * are `feedbackCategory`'s, shared with the badges and the dialog's picker. de-CH canon
- * (keksdose `de-CH.json`): `trigger` "Feedback senden", `myFeedback` "Mein Feedback",
- * `viewFeedback` "Feedback ansehen".
+ * (keksdose `de-CH.json`, §10.6): `trigger` "Feedback senden", `discussion`
+ * "Feedback-Diskussion", `myFeedback` "Mein Feedback", `inbox` "Feedback-Eingang".
  */
 export interface FeedbackMenuLabels {
   /** The trigger's accessible name, and the menu's. keksdose `feedback.send`. */
   trigger: string;
-  /** The link to the reporter's own reports — everyone but an admin. keksdose
-   *  `feedback.my_title`. */
+  /** The link to the viewer's own reports — everyone's, an admin's too since 0.40
+   *  (§10.2 decision 3). keksdose `feedback.my_title`. */
   myFeedback: string;
-  /** The link to the inbox — an admin's one list link, in place of "My feedback".
-   *  keksdose `feedback.view_all`. */
-  viewFeedback: string;
-  /** The link to every public report, {@link FeedbackMenuProps.publicHref} (0.38,
-   *  docs/feedback-harmonization.md §9.2 decision 21). Optional, so a complete
-   *  `UiKitLabels` typed before 0.38 still compiles. de-CH "Alle Rückmeldungen". */
+  /** 0.40: the link to the public list, {@link FeedbackMenuProps.publicHref} (§10.2
+   *  decision 3; "All feedback" before). de-CH "Feedback-Diskussion". */
+  discussion: string;
+  /** 0.40: the admin's link to the triage list, {@link FeedbackMenuProps.inboxHref}
+   *  ("View feedback" before). de-CH "Feedback-Eingang". */
+  inbox: string;
+  /** @deprecated 0.40 — use {@link inbox}; removed in 0.41. Unused: the inbox row reads
+   *  `inbox` (feedback §10.6). */
+  viewFeedback?: string;
+  /** @deprecated 0.40 — use {@link discussion}; removed in 0.41. Unused: the public row
+   *  reads `discussion` (feedback §10.6). */
   allFeedback?: string;
 }
 
@@ -38,8 +43,8 @@ export interface FeedbackMenuProps {
   /** A category row was chosen — open the submit dialog on it (`useFeedbackSubmit`'s
    *  `open`). Never called with `CRASH`: there is no row for it. */
   onFile: (category: FeedbackCategory) => void;
-  /** The list link is "View feedback" → {@link inboxHref} INSTEAD of "My feedback" (§4.1,
-   *  keksdose `top-bar.tsx:205-214`). The admin check is the app's (kastlan's is
+  /** Adds the **Feedback inbox** row → {@link inboxHref} under "My feedback" (0.40, §10.2
+   *  decision 11; until 0.39 it replaced it). The admin check is the app's (kastlan's is
    *  company-scoped). Default `false`. */
   isAdmin?: boolean;
   /**
@@ -50,16 +55,16 @@ export interface FeedbackMenuProps {
    * `all-feedback`, `my-feedback`, `view-feedback`).
    */
   extraEntries?: TopBarMenuEntry[];
-  /** The user's own reports, linked for everyone but an admin. Default `"/my-feedback"`
-   *  (§2.3). */
+  /** The viewer's own reports, linked for everyone (an admin too since 0.40). Default
+   *  `"/my-feedback"` (§2.3). */
   myFeedbackHref?: string;
   /** The admin inbox, linked for an admin. Default `"/feedback"` (§2.3). */
   inboxHref?: string;
   /**
    * The public list (0.38, docs/feedback-harmonization.md §9.2 decision 21): when passed,
-   * an **All feedback** row (`Users`, key `all-feedback`) above the list link, for
-   * everyone — the admin too, who reads what the others read there. keksdose:
-   * `"/all-feedback"`; "My feedback" stays as it is. Leave it out where the app has no
+   * a **Feedback discussion** row (`Users`, key `all-feedback`; "All feedback" until 0.40)
+   * first of the list links, for everyone — the admin too, who reads what the others read
+   * there. keksdose: `"/all-feedback"`. Leave it out where the app has no
    * public parts (kastlan) or the viewer may not see them (a Kurvenschmiede customer, a
    * demo — §9.2 decisions 7, 8).
    */
@@ -83,17 +88,19 @@ export interface FeedbackMenuProps {
  *    the category badges' own glyphs), each calling `onFile(category)`;
  * 3. a divider, always;
  * 4. the app's `extraEntries`;
- * 5. with `publicHref` (0.38), **All feedback** → the public list, for everyone;
- * 6. ONE list link, `Inbox`: an admin's is "View feedback" → `/feedback`, everyone
- *    else's "My feedback" → `/my-feedback` — keksdose's (`top-bar.tsx:205-214`, feedback
- *    #331: admins get the management view, everyone else their own submissions).
+ * 5. the list links (0.40, §10.2 decision 11), in this order: **Feedback discussion**
+ *    (`Users`, key `all-feedback`) → `publicHref`, when passed; **My feedback** (`User`,
+ *    key `my-feedback`) → `/my-feedback`, for everyone, admins included; **Feedback
+ *    inbox** (`Inbox`, key `view-feedback`) → `/feedback`, for an admin. An admin with
+ *    public parts sees three, a member two; without them an admin two and anyone else
+ *    one. Until 0.39 an admin had the inbox in place of their own list (feedback #331);
+ *    Marcel's kk #419 gave them both.
  *
  * WHY A PRESET. Three apps had drawn three menus on the same primitive and they disagreed:
  * kastlan headed it "New submission", Kurvenschmiede "Send feedback" with a single link
  * that changed its words by role, keksdose had no heading and one link by role. keksdose
- * is the source (§2.4, §7.11): no heading, one link — the inbox for an admin, who reaches
- * their own reports there too — and the kit draws it, so the row order, the icons and the
- * words cannot drift again. Where the menu sits in the bar stays each app's.
+ * is the source (§2.4, §7.11): no heading, the list links by role — and the kit draws
+ * it, so the row order, the icons and the words cannot drift again. Where the menu sits in the bar stays each app's.
  *
  * `CRASH` has no row and never will: crash reports are filed by the error boundary with
  * the stack and a fingerprint (keksdose feedback #160), and a hand-filed "crash" would sort
@@ -136,17 +143,28 @@ export function FeedbackMenu({
             key: "all-feedback",
             to: publicHref,
             icon: <Users className="size-4" />,
-            label: labels.allFeedback ?? DEFAULT_FEEDBACK_MENU_LABELS.allFeedback!,
+            label: labels.discussion,
           } satisfies TopBarMenuEntry,
         ]
       : []),
     {
       kind: "link",
-      key: isAdmin ? "view-feedback" : "my-feedback",
-      to: isAdmin ? inboxHref : myFeedbackHref,
-      icon: <Inbox className="size-4" />,
-      label: isAdmin ? labels.viewFeedback : labels.myFeedback,
+      key: "my-feedback",
+      to: myFeedbackHref,
+      icon: <User className="size-4" />,
+      label: labels.myFeedback,
     },
+    ...(isAdmin
+      ? [
+          {
+            kind: "link",
+            key: "view-feedback",
+            to: inboxHref,
+            icon: <Inbox className="size-4" />,
+            label: labels.inbox,
+          } satisfies TopBarMenuEntry,
+        ]
+      : []),
   ];
   return (
     <TopBarActionMenu

package/src/feedback/feedback-public-labels.ts

@@ -10,10 +10,11 @@
  * stay `feedbackPage`'s, so the two lists cannot disagree; the vote button's words are
  * `feedbackVote`'s, the thread's `feedbackComments`'.
  *
- * de-CH canon (§9.2, §9.5): `title` "Alle Rückmeldungen", `anonymous` "Eine Person".
+ * de-CH canon (§9.2, §9.5, §10.6): `title` "Feedback-Diskussion", `anonymous` "Eine Person".
  */
 export interface FeedbackPublicLabels {
-  /** The page's heading — keksdose's `/all-feedback`, the menu's "All feedback". */
+  /** The page's heading — keksdose's `/all-feedback`, the menu's "Feedback discussion"
+   *  (0.40, §10.2 decision 11; "All feedback" before). de-CH "Feedback-Diskussion". */
   title: string;
   /** The sort toggle's accessible name. */
   sort: string;
@@ -57,7 +58,7 @@ export interface FeedbackPublicLabels {
 }
 
 export const DEFAULT_FEEDBACK_PUBLIC_LABELS: FeedbackPublicLabels = {
-  title: "All feedback",
+  title: "Feedback discussion",
   sort: "Sort",
   sortNewest: "Newest",
   sortVotes: "Most wanted",

package/src/feedback/feedback-public-list.tsx

@@ -455,7 +455,8 @@ export function FeedbackPublicDetail({
         />
       </div>
       <FeedbackDetailSection title={labels.body}>
-        {/* Rework rounds stay in it — the author's own words (§9.4). */}
+        {/* Rework rounds stay in it — the author's own words (§9.4) — on a server before
+            server-kit 0.13; since then each is an entry in the conversation (§10.3). */}
         <FeedbackProse>{row.body}</FeedbackProse>
       </FeedbackDetailSection>
       <FeedbackDetailSection title={labels.conversation}>
@@ -464,6 +465,8 @@ export function FeedbackPublicDetail({
           comments={comments ?? []}
           loading={comments === undefined}
           isAdmin={isAdmin}
+          // 0.40 (§10.3): the author's rework entries are theirs — at the reading end.
+          isAuthor={row.mine}
           onComment={onComment}
           onHide={onHide}
           onDelete={onDelete}

package/src/feedback/feedback-public-types.ts

@@ -11,14 +11,28 @@ import type { FeedbackCategory, FeedbackStatus } from "./feedback-vocabulary";
  * account, a loop's reply). The client never builds one from an id.
  */
 
-/** One answer of the admin's — `FeedbackReplyResponse`, §9.7. Oldest first. */
+/** The two kinds of entry in a report's timeline (0.40, §10.2 decision 7): the admin's
+ *  `reply`, and the author's `rework` — the report sent back with a note. */
+export type FeedbackEntryKind = "reply" | "rework";
+
+/** One answer of the admin's — `FeedbackReplyResponse`, §9.7 — or, since 0.40, one
+ *  rework of the author's (§10.3, `kind: "rework"`). Oldest first. */
 export interface FeedbackReply {
   id: number;
   /** `null`: a loop's reply, a migrated `outcome`, or an erased admin — drawn as the
-   *  app's word for its admin ("Admin"). */
+   *  app's word for its admin ("Admin"). On a rework entry `null` is an erased or
+   *  unattributed author, drawn as "A user" (`feedbackPublic.anonymous`), never as the
+   *  admin word. */
   author_name: string | null;
   body: string;
-  /** The status this reply moved the report to; `null` = no status change. */
+  /** 0.40 (§10.3): `"reply"` (absent: a server before server-kit 0.13, all replies) or
+   *  `"rework"`, the author's entry. */
+  kind?: FeedbackEntryKind;
+  /** 0.40: a rework entry's one file (`/api/v1/feedback/attachments/<key>`) — the admin
+   *  and author views only; `null` or absent otherwise (never in the public view, §9.10). */
+  attachment_url?: string | null;
+  /** The status this reply moved the report to; `null` = no status change — and on a
+   *  rework migrated out of the body (§10.4), whose move was never recorded. */
   status_to: FeedbackStatus | null;
   /** Where it moved from — the admin view only. */
   status_from?: FeedbackStatus | null;