@simmalugnt-se/payload-editor-assistant 0.11.2 → 0.12.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 0.12.0
+
+- Proposals are grouped by block, row and named group, in document order, with collapsible sections
+  and field labels directly attached to their suggested values. Batches and ordinary form proposals
+  use the same review layout.
+- Rich text proposals show a full formatted preview of the compiled Lexical content, including
+  headings, lists and text formatting. Current content can be expanded for comparison; links show
+  their text, and embedded content has a placeholder. Raw Markdown and repeated part labels are no
+  longer shown in the review.
+- Proposal compilation and batch saving keep allowlisted rich text in its stored Lexical format,
+  separate from the model's capped Markdown projection. Unchanged nodes retain their formatting,
+  and previews match the content to be saved even on long documents.
+- Translation batch cards use the default-language document title when the target title is empty.
+  The document heading stays visible while scrolling its suggestions. The draft-save hint uses
+  future wording so a suggestion is not mistaken for saved content.
+
+## 0.11.3
+
+- Clicking "Fix N with the assistant" again after closing the panel opens it on the batch that is
+  still there. The link was remembered as taken and did nothing.
+
 ## 0.11.2
 
 - Translating a page whose text is all inside blocks or rows now works. The assistant left the

package/dist/components/BatchPanel.js

@@ -8,6 +8,7 @@ import { ENDPOINT_PREFIX } from "../package-name.js";
 import { assistantRequest } from "./assistant-api.js";
 import { cardAfterApply, cardAfterPropose, changedEdits, initialCards, savePlan, waitingKeys, } from "./batch-run.js";
 import { BATCH_COPY, uiLanguage } from "./copy.js";
