@eifi1/ui-kit 0.39.0 → 0.40.0

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;

package/src/feedback/feedback-record.ts

@@ -179,11 +179,12 @@ export const FEEDBACK_PICKABLE_CATEGORIES: readonly FeedbackCategory[] = Object.
 
 /**
  * The statuses a report can be sent back for **rework** from (§3.4): everything the team
- * has answered — `IN_EVALUATION`, `NEEDS_LIVE_TEST`, `POSTPONED`, `DONE`, `WONT_DO`. On
- * these the server reopens the row when the body grows by a rework block; on `OPEN`,
- * `READY` and `IN_PROGRESS` there is nothing to send back yet.
+ * has answered — `IN_EVALUATION`, `NEEDS_LIVE_TEST`, `POSTPONED`, `DONE`, `WONT_DO` — and,
+ * since 0.40, `REWORK` itself (§10.2 decision 4: a second rework adds another entry). On
+ * `OPEN`, `READY` and `IN_PROGRESS` there is nothing to send back yet.
  */
 export const FEEDBACK_REWORKABLE_STATUSES: readonly FeedbackStatus[] = Object.freeze([
+  "REWORK",
   "IN_EVALUATION",
   "NEEDS_LIVE_TEST",
   "POSTPONED",
@@ -191,6 +192,18 @@ export const FEEDBACK_REWORKABLE_STATUSES: readonly FeedbackStatus[] = Object.fr
   "WONT_DO",
 ] as const);
 
+/**
+ * The loops' queue (0.40, §10.2 decision 4; server-kit `QUEUE_STATUSES`): released for
+ * work (`READY`), sent back and released again (`REWORK`), and being worked
+ * (`IN_PROGRESS`). Kurvenschmiede's loop adds `OPEN` (decision 9) — its own difference,
+ * not this list's.
+ */
+export const FEEDBACK_QUEUE_STATUSES: readonly FeedbackStatus[] = Object.freeze([
+  "READY",
+  "REWORK",
+  "IN_PROGRESS",
+] as const);
+
 /**
  * The statuses in which the AUTHOR may still edit title, body and category (§3.4,
  * keksdose `canAuthorEdit`, `feedback-page.tsx:398`): `OPEN`, `READY` and `IN_PROGRESS`.
@@ -320,6 +333,24 @@ export function reworkCount(body: string): number {
   return n;
 }
 
+/**
+ * How many times a report has been sent back, since 0.40 (§10.3): its `kind: "rework"`
+ * entries when the row carries `replies`, else {@link reworkCount} off the body (a server
+ * before server-kit 0.13, whose reworks are still `--- REWORK … ---` blocks). What the
+ * Rework chip counts.
+ */
+export function feedbackReworkCount(
+  row: { body?: string | null; replies?: readonly Pick<FeedbackReply, "kind">[] | null },
+): number {
+  if (row.replies) {
+    const entries = row.replies.filter((reply) => reply.kind === "rework").length;
+    // A row migrated by an app that answers `replies` but not yet `kind` keeps its body's
+    // count: no entry is a rework there, and the blocks are still in the body.
+    if (entries > 0) return entries;
+  }
+  return reworkCount(row.body ?? "");
+}
+
 /**
  * A body split into the prose to render and the files to show beside it, in body order.
  *

package/src/feedback/feedback-replies.tsx

@@ -1,5 +1,6 @@
 import { useState } from "react";
-import { BellOff } from "lucide-react";
+import type { ReactNode } from "react";
+import { BellOff, Paperclip } from "lucide-react";
 import { Select } from "../components/select";
 import type { CommitScope } from "../components/write-lock";
 import { useKitLabels, useKitLocale, type LabelOverride } from "../i18n/kit-labels";
@@ -8,9 +9,11 @@ import { formatDate } from "../lib/format";
 import { FeedbackStatusBadge, selectableFeedbackStatuses, type FeedbackStatus } from "./feedback-inbox";
 import { useFeedbackStatusLabels } from "./feedback-labels";
 import type { FeedbackReply } from "./feedback-public-types";
-import { FEEDBACK_DECIDED_STATUSES, FEEDBACK_REPLY_MAX } from "./feedback-record";
+import { FEEDBACK_DECIDED_STATUSES, FEEDBACK_REPLY_MAX, attachmentName } from "./feedback-record";
 import { ChatComposer } from "./feedback-thread";
 import { DEFAULT_FEEDBACK_REPLIES_LABELS } from "./feedback-thread-parts-labels";
+import { FeedbackReworkEntryChip } from "./feedback-rework-entry-chip";
+import { DEFAULT_FEEDBACK_PUBLIC_LABELS } from "./feedback-public-labels";
 
 /**
  * The admin's answers as a list (docs/feedback-harmonization.md §9.7, decision 5): each
@@ -79,23 +82,53 @@ export interface FeedbackReplyTimelineProps {
   renderDate?: (iso: string) => string;
   /** Tag bodies and names `data-private` (a host's screen-share blur). Default true. */
   redact?: boolean;
