@alpaca-editor/core 1.0.4096 → 1.0.4098

package/dist/editor/control-center/setup-steps/AiSetupStep/tools/GenerateToolsSection.js

@@ -1,8 +1,328 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from "react";
 import { Button } from "../../../../../components/ui/button";
 import { CheckCircle, RefreshCw } from "lucide-react";
-export function GenerateToolsSection(props) {
-    const { toolsBusy, toolsError, onGenerateTools } = props;
-    return (_jsxs("div", { className: "mt-4 flex items-center gap-2", children: [_jsxs(Button, { size: "sm", variant: "outline", disabled: toolsBusy, onClick: onGenerateTools, children: [toolsBusy ? (_jsx(RefreshCw, { strokeWidth: 1, className: "h-4 w-4 animate-spin" })) : (_jsx(CheckCircle, { strokeWidth: 1, className: "h-4 w-4" })), "Generate AI tool items"] }), toolsError && _jsx("span", { className: "text-xs text-red-600", children: toolsError })] }));
+import { useEditContext } from "../../../../client/editContext";
+import { getChildren } from "../../../../services/contentService";
+import { findByName, resolvePathUnderContent } from "../utils";
+// IDs for tool templates/fields
+const AI_TOOLS_TEMPLATE_ID = "7e3f9d9d-8e84-4e57-b12e-6e9c99d4fd11"; // container
+const AI_TOOL_TEMPLATE_ID = "a2e8a0d9-7b1f-4d1a-a2d8-8f3ea6d6f0b1"; // item template
+const FIELD_FUNCTION_NAME_ID = "3d9f2b1a-9d44-4d26-8a1b-92f0fb4d3a2c";
+const FIELD_LABEL_ID = "5a19f5a5-1d21-4b6a-9f83-6f3fc0b34b2e";
+const FIELD_DESCRIPTION_ID = "6b2e4b8e-8a9f-4d8f-9f6e-1a2b3c4d5e6f";
+export function GenerateToolsSection() {
+    const editContext = useEditContext();
+    const [toolsBusy, setToolsBusy] = React.useState(false);
+    const [toolsError, setToolsError] = React.useState(null);
+    const userLang = editContext?.contentEditorItem?.language || "en";
+    const ensureAiToolsAndGenerate = React.useCallback(async () => {
+        if (!editContext)
+            return;
+        try {
+            setToolsBusy(true);
+            setToolsError(null);
+            // Resolve /Settings/Editor
+            const settingsItem = await resolvePathUnderContent(editContext.sessionId, userLang, ["Settings", "Editor"]);
+            if (!settingsItem)
+                throw new Error("Editor settings item not found. Create it first.");
+            // Ensure AI Tools container exists
+            const editorChildren = (await getChildren(settingsItem.id, editContext.sessionId, [], false, userLang, "path"));
+            let aiToolsParent = findByName(editorChildren, "AI Tools");
+            if (!aiToolsParent) {
+                const created = await editContext.operations.createItem(settingsItem, AI_TOOLS_TEMPLATE_ID, "AI Tools");
+                if (!created)
+                    throw new Error("Failed to create 'AI Tools' container");
+                aiToolsParent = {
+                    id: created.id,
+                    name: "AI Tools",
+                    displayName: "AI Tools",
+                    thumbUrl: "",
+                    previewUrl: "",
+                    templateId: "",
+                    icon: "",
+                    hasChildren: false,
+                    isComponent: false,
+                    language: userLang,
+                    version: 0,
+                    hasLayout: false,
+                };
+            }
+            // Get existing items directly under AI Tools (root-level children)
+            const rootChildren = (await getChildren(aiToolsParent.id, editContext.sessionId, [], false, userLang, "path"));
+            const findChildByName = (children, name) => findByName(children, name);
+            // Define groups and their tools
+            const toolsByGroup = [
+                {
+                    group: "Content",
+                    tools: [
+                        {
+                            functionName: "get-content",
+                            label: "Get Content",
+                            description: "Returns page content or selected components",
+                        },
+                        {
+                            functionName: "edit-field",
+                            label: "Edit Field",
+                            description: "Edits a field on the page or datasource",
+                        },
+                        {
+                            functionName: "suggest-field-edit",
+                            label: "Suggest Field Edit",
+                            description: "Suggests changes to a field's content",
+                        },
+                    ],
+                },
+                {
+                    group: "Items",
+                    tools: [
+                        {
+                            functionName: "create-item",
+                            label: "Create Item",
+                            description: "Creates a new item using a template",
+                        },
+                        {
+                            functionName: "load-item",
+                            label: "Load Item",
+                            description: "Loads an item for context",
+                        },
+                        {
+                            functionName: "get-items",
+                            label: "Get Items",
+                            description: "Finds items by criteria",
+                        },
+                        {
+                            functionName: "get-children",
+                            label: "Get Children",
+                            description: "Lists child items under a parent",
+                        },
+                        {
+                            functionName: "get-insertoptions",
+                            label: "Get Insert Options",
+                            description: "Lists available insert templates for an item",
+                        },
+                    ],
+                },
+                {
+                    group: "Components",
+                    tools: [
+                        {
+                            functionName: "add-component",
+                            label: "Add Component",
+                            description: "Adds a component to a placeholder",
+                        },
+                        {
+                            functionName: "remove-component",
+                            label: "Remove Component",
+                            description: "Removes a component from the page",
+                        },
+                        {
+                            functionName: "move-components",
+                            label: "Move Components",
+                            description: "Moves components between placeholders",
+                        },
+                        {
+                            functionName: "get-placeholders",
+                            label: "Get Placeholders",
+                            description: "Lists placeholders for a component",
+                        },
+                        {
+                            functionName: "get-component-props-and-placeholders",
+                            label: "Get Component Props and Placeholders",
+                            description: "Returns component prop schema and placeholders",
+                        },
+                    ],
+                },
+                {
+                    group: "Search",
+                    tools: [
+                        {
+                            functionName: "search-content",
+                            label: "Search Content",
+                            description: "Searches content across the index",
+                        },
+                        {
+                            functionName: "google-search",
+                            label: "Google Search",
+                            description: "Performs a web search",
+                        },
+                        {
+                            functionName: "scrape-webpage",
+                            label: "Scrape Webpage",
+                            description: "Fetches a webpage and extracts content",
+                        },
+                    ],
+                },
+                {
+                    group: "Media",
+                    tools: [
+                        {
+                            functionName: "search-images",
+                            label: "Search Images",
+                            description: "Searches images for use in content",
+                        },
+                        {
+                            functionName: "edit-image",
+                            label: "Edit Image",
+                            description: "Uses AI to modify an image",
+                        },
+                        {
+                            functionName: "get-picture-description",
+                            label: "Get Picture Description",
+                            description: "Describes an image",
+                        },
+                    ],
+                },
+                {
+                    group: "Collaboration",
+                    tools: [
+                        {
+                            functionName: "add-comment",
+                            label: "Add Comment",
+                            description: "Adds a comment to the page",
+                        },
+                        {
+                            functionName: "get-comments",
+                            label: "Get Comments",
+                            description: "Lists comments on the page",
+                        },
+                        {
+                            functionName: "get-reviews",
+                            label: "Get Reviews",
+                            description: "Lists reviews on the page",
+                        },
+                        {
+                            functionName: "invite-reviewer",
+                            label: "Invite Reviewer",
+                            description: "Adds a reviewer and sends an invitation email",
+                        },
+                        {
+                            functionName: "get-suggestions",
+                            label: "Get Suggestions",
+                            description: "Provides AI suggestions",
+                        },
+                    ],
+                },
+            ];
+            // Ensure groups exist, then create or move tools under them
+            for (const groupDef of toolsByGroup) {
+                // Find or create group container under AI Tools
+                let groupNode = findChildByName(rootChildren, groupDef.group);
+                if (!groupNode) {
+                    const createdGroup = await editContext.operations.createItem({
+                        id: aiToolsParent.id,
+                        language: userLang,
+                        version: 0,
+                    }, AI_TOOLS_TEMPLATE_ID, groupDef.group);
+                    if (!createdGroup)
+                        throw new Error(`Failed to create group '${groupDef.group}'`);
+                    groupNode = {
+                        id: createdGroup.id,
+                        name: groupDef.group,
+                        displayName: groupDef.group,
+                        thumbUrl: "",
+                        previewUrl: "",
+                        templateId: "",
+                        icon: "",
+                        hasChildren: true,
+                        isComponent: false,
+                        language: userLang,
+                        version: 0,
+                        hasLayout: false,
+                    };
+                    // Update our in-memory root children list so subsequent groups can be found
+                    rootChildren.push(groupNode);
+                }
+                // Load current group children (tools already inside this group)
+                const groupChildren = (await getChildren(groupNode.id, editContext.sessionId, [], false, userLang, "path"));
+                for (const t of groupDef.tools) {
+                    // Try to find tool inside the group first
+                    let toolNode = findChildByName(groupChildren, t.label);
+                    if (!toolNode) {
+                        // See if tool exists at root and move it into the group
+                        const existingAtRoot = findChildByName(rootChildren, t.label);
+                        if (existingAtRoot) {
+                            await editContext.operations.moveItems([
+                                {
+                                    id: existingAtRoot.id,
+                                    language: userLang,
+                                    version: 0,
+                                },
+                            ], {
+                                id: groupNode.id,
+                                language: userLang,
+                                version: 0,
+                            }, groupChildren.length);
+                            toolNode = existingAtRoot;
+                        }
+                        else {
+                            // Create new tool item under the group
+                            const createdTool = await editContext.operations.createItem({
+                                id: groupNode.id,
+                                language: userLang,
+                                version: 0,
+                            }, AI_TOOL_TEMPLATE_ID, t.label);
+                            if (!createdTool)
+                                throw new Error(`Failed to create tool '${t.label}'`);
+                            toolNode = {
+                                id: createdTool.id,
+                                name: t.label,
+                                displayName: t.label,
+                                thumbUrl: "",
+                                previewUrl: "",
+                                templateId: "",
+                                icon: "",
+                                hasChildren: false,
+                                isComponent: false,
+                                language: userLang,
+                                version: 0,
+                                hasLayout: false,
+                            };
+                        }
+                    }
+                    // Set Function Name
+                    await editContext.operations.editField({
+                        field: {
+                            fieldId: FIELD_FUNCTION_NAME_ID,
+                            item: { id: toolNode.id, language: userLang, version: 0 },
+                        },
+                        value: t.functionName,
+                        rawValue: t.functionName,
+                        refresh: "delayed",
+                    });
+                    // Set Label
+                    await editContext.operations.editField({
+                        field: {
+                            fieldId: FIELD_LABEL_ID,
+                            item: { id: toolNode.id, language: userLang, version: 0 },
+                        },
+                        value: t.label,
+                        rawValue: t.label,
+                        refresh: "delayed",
+                    });
+                    // Set Description
+                    if (t.description) {
+                        await editContext.operations.editField({
+                            field: {
+                                fieldId: FIELD_DESCRIPTION_ID,
+                                item: { id: toolNode.id, language: userLang, version: 0 },
+                            },
+                            value: t.description,
+                            rawValue: t.description,
+                            refresh: "delayed",
+                        });
+                    }
+                }
+            }
+            editContext.requestRefresh?.("immediate");
+        }
+        catch (e) {
+            setToolsError(e?.message || "Failed to generate AI tools");
+        }
+        finally {
+            setToolsBusy(false);
+        }
+    }, [editContext, userLang]);
+    return (_jsxs("div", { className: "mt-4 flex items-center gap-2", children: [_jsxs(Button, { size: "sm", variant: "outline", disabled: toolsBusy, onClick: ensureAiToolsAndGenerate, children: [toolsBusy ? (_jsx(RefreshCw, { strokeWidth: 1, className: "h-4 w-4 animate-spin" })) : (_jsx(CheckCircle, { strokeWidth: 1, className: "h-4 w-4" })), "Generate AI tool items"] }), toolsError && _jsx("span", { className: "text-xs text-red-600", children: toolsError })] }));
 }
 //# sourceMappingURL=GenerateToolsSection.js.map

package/dist/editor/control-center/setup-steps/AiSetupStep/tools/GenerateToolsSection.js.map

@@ -1 +1 @@
-{"version":3,"file":"GenerateToolsSection.js","sourceRoot":"","sources":["../../../../../../src/editor/control-center/setup-steps/AiSetupStep/tools/GenerateToolsSection.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAQtD,MAAM,UAAU,oBAAoB,CAAC,KAAgC;IACnE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IAEzD,OAAO,CACL,eAAK,SAAS,EAAC,8BAA8B,aAC3C,MAAC,MAAM,IACL,IAAI,EAAC,IAAI,EACT,OAAO,EAAC,SAAS,EACjB,QAAQ,EAAE,SAAS,EACnB,OAAO,EAAE,eAAe,aAEvB,SAAS,CAAC,CAAC,CAAC,CACX,KAAC,SAAS,IAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAC,sBAAsB,GAAG,CAC/D,CAAC,CAAC,CAAC,CACF,KAAC,WAAW,IAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAC,SAAS,GAAG,CACpD,8BAEM,EACR,UAAU,IAAI,eAAM,SAAS,EAAC,sBAAsB,YAAE,UAAU,GAAQ,IACrE,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"GenerateToolsSection.js","sourceRoot":"","sources":["../../../../../../src/editor/control-center/setup-steps/AiSetupStep/tools/GenerateToolsSection.tsx"],"names":[],"mappings":"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"}

package/dist/editor/control-center/setup-steps/AiSetupStep/types.d.ts

@@ -0,0 +1 @@
+export type StepState = "idle" | "checking" | "success" | "error";

package/dist/editor/control-center/setup-steps/AiSetupStep/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/editor/control-center/setup-steps/AiSetupStep/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/editor/control-center/setup-steps/AiSetupStep/types.ts"],"names":[],"mappings":""}

package/dist/editor/control-center/setup-steps/AiSetupStep/utils.d.ts

@@ -0,0 +1,4 @@
+import type { ItemTreeNodeData } from "../../../services/contentService";
+import type { ItemDescriptor } from "../../../pageModel";
+export declare function findByName(items: ItemTreeNodeData[], name: string): ItemTreeNodeData | undefined;
+export declare function resolvePathUnderContent(sessionId: string | undefined, userLang: string, names: string[]): Promise<ItemDescriptor | null>;

package/dist/editor/control-center/setup-steps/AiSetupStep/utils.js

@@ -0,0 +1,25 @@
+import { getChildren } from "../../../services/contentService";
+import { contentItemId } from "../../../../config/config";
+export function findByName(items, name) {
+    const target = name.toLowerCase();
+    return items.find((x) => (x.displayName || x.name || "").toLowerCase() ===
+        target);
+}
+export async function resolvePathUnderContent(sessionId, userLang, names) {
+    if (!sessionId)
+        return null;
+    let currentId = contentItemId;
+    for (const segment of names) {
+        const children = (await getChildren(currentId, sessionId, [], false, userLang, "path"));
+        const next = findByName(children, segment);
+        if (!next)
+            return null;
+        currentId = next.id;
+    }
+    return {
+        id: currentId,
+        language: userLang,
+        version: 0,
+    };
+}
+//# sourceMappingURL=utils.js.map

package/dist/editor/control-center/setup-steps/AiSetupStep/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/editor/control-center/setup-steps/AiSetupStep/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAG/D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,UAAU,UAAU,CACxB,KAAyB,EACzB,IAAY;IAEZ,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAClC,OAAO,KAAK,CAAC,IAAI,CACf,CAAC,CAAC,EAAE,EAAE,CACH,CAAE,CAAC,CAAC,WAAsB,IAAI,CAAC,CAAC,IAAI,IAAI,EAAE,CAAY,CAAC,WAAW,EAAE;QACrE,MAAM,CACT,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,SAA6B,EAC7B,QAAgB,EAChB,KAAe;IAEf,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAC5B,IAAI,SAAS,GAAG,aAAa,CAAC;IAC9B,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,CAAC,MAAM,WAAW,CACjC,SAAS,EACT,SAAS,EACT,EAAE,EACF,KAAK,EACL,QAAQ,EACR,MAAM,CACP,CAAkC,CAAC;QACpC,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QACvB,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC;IACtB,CAAC;IACD,OAAO;QACL,EAAE,EAAE,SAAS;QACb,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,CAAC;KACO,CAAC;AACtB,CAAC"}

package/dist/editor/control-center/setup-steps/IndexSetupStep.js

@@ -6,6 +6,7 @@ import { Badge } from "../../../components/ui/badge";
 import { ExternalLink, Link2 } from "lucide-react";
 import { getCombinedIndexStatus } from "../../services/indexService";
 import { useEditContext } from "../../client/editContext";
+import { EmbeddingsModelSection } from "./AiSetupStep/EmbeddingsModelSection";
 export function IndexSetupStep() {
     const [indexCount, setIndexCount] = useState(null);
     const [indexLoading, setIndexLoading] = useState(false);
@@ -29,7 +30,7 @@ export function IndexSetupStep() {
     useEffect(() => {
         loadIndex();
     }, [loadIndex]);
-    return (_jsx(Card, { icon: _jsx(Link2, { strokeWidth: 1, className: "h-5 w-5" }), title: "Search index", description: "Shows number of indexed items and links to Index panel.", children: _jsxs("div", { className: "flex items-center justify-between gap-2", children: [_jsx("div", { className: "flex items-center gap-2", children: _jsxs(Badge, { variant: "outline", children: ["Indexed Items:", " ", indexLoading ? "..." : (indexCount ?? 0).toLocaleString()] }) }), _jsxs(Button, { size: "sm", variant: "outline", onClick: goToIndexPanel, children: [_jsx(ExternalLink, { strokeWidth: 1, className: "h-4 w-4" }), "Open Index"] })] }) }));
+    return (_jsxs(Card, { icon: _jsx(Link2, { strokeWidth: 1, className: "h-5 w-5" }), title: "Search index", description: "Shows number of indexed items and links to Index panel.", children: [_jsxs("div", { className: "flex items-center justify-between gap-2", children: [_jsx("div", { className: "flex items-center gap-2", children: _jsxs(Badge, { variant: "outline", children: ["Indexed Items:", " ", indexLoading ? "..." : (indexCount ?? 0).toLocaleString()] }) }), _jsxs(Button, { size: "sm", variant: "outline", onClick: goToIndexPanel, children: [_jsx(ExternalLink, { strokeWidth: 1, className: "h-4 w-4" }), "Open Index"] })] }), _jsx(EmbeddingsModelSection, {})] }));
 }
 export default IndexSetupStep;
 //# sourceMappingURL=IndexSetupStep.js.map

package/dist/editor/control-center/setup-steps/IndexSetupStep.js.map

@@ -1 +1 @@
-{"version":3,"file":"IndexSetupStep.js","sourceRoot":"","sources":["../../../../src/editor/control-center/setup-steps/IndexSetupStep.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,UAAU,cAAc;IAC5B,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAClE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;QACtC,uEAAuE;QACvE,WAAW,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACrE,WAAW,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACvC,IAAI,CAAC;YACH,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,MAAM,IAAI,GAAG,MAAM,sBAAsB,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,IAAI,EAAE,WAAW,EAAE,oBAAoB,IAAI,IAAI,CAAC;YAC9D,aAAa,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1D,CAAC;gBAAS,CAAC;YACT,eAAe,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,SAAS,EAAE,CAAC;IACd,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,OAAO,CACL,KAAC,IAAI,IACH,IAAI,EAAE,KAAC,KAAK,IAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAC,SAAS,GAAG,EACnD,KAAK,EAAC,cAAc,EACpB,WAAW,EAAC,yDAAyD,YAErE,eAAK,SAAS,EAAC,yCAAyC,aACtD,cAAK,SAAS,EAAC,yBAAyB,YACtC,MAAC,KAAK,IAAC,OAAO,EAAC,SAAS,+BACP,GAAG,EACjB,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE,IACpD,GACJ,EACN,MAAC,MAAM,IAAC,IAAI,EAAC,IAAI,EAAC,OAAO,EAAC,SAAS,EAAC,OAAO,EAAE,cAAc,aACzD,KAAC,YAAY,IAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAC,SAAS,GAAG,kBAE7C,IACL,GACD,CACR,CAAC;AACJ,CAAC;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"IndexSetupStep.js","sourceRoot":"","sources":["../../../../src/editor/control-center/setup-steps/IndexSetupStep.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,MAAM,UAAU,cAAc;IAC5B,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAClE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;QACtC,uEAAuE;QACvE,WAAW,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACrE,WAAW,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACvC,IAAI,CAAC;YACH,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,MAAM,IAAI,GAAG,MAAM,sBAAsB,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,IAAI,EAAE,WAAW,EAAE,oBAAoB,IAAI,IAAI,CAAC;YAC9D,aAAa,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1D,CAAC;gBAAS,CAAC;YACT,eAAe,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,SAAS,EAAE,CAAC;IACd,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,OAAO,CACL,MAAC,IAAI,IACH,IAAI,EAAE,KAAC,KAAK,IAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAC,SAAS,GAAG,EACnD,KAAK,EAAC,cAAc,EACpB,WAAW,EAAC,yDAAyD,aAErE,eAAK,SAAS,EAAC,yCAAyC,aACtD,cAAK,SAAS,EAAC,yBAAyB,YACtC,MAAC,KAAK,IAAC,OAAO,EAAC,SAAS,+BACP,GAAG,EACjB,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE,IACpD,GACJ,EACN,MAAC,MAAM,IAAC,IAAI,EAAC,IAAI,EAAC,OAAO,EAAC,SAAS,EAAC,OAAO,EAAE,cAAc,aACzD,KAAC,YAAY,IAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAC,SAAS,GAAG,kBAE7C,IACL,EACN,KAAC,sBAAsB,KAAG,IACrB,CACR,CAAC;AACJ,CAAC;AAED,eAAe,cAAc,CAAC"}

package/dist/editor/field-types/SingleLineText.js.map

@@ -1 +1 @@
-{"version":3,"file":"SingleLineText.js","sourceRoot":"","sources":["../../../src/editor/field-types/SingleLineText.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EACL,cAAc,EACd,iBAAiB,EAEjB,uBAAuB,GAExB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAW,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,MAAM,UAAU,cAAc,CAAC,EAC7B,KAAK,EACL,QAAQ,EACR,gBAAgB,GAKjB;IACC,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;IAC3C,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,gBAAgB,GAAG,uBAAuB,EAAE,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,CAAmB,IAAI,CAAC,CAAC;IAChD,2DAA2D;IAC3D,uDAAuD;IACvD,IAAI,CAAC,cAAc,CAAC,OAAO;QAAE,OAAO;IAEpC,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;IACxC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAqB,SAAS,CAAC,CAAC;IAElE,uEAAuE;IACvE,MAAM,EAAE,aAAa,EAAE,GAAG,oBAAoB,CAC5C,KAAK,CAAC,EAAE,EACR,SAAS,CAAC,EAAE,EACZ,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,OAAO,CAClB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,CAAC,OAAO,KAAK,QAAQ,CAAC,aAAa,EAAE,CAAC;YAChD,IAAI,KAAK,CAAC,UAAU;gBAAE,QAAQ,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;iBACjD,CAAC;gBACJ,QAAQ,CAAC,aAAa,EAAE,KAAK,IAAK,KAAK,CAAC,KAAgB,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;IAE1D,IAAI,CAAC,SAAS;QAAE,OAAO;IAEvB,MAAM,YAAY,GAAG,CAAC,CAAsC,EAAE,EAAE;QAC9D,IAAI,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;YAC/C,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QAChC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACvB,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnB,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,CAAC,CAAyC,EAAE,EAAE;QACjE,MAAM,MAAM,GAAG,CAAC,CAAC,MAA0B,CAAC;QAC5C,MAAM,KAAK,GAAmB;YAC5B,MAAM,EAAE,SAAS,CAAC,EAAE;YACpB,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,WAAW,EAAE,MAAM,CAAC,cAAc,IAAI,CAAC;YACvC,SAAS,EAAE,MAAM,CAAC,YAAY,IAAI,CAAC;YACnC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CACtB,MAAM,CAAC,cAAc,IAAI,CAAC,EAC1B,MAAM,CAAC,YAAY,IAAI,CAAC,CACzB;SACF,CAAC;QAEF,IACE,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,aAAa,EAAE,IAAI;YAC/C,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,KAAK,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC;YACrE,KAAK,CAAC,MAAM,KAAK,WAAW,EAAE,aAAa,EAAE,MAAM,EACnD,CAAC;YACD,cAAc,CAAC,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAClD,CAAC;IACH,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC;QAC5D,IACE,YAAY,EAAE,OAAO,KAAK,KAAK,CAAC,EAAE;YAClC,YAAY,EAAE,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE;YACtC,YAAY,EAAE,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ;YAClD,YAAY,EAAE,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,OAAO,EAChD,CAAC;YACD,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC;YACpD,IAAI,KAAK,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBAC9B,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;gBACvE,wCAAwC;gBACxC,oCAAoC;YACtC,CAAC;QACH,CAAC;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;IAEjC,6CAA6C;IAC7C,oCAAoC;IACpC,yEAAyE;IAEzE,8BAA8B;IAC9B,2DAA2D;IAC3D,gEAAgE;IAEhE,kDAAkD;IAClD,iDAAiD;IACjD,sEAAsE;IACtE,sCAAsC;IACtC,sCAAsC;IACtC,qCAAqC;IAErC,wCAAwC;IACxC,wEAAwE;IAExE,kCAAkC;IAClC,sDAAsD;IAEtD,qCAAqC;IAErC,aAAa;IACb,6BAA6B;IAC7B,2BAA2B;IAC3B,OAAO;IACP,KAAK;IAEL,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC;YAC5D,IACE,CAAC,gBAAgB,CAAC,OAAO,EAAE,yBAAyB;gBACpD,YAAY,EAAE,OAAO,KAAK,KAAK,CAAC,EAAE;gBAClC,YAAY,EAAE,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE;gBACtC,YAAY,EAAE,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ;gBAClD,YAAY,EAAE,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,OAAO,EAChD,CAAC;gBACD,6EAA6E;gBAC7E,IACE,QAAQ,CAAC,OAAO;oBAChB,CAAC,CAAC,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa,KAAK,QAAQ,CAAC,IAAI,CAAC,EACrE,CAAC;oBACD,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAE7C,MAAM,YAAY,GAAI,KAAa,EAAE,gBAAgB,EAAE,MAE1C,CAAC;IACd,MAAM,sBAAsB,GAC1B,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAE9E,OAAO,CACL,eAAK,SAAS,EAAC,UAAU,aAUvB,KAAC,SAAS,IACR,GAAG,EAAE,QAAQ,EAEb,KAAK,EAAE,KAAK,IAAI,EAAE,EAClB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAC,2CAA2C,EACrD,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EACxB,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,YAAY,IANjB,SAAS,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,GAAG,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAOrE,EACD,sBAAsB,IAAI,CACzB,iBACE,IAAI,EAAC,QAAQ,EACb,KAAK,EAAC,WAAW,EACjB,SAAS,EAAC,yFAAyF,EACnG,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,YAEvD,KAAC,SAAS,IAAC,SAAS,EAAC,SAAS,EAAC,WAAW,EAAE,CAAC,GAAI,GAC1C,CACV,IACG,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"SingleLineText.js","sourceRoot":"","sources":["../../../src/editor/field-types/SingleLineText.tsx"],"names":[],"mappings":"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"}

package/dist/editor/field-types/TreeListEditor.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Splitter, } from "../ui/Splitter";
 import { useEditContext } from "../client/editContext";
+import { useFieldModification } from "../client/fieldModificationStore";
 import { useEffect, useState } from "react";
 import { getLookupSources } from "../services/editService";
 import { SimpleIconButton } from "../ui/SimpleIconButton";
@@ -17,12 +18,29 @@ export default function TreeListEditor({ field, readOnly, }) {
     const [activeOpenButtonId, setActiveOpenButtonId] = useState("");
     const [rootItemIds, setRootItemIds] = useState([]);
     const [values, setValues] = useState([]);
+    const [pendingAddedItems, setPendingAddedItems] = useState({});
+    const [pendingRemovedIds, setPendingRemovedIds] = useState({});
     const [hoveredItemId, setHoveredItemId] = useState();
     const [hoveredItem, setHoveredItem] = useState();
     const [draggedIndex, setDraggedIndex] = useState(null);
     const [lastClickedIndex, setLastClickedIndex] = useState(null);
+    // Track if the field is currently dirty (has local unsaved edits)
+    const { isModified, isSaved } = useFieldModification(field.id, field.descriptor.item.id, field.descriptor.item.language, field.descriptor.item.version);
     if (!editContext)
         return;
+    // Helper: ensure unique items by normalized id while preserving order (first wins)
+    const dedupeById = (items) => {
+        const seen = new Set();
+        const result = [];
+        for (const it of items) {
+            const key = normalizeGuid(it.id);
+            if (!seen.has(key)) {
+                seen.add(key);
+                result.push(it);
+            }
+        }
+        return result;
+    };
     // Click outside handler to reset active button
     useEffect(() => {
         const handleClickOutside = () => {
@@ -48,15 +66,42 @@ export default function TreeListEditor({ field, readOnly, }) {
         loadItem();
     }, [hoveredItemId]);
     useEffect(() => {
-        // if (
-        //   editContext.lockedField?.fieldId === field.descriptor.fieldId &&
-        //   editContext.lockedField.item.id == field.descriptor.item.id &&
-        //   editContext.lockedField.item.language == field.descriptor.item.language &&
-        //   editContext.lockedField.item.version == field.descriptor.item.version
-        // )
-        //   return;
-        setValues(field.value || []);
-    }, [field.value]);
+        // Ignore server payloads while the field is dirty to avoid race-condition duplicates
+        if (isModified && !isSaved)
+            return;
+        // Reconcile server updates with any local optimistic additions still in-flight
+        const serverValues = field.value || [];
+        const serverIdsNormalized = new Set(serverValues.map((x) => normalizeGuid(x.id)));
+        // Clear pending items that are now present on the server (compare by normalized id)
+        let pendingChanged = false;
+        const nextPending = { ...pendingAddedItems };
+        for (const key of Object.keys(nextPending)) {
+            if (serverIdsNormalized.has(key)) {
+                delete nextPending[key];
+                pendingChanged = true;
+            }
+        }
+        // Clear pending-removed ids that the server no longer includes
+        let removedChanged = false;
+        const nextRemoved = { ...pendingRemovedIds };
+        for (const key of Object.keys(nextRemoved)) {
+            if (!serverIdsNormalized.has(key)) {
+                delete nextRemoved[key];
+                removedChanged = true;
+            }
+        }
+        // Build merged list, deduping by normalized id while preserving order (server wins)
+        const mergedList = dedupeById([
+            ...serverValues,
+            ...Object.values(pendingAddedItems),
+        ]);
+        const filtered = mergedList.filter((x) => !nextRemoved[normalizeGuid(x.id)]);
+        setValues(filtered);
+        if (pendingChanged)
+            setPendingAddedItems(nextPending);
+        if (removedChanged)
+            setPendingRemovedIds(nextRemoved);
+    }, [field.value, pendingAddedItems, pendingRemovedIds, isModified, isSaved]);
     useEffect(() => {
         const loadLookupSources = async () => {
             const datasources = await getLookupSources(field, editContext.sessionId);
@@ -76,8 +121,27 @@ export default function TreeListEditor({ field, readOnly, }) {
         return path;
     };
     async function removeFromList(items) {
-        const newValues = values.filter((x) => !items.find((i) => x.id == i.id));
-        setValues(newValues);
+        const idsToRemove = new Set(items.map((i) => normalizeGuid(i.id)));
+        const newValues = values.filter((x) => !idsToRemove.has(normalizeGuid(x.id)));
+        setValues(dedupeById(newValues));
+        // Mask removed items locally until server acknowledges
+        if (items.length) {
+            setPendingRemovedIds((prev) => {
+                const next = { ...prev };
+                for (const item of items)
+                    next[normalizeGuid(item.id)] = true;
+                return next;
+            });
+        }
+        // Cancel any optimistic additions for items being removed
+        if (items.length) {
+            setPendingAddedItems((prev) => {
+                const next = { ...prev };
+                for (const item of items)
+                    delete next[normalizeGuid(item.id)];
+                return next;
+            });
+        }
         await editContext?.operations.editField({
             field: field.descriptor,
             value: newValues,
@@ -88,18 +152,40 @@ export default function TreeListEditor({ field, readOnly, }) {
     async function addToList(itemNodes) {
         setSelectedItemNodesInTree([]);
         const newValues = [...values];
+        const addedNow = [];
         itemNodes.forEach((node) => {
-            if (!newValues.find((x) => x.id == node.id)) {
-                newValues.push({
+            const nodeKey = normalizeGuid(node.id);
+            const exists = newValues.some((x) => normalizeGuid(x.id) === nodeKey);
+            if (!exists) {
+                const item = {
                     id: node.id,
                     path: node.path || node.name,
                     name: node.name,
                     icon: node.icon,
                     idPath: node.idPath,
-                });
+                };
+                newValues.push(item);
+                addedNow.push(item);
             }
         });
-        setValues(newValues);
+        setValues(dedupeById(newValues));
+        if (addedNow.length) {
+            setPendingAddedItems((prev) => {
+                const next = { ...prev };
+                for (const item of addedNow)
+                    next[normalizeGuid(item.id)] = item;
+                return next;
+            });
+        }
+        // If we are re-adding any id that was pending-removed, clear it from mask
+        if (addedNow.length) {
+            setPendingRemovedIds((prev) => {
+                const next = { ...prev };
+                for (const item of addedNow)
+                    delete next[normalizeGuid(item.id)];
+                return next;
+            });
+        }
         await editContext?.operations.editField({
             field: field.descriptor,
             value: newValues,
@@ -128,7 +214,7 @@ export default function TreeListEditor({ field, readOnly, }) {
         if (!draggedItem)
             return;
         newValues.splice(dropIndex, 0, draggedItem);
-        setValues(newValues);
+        setValues(dedupeById(newValues));
         setDraggedIndex(null);
         await editContext?.operations.editField({
             field: field.descriptor,