+import { ProposalReview } from "./ProposalReview.js";
 /**
  * Many documents at once, from a work list link: the assistant suggests a change for each, one
  * request after the other, and the editor saves the ones they want. Nothing is written before that.
@@ -135,12 +136,12 @@ export function BatchPanel({ batch, onClose }) {
     const selected = cards.filter((card) => card.status === "proposed" && card.checked).length;
     const waiting = waitingKeys(cards).length;
     const savedCount = cards.filter((card) => card.status === "saved" || card.status === "draft").length;
-    return (_jsxs("div", { className: "ea-batch", children: [_jsxs("div", { className: "ea-batch__head", children: [_jsx("h3", { children: copy.title(batch.targets.length) }), _jsxs("p", { className: "ea-batch__task", children: [_jsxs("span", { children: [copy.task, ":"] }), " ", batch.prompt] }), phase === "ready" ? (_jsxs(_Fragment, { children: [_jsx("p", { children: copy.intro(waiting) }), _jsxs("div", { className: "ea-actions", children: [_jsx(Button, { buttonStyle: "primary", disabled: waiting === 0, margin: false, onClick: () => void run(), size: "medium", children: copy.start }), _jsx(Button, { buttonStyle: "secondary", margin: false, onClick: onClose, size: "medium", children: copy.cancel })] })] })) : null, phase === "running" || phase === "saving" ? (_jsx("p", { "aria-live": "polite", children: phase === "saving" ? copy.saving : copy.progress(finished, total) })) : null, phase === "review" && selected > 0 ? _jsx("p", { children: copy.review }) : null, phase === "done" ? (_jsx("p", { "aria-live": "polite", children: copy.summary(savedCount, total - savedCount) })) : null] }), _jsx("ul", { className: "ea-batch__cards", children: cards.map((card) => (_jsx(BatchCardItem, { adminRoute: config.routes.admin, card: card, copy: copy, editable: phase === "review" || phase === "done", onCheck: (checked) => update(card.key, (current) => ({ ...current, checked })), onEdit: (path, value) => update(card.key, (current) => ({
+    return (_jsxs("div", { className: "ea-batch", children: [_jsxs("div", { className: "ea-batch__head", children: [_jsx("h3", { children: copy.title(batch.targets.length) }), _jsxs("p", { className: "ea-batch__task", children: [_jsxs("span", { children: [copy.task, ":"] }), " ", batch.prompt] }), phase === "ready" ? (_jsxs(_Fragment, { children: [_jsx("p", { children: copy.intro(waiting) }), _jsxs("div", { className: "ea-actions", children: [_jsx(Button, { buttonStyle: "primary", disabled: waiting === 0, margin: false, onClick: () => void run(), size: "medium", children: copy.start }), _jsx(Button, { buttonStyle: "secondary", margin: false, onClick: onClose, size: "medium", children: copy.cancel })] })] })) : null, phase === "running" || phase === "saving" ? (_jsx("p", { "aria-live": "polite", children: phase === "saving" ? copy.saving : copy.progress(finished, total) })) : null, phase === "review" && selected > 0 ? _jsx("p", { children: copy.review }) : null, phase === "done" ? (_jsx("p", { "aria-live": "polite", children: copy.summary(savedCount, total - savedCount) })) : null] }), _jsx("ul", { className: "ea-batch__cards", children: cards.map((card) => (_jsx(BatchCardItem, { adminRoute: config.routes.admin, card: card, copy: copy, language: language, editable: phase === "review" || phase === "done", onCheck: (checked) => update(card.key, (current) => ({ ...current, checked })), onEdit: (path, value) => update(card.key, (current) => ({
                         ...current,
                         edits: { ...current.edits, [path]: value },
                     })), onRetry: (instruction) => void retry(card, instruction) }, card.key))) }), phase === "ready" ? null : (_jsxs("div", { className: "ea-actions ea-batch__actions", children: [phase === "running" ? (_jsx(Button, { buttonStyle: "secondary", margin: false, onClick: stop, size: "medium", children: copy.stop })) : null, phase === "review" ? (_jsxs(_Fragment, { children: [_jsx(Button, { buttonStyle: "primary", disabled: selected === 0, margin: false, onClick: () => void save(), size: "medium", children: copy.save(selected) }), waiting > 0 ? (_jsx(Button, { buttonStyle: "secondary", margin: false, onClick: () => void run(), size: "medium", children: copy.continue })) : null, _jsx(Button, { buttonStyle: "secondary", margin: false, onClick: () => void close(), size: "medium", children: copy.cancel })] })) : null, phase === "done" ? (_jsx(Button, { buttonStyle: "primary", margin: false, onClick: onClose, size: "medium", children: copy.close })) : null] }))] }));
 }
-function BatchCardItem({ adminRoute, card, copy, editable, onCheck, onEdit, onRetry, }) {
+function BatchCardItem({ adminRoute, card, copy, language, editable, onCheck, onEdit, onRetry, }) {
     const [retrying, setRetrying] = useState(false);
     const [instruction, setInstruction] = useState("");
     const { target } = card;
@@ -152,7 +153,7 @@ function BatchCardItem({ adminRoute, card, copy, editable, onCheck, onEdit, onRe
     return (_jsxs("li", { className: `ea-batch__card ea-batch__card--${card.status}`, children: [_jsxs("div", { className: "ea-batch__card-head", children: [proposed ? (_jsx("input", { "aria-label": copy.select(card.title), checked: card.checked, disabled: !editable, id: checkboxId, onChange: (event) => onCheck(event.target.checked), type: "checkbox" })) : null, card.thumbnail ? (
                     // A plugin cannot set up next/image for the project's media addresses.
                     // biome-ignore lint/performance/noImgElement: a small thumbnail as Payload serves it
-                    _jsx("img", { alt: "", className: "ea-batch__thumb", src: card.thumbnail })) : null, _jsxs("label", { className: "ea-batch__title", htmlFor: proposed ? checkboxId : undefined, children: [card.title, target.locale ? _jsx("span", { className: "ea-batch__pill", children: target.locale }) : null] }), _jsx("span", { className: "ea-batch__status", children: copy.status[card.status] })] }), card.proposal ? (_jsx("ul", { className: "ea-batch__lines", children: card.proposal.lines.map((line, index) => line.edit ? (_jsxs("li", { className: "ea-batch__edit", children: [_jsx("span", { className: "ea-batch__label", children: line.edit.label }), _jsxs("span", { className: "ea-batch__before", children: [copy.before, ": ", line.edit.before || copy.empty] }), _jsx("textarea", { "aria-label": line.edit.label, disabled: !editable || !proposed, onChange: (event) => onEdit(line.path, event.target.value), rows: 2, value: card.edits[line.path] ?? line.edit.value }), _jsx("span", { className: "ea-batch__count", children: [...(card.edits[line.path] ?? line.edit.value)].length })] }, line.path)) : (_jsx("li", { children: line.text }, `${line.path}:${index}`))) })) : null, card.text && (card.status === "nothing" || card.status === "failed") ? (_jsx("p", { className: "ea-batch__text", children: card.text })) : null, proposed ? (_jsx("p", { className: "ea-batch__hint", children: card.drafts ? copy.savesDraft : copy.savesDirectly })) : null, card.status === "stale" ? _jsx("p", { className: "ea-batch__hint", children: copy.staleHint }) : null, retrying ? (_jsxs("form", { className: "ea-batch__retry", onSubmit: (event) => {
+                    _jsx("img", { alt: "", className: "ea-batch__thumb", src: card.thumbnail })) : null, _jsxs("label", { className: "ea-batch__title", htmlFor: proposed ? checkboxId : undefined, children: [card.title, target.locale ? _jsx("span", { className: "ea-batch__pill", children: target.locale }) : null] }), _jsx("span", { className: "ea-batch__status", children: copy.status[card.status] })] }), card.proposal ? (_jsx(ProposalReview, { lines: card.proposal.lines, language: language, editable: editable && proposed, edits: card.edits, onEdit: onEdit })) : null, card.text && (card.status === "nothing" || card.status === "failed") ? (_jsx("p", { className: "ea-batch__text", children: card.text })) : null, proposed ? (_jsx("p", { className: "ea-batch__hint", children: card.drafts ? copy.savesDraft : copy.savesDirectly })) : null, card.status === "stale" ? _jsx("p", { className: "ea-batch__hint", children: copy.staleHint }) : null, retrying ? (_jsxs("form", { className: "ea-batch__retry", onSubmit: (event) => {
                     event.preventDefault();
                     setRetrying(false);
                     onRetry(instruction);

package/dist/components/EditorAssistantAside.js

@@ -10,6 +10,7 @@ import { useAssistantState, } from "./assistant-context.js";
 import { BatchPanel } from "./BatchPanel.js";
 import { releaseTakenBatches } from "./batch-link.js";
 import { COPY, translateAction, uiLanguage } from "./copy.js";
+import { ProposalReview } from "./ProposalReview.js";
 import { isFormProposal, proposalSteps, refineProposal, replaceLatestStep, } from "./proposal-chain.js";
 import { ReplyText } from "./ReplyText.js";
 import { KEEP_SELECTION_ATTR } from "./selection-dom.js";
@@ -449,11 +450,11 @@ export function EditorAssistantAside() {
                         setBatch(null);
                     } }, batch.id) })) : (_jsxs("div", { className: "ea-aside__body", children: [_jsxs("div", { className: "ea-messages", ref: threadRef, onScroll: onThreadScroll, children: [messages.length === 0 ? (_jsx("div", { className: "ea-msg ea-msg--assistant", children: introText(view, bridge, collections, config, copy) })) : null, messages.map((message) => (_jsxs("div", { className: `ea-msg ea-msg--${message.role}`, children: [message.role === "assistant" ? _jsx(ReplyText, { text: message.text }) : message.text, message.candidates?.length ? (_jsx("div", { className: "ea-actions", children: message.candidates.map((candidate) => (_jsx(Button, { buttonStyle: "pill", margin: false, onClick: () => {
                                                 router.push(candidate.href);
-                                            }, size: "small", children: candidate.label }, candidate.href))) })) : null] }, message.id))), status === "streaming" ? (_jsxs("div", { className: "ea-msg ea-msg--working", children: [_jsxs("span", { className: "ea-dots", "aria-hidden": "true", children: [_jsx("span", {}), _jsx("span", {}), _jsx("span", {})] }), _jsx("span", { children: step ? talk.steps[step] : talk.working })] })) : null] }), pendingApproval ? (_jsxs("div", { className: "ea-approval", children: [_jsx("h3", { children: pendingApproval.title }), pendingApproval.applied ? (_jsxs("p", { className: "ea-approval__hint", children: [autosave ? copy.previewHintAutosave : copy.previewHint, pendingApproval.earlier?.length ? ` ${copy.refinedHint}` : ""] })) : null, _jsx("ul", { className: "ea-approval__diff", children: pendingApproval.summary.split("\n").map((line, index) => line.startsWith("  ") ? (
+                                            }, size: "small", children: candidate.label }, candidate.href))) })) : null] }, message.id))), status === "streaming" ? (_jsxs("div", { className: "ea-msg ea-msg--working", children: [_jsxs("span", { className: "ea-dots", "aria-hidden": "true", children: [_jsx("span", {}), _jsx("span", {}), _jsx("span", {})] }), _jsx("span", { children: step ? talk.steps[step] : talk.working })] })) : null] }), pendingApproval ? (_jsxs("div", { className: "ea-approval", children: [_jsx("h3", { children: pendingApproval.title }), pendingApproval.applied ? (_jsxs("p", { className: "ea-approval__hint", children: [autosave ? copy.previewHintAutosave : copy.previewHint, pendingApproval.earlier?.length ? ` ${copy.refinedHint}` : ""] })) : null, pendingApproval.lines?.length ? (_jsx("div", { className: "ea-approval__review", children: _jsx(ProposalReview, { lines: pendingApproval.lines, language: uiLanguage(i18n.language) }) })) : (_jsx("ul", { className: "ea-approval__diff", children: pendingApproval.summary.split("\n").map((line, index) => line.startsWith("  ") ? (
                                 // biome-ignore lint/suspicious/noArrayIndexKey: lines are static for one approval
                                 _jsx("li", { className: "ea-approval__sub", children: line.trim() }, index)) : (
                                 // biome-ignore lint/suspicious/noArrayIndexKey: lines are static for one approval
-                                _jsx("li", { children: line }, index))) }), confirmUndo ? (_jsxs(_Fragment, { children: [_jsx("p", { className: "ea-approval__warn", children: copy.undoLosesEdits }), _jsxs("div", { className: "ea-actions", children: [_jsx(Button, { buttonStyle: "primary", margin: false, onClick: () => void undoPreview(pendingApproval, true), size: "medium", children: copy.undoAnyway }), _jsx(Button, { buttonStyle: "secondary", margin: false, onClick: () => setConfirmUndo(false), size: "medium", children: copy.cancel })] })] })) : (_jsxs("div", { className: "ea-actions", children: [_jsx(Button, { buttonStyle: "primary", disabled: status === "streaming", margin: false, onClick: () => void decide("approve"), size: "medium", children: pendingApproval.applied ? copy.keep : copy.approve }), _jsx(Button, { buttonStyle: "secondary", disabled: status === "streaming", margin: false, onClick: () => void decide("reject"), size: "medium", children: pendingApproval.applied ? copy.undo : copy.reject })] }))] })) : null, status !== "idle" && status !== "streaming" ? (_jsx("div", { className: `ea-status ea-status--${status}`, children: statusText(status, talk) })) : null, _jsxs("form", { className: "ea-composer", onSubmit: onSubmit, children: [visibleShortcuts.length > 0 || translate ? (_jsxs("div", { className: "ea-shortcuts", children: [translate ? (_jsx(Button, { buttonStyle: "pill", disabled: status === "streaming", margin: false, onClick: () => {
+                                _jsx("li", { children: line }, index))) })), confirmUndo ? (_jsxs(_Fragment, { children: [_jsx("p", { className: "ea-approval__warn", children: copy.undoLosesEdits }), _jsxs("div", { className: "ea-actions", children: [_jsx(Button, { buttonStyle: "primary", margin: false, onClick: () => void undoPreview(pendingApproval, true), size: "medium", children: copy.undoAnyway }), _jsx(Button, { buttonStyle: "secondary", margin: false, onClick: () => setConfirmUndo(false), size: "medium", children: copy.cancel })] })] })) : (_jsxs("div", { className: "ea-actions", children: [_jsx(Button, { buttonStyle: "primary", disabled: status === "streaming", margin: false, onClick: () => void decide("approve"), size: "medium", children: pendingApproval.applied ? copy.keep : copy.approve }), _jsx(Button, { buttonStyle: "secondary", disabled: status === "streaming", margin: false, onClick: () => void decide("reject"), size: "medium", children: pendingApproval.applied ? copy.undo : copy.reject })] }))] })) : null, status !== "idle" && status !== "streaming" ? (_jsx("div", { className: `ea-status ea-status--${status}`, children: statusText(status, talk) })) : null, _jsxs("form", { className: "ea-composer", onSubmit: onSubmit, children: [visibleShortcuts.length > 0 || translate ? (_jsxs("div", { className: "ea-shortcuts", children: [translate ? (_jsx(Button, { buttonStyle: "pill", disabled: status === "streaming", margin: false, onClick: () => {
                                             void send(translate.prompt);
                                         }, size: "small", children: translate.label })) : null, visibleShortcuts.map((shortcut) => (_jsx(Button, { buttonStyle: "pill", disabled: status === "streaming", margin: false, onClick: () => {
                                             void send(shortcut.prompt);

package/dist/components/ProposalReview.d.ts

@@ -0,0 +1,11 @@
+import type { ProposalLine } from "../domain/propose.ts";
+type Props = {
+    lines: ProposalLine[];
+    language: "en" | "sv";
+    editable?: boolean;
+    edits?: Record<string, string>;
+    onEdit?: (path: string, value: string) => void;
+};
+/** One review layout for batch proposals and changes in the open form. */
+export declare function ProposalReview(props: Props): import("react").JSX.Element;
+export {};