+  /** 0.40: how a rework entry's file (`attachment_url`) is drawn under its text. Default:
+   *  its name beside a paperclip — the file itself is in the row detail's Attachment
+   *  section, fetched with the app's credentials. */
+  renderAttachment?: (url: string) => ReactNode;
   labels?: LabelOverride<FeedbackRepliesLabels>;
   className?: string;
 }
 
+/** The status an entry moved the report to — "→ Done", with where from in the admin view.
+ *  Nothing on an entry with no `status_to`: a status-less reply, or a rework migrated out
+ *  of the body, whose move was never recorded (0.40, §10.3). */
+function EntryStatus({ reply, statusChanged }: { reply: FeedbackReply; statusChanged: string }) {
+  if (!reply.status_to) return null;
+  return (
+    <span className="inline-flex min-w-0 max-w-full flex-wrap items-center gap-1" data-feedback-reply-status={reply.status_to}>
+      <span className="sr-only">{statusChanged}</span>
+      {reply.status_from && reply.status_from !== reply.status_to && (
+        <>
+          <FeedbackStatusBadge status={reply.status_from} />
+          <span aria-hidden>→</span>
+        </>
+      )}
+      {!reply.status_from && <span aria-hidden>→</span>}
+      <FeedbackStatusBadge status={reply.status_to} />
+    </span>
+  );
+}
+
 /**
  * The replies, oldest first, down a rule: each with its author (`null` → "Admin"), its
  * time, the status it set ("→ Done"; the admin view adds where from) and its text. No
  * edit and no delete (§9.7): a correction is a new reply.
+ *
+ * 0.40 (§10.3): an author's **rework** entry (`kind: "rework"`) stands among them as the
+ * author's — their name (`null` → "A user", never "Admin"), the **Rework** chip, the
+ * status it moved the report to (none on a migrated one) and its file.
  */
 export function FeedbackReplyTimeline({
   replies,
   renderDate,
   redact = true,
+  renderAttachment,
   labels: labelsProp,
   className,
 }: FeedbackReplyTimelineProps) {
   const labels = useFeedbackRepliesLabels(labelsProp);
+  const anonymous = useKitLabels("feedbackPublic", DEFAULT_FEEDBACK_PUBLIC_LABELS).anonymous;
   const locale = useKitLocale();
   const priv = redact ? "" : undefined;
   if (replies.length === 0) {
@@ -105,40 +138,72 @@ export function FeedbackReplyTimeline({
     renderDate ? renderDate(iso) : formatDate(iso, { dateStyle: "medium", timeStyle: "short" }, { locale });
   return (
     <ol aria-label={labels.replies} className={cn("space-y-3 border-s-2 border-subtle ps-3", className)}>
-      {replies.map((reply) => (
-        <li key={reply.id} data-feedback-reply={reply.id} className="min-w-0 text-sm">
-          <div className="flex flex-wrap items-center gap-x-2 gap-y-1 text-caption text-muted">
-            <span data-private={priv} className="font-medium text-secondary">
-              {reply.author_name ?? labels.admin}
-            </span>
-            <time dateTime={reply.created_at} className="tabular-nums">
-              {dateText(reply.created_at)}
-            </time>
-            {reply.status_to && (
-              <span className="inline-flex min-w-0 max-w-full flex-wrap items-center gap-1" data-feedback-reply-status={reply.status_to}>
-                <span className="sr-only">{labels.statusChanged}</span>
-                {reply.status_from && reply.status_from !== reply.status_to && (
-                  <>
-                    <FeedbackStatusBadge status={reply.status_from} />
-                    <span aria-hidden>→</span>
-                  </>
-                )}
-                {!reply.status_from && <span aria-hidden>→</span>}
-                <FeedbackStatusBadge status={reply.status_to} />
+      {replies.map((reply) => {
+        const rework = reply.kind === "rework";
+        return (
+          <li
+            key={reply.id}
+            data-feedback-reply={reply.id}
+            data-feedback-entry-kind={rework ? "rework" : undefined}
+            className="min-w-0 text-sm"
+          >
+            <div className="flex flex-wrap items-center gap-x-2 gap-y-1 text-caption text-muted">
+              <span data-private={priv} className="font-medium text-secondary">
+                {reply.author_name ?? (rework ? anonymous : labels.admin)}
               </span>
+              {rework && <FeedbackReworkEntryChip />}
+              <time dateTime={reply.created_at} className="tabular-nums">
+                {dateText(reply.created_at)}
+              </time>
+              <EntryStatus reply={reply} statusChanged={labels.statusChanged} />
+            </div>
+            <p data-private={priv} dir="auto" className="mt-0.5 whitespace-pre-wrap break-words text-start text-primary">
+              {reply.body}
+            </p>
+            {rework && reply.attachment_url && (
+              <div className="mt-1 min-w-0" data-private={priv} data-feedback-entry-file="">
+                {renderAttachment ? (
+                  renderAttachment(reply.attachment_url)
+                ) : (
+                  <span className="inline-flex min-w-0 max-w-full items-center gap-1 text-xs text-secondary">
+                    <Paperclip className="size-3.5 shrink-0" aria-hidden />
+                    <span className="min-w-0 break-all">{attachmentName(reply.attachment_url)}</span>
+                  </span>
+                )}
+              </div>
             )}
-          </div>
-          <p data-private={priv} dir="auto" className="mt-0.5 whitespace-pre-wrap break-words text-start text-primary">
-            {reply.body}
-          </p>
-        </li>
-      ))}
+          </li>
+        );
+      })}
     </ol>
   );
 }
 
 /* ── The composer ─────────────────────────────────────────────────────────── */
 
+/**
+ * The status Select and Reply on one line, one height (keksdose live #417, Android, dark).
+ *
+ * A field and a button of the same padding are not the same height everywhere: on a touch
+ * screen the field's type grows to 16 px (FIELD_TOUCH_TEXT, so iOS does not zoom) and its
+ * box with it, while the button keeps its 14 px line — and at Large the button takes its
+ * 48 px touch floor, which the field has not. So the composer's action row stretches its
+ * two halves to one height and Reply fills it (Button's `stretch`, which is the kit's
+ * answer for a button beside a taller field). Scoped to this composer through the marks
+ * ChatComposer puts on its row: a host slot with an attachment preview must not drag the
+ * send button to the preview's 80 px.
+ *
+ * On a touch screen the "Ctrl+Enter to send" hint has no keyboard to speak of, and beside
+ * a field-height select it pushed Reply onto a line of its own on a phone — it is
+ * visually hidden there (still read in order). At Large the button's 48 px floor is
+ * taller than any field, here as in every form row of the kit.
+ */
+const REPLY_ROW_ALIGN = cn(
+  "[&_[data-chat-composer-actions]]:items-stretch",
+  "[&_[data-chat-composer-send]]:self-stretch",
+  "pointer-coarse:[&_[data-chat-composer-hint]]:sr-only",
+);
+
 export interface FeedbackReplyComposerProps {
   /** The report's status now — what "No change" keeps. */
   status: FeedbackStatus;
@@ -161,7 +226,9 @@ export interface FeedbackReplyComposerProps {
 
 /**
  * The admin's reply box (§9.7): the text, the **status** to set with it ("No change"
- * first, then every status — {@link selectableFeedbackStatuses}), and **Reply**. A
+ * first, then every status — {@link selectableFeedbackStatuses}, `REWORK` among them
+ * since 0.40: how an admin sends any report back, their own included, §10.2 decision 6),
+ * and **Reply**. A
  * {@link ChatComposer} underneath: Ctrl/⌘+Enter sends, the count runs to 8 000, a draft
  * typed while a reply is in flight stays.
  *
@@ -196,7 +263,7 @@ export function FeedbackReplyComposer({
   };
 
   return (
-    <div className={cn("space-y-2", className)} data-feedback-reply-composer="">
+    <div className={cn("space-y-2", REPLY_ROW_ALIGN, className)} data-feedback-reply-composer="">
       {suggestedStatus && (
         <p className="flex items-start gap-1.5 text-xs text-secondary" data-feedback-nudge={suggestedStatus}>
           <BellOff className="mt-0.5 size-3.5 shrink-0 text-warning" aria-hidden />
@@ -211,8 +278,10 @@ export function FeedbackReplyComposer({
         showCount
         labels={{ field: labels.field, placeholder: labels.placeholder, send: labels.reply }}
         attachmentSlot={
+          // The kit's standard Select at field height (#417: "not invent new things where
+          // there are usable ones already") — `size="sm"` was a 28 px box beside the
+          // 38 px Reply. See REPLY_ROW_ALIGN for how the two keep one height.
           <Select
-            size="sm"
             aria-label={labels.status}
             value={picked}
             disabled={pending}

package/src/feedback/feedback-rework-entry-chip.tsx

@@ -0,0 +1,18 @@
+import { Chip } from "../components/chip";
+import { useKitLabels } from "../i18n/kit-labels";
+import { DEFAULT_FEEDBACK_PAGE_LABELS } from "./feedback-table-labels";
+
+/**
+ * The **Rework** chip on an author's rework entry (0.40, docs/feedback-harmonization.md
+ * §10.3) — the table's own `feedbackPage.reworkChip(1)` and tone, so the entry and the
+ * row's chip say the same. Drawn by `FeedbackReplyTimeline` and `FeedbackCommentThread`.
+ * Internal: not re-exported.
+ */
+export function FeedbackReworkEntryChip({ className }: { className?: string }) {
+  const pageLabels = useKitLabels("feedbackPage", DEFAULT_FEEDBACK_PAGE_LABELS);
+  return (
+    <Chip size="sm" tone="warning" caps className={className} data-feedback-entry-rework="">
+      {pageLabels.reworkChip(1)}
+    </Chip>
+  );
+}