@simmalugnt-se/payload-editor-assistant 0.12.1 → 0.12.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.12.2
+
+- Batch links remove their parameters from Next’s router state as well as browser history, so
+  refreshing cannot reopen a finished batch. Field prompts use the same URL integration.
+- Collapsing the assistant preserves batch progress instead of resetting completed cards.
+- Batch revision checks treat schema-defined empty values consistently, so the first draft saved
+  in one language does not falsely invalidate another language’s proposal on Postgres. Real content
+  changes anywhere in the allowlisted form still refuse the save.
+
 ## 0.12.1
 
 - The review lists groups in the schema's order (a group's own position, blocks and rows by their

package/dist/components/EditorAssistantAside.d.ts

@@ -1 +1 @@
-export declare function EditorAssistantAside(): import("react").JSX.Element | null;
+export declare function EditorAssistantAside(): import("react").JSX.Element;

package/dist/components/EditorAssistantAside.js

@@ -441,11 +441,8 @@ export function EditorAssistantAside() {
             void send(draft);
         }
     };
-    // Closed: nothing is shown. The component stays mounted, so an applied preview survives.
-    if (!open) {
-        return null;
-    }
-    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] }), !batch && (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 })] }), batch ? (_jsx("div", { className: "ea-aside__body", children: _jsx(BatchPanel, { batch: batch, onClose: () => {
+    // Keep batch cards mounted while collapsed, so reopening never resets saved cards to tasks.
+    return (_jsxs("aside", { className: "ea-aside", "aria-label": copy.assistant, hidden: !open, [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] }), !batch && (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 })] }), batch ? (_jsx("div", { className: "ea-aside__body", children: _jsx(BatchPanel, { batch: batch, onClose: () => {
                         releaseTakenBatches();
                         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: () => {

package/dist/components/EditorAssistantDocumentBridge.js

@@ -40,7 +40,7 @@ export function EditorAssistantDocumentBridge() {
             return;
         }
         url.searchParams.delete(ASK_PARAM);
-        window.history.replaceState(window.history.state, "", url);
+        window.history.replaceState(null, "", url);
         if (prompt) {
             setPrefill(prompt);
             setOpen(true);

package/dist/components/batch-link.js

@@ -32,7 +32,8 @@ export function useBatchLink() {
         for (const name of [BATCH_PARAM, BATCH_SCOPE_PARAM, ASK_PARAM]) {
             url.searchParams.delete(name);
         }
-        window.history.replaceState(window.history.state, "", url.toString());
+        // Next copies its internal state itself; passing it back skips the router URL update.
+        window.history.replaceState(null, "", url.toString());
         if (repeated) {
             // The batch is still in the panel, which the editor closed: show it again.
             setOpen(true);

package/dist/domain/batch.js

@@ -1,3 +1,4 @@
+import { hashBatchRevision } from "../form/batch-revision.js";
 import { changedPaths } from "../form/changed-paths.js";
 import { compileOperations } from "../form/compile.js";
 import { hashFormRevision } from "../form/hash.js";
@@ -188,10 +189,13 @@ export async function applyBatchTarget(req, options, input) {
     if (!saved) {
         return fail("tool_denied", "Document is not accessible.");
     }
-    if ((await hashFormRevision(saved.form)) !== record.formRevision) {
+    const fields = entityFields(req, options, { collection: record.targetCollection });
+    const revision = record.formRevision?.startsWith("batch-v1:")
+        ? await hashBatchRevision(saved.form, fields)
+        : await hashFormRevision(saved.form);
+    if (revision !== 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.form);
     if (!edited.ok) {
         // Not the editor's approval to spend: the card can still be saved without the edit.

package/dist/domain/propose.js

@@ -1,3 +1,4 @@
+import { hashBatchRevision } from "../form/batch-revision.js";
 import { changedPaths } from "../form/changed-paths.js";
 import { compileOperations } from "../form/compile.js";
 import { humanDiff, richTextLines } from "../form/diff.js";
@@ -85,7 +86,11 @@ export async function proposeChange(req, options, input) {
     if (!relations.ok) {
         return { ok: false, error: "tool_denied", message: relations.message };
     }
-    const formRevision = input.capability === "draft.create" ? undefined : await hashFormRevision(current);
+    const formRevision = input.capability === "draft.create"
+        ? undefined
+        : input.capability === "content.update"
+            ? await hashBatchRevision(current, fields)
+            : await hashFormRevision(current);
     const canonicalHash = await hashFormRevision(typedOperations);
     const nonce = crypto.randomUUID();
     const expiresAt = new Date(Date.now() + TTL_MS).toISOString();

package/dist/form/batch-revision.d.ts

@@ -0,0 +1,6 @@
+import type { FieldNode } from "../schema/fields.ts";
+/**
+ * A first SQL draft may materialize absent localized columns as null. Hash their empty values
+ * consistently, without altering saved content or relaxing checks on nonempty fields or row ids.
+ */
+export declare function hashBatchRevision(data: Record<string, unknown>, fields: FieldNode[]): Promise<string>;

package/dist/form/batch-revision.js

@@ -0,0 +1,39 @@
+import { hashFormRevision } from "./hash.js";
+/**
+ * A first SQL draft may materialize absent localized columns as null. Hash their empty values
+ * consistently, without altering saved content or relaxing checks on nonempty fields or row ids.
+ */
+export async function hashBatchRevision(data, fields) {
+    return `batch-v1:${await hashFormRevision(normalizeRecord(data, fields))}`;
+}
+function normalizeRecord(data, fields) {
+    const normalized = { ...data };
+    for (const field of fields) {
+        const value = data[field.name];
+        if (field.type === "group" && (value == null || isRecord(value))) {
+            normalized[field.name] = normalizeRecord(isRecord(value) ? value : {}, field.fields ?? []);
+        }
+        else if (field.type === "array" && Array.isArray(value)) {
+            normalized[field.name] = value.map((row) => isRecord(row) ? normalizeRecord(row, field.fields ?? []) : row);
+        }
+        else if (field.type === "blocks" && Array.isArray(value)) {
+            normalized[field.name] = value.map((row) => {
+                if (!isRecord(row))
+                    return row;
+                const block = field.blocks?.find((entry) => entry.slug === row.blockType);
+                return block ? normalizeRecord(row, block.fields) : row;
+            });
+        }
+        else {
+            normalized[field.name] =
+                value === undefined ||
+                    ((field.type === "text" || field.type === "textarea") && value === "")
+                    ? null
+                    : value;
+        }
+    }
+    return normalized;
+}
+function isRecord(value) {
+    return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}

package/dist/styles/assistant.css

@@ -836,3 +836,8 @@ html[data-theme="dark"] .ea-trigger--open .ea-trigger__icon {
   padding: calc(var(--base) * 0.5) var(--base) calc(var(--base) * 0.8);
   border-top: 1px solid var(--theme-elevation-100);
 }
+
+/* The batch keeps its progress when the editor collapses the panel. */
+.ea-aside[hidden] {
+  display: none;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simmalugnt-se/payload-editor-assistant",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Context-aware editor assistant plugin for Payload Admin",
   "keywords": [
     "payload",