package/dist/components/ProposalReview.js

@@ -0,0 +1,46 @@
+"use client";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useId } from "react";
+import { groupProposalLines } from "./proposal-review.js";
+import { hasRichText, RichTextPreview } from "./RichTextPreview.js";
+const COPY = {
+    en: {
+        current: "Current text",
+        suggested: "Suggested text",
+        added: "New",
+        empty: "Cleared",
+        block: "Block",
+    },
+    sv: {
+        current: "Nuvarande text",
+        suggested: "Föreslagen text",
+        added: "Nytt",
+        empty: "Tömt",
+        block: "Block",
+    },
+};
+/** One review layout for batch proposals and changes in the open form. */
+export function ProposalReview(props) {
+    return (_jsx("div", { className: "ea-review", children: groupProposalLines(props.lines).map((node) => (_jsx(ReviewNodeItem, { node: node, props: props }, node.path))) }));
+}
+function ReviewNodeItem({ node, props }) {
+    if (node.kind === "field")
+        return _jsx(FieldReview, { lines: node.lines, props: props });
+    const { group } = node;
+    const children = node.children.map((child) => (_jsx(ReviewNodeItem, { node: child, props: props }, child.path)));
+    if (group.kind === "container")
+        return (_jsxs("section", { className: "ea-review__collection", children: [_jsx("h4", { children: group.label }), _jsx("div", { className: "ea-review__children", children: children })] }));
+    return (_jsxs("details", { className: `ea-review__group ea-review__group--${group.kind}`, open: true, children: [_jsxs("summary", { children: [_jsx("span", { children: group.label }), group.kind === "block" ? (_jsxs("span", { className: "ea-review__badge", children: [COPY[props.language].block, " ", group.position] })) : null] }), _jsx("div", { className: "ea-review__children", children: children })] }));
+}
+function FieldReview({ lines, props }) {
+    const id = useId();
+    const line = lines[0];
+    if (!line)
+        return null;
+    const copy = COPY[props.language];
+    const label = line.label ?? line.edit?.label;
+    const rich = line.richText;
+    const added = rich ? !hasRichText(rich.before) : line.edit ? !line.edit.before : false;
+    const value = props.edits?.[line.path] ?? line.edit?.value ?? "";
+    return (_jsxs("div", { className: "ea-review__field", children: [label ? (_jsxs("div", { className: "ea-review__field-head", children: [_jsx("label", { htmlFor: line.edit && props.onEdit ? id : undefined, children: label }), added ? _jsx("span", { className: "ea-review__new", children: copy.added }) : null] })) : null, rich ? (_jsxs(_Fragment, { children: [hasRichText(rich.before) ? (_jsxs("details", { className: "ea-review__current", children: [_jsx("summary", { children: copy.current }), _jsx(RichTextPreview, { value: rich.before, language: props.language })] })) : null, _jsx("div", { className: "ea-review__preview", role: "region", "aria-label": `${label}: ${copy.suggested}`, children: hasRichText(rich.after) ? (_jsx(RichTextPreview, { value: rich.after, language: props.language })) : (_jsx("span", { children: copy.empty })) })] })) : line.edit ? (_jsxs(_Fragment, { children: [line.edit.before ? (_jsxs("details", { className: "ea-review__current", children: [_jsx("summary", { children: copy.current }), _jsx("p", { children: line.edit.before })] })) : null, props.onEdit ? (_jsx("textarea", { id: id, "aria-label": [line.context, label].filter(Boolean).join(" › "), disabled: !props.editable, onChange: (event) => props.onEdit?.(line.path, event.target.value), rows: 2, value: value })) : (_jsx("p", { className: "ea-review__value", children: value || copy.empty })), props.onEdit ? _jsx("span", { className: "ea-review__count", children: [...value].length }) : null] })) : (_jsx("div", { className: "ea-review__change", children: lines.map((line, index) => (_jsx("p", { children: line.text }, `${line.path}:${index}`))) }))] }));
+}

