@eifi1/ui-kit 0.39.1 → 0.40.1

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>
+  );
+}

package/src/feedback/feedback-row-detail.tsx

@@ -237,7 +237,8 @@ export function feedbackPageUrl(context: FeedbackContext | null | undefined): st
  * keyed by URL, a React key clash keksdose had).
  */
 export function feedbackAttachmentUrls(
-  row: Pick<FeedbackRecord, "screenshot_url" | "attachment_urls" | "body">,
+  row: Pick<FeedbackRecord, "screenshot_url" | "attachment_urls" | "body"> &
+    Partial<Pick<FeedbackRecord, "replies">>,
 ): string[] {
   const urls = [
     ...(row.screenshot_url ? [row.screenshot_url] : []),
@@ -245,6 +246,11 @@ export function feedbackAttachmentUrls(
     // that predates it (keksdose dev #578).
     ...(row.attachment_urls ?? []),
     ...splitBodyAttachments(row.body).urls,
+    // 0.40 (§10.3): a rework entry's one file, in entry order — where the rework
+    // pictures of the body were before.
+    ...(row.replies ?? []).flatMap((reply) =>
+      reply.kind === "rework" && reply.attachment_url ? [reply.attachment_url] : [],
+    ),
   ];
   return [...new Set(urls)];
 }
@@ -330,8 +336,9 @@ export interface FeedbackRowAccess {
   /** The admin on the inbox (`canEdit`): since 0.38 the reply composer (the outcome
    *  itself is frozen, §9.7). */
   canEditOutcome: boolean;
-  /** "Rework": the admin or the author, on an answered row
-   *  ({@link FEEDBACK_REWORKABLE_STATUSES}) — §3.4, anyone else gets the server's 403. */
+  /** "Rework": the author, on an answered row ({@link FEEDBACK_REWORKABLE_STATUSES}).
+   *  Since 0.40 (§10.2 decision 6) the author's only — an admin sends a report back with
+   *  a reply whose status is `REWORK`; the server answers anyone else 403. */
   canRework: boolean;
   /** The status pills: the admin on the inbox; everyone else sees them read-only. */
   canChangeStatus: boolean;
@@ -356,7 +363,7 @@ export function feedbackRowAccess(
     isAuthor,
     canEditDescription: isAuthor && FEEDBACK_AUTHOR_EDITABLE_STATUSES.includes(row.status),
     canEditOutcome: canEdit,
-    canRework: (canEdit || isAuthor) && FEEDBACK_REWORKABLE_STATUSES.includes(row.status),
+    canRework: isAuthor && FEEDBACK_REWORKABLE_STATUSES.includes(row.status),
     canChangeStatus: canEdit,
   };
 }
@@ -396,11 +403,22 @@ export type FeedbackUpload = (file: File) => Promise<string>;
 
 /* ── Send for rework (§4.4.5) ─────────────────────────────────────────────── */
 
+/** 0.40 (§10.3): `POST /feedback/{id}/rework` — the trimmed note and the uploaded file's
+ *  URL. Return the promise: the section closes when it resolves and keeps the note when
+ *  it rejects (the toast is the app's: the server's `detail`, else
+ *  `feedbackToast.updateFailed`). */
+export type FeedbackReworkSend = (note: string, attachmentUrl?: string) => void | Promise<unknown>;
+
 export interface FeedbackReworkSectionProps {
   /** The row being sent back: its id, and the body the round is appended to. */
   row: Pick<FeedbackRecord, "id" | "body">;
-  /** The PATCH — see {@link FeedbackDetailUpdate}. Called with `{ id, body }` only. */
-  onUpdate: FeedbackDetailUpdate;
+  /** 0.40: the rework as an entry of its own — see {@link FeedbackReworkSend}. With it,
+   *  `onUpdate` is not called. */
+  onRework?: FeedbackReworkSend;
+  /** The PATCH — see {@link FeedbackDetailUpdate}. Called with `{ id, body }` only, and
+   *  only without `onRework`: the legacy append (§3.4), which server-kit 0.13 still
+   *  turns into an entry for one release. Optional since 0.40; pass one of the two. */
+  onUpdate?: FeedbackDetailUpdate;
   /** The PATCH is in flight (`update.isPending`). The upload adds its own. */
   pending?: boolean;
   /** The upload. Left out, the note goes without a file field. */
@@ -422,7 +440,7 @@ export interface FeedbackReworkSectionProps {
 }
 
 /**
- * The rework editor (§4.4.5): the submitter — or the admin — sends an answered report
+ * The rework editor (§4.4.5): the submitter sends an answered report
  * back with a note and at most one file, and the server reopens it (§3.4, keksdose
  * `submitRework`, `feedback-page.tsx:350`).
  *
@@ -432,6 +450,9 @@ export interface FeedbackReworkSectionProps {
  *   uploaded FIRST and awaited: a body naming a file that never arrived would be a
  *   rework whose evidence is missing, and the upload is the half that fails on its
  *   own. If it fails nothing is sent and the toast says so; the note stays in the box.
+ * - **0.40: an entry of its own** (§10.3) — with `onRework`, the note and the file's URL
+ *   go to `POST /feedback/{id}/rework` and the body is not touched. Without it, the
+ *   legacy append below, which server-kit 0.13 still converts (one minor).
  * - **The body alone goes in the PATCH** — {@link appendRework}'s strict extension of
  *   the current body, which is how the server recognises the append and reopens the
  *   row. Never a `status` (kastlan's client sent `OPEN`; an author may not write one,
@@ -443,6 +464,7 @@ export interface FeedbackReworkSectionProps {
  */
 export function FeedbackReworkSection({
   row,
+  onRework,
   onUpdate,
   pending = false,
   onUpload,
@@ -456,6 +478,7 @@ export function FeedbackReworkSection({
   const labels = useFeedbackDetailLabels(labelsProp);
   const toasts = useFeedbackToastLabels();
   const [uploading, setUploading] = useState(false);
+  const [sending, setSending] = useState(false);
   // The body as it is NOW, not as it was when Send was pressed: the list can refresh
   // while the file uploads, and an append to a stale body is no longer a strict
   // extension of the stored one — the server would read it as an edit, and refuse it.
@@ -490,6 +513,21 @@ export function FeedbackReworkSection({
         setUploading(false);
       }
     }
+    if (onRework) {
+      // 0.40 (§10.3): the entry, not the body — the server checks the URL (a 422 outside
+      // the app's attachment prefix).
+      setSending(true);
+      try {
+        await onRework(note, url ?? undefined);
+      } catch {
+        return; // The app's toast; the note stays in the box.
+      } finally {
+        setSending(false);
+      }
+      onSent?.();
+      return;
+    }
+    if (!onUpdate) return;
     let body: string | null;
     try {
       body = appendRework(latestBody.current, note, url);
@@ -511,7 +549,7 @@ export function FeedbackReworkSection({
         initial=""
         required
         commit={commit}
-        pending={pending || uploading}
+        pending={pending || uploading || sending}
         onSave={(value, file) => void send(value, file)}
         onCancel={onCancel}
         saveLabel={labels.reworkSend}
@@ -593,6 +631,15 @@ export interface FeedbackRowDetailProps {
   onReply?: (body: string, status?: FeedbackStatus) => void | Promise<unknown>;
   /** 0.38: the reply is in flight. */
   replying?: boolean;
+  /**
+   * 0.40 (§10.3): `POST /feedback/{id}/rework` — the author's rework as an entry of its
+   * own (see {@link FeedbackReworkSend}). The **Rework** button shows only to the author
+   * on an answered row, and only where the reply composer is not shown (§10.2 decision 6:
+   * an admin answering a report sends it back with a reply whose status is `REWORK`).
+   * Left out, the rework goes through `onUpdate` as the legacy body append — for one
+   * minor, while the server converts it.
+   */
+  onRework?: FeedbackReworkSend;
   /** 0.38: the report's comments — the app's `FeedbackCommentThread` — in a section of
    *  their own under the replies. A thread here draws the comments alone (0.38.1): the
    *  Replies section above has the replies, so whatever `replies` the thread is handed
@@ -647,6 +694,7 @@ export function FeedbackRowDetail({
   showSubject = true,
   onReply,
   replying = false,
+  onRework,
   comments,
   onPublicChange,
   labels: labelsProp,
@@ -687,7 +735,11 @@ export function FeedbackRowDetail({
   // 0.38, whose frozen outcome is shown as it is, read-only.
   const replies = row.replies;
   const commentLabels = useKitLabels("feedbackComments", DEFAULT_FEEDBACK_COMMENTS_LABELS);
-  const showRework = access.canRework && reworking;
+  // 0.40 (§10.2 decision 6): whoever has the reply composer answers with it — REWORK is
+  // one of its statuses — so the Rework button is for an author without it.
+  const composerShown = Boolean(replies && access.canEditOutcome && onReply);
+  const canRework = access.canRework && !composerShown;
+  const showRework = canRework && reworking;
 
   return (
     <FeedbackDetail className={className}>
@@ -791,7 +843,7 @@ export function FeedbackRowDetail({
           ) : (
             <FeedbackProse>{row.outcome || undefined}</FeedbackProse>
           )}
-          {replies && access.canEditOutcome && onReply && (
+          {composerShown && replies && onReply && (
             <FeedbackReplyComposer
               key={row.id}
               status={row.status}
@@ -801,9 +853,9 @@ export function FeedbackRowDetail({
               commit={commit}
             />
           )}
-          {((access.canRework && !reworking) || pageHref) && (
+          {((canRework && !reworking) || pageHref) && (
             <div className="flex flex-wrap gap-2">
-              {access.canRework && !reworking && (
+              {canRework && !reworking && (
                 <Button
                   type="button"
                   variant="secondary"
@@ -836,6 +888,7 @@ export function FeedbackRowDetail({
       {showRework && (
         <FeedbackReworkSection
           row={row}
+          onRework={onRework}
           onUpdate={onUpdate}
           pending={pending}
           onUpload={onUpload}

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

@@ -5,7 +5,7 @@
 import type { FeedbackPageLabels } from "./feedback-table";
 
 export const DEFAULT_FEEDBACK_PAGE_LABELS: FeedbackPageLabels = {
-  title: "Feedback",
+  title: "Feedback inbox",
   myTitle: "My feedback",
   columnId: "#",
   columnDate: "Date",

package/src/feedback/feedback-table.tsx

@@ -28,7 +28,7 @@ import {
   type FeedbackCategoryLabels,
   type FeedbackStatusLabels,
 } from "./feedback-labels";
-import { FEEDBACK_AWAITING_STATUSES, reworkCount, type FeedbackContext, type FeedbackRecord } from "./feedback-record";
+import { FEEDBACK_AWAITING_STATUSES, feedbackReworkCount, type FeedbackContext, type FeedbackRecord } from "./feedback-record";
 import type { FeedbackStatusChange } from "./feedback-status-undo";
 import { feedbackPageHref, feedbackPagePath } from "./feedback-row-detail";
 import type { CommitScope } from "../components/write-lock";
@@ -70,7 +70,8 @@ import { DEFAULT_FEEDBACK_PUBLIC_LABELS } from "./feedback-public-labels";
  * `de-CH.json`, ss never ß).
  */
 export interface FeedbackPageLabels {
-  /** The admin inbox's page title, `/feedback`. de-CH: "Feedback" */
+  /** The admin inbox's page title, `/feedback` — the menu's "Feedback inbox" (0.40,
+   *  §10.2 decision 11; "Feedback" before). de-CH: "Feedback-Eingang" */
   title: string;
   /** The user's own list, `/my-feedback`. de-CH: "Mein Feedback" */
   myTitle: string;
@@ -268,7 +269,9 @@ function instant(value: string | null | undefined): number | null {
 /* ── The subject: title + environment chip + rework chip ───────────────────── */
 
 export interface FeedbackSubjectProps {
-  row: Pick<FeedbackRecord, "title" | "body" | "context">;
+  /** `replies` (0.40): the chip counts the rework entries, else the body's blocks —
+   *  {@link feedbackReworkCount}. */
+  row: Pick<FeedbackRecord, "title" | "body" | "context"> & Partial<Pick<FeedbackRecord, "replies">>;
   /**
    * `false` (default): one line — the title truncates and the chips stay whole, as a
    * table cell wants. `true`: the title wraps and the chips flow after its last word, as
@@ -292,7 +295,7 @@ export interface FeedbackSubjectProps {
 export function FeedbackSubject({ row, wrap = false, labels: labelsProp, className }: FeedbackSubjectProps) {
   const labels = useFeedbackPageLabels(labelsProp);
   const env = feedbackEnvironment(row.context);
-  const rounds = reworkCount(row.body ?? "");
+  const rounds = feedbackReworkCount(row);
   const chipClass = wrap ? "ms-1.5 align-middle" : "shrink-0";
   const chips = (
     <>

package/src/feedback/feedback-thread.tsx

@@ -852,7 +852,9 @@ export function ChatComposer({
           }
         }}
       />
-      <div className="flex flex-wrap items-end justify-between gap-2">
+      {/* The `data-chat-composer-*` marks are for a host that lines its slot up with the
+          send button — FeedbackReplyComposer's status Select (#417). */}
+      <div data-chat-composer-actions="" className="flex flex-wrap items-end justify-between gap-2">
         {config || slot != null ? (
           <div className="flex min-w-0 flex-wrap items-end gap-2">
             {config && (
@@ -878,11 +880,13 @@ export function ChatComposer({
         <div className="ms-auto flex items-center gap-2">
           <span
             id={hintId}
+            data-chat-composer-hint=""
             className={size === "sm" ? "sr-only" : "text-xs text-placeholder"}
           >
             {sendOn === "enter" ? labels.sendHintEnter : labels.sendHint(modifier)}
           </span>
           <Button
+            data-chat-composer-send=""
             onClick={send}
             disabled={!canSend}
             commit={commit}

package/src/feedback/feedback-vocabulary.ts

@@ -11,12 +11,13 @@ import {
   MoreHorizontal,
   OctagonAlert,
   PauseCircle,
+  RotateCcw,
   Wrench,
 } from "lucide-react";
 import type { LucideIcon } from "lucide-react";
 
 /**
- * The feedback **vocabulary**: the eight statuses and five categories, the glyph and tone
+ * The feedback **vocabulary**: the nine statuses and five categories, the glyph and tone
  * of each, their orders, and the policy for how a report moves from status to status.
  *
  * Data and plain functions, no components. Until 0.34 this lived at the top of
@@ -27,16 +28,18 @@ import type { LucideIcon } from "lucide-react";
  * feedback-inbox.tsx re-exports every name here, so nothing an app imports has moved.
  */
 
-/** The eight states a report can be in.
+/** The nine states a report can be in.
  *
  *  Shared value for value across the apps on purpose: it is what lets one habit,
  *  and one agent prompt, work on any repo. Five are a chain and three sit off
  *  it — see {@link visibleFeedbackStatuses} for what that buys. `READY` joined in 0.31
  *  (feedback contract §8.2): OPEN is "filed, not yet triaged", READY "released for
- *  implementation", and nobody works an OPEN row. */
+ *  implementation", and nobody works an OPEN row. `REWORK` joined in 0.40 (§10.2
+ *  decisions 2, 4): "sent back, released for work again" — a READY that came back. */
 export type FeedbackStatus =
   | "OPEN"
   | "READY"
+  | "REWORK"
   | "IN_PROGRESS"
   | "IN_EVALUATION"
   | "NEEDS_LIVE_TEST"
@@ -76,6 +79,16 @@ export const FEEDBACK_STATUS_META: Record<
     activeBg: "bg-brand-soft",
     activeText: "text-brand",
   },
+  // Sent back by its author or an admin and released for work again (0.40, feedback
+  // contract §10.2 decision 4): the Rework button's `RotateCcw`, in the danger tint so the
+  // queue shows reworks apart from new reports. Not IN_PROGRESS's warning tint — that is
+  // where a REWORK row moves next — and WONT_DO, the only other red, sits at the far end
+  // with `Ban`.
+  REWORK: {
+    icon: RotateCcw,
+    activeBg: "bg-danger-soft",
+    activeText: "text-danger",
+  },
   IN_PROGRESS: {
     icon: Wrench,
     activeBg: "bg-warning-soft",
@@ -142,8 +155,11 @@ const OFF_CHAIN: FeedbackStatus[] = ["NEEDS_LIVE_TEST", "POSTPONED", "WONT_DO"];
 const FORWARD_CHAIN: FeedbackStatus[] = ["OPEN", "READY", "IN_PROGRESS", "IN_EVALUATION", "DONE"];
 
 /** The next status along the chain, or null at the end (or off it, as `WONT_DO`
- *  is). What a swipe-to-advance gesture commits. */
+ *  is). What a swipe-to-advance gesture commits. `REWORK` (0.40) is not in the chain —
+ *  "advance" from READY still goes to IN_PROGRESS — but it leads there too: a reworked
+ *  row is READY's twin. */
 export function nextFeedbackStatus(current: FeedbackStatus): FeedbackStatus | null {
+  if (current === "REWORK") return "IN_PROGRESS";
   const at = FORWARD_CHAIN.indexOf(current);
   return at !== -1 && at < FORWARD_CHAIN.length - 1 ? FORWARD_CHAIN[at + 1] : null;
 }
@@ -152,7 +168,7 @@ export function nextFeedbackStatus(current: FeedbackStatus): FeedbackStatus | nu
  * The steps that make sense from where a row currently stands.
  *
  * For the compact control in a table cell: it is a glanceable triage affordance,
- * and a row of eight icons in a cell is noise. One step forward, one step back
+ * and a row of nine icons in a cell is noise. One step forward, one step back
  * (so an item can be sent back for rework), and any of the three off-chain
  * verdicts — which is what makes those usable as verdicts at all.
  *
@@ -165,7 +181,12 @@ export function nextFeedbackStatus(current: FeedbackStatus): FeedbackStatus | nu
 export function visibleFeedbackStatuses(current: FeedbackStatus): FeedbackStatus[] {
   const set = new Set<FeedbackStatus>([current]);
   const at = FORWARD_CHAIN.indexOf(current);
-  if (at !== -1) {
+  if (current === "REWORK") {
+    // READY's twin (0.40, §10.2 decision 4): the step that picks the work up, and the
+    // verdicts a released row can still get.
+    set.add("IN_PROGRESS");
+    for (const off of OFF_CHAIN) set.add(off);
+  } else if (at !== -1) {
     if (at < FORWARD_CHAIN.length - 1) set.add(FORWARD_CHAIN[at + 1]);
     if (at > 0) set.add(FORWARD_CHAIN[at - 1]);
     for (const off of OFF_CHAIN) set.add(off);