@simmalugnt-se/payload-editor-assistant 0.3.2 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## 0.4.0
+
+- A suggestion in the form stays open while the editor writes on, so "shorter" or "another tone"
+  adjusts it instead of keeping it first. The preview shows the adjusted version, **Undo** takes the
+  form back to before the first suggestion, and **Keep** confirms every step in order on the server,
+  each against the form it was made for, so the audit log shows them all. Leaving the form or
+  starting a draft still keeps an open suggestion first.
+- The conversation is kept per document: each document and global has its own thread, and lists and
+  the dashboard share one. Threads are stored in the browser (localStorage) per user, survive a
+  reload, hold the last 50 messages and are forgotten after 30 days; **New chat** clears the current
+  one. A new document's thread becomes the document's own when it is first saved. Switching document
+  stops an unfinished request and closes an open proposal card, which belongs to the other form.
+- While the assistant works, the panel says what it is doing ("Läser formuläret…", "Förbereder
+  ändringen…", "Skriver svaret…") instead of only "Working…". A form proposal goes into the form and
+  Live Preview as soon as it exists, before the reply is written. The chat endpoint answers as NDJSON
+  events when the request asks for `stream: true`; without it, it answers JSON as before. The reply
+  text itself still arrives whole, after the checks it goes through.
+- Everything said in the thread follows the language the editor writes in, including the panel's
+  own messages ("Kept", "Undone", errors). Buttons, headings and hints still follow Admin's language.
+- With a form proposal the model's own short sentence is shown ("Här är en kortare rubrik.") instead
+  of the same fixed line every time. Sentences that say the change is saved, published or kept, or
+  that tell the editor to approve or click, are left out; if nothing is left, the fixed line is used.
+  Draft creation keeps its fixed line, since nothing exists until it is approved.
+- Undo reliably discards the proposals on the server: they are sent one at a time, as a second
+  request at once replaced the CSRF cookie the first one needed.
+- A reply that says it put a change in the form ("har lagt in", "I've put") without making one is
+  retried like other claimed changes.
+
+## 0.3.3
+
+- A `model` function may return `null` or `undefined`, for example when no API key is set. The drawer
+  then says that no AI model is set up instead of that the AI service did not answer, and the server
+  logs a warning instead of an error. Hosts no longer need a cast to keep the plugin installed
+  without a model.
+
 ## 0.3.2
 
 - One control opens and closes the assistant: the text button with a sparkles icon in Admin's

package/README.md

@@ -57,9 +57,17 @@ with its key, e.g. `createAnthropic({ apiKey: process.env.ANTHROPIC_API_KEY })`.
 Providers also read a default environment variable (`DEEPSEEK_API_KEY`, `ANTHROPIC_API_KEY`, ...)
 when no `apiKey` is passed, but passing it explicitly keeps the connection visible in your config.
 
-If the key is missing or wrong, the drawer shows `provider_error` and the cause is logged on the
+If the key is wrong, the drawer says the AI service did not answer and the cause is logged on the
 server through Payload's logger.
 
+To keep the plugin installed without a key (its tables stay in your schema and migrations), let
+`model` be a function that returns `null` or `undefined` when there is nothing to call. The drawer then
+tells the editor that no AI model is set up, and a warning is logged:
+
+```ts
+model: () => (process.env.DEEPSEEK_API_KEY ? deepSeek("deepseek-chat") : null),
+```
+
 ## What the assistant may do
 
 Nothing is reachable unless you list it. Each collection or global gets the capabilities it allows:
@@ -81,11 +89,13 @@ secrets (`password`, `token`, `apiKey`, ...) are always off limits.
 A proposed form change goes straight into the open form, so the fields and Live Preview show it
 before the editor decides. The changed fields are outlined in blue, and the panel offers **Keep**
 and **Undo**. Undo puts the form back as it was; if the editor typed in the form in the meantime,
-the panel asks first, since undo removes that too. Writing another message keeps the change and
-builds on it ("shorter", "now the summary").
+the panel asks first, since undo removes that too. Writing another message leaves the suggestion
+open, so the editor can adjust it ("shorter", "now the summary too"): the adjusted version replaces
+it in the preview, and Undo still goes back to the form from before the first suggestion. Leaving the
+form or starting a draft keeps an open suggestion first.
 
-Keep is still checked on the server against the form the change was made for, and logged. A
-proposal expires after 30 minutes.
+Keep is still checked on the server against the form the change was made for, and logged; an adjusted
+suggestion is kept step by step, each step against its own form. A proposal expires after 30 minutes.
 
 With autosave (`versions.drafts.autosave`) the draft is saved with the change while it is shown;
 undo saves the draft back. A preview that renders from the saved draft (`RefreshRouteOnSave`)
@@ -102,6 +112,20 @@ clicks in the assistant keep it.
 Preview clicks need `@simmalugnt-se/payload-visual-editing` (0.2.0 or later), which announces them
 with a `visual-editing:select` event. Without it the selection follows the form only.
 
+## While it works
+
+The panel shows what the assistant is doing (reading the form, searching content, preparing a
+change, writing the reply). A proposed form change is put in the form as soon as the assistant has
+made it, before its reply is written; Keep and Undo wait until the turn is over. If a proxy in front
+of Payload buffers responses, the steps arrive all at once at the end, which still works.
+
+## Conversations
+
+Each document and global has its own conversation, and lists and the dashboard share one. They are
+kept in the editor's browser (localStorage), per user: the last 50 messages, for 30 days. Nothing is
+stored in the database, so a conversation does not follow the editor to another browser. **New
+chat** clears the current one.
+
 ## Options
 
 | Option | |

package/dist/components/EditorAssistantAside.js

@@ -3,10 +3,12 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { Button, ChevronIcon, useConfig, useLocale, useTranslation, XIcon } from "@payloadcms/ui";
 import { usePathname, useRouter } from "next/navigation";
 import { useEffect, useLayoutEffect, useRef, useState, } from "react";
+import { resolveChatLanguage } from "../runtime/language.js";
 import { parseAdminView } from "../view.js";
-import { assistantRequest } from "./assistant-api.js";
+import { assistantRequest, assistantStream } from "./assistant-api.js";
 import { useAssistantState, } from "./assistant-context.js";
 import { COPY, uiLanguage } from "./copy.js";
+import { isFormProposal, proposalSteps, refineProposal, replaceLatestStep, } from "./proposal-chain.js";
 import { KEEP_SELECTION_ATTR } from "./selection-dom.js";
 export function EditorAssistantAside() {
     const { open, setOpen, status, messages, shortcuts, collections, bridge, formAdapter, pendingApproval, selection, setSelection, resetConversation, setStatus, setMessages, setPendingApproval, stop, setAbortController, } = useAssistantState();
@@ -15,6 +17,9 @@ export function EditorAssistantAside() {
     const locale = useLocale();
     const { i18n } = useTranslation();
     const copy = COPY[uiLanguage(i18n.language)];
+    // What is said in the thread follows the language the editor writes in, like the replies;
+    // the panel's own controls follow Admin.
+    const talk = COPY[resolveChatLanguage(messages.filter((message) => message.role === "user").map((message) => message.text), i18n.language)];
     const pathname = usePathname();
     const view = parseAdminView(pathname ?? "", config.routes.admin);
     const visibleShortcuts = shortcuts.filter((shortcut) => shortcutMatches(shortcut, view));
@@ -23,6 +28,8 @@ export function EditorAssistantAside() {
     /** Whether the editor typed in the form while a preview was in it; undo would discard that. */
     const editedSinceRef = useRef(false);
     const [confirmUndo, setConfirmUndo] = useState(false);
+    /** What the assistant is doing while a turn runs, from the server's step events. */
+    const [step, setStep] = useState(null);
     const stickToBottomRef = useRef(true);
     const apiBase = config.routes.api;
     // Scroll when the thread grows. The values are triggers, not reads.
@@ -62,8 +69,12 @@ export function EditorAssistantAside() {
     const say = (text) => {
         setMessages((current) => [...current, { id: crypto.randomUUID(), role: "assistant", text }]);
     };
-    /** Puts a form proposal into the form so the form and Live Preview show it before it is kept. */
-    const applyPreview = async (pending) => {
+    /**
+     * Puts a form proposal into the form so the form and Live Preview show it before it is kept.
+     * `basis` is the form the proposal was made for. With a suggestion already in the form, the new
+     * one refines it: undo still goes back to the form from before the first.
+     */
+    const applyPreview = async (pending, basis, open) => {
         if (pending.capability !== "form.propose" ||
             !pending.preview ||
             !formAdapter ||
@@ -77,10 +88,19 @@ export function EditorAssistantAside() {
             formAdapter.setModified(true);
         }
         catch {
+            if (open?.applied) {
+                // The earlier suggestion is still what the form shows; the refinement is dropped.
+                void decideRequest(pending, "reject", undefined).catch(() => undefined);
+                say(talk.applyFailed);
+                return open;
+            }
             return pending;
         }
+        if (open?.applied) {
+            return refineProposal(open, pending, basis);
+        }
         editedSinceRef.current = false;
-        return { ...pending, applied: { before, beforeModified: bridge.modified } };
+        return { ...pending, applied: { before, beforeModified: bridge.modified, basis } };
     };
     const restore = async (applied) => {
         if (!formAdapter) {
@@ -92,10 +112,10 @@ export function EditorAssistantAside() {
         // is also what refreshes a preview that renders from the saved draft.
         formAdapter.setModified(autosave || applied.beforeModified);
     };
-    const decideRequest = (pending, action, formData) => assistantRequest(apiBase, "/decide", {
+    const decideRequest = (step, action, formData) => assistantRequest(apiBase, "/decide", {
         action,
-        approvalId: pending.approvalId,
-        nonce: pending.nonce,
+        approvalId: step.approvalId,
+        nonce: step.nonce,
         collection: bridge?.collectionSlug,
         global: bridge?.globalSlug,
         documentId: bridge?.documentId,
@@ -103,8 +123,8 @@ export function EditorAssistantAside() {
         formData,
     });
     /**
-     * Keeps a previewed change. The server checks the proposal against the form it was made for
-     * and logs it; the form already shows the change, so nothing is applied again.
+     * Keeps a previewed change. The server checks each step against the form it was made for and
+     * logs it, oldest first; the form already shows the change, so nothing is applied again.
      */
     const keepPreview = async (pending, quiet = false) => {
         const applied = pending.applied;
@@ -113,14 +133,18 @@ export function EditorAssistantAside() {
         }
         setPendingApproval(null);
         setConfirmUndo(false);
-        const result = await decideRequest(pending, "approve", applied.before).catch(() => null);
-        if (!result?.ok) {
-            await restore(applied).catch(() => undefined);
-            say(copy.keepFailed);
-            return false;
+        const steps = proposalSteps(pending);
+        for (const [index, step] of steps.entries()) {
+            const result = await decideRequest(step, "approve", step.basis).catch(() => null);
+            if (!result?.ok) {
+                await restore(applied).catch(() => undefined);
+                void rejectSteps(steps.slice(index + 1));
+                say(talk.keepFailed);
+                return false;
+            }
         }
         if (!quiet) {
-            say(autosave ? copy.keptAutosave : copy.kept);
+            say(autosave ? talk.keptAutosave : talk.kept);
         }
         return true;
     };
@@ -137,24 +161,33 @@ export function EditorAssistantAside() {
         setConfirmUndo(false);
         try {
             await restore(applied);
-            say(copy.undone);
+            say(talk.undone);
         }
         catch {
-            say(copy.applyFailed);
+            say(talk.applyFailed);
+        }
+        void rejectSteps(proposalSteps(pending));
+    };
+    /**
+     * One at a time: each request fetches a CSRF token and replaces the cookie, so a second request
+     * started alongside would leave the first with a token that no longer matches.
+     */
+    const rejectSteps = async (steps) => {
+        for (const step of steps) {
+            await decideRequest(step, "reject", undefined).catch(() => undefined);
         }
-        void decideRequest(pending, "reject", undefined).catch(() => undefined);
     };
     const send = async (text) => {
         const trimmed = text.trim();
         if (!trimmed || status === "streaming") {
             return;
         }
-        // Writing on is taken as keeping what is in the form; the next change builds on it.
-        if (pendingApproval?.applied && !(await keepPreview(pendingApproval, true))) {
-            return;
-        }
+        // A suggestion in the form stays open while the editor writes on: the next one refines it.
+        const open = pendingApproval?.applied ? pendingApproval : null;
+        const basis = formAdapter?.getData();
         stickToBottomRef.current = true;
         setDraft("");
+        setStep(null);
         const userMessage = { id: crypto.randomUUID(), role: "user", text: trimmed };
         setMessages((current) => [...current, userMessage]);
         const controller = new AbortController();
@@ -165,16 +198,42 @@ export function EditorAssistantAside() {
                 role: message.role,
                 text: message.text,
             }));
-            const result = await assistantRequest(apiBase, "/chat", {
+            // A form proposal arrives before the reply is written and goes into the form right away.
+            // Proposals are applied one after another; a later one in the same turn replaces the earlier.
+            let shown = null;
+            let applying = Promise.resolve();
+            const showProposal = (next) => {
+                applying = applying.then(async () => {
+                    if (shown?.approvalId === next.approvalId || !basis) {
+                        return;
+                    }
+                    shown = shown?.applied
+                        ? await replacePreview(shown, next, basis)
+                        : await applyPreview(next, basis, open);
+                    setPendingApproval(shown);
+                });
+                return applying;
+            };
+            const onEvent = (event) => {
+                if (event.type === "step" && typeof event.step === "string") {
+                    setStep(event.step);
+                }
+                if (event.type === "proposal" && isFormProposal(event.pendingApproval)) {
+                    void showProposal(event.pendingApproval);
+                }
+            };
+            const result = await assistantStream(apiBase, "/chat", {
                 message: trimmed,
                 messages: history,
                 bridge,
                 view,
                 locale: locale.code,
                 uiLanguage: i18n.language,
-                formData: formAdapter?.getData(),
+                formData: basis,
                 selection: selection?.path,
-            }, controller.signal);
+                openProposal: open?.preview ? { changedPaths: open.preview.changedPaths } : undefined,
+            }, onEvent, controller.signal);
+            await applying;
             if (controller.signal.aborted) {
                 setStatus("aborted");
                 return;
@@ -187,22 +246,35 @@ export function EditorAssistantAside() {
                     {
                         id: crypto.randomUUID(),
                         role: "assistant",
-                        text: result.message ?? copy.requestFailed,
+                        text: result.message ?? talk.requestFailed,
                     },
                 ]);
                 return;
             }
             setStatus("idle");
-            if (result.data.pendingApproval) {
-                setPendingApproval(await applyPreview(result.data.pendingApproval));
-            }
             const navigate = result.data.navigate;
+            const next = result.data.pendingApproval;
+            if (isFormProposal(next) && basis) {
+                await showProposal(next);
+            }
+            else {
+                // Leaving the form or starting a draft ends the open suggestion: keep it first, as before.
+                const chain = shown ?? open;
+                if (chain?.applied && (next || (navigate && "href" in navigate))) {
+                    if (!(await keepPreview(chain, true))) {
+                        return;
+                    }
+                }
+                if (next) {
+                    setPendingApproval(next);
+                }
+            }
             setMessages((current) => [
                 ...current,
                 {
                     id: crypto.randomUUID(),
                     role: "assistant",
-                    text: result.data.text ?? copy.done,
+                    text: result.data.text ?? talk.done,
                     candidates: navigate && "candidates" in navigate ? navigate.candidates : undefined,
                 },
             ]);
@@ -215,7 +287,24 @@ export function EditorAssistantAside() {
         }
         finally {
             setAbortController(null);
+            setStep(null);
+        }
+    };
+    /** A second proposal in one turn takes the first one's place in the form and on the server. */
+    const replacePreview = async (current, next, basis) => {
+        if (!formAdapter || !next.preview) {
+            return current;
+        }
+        try {
+            await formAdapter.reset(next.preview.data);
+            formAdapter.setModified(true);
+        }
+        catch {
+            void decideRequest(next, "reject", undefined).catch(() => undefined);
+            return current;
         }
+        void decideRequest(current, "reject", undefined).catch(() => undefined);
+        return replaceLatestStep(current, next, basis);
     };
     const decide = async (action) => {
         if (!pendingApproval || status === "streaming") {
@@ -256,7 +345,7 @@ export function EditorAssistantAside() {
                     {
                         id: crypto.randomUUID(),
                         role: "assistant",
-                        text: result.message ?? copy.proposalFailed,
+                        text: result.message ?? talk.proposalFailed,
                     },
                 ]);
                 return;
@@ -270,8 +359,8 @@ export function EditorAssistantAside() {
                         id: crypto.randomUUID(),
                         role: "assistant",
                         text: pendingApproval.capability === "draft.create"
-                            ? copy.rejectedDraft
-                            : copy.rejectedForm,
+                            ? talk.rejectedDraft
+                            : talk.rejectedForm,
                     },
                 ]);
                 return;
@@ -285,7 +374,7 @@ export function EditorAssistantAside() {
                         {
                             id: crypto.randomUUID(),
                             role: "assistant",
-                            text: copy.applied,
+                            text: talk.applied,
                         },
                     ]);
                 }
@@ -296,7 +385,7 @@ export function EditorAssistantAside() {
                         {
                             id: crypto.randomUUID(),
                             role: "assistant",
-                            text: copy.applyFailed,
+                            text: talk.applyFailed,
                         },
                     ]);
                 }
@@ -311,7 +400,7 @@ export function EditorAssistantAside() {
                     {
                         id: crypto.randomUUID(),
                         role: "assistant",
-                        text: copy.draftCreated,
+                        text: talk.draftCreated,
                     },
                 ]);
                 router.push(href);
@@ -340,11 +429,11 @@ export function EditorAssistantAside() {
     }
     return (_jsxs("aside", { className: "ea-aside", "aria-label": copy.assistant, [KEEP_SELECTION_ATTR]: "", children: [_jsxs("div", { className: "ea-aside__head", children: [_jsxs("div", { className: "ea-aside__title", children: [_jsx("h2", { children: copy.assistant }), bridge ? _jsx("p", { className: "ea-aside__context", children: contextLine(bridge, config) }) : null] }), (messages.length > 0 || pendingApproval) && !pendingApproval?.applied ? (_jsx(Button, { buttonStyle: "subtle", margin: false, onClick: () => resetConversation(), size: "medium", children: copy.newChat })) : null, _jsx(Button, { "aria-label": copy.collapseLabel, buttonStyle: "icon-label", className: "ea-aside__collapse", icon: _jsx(ChevronIcon, { direction: "right" }), margin: false, onClick: () => setOpen(false), tooltip: copy.collapse })] }), _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.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: copy.working })] })) : null] }), pendingApproval ? (_jsxs("div", { className: "ea-approval", children: [_jsx("h3", { children: pendingApproval.title }), pendingApproval.applied ? (_jsx("p", { className: "ea-approval__hint", children: autosave ? copy.previewHintAutosave : copy.previewHint })) : 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, _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", margin: false, onClick: () => void decide("approve"), size: "medium", children: pendingApproval.applied ? copy.keep : copy.approve }), _jsx(Button, { buttonStyle: "secondary", 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, copy) })) : null, _jsxs("form", { className: "ea-composer", onSubmit: onSubmit, children: [visibleShortcuts.length > 0 ? (_jsx("div", { className: "ea-shortcuts", children: visibleShortcuts.map((shortcut) => (_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 ? (_jsx("div", { className: "ea-shortcuts", children: visibleShortcuts.map((shortcut) => (_jsx(Button, { buttonStyle: "pill", disabled: status === "streaming", margin: false, onClick: () => {
                                         void send(shortcut.prompt);
                                     }, size: "small", children: shortcut.label }, shortcut.id))) })) : null, selection && bridge ? (_jsxs("div", { className: "ea-selection", children: [_jsxs("span", { className: "ea-selection__label", children: [copy.selected, ": ", _jsx("strong", { children: selection.label })] }), _jsx("button", { "aria-label": copy.clearSelection, className: "ea-selection__clear", type: "button", onClick: () => setSelection(null), children: _jsx(XIcon, {}) })] })) : null, _jsxs("div", { className: "ea-composer__box", children: [_jsx("textarea", { disabled: status === "streaming", placeholder: copy.placeholder, rows: 2, value: draft, onChange: (event) => setDraft(event.target.value), onKeyDown: onKeyDown }), _jsx("div", { className: "ea-composer__bar", children: status === "streaming" ? (
                                         // While the assistant works, Send becomes Stop, where the editor's eye already is.

package/dist/components/EditorAssistantProvider.js

@@ -7,7 +7,7 @@ import { ChangedFieldsHighlight } from "./ChangedFieldsHighlight.js";
 import { EditorAssistantAside } from "./EditorAssistantAside.js";
 export function EditorAssistantProvider({ children, shortcuts = [], collections = [], }) {
     const { user } = useAuth();
-    return (_jsx(AssistantStateProvider, { shortcuts: shortcuts, collections: collections, children: user ? _jsx(EditorAssistantShell, { children: children }) : children }));
+    return (_jsx(AssistantStateProvider, { shortcuts: shortcuts, collections: collections, userId: user?.id, children: user ? _jsx(EditorAssistantShell, { children: children }) : children }));
 }
 function EditorAssistantShell({ children }) {
     const { open } = useAssistantState();

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

@@ -7,3 +7,23 @@ export declare function assistantRequest<T>(apiBase: string, path: string, body:
     message?: string;
     status: number;
 }>;
+/**
+ * Like `assistantRequest`, for a turn answered as NDJSON: `onEvent` gets each `step` and `proposal`
+ * event as it arrives, and the result is the final `done` (or `error`) event. A server that answers
+ * with plain JSON instead still works.
+ */
+export declare function assistantStream<T>(apiBase: string, path: string, body: Record<string, unknown>, onEvent: (event: StreamEvent) => void, signal?: AbortSignal): Promise<{
+    ok: true;
+    data: T;
+} | {
+    ok: false;
+    error: string;
+    message?: string;
+    status: number;
+}>;
+export type StreamEvent = {
+    type: string;
+    [key: string]: unknown;
+};
+/** Calls `handle` with each JSON object line; chunks may split a line anywhere. */
+export declare function readNdjson(body: ReadableStream<Uint8Array>, handle: (event: StreamEvent) => void): Promise<void>;

package/dist/components/assistant-api.js

@@ -1,5 +1,99 @@
 import { CSRF_HEADER, ENDPOINT_PREFIX } from "../package-name.js";
 export async function assistantRequest(apiBase, path, body, signal) {
+    const response = await post(apiBase, path, body, signal);
+    if (!(response instanceof Response)) {
+        return response;
+    }
+    const payload = (await response.json().catch(() => ({})));
+    if (!response.ok) {
+        return {
+            ok: false,
+            error: payload.error ?? "provider_error",
+            message: payload.message,
+            status: response.status,
+        };
+    }
+    return { ok: true, data: payload };
+}
+/**
+ * Like `assistantRequest`, for a turn answered as NDJSON: `onEvent` gets each `step` and `proposal`
+ * event as it arrives, and the result is the final `done` (or `error`) event. A server that answers
+ * with plain JSON instead still works.
+ */
+export async function assistantStream(apiBase, path, body, onEvent, signal) {
+    const response = await post(apiBase, path, { ...body, stream: true }, signal);
+    if (!(response instanceof Response)) {
+        return response;
+    }
+    const type = response.headers.get("content-type") ?? "";
+    if (!response.ok || !response.body || !type.includes("ndjson")) {
+        const payload = (await response.json().catch(() => ({})));
+        return response.ok
+            ? { ok: true, data: payload }
+            : {
+                ok: false,
+                error: payload.error ?? "provider_error",
+                message: payload.message,
+                status: response.status,
+            };
+    }
+    let final;
+    await readNdjson(response.body, (event) => {
+        if (event.type === "done") {
+            final = { ok: true, data: event.result };
+        }
+        else if (event.type === "error") {
+            final = {
+                ok: false,
+                error: typeof event.error === "string" ? event.error : "provider_error",
+                message: typeof event.message === "string" ? event.message : undefined,
+                status: response.status,
+            };
+        }
+        else {
+            onEvent(event);
+        }
+    });
+    return final ?? { ok: false, error: "provider_error", status: response.status };
+}
+/** Calls `handle` with each JSON object line; chunks may split a line anywhere. */
+export async function readNdjson(body, handle) {
+    const parse = (line) => {
+        if (!line.trim()) {
+            return;
+        }
+        try {
+            const event = JSON.parse(line);
+            if (event && typeof event.type === "string") {
+                handle(event);
+            }
+        }
+        catch {
+            // A line that is not JSON is skipped.
+        }
+    };
+    const reader = body.getReader();
+    const decoder = new TextDecoder();
+    let buffered = "";
+    for (;;) {
+        const { done, value } = await reader.read();
+        if (done) {
+            break;
+        }
+        buffered += decoder.decode(value, { stream: true });
+        const lines = buffered.split("\n");
+        buffered = lines.pop() ?? "";
+        for (const line of lines) {
+            parse(line);
+        }
+    }
+    parse(buffered + decoder.decode());
+}
+/**
+ * Posts with a fresh CSRF token. Fetching one replaces the cookie, so requests must not overlap: the
+ * earlier one would carry a token that no longer matches.
+ */
+async function post(apiBase, path, body, signal) {
     const csrfResponse = await fetch(`${apiBase}${ENDPOINT_PREFIX}/csrf`, {
         credentials: "include",
         signal,
@@ -11,7 +105,7 @@ export async function assistantRequest(apiBase, path, body, signal) {
     if (!csrf.token) {
         return { ok: false, error: "unauthorized", status: 401 };
     }
-    const response = await fetch(`${apiBase}${ENDPOINT_PREFIX}${path}`, {
+    return fetch(`${apiBase}${ENDPOINT_PREFIX}${path}`, {
         method: "POST",
         credentials: "include",
         signal,
@@ -21,14 +115,4 @@ export async function assistantRequest(apiBase, path, body, signal) {
         },
         body: JSON.stringify(body),
     });
-    const payload = (await response.json().catch(() => ({})));
-    if (!response.ok) {
-        return {
-            ok: false,
-            error: payload.error ?? "provider_error",
-            message: payload.message,
-            status: response.status,
-        };
-    }
-    return { ok: true, data: payload };
 }

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

@@ -1,7 +1,7 @@
 import { type ReactNode } from "react";
 import type { AssistantShortcut } from "../types.ts";
 import type { DomSelection } from "./selection-dom.ts";
-export type AssistantChromeStatus = "idle" | "unavailable" | "unauthorized" | "rate_limited" | "timeout" | "provider_error" | "tool_denied" | "stale_context" | "aborted" | "streaming";
+export type AssistantChromeStatus = "idle" | "unavailable" | "unauthorized" | "rate_limited" | "timeout" | "provider_error" | "no_model" | "tool_denied" | "stale_context" | "aborted" | "streaming";
 export type DocumentBridgeSnapshot = {
     collectionSlug?: string;
     globalSlug?: string;
@@ -30,11 +30,21 @@ export type PendingApproval = {
         data: Record<string, unknown>;
         changedPaths: string[];
     };
-    /** Set once the preview is in the form: what to restore on undo. */
+    /**
+     * Set once the preview is in the form: what to restore on undo (the form before the first step)
+     * and `basis`, the form this proposal was made for, which keeping it is checked against.
+     */
     applied?: {
         before: Record<string, unknown>;
         beforeModified: boolean;
+        basis: Record<string, unknown>;
     };
+    /** Earlier proposals this one refines, oldest first; kept or undone together with it. */
+    earlier?: Array<{
+        approvalId: string;
+        nonce: string;
+        basis: Record<string, unknown>;
+    }>;
 };
 export type AssistantMessage = {
     id: string;
@@ -70,10 +80,12 @@ type AssistantContextValue = {
     abortController: AbortController | null;
     setAbortController: (controller: AbortController | null) => void;
 };
-export declare function AssistantStateProvider({ children, shortcuts, collections, }: {
+export declare function AssistantStateProvider({ children, shortcuts, collections, userId, }: {
     children: ReactNode;
     shortcuts: AssistantShortcut[];
     collections: string[];
+    /** Whose conversations the browser keeps; none are kept without a signed-in user. */
+    userId?: string | number;
 }): import("react").JSX.Element;
 export declare function useAssistantState(): AssistantContextValue;
 export {};