package/dist/components/RichTextPreview.d.ts

@@ -0,0 +1,6 @@
+export declare function hasRichText(value: unknown): boolean;
+/** Render stored Lexical content as safe React elements; no HTML or live links from content. */
+export declare function RichTextPreview({ value, language }: {
+    value: unknown;
+    language: "en" | "sv";
+}): import("react").JSX.Element;

package/dist/components/RichTextPreview.js

@@ -0,0 +1,76 @@
+"use client";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createElement, Fragment } from "react";
+export function hasRichText(value) {
+    const visit = (value) => {
+        if (!value || typeof value !== "object")
+            return false;
+        const node = value;
+        if (node.root)
+            return visit(node.root);
+        if (typeof node.text === "string" && node.text.trim())
+            return true;
+        if (Array.isArray(node.children) && node.children.some(visit))
+            return true;
+        return Boolean(node.type &&
+            !["root", "paragraph", "heading", "text", "linebreak", "list", "listitem"].includes(node.type));
+    };
+    return typeof value === "string" ? Boolean(value.trim()) : visit(value);
+}
+/** Render stored Lexical content as safe React elements; no HTML or live links from content. */
+export function RichTextPreview({ value, language }) {
+    const root = value?.root;
+    const embedded = language === "sv" ? "Inbäddat innehåll" : "Embedded content";
+    const render = (value, key) => {
+        if (!value || typeof value !== "object")
+            return null;
+        const node = value;
+        const children = Array.isArray(node.children) ? node.children.map(render) : null;
+        const style = typeof node.format === "string" &&
+            ["left", "right", "center", "justify"].includes(node.format)
+            ? { textAlign: node.format }
+            : undefined;
+        if (node.type === "text") {
+            let text = typeof node.text === "string" ? node.text : "";
+            const format = typeof node.format === "number" ? node.format : 0;
+            // Lexical's serialized TextNode format flags, independent of the optional editor peer.
+            if (format & 1)
+                text = _jsx("strong", { children: text });
+            if (format & 2)
+                text = _jsx("em", { children: text });
+            if (format & 4)
+                text = _jsx("s", { children: text });
+            if (format & 8)
+                text = _jsx("u", { children: text });
+            if (format & 16)
+                text = _jsx("code", { children: text });
+            if (format & 32)
+                text = _jsx("sub", { children: text });
+            if (format & 64)
+                text = _jsx("sup", { children: text });
+            return _jsx(Fragment, { children: text }, key);
+        }
+        switch (node.type) {
+            case "paragraph":
+                return (_jsx("p", { style: style, children: children }, key));
+            case "heading":
+                return createElement(/^h[1-6]$/.test(node.tag ?? "") ? node.tag : "h3", { key, style }, children);
+            case "list":
+                return node.tag === "ol" ? (_jsx("ol", { start: node.start, children: children }, key)) : (_jsx("ul", { children: children }, key));
+            case "listitem":
+                return _jsx("li", { children: children }, key);
+            case "quote":
+                return (_jsx("blockquote", { style: style, children: children }, key));
+            case "horizontalrule":
+                return _jsx("hr", {}, key);
+            case "linebreak":
+                return _jsx("br", {}, key);
+            case "link":
+            case "autolink":
+                return (_jsx("span", { className: "ea-review__link", title: node.fields?.url ?? (language === "sv" ? "Intern länk" : "Internal link"), children: children }, key));
+            default:
+                return (_jsx("span", { className: "ea-review__embedded", children: embedded }, key));
+        }
+    };
+    return (_jsx("div", { className: "ea-review__rich", children: Array.isArray(root?.children) ? (root.children.map(render)) : typeof value === "string" ? (_jsx("p", { children: value })) : null }));
+}

package/dist/components/assistant-context.d.ts

@@ -1,5 +1,6 @@
 import { type ReactNode } from "react";
 import type { BatchScope, BatchTarget } from "../batch/targets.ts";
+import type { ProposalLine } from "../domain/propose.ts";
 import type { AssistantShortcut } from "../types.ts";
 import type { DomSelection } from "./selection-dom.ts";
 export type AssistantChromeStatus = "idle" | "unavailable" | "unauthorized" | "rate_limited" | "timeout" | "provider_error" | "no_model" | "tool_denied" | "stale_context" | "aborted" | "streaming";
@@ -23,6 +24,7 @@ export type FormAdapter = {
 export type PendingApproval = {
     title: string;
     summary: string;
+    lines?: ProposalLine[];
     approvalId: string;
     nonce: string;
     capability: "form.propose" | "draft.create";

package/dist/components/batch-link.js

@@ -17,11 +17,13 @@ export function releaseTakenBatches() {
 export function useBatchLink() {
     const params = useSearchParams();
     const { setBatch, setOpen } = useAssistantState();
-    const value = params?.get(BATCH_PARAM);
+    // Depends on `params`, not the value: the same batch clicked twice leaves the value unchanged.
     useEffect(() => {
-        if (!value || taken.has(value)) {
+        const value = params?.get(BATCH_PARAM);
+        if (!value) {
             return;
         }
+        const repeated = taken.has(value);
         taken.add(value);
         const url = new URL(window.location.href);
         const targets = parseBatchTargets(url.searchParams.get(BATCH_PARAM));
@@ -31,9 +33,14 @@ export function useBatchLink() {
             url.searchParams.delete(name);
         }
         window.history.replaceState(window.history.state, "", url.toString());
+        if (repeated) {
+            // The batch is still in the panel, which the editor closed: show it again.
+            setOpen(true);
+            return;
+        }
         if (targets.length > 0 && prompt) {
             setBatch({ id: crypto.randomUUID(), targets, scope, prompt });
             setOpen(true);
         }
-    }, [value, setBatch, setOpen]);
+    }, [params, setBatch, setOpen]);
 }

package/dist/components/copy.d.ts

@@ -156,7 +156,7 @@ export declare const BATCH_COPY: {
         readonly save: (count: number) => string;
         readonly saving: "Saving…";
         readonly review: "Check the suggestions. Uncheck any you do not want, or change the wording before saving.";
-        readonly savesDraft: "Saved as a draft; nothing is published.";
+        readonly savesDraft: "Saves as a draft; nothing is published.";
         readonly savesDirectly: "Saved directly: this collection has no drafts.";
         readonly before: "Before";
         readonly empty: "empty";

package/dist/components/copy.js

@@ -166,7 +166,7 @@ export const BATCH_COPY = {
         save: (count) => `Save ${count} selected`,
         saving: "Saving…",
         review: "Check the suggestions. Uncheck any you do not want, or change the wording before saving.",
-        savesDraft: "Saved as a draft; nothing is published.",
+        savesDraft: "Saves as a draft; nothing is published.",
         savesDirectly: "Saved directly: this collection has no drafts.",
         before: "Before",
         empty: "empty",

package/dist/components/proposal-review.d.ts

@@ -0,0 +1,16 @@
+import type { ProposalLine } from "../domain/propose.ts";
+import type { FieldPathGroup } from "../form/field-label.ts";
+export type ReviewField = {
+    kind: "field";
+    path: string;
+    lines: ProposalLine[];
+};
+export type ReviewGroup = {
+    kind: "group";
+    path: string;
+    group: FieldPathGroup;
+    children: ReviewNode[];
+};
+export type ReviewNode = ReviewField | ReviewGroup;
+/** Merge fields under their actual parents and keep blocks and rows in document order. */
+export declare function groupProposalLines(lines: ProposalLine[]): ReviewNode[];

package/dist/components/proposal-review.js

@@ -0,0 +1,34 @@
+/** Merge fields under their actual parents and keep blocks and rows in document order. */
+export function groupProposalLines(lines) {
+    const root = [];
+    for (const line of lines) {
+        let children = root;
+        for (const group of line.groups ?? []) {
+            let node = children.find((node) => node.kind === "group" && node.path === group.path);
+            if (!node) {
+                node = { kind: "group", path: group.path, group, children: [] };
+                children.push(node);
+            }
+            children = node.children;
+        }
+        const existing = children.find((node) => node.kind === "field" && node.path === line.path);
+        if (existing)
+            existing.lines.push(line);
+        else
+            children.push({ kind: "field", path: line.path, lines: [line] });
+    }
+    const sort = (nodes) => {
+        nodes.sort((a, b) => a.kind !== b.kind
+            ? a.kind === "field"
+                ? -1
+                : 1
+            : a.kind === "group"
+                ? a.path.localeCompare(b.path, "en", { numeric: true })
+                : 0);
+        for (const node of nodes)
+            if (node.kind === "group")
+                sort(node.children);
+    };
+    sort(root);
+    return root;
+}

package/dist/domain/batch.js

@@ -5,14 +5,14 @@ import { isFormOperation } from "../form/operations.js";
 import { cloneData, getAtPath, parseFieldPath, setAtPath } from "../form/path.js";
 import { relationValueError } from "../form/relation-shape.js";
 import { loadRichText } from "../form/rich-text.js";
-import { finalizeCompiled, openRichText } from "../form/shape.js";
+import { finalizeCompiled, openRichText, richTextPaths } from "../form/shape.js";
 import { translationPaths } from "../form/translation.js";
 import { DEFAULT_APPROVAL_SLUG } from "../package-name.js";
 import { runAgentTurn } from "../runtime/agent.js";
 import { sourceLocale } from "../runtime/translation-source.js";
 import { configuredDefaultLocale, configuredLocales, entityFields, findCollectionConfig, hasDrafts, } from "../schema/discover.js";
 import { fieldAtPath } from "../schema/fields.js";
-import { projectRecord } from "../schema/project.js";
+import { projectFormRecord, projectRecord } from "../schema/project.js";
 import { hasCapability, resolveAllowlist } from "./allowlist.js";
 import { writeAudit } from "./audit.js";
 import { readDocument } from "./content.js";
@@ -110,6 +110,7 @@ async function readSaved(req, options, collection, id, locale) {
     const title = useAsTitle ? read.doc[useAsTitle] : undefined;
     return {
         data: projectRecord(read.doc, read.fields, options.redact, read.slug).data,
+        form: projectFormRecord(read.doc, read.fields, options.redact, read.slug),
         raw: read.doc,
         title: typeof title === "string" && title ? title : undefined,
     };
@@ -187,24 +188,24 @@ export async function applyBatchTarget(req, options, input) {
     if (!saved) {
         return fail("tool_denied", "Document is not accessible.");
     }
-    if ((await hashFormRevision(saved.data)) !== record.formRevision) {
+    if ((await hashFormRevision(saved.form)) !== record.formRevision) {
         return fail("stale_context", "The document changed after the proposal.");
     }
     const fields = entityFields(req, options, { collection: record.targetCollection });
-    const edited = withEdits(stored, input.edits, fields, saved.data);
+    const edited = withEdits(stored, input.edits, fields, saved.form);
     if (!edited.ok) {
         // Not the editor's approval to spend: the card can still be saved without the edit.
         return { ok: false, error: "tool_denied", message: edited.message };
     }
     const operations = edited.operations;
-    const compiled = compileOperations(openRichText(saved.data, fields), operations, {
+    const compiled = compileOperations(openRichText(saved.form, fields), operations, {
         allowlist: resolved.allowlist.fields,
         denyFields: options.denyFields,
     });
     if (!compiled.ok) {
         return fail("tool_denied", compiled.error);
     }
-    const finalized = finalizeCompiled(compiled.data, fields, saved.data);
+    const finalized = finalizeCompiled(compiled.data, fields, saved.form);
     if (!finalized.ok) {
         return fail("tool_denied", finalized.error);
     }
@@ -224,12 +225,15 @@ export async function applyBatchTarget(req, options, input) {
         return fail("tool_denied", relations.message);
     }
     const drafts = hasDrafts(findCollectionConfig(req, record.targetCollection)?.versions);
+    // The model addresses Markdown parts; Payload stores the containing Lexical field as a unit.
+    const richPaths = richTextPaths(operations, fields, saved.form);
+    const storedPaths = paths.map((path) => richPaths.find((field) => path === field || path.startsWith(`${field}.`)) ?? path);
     try {
         await localApi(req).update({
             collection: record.targetCollection,
             id: record.documentId,
             locale: record.locale,
-            data: changedTopLevel(saved.raw, finalized.data, paths),
+            data: changedTopLevel(saved.raw, finalized.data, storedPaths),
             draft: drafts,
             depth: 0,
             req,
@@ -322,7 +326,18 @@ export async function describeBatchTargets(req, options, targets) {
             : undefined;
         const doc = read?.ok ? read.doc : undefined;
         const useAsTitle = config?.admin?.useAsTitle;
-        const title = [useAsTitle ? doc?.[useAsTitle] : undefined, doc?.filename].find((value) => typeof value === "string" && value.trim() !== "");
+        let title = [useAsTitle ? doc?.[useAsTitle] : undefined, doc?.filename].find((value) => typeof value === "string" && value.trim() !== "");
+        const defaultLocale = configuredDefaultLocale(req);
+        if (doc && !title && defaultLocale && target.locale && defaultLocale !== target.locale) {
+            const source = await readDocument(req, options, {
+                collection: target.collection,
+                documentId: target.id,
+                locale: defaultLocale,
+            });
+            const sourceTitle = source.ok && useAsTitle ? source.doc[useAsTitle] : undefined;
+            if (typeof sourceTitle === "string" && sourceTitle.trim())
+                title = sourceTitle;
+        }
         infos.push({
             key: target.key,
             title: title ?? target.id,

package/dist/domain/propose.d.ts

@@ -1,5 +1,6 @@
 import type { PayloadRequest } from "payload";
 import type { ValidatedEditorAssistantOptions } from "../config/validate.ts";
+import { type FieldPathGroup } from "../form/field-label.ts";
 export type ProposeInput = {
     capability: "form.propose" | "draft.create" | "content.update";
     collection?: string;
@@ -22,6 +23,15 @@ export type ProposeInput = {
 export type ProposalLine = {
     path: string;
     text: string;
+    /** Parent groups, blocks and row positions, separate from an editable field's label. */
+    context?: string;
+    label?: string;
+    groups?: FieldPathGroup[];
+    /** Complete stored content before and after compilation, not a truncated Markdown diff. */
+    richText?: {
+        before: unknown;
+        after: unknown;
+    };
     edit?: {
         label: string;
         before: string;

package/dist/domain/propose.js

@@ -1,19 +1,20 @@
 import { changedPaths } from "../form/changed-paths.js";
 import { compileOperations } from "../form/compile.js";
 import { humanDiff, richTextLines } from "../form/diff.js";
+import { fieldPathInfo } from "../form/field-label.js";
 import { hashFormRevision } from "../form/hash.js";
 import { isFormOperation, normalizeOperations } from "../form/operations.js";
 import { getAtPath, parseFieldPath } from "../form/path.js";
 import { relationValueError } from "../form/relation-shape.js";
 import { loadRichText, toBlocks } from "../form/rich-text.js";
-import { finalizeCompiled, openRichText } from "../form/shape.js";
+import { finalizeCompiled, openRichText, richTextPaths } from "../form/shape.js";
 import { DEFAULT_APPROVAL_SLUG } from "../package-name.js";
 import { entityFields, findCollectionConfig, hasDrafts } from "../schema/discover.js";
 import { fieldAtPath } from "../schema/fields.js";
-import { projectRecord } from "../schema/project.js";
+import { projectFormRecord } from "../schema/project.js";
 import { hasCapability, resolveAllowlist } from "./allowlist.js";
 import { writeAudit } from "./audit.js";
-import { findContentById, readDocument } from "./content.js";
+import { readDocument } from "./content.js";
 import { localApi } from "./local-api.js";
 import { labelRelations, verifyDocumentRelations } from "./relations.js";
 /** Long enough to look at a change in the preview before keeping it. */
@@ -97,14 +98,40 @@ export async function proposeChange(req, options, input) {
         : undefined;
     const inRichText = (operation) => "path" in operation &&
         richTextBefore.some(({ path }) => operation.path === path || operation.path.startsWith(`${path}.`));
+    const fieldLabel = (path) => fieldPathInfo(fields, path, current, input.language);
     const diff = [
-        ...humanDiff(current, typedOperations.filter((operation) => !inRichText(operation)), input.language, labels),
-        ...richTextBefore.flatMap(({ path, blocks, after }) => richTextLines(path, blocks, Array.isArray(after) ? after : [after], input.language)),
+        ...humanDiff(current, typedOperations.filter((operation) => !inRichText(operation)), input.language, labels, (path) => fieldLabel(path).full),
+        ...richTextBefore.flatMap(({ path, blocks, after }) => richTextLines(path, blocks, Array.isArray(after) ? after : [after], input.language, (path) => fieldLabel(path).full)),
     ];
-    const lines = diff.map((line) => ({
-        ...line,
-        ...editableLine(line.path, typedOperations, fields, current),
-    }));
+    const lines = diff
+        .filter((line) => !richTextBefore.some(({ path }) => path === line.path))
+        .map((line) => {
+        const { context, label, groups } = fieldLabel(line.path);
+        return {
+            ...line,
+            label,
+            groups,
+            ...(context ? { context } : {}),
+            ...editableLine(line.path, typedOperations, fields, current),
+        };
+    });
+    for (const { path } of richTextBefore) {
+        const { context, label, groups } = fieldLabel(path);
+        lines.push({
+            path,
+            label,
+            groups,
+            ...(context ? { context } : {}),
+            text: diff
+                .filter((line) => line.path === path)
+                .map((line) => line.text)
+                .join("\n"),
+            richText: {
+                before: getAtPath(current, parseFieldPath(path)),
+                after: getAtPath(finalized.data, parseFieldPath(path)),
+            },
+        });
+    }
     let created;
     try {
         created = await localApi(req).create({
@@ -179,7 +206,10 @@ async function resolveCurrentForm(req, options, input) {
     if (input.capability !== "form.propose") {
         return {};
     }
-    const saved = await findContentById(req, options, {
+    const resolved = resolveAllowlist(options, input);
+    if (!resolved || !hasCapability(resolved.allowlist, "content.findById"))
+        return snapshot;
+    const saved = await readDocument(req, options, {
         collection: input.collection,
         global: input.global,
         documentId: input.documentId,
@@ -188,7 +218,7 @@ async function resolveCurrentForm(req, options, input) {
     if (!saved.ok) {
         return snapshot;
     }
-    return { ...saved.data, ...snapshot };
+    return { ...projectFormRecord(saved.doc, saved.fields, options.redact, saved.slug), ...snapshot };
 }
 /** A saved document as the batch sees it: allowlisted fields in the target's language. */
 export async function readSavedForm(req, options, target) {
@@ -203,7 +233,7 @@ export async function readSavedForm(req, options, target) {
     if (!read.ok) {
         return null;
     }
-    return projectRecord(read.doc, read.fields, options.redact, read.slug).data;
+    return projectFormRecord(read.doc, read.fields, options.redact, read.slug);
 }
 /**
  * A batch proposal sets or clears values within its target's fields: no rows or blocks added,
@@ -263,23 +293,6 @@ function draftCreateDenied(req, collection) {
     }
     return null;
 }
-/** Rich text fields the operations reach, whole or by block, as form paths. */
-function richTextPaths(operations, fields, current) {
-    const paths = new Set();
-    for (const operation of operations) {
-        if (!("path" in operation))
-            continue;
-        const segments = operation.path.split(".");
-        for (let end = 1; end <= segments.length; end++) {
-            const prefix = segments.slice(0, end).join(".");
-            if (fieldAtPath(fields, prefix, current)?.type === "richText") {
-                paths.add(prefix);
-                break;
-            }
-        }
-    }
-    return [...paths];
-}
 /** The stored rich text at `path` as the model read it: Markdown blocks and `{ keep, type }`. */
 function storedBlocks(fields, path, current) {
     const field = fieldAtPath(fields, path, current);

package/dist/form/diff.d.ts

@@ -8,11 +8,11 @@ export type DiffLanguage = "sv" | "en";
  * `labels` names related documents by id (see `labelRelations`), so a chosen image reads as its
  * filename or alt text instead of an id. Rich text is listed by `richTextLines` instead.
  */
-export declare function humanDiff(current: Record<string, unknown>, operations: FormOperation[], language?: DiffLanguage, labels?: Map<string, string>): HumanDiffLine[];
+export declare function humanDiff(current: Record<string, unknown>, operations: FormOperation[], language?: DiffLanguage, labels?: Map<string, string>, fieldLabel?: (path: string) => string): HumanDiffLine[];
 /**
  * The parts of a rich text field that changed: `before` as the model read it (Markdown blocks),
  * `after` as compiled, where `{ keep: i }` is block `i` unchanged.
  */
-export declare function richTextLines(path: string, before: unknown[], after: unknown[], language?: DiffLanguage): HumanDiffLine[];
+export declare function richTextLines(path: string, before: unknown[], after: unknown[], language?: DiffLanguage, fieldLabel?: (path: string) => string): HumanDiffLine[];
 /** Sub-lines are indented two spaces; the approval panel nests them under the header. */
 export declare const DIFF_SUBLINE_INDENT = "  ";