@ai-stack/payloadcms 3.2.26 → 3.68.0-beta.2

package/dist/fields/PromptEditorField/PromptEditorField.js

@@ -1,6 +1,6 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { FieldDescription, FieldLabel, useField } from '@payloadcms/ui';
+import { FieldDescription, FieldLabel, useConfig, useField } from '@payloadcms/ui';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Mention, MentionsInput } from 'react-mentions/dist/react-mentions.cjs.js';
 import { useInstructions } from '../../providers/InstructionsProvider/useInstructions.js';
@@ -12,13 +12,141 @@ export const PromptEditorField = (props)=>{
     });
     const [localValue, setLocalValue] = useState(payloadValue || '');
     const hasInitialized = useRef(false);
-    const { promptEditorSuggestions } = useInstructions();
+    const { activeCollection, promptEditorSuggestions } = useInstructions();
+    const { config } = useConfig();
     const suggestions = useMemo(()=>promptEditorSuggestions.map((suggestion)=>({
                 id: suggestion,
                 display: suggestion
             })), [
         promptEditorSuggestions
     ]);
+    // Extract document ID from URL if available (to get specific filenames)
+    const [documentData, setDocumentData] = useState(null);
+    useEffect(()=>{
+        // Only run in browser
+        if (typeof window === 'undefined') {
+            return;
+        }
+        // Allow time for verify window.location is stable (unlikely to change but good practice)
+        const segments = window.location.pathname.split('/');
+        const collectionsIndex = segments.indexOf('collections');
+        if (collectionsIndex > -1 && segments.length > collectionsIndex + 2) {
+            const urlCollectionSlug = segments[collectionsIndex + 1];
+            const urlId = segments[collectionsIndex + 2];
+            // Only fetch if we are editing instructions for the same collection we are viewing
+            // and we haven't fetched yet (or ID changed)
+            if (urlCollectionSlug === activeCollection && urlId && urlId !== 'create') {
+                const fetchDocument = async ()=>{
+                    try {
+                        const response = await fetch(`${String(config.serverURL)}${String(config.routes.api)}/${String(urlCollectionSlug)}/${String(urlId)}`);
+                        if (response.ok) {
+                            const data = await response.json();
+                            setDocumentData(data);
+                        }
+                    } catch (_err) {
+                    // Ignore error
+                    }
+                };
+                void fetchDocument();
+            }
+        }
+    }, [
+        activeCollection,
+        config
+    ]);
+    // Extract all upload fields from the current collection schema
+    const imageFieldSuggestions = useMemo(()=>{
+        const suggestions = [];
+        // Use activeCollection from context which holds the target collection slug
+        const targetSlug = activeCollection;
+        if (!targetSlug || !config?.collections) {
+            return [];
+        }
+        const collection = config.collections.find((c)=>c.slug === targetSlug);
+        if (!collection?.fields) {
+            return [];
+        }
+        const uploadFields = [];
+        // Recursive function to find upload fields
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const findUploadFields = (fields, prefix = '')=>{
+            for (const field of fields){
+                if (field.type === 'upload' && field.name) {
+                    const fieldPath = prefix ? `${prefix}.${String(field.name)}` : String(field.name);
+                    uploadFields.push({
+                        name: fieldPath,
+                        hasMany: field.hasMany === true
+                    });
+                }
+                // Check nested fields in groups, arrays, etc.
+                if (field.fields && Array.isArray(field.fields)) {
+                    const newPrefix = field.name ? prefix ? `${prefix}.${String(field.name)}` : String(field.name) : prefix;
+                    findUploadFields(field.fields, newPrefix);
+                }
+            }
+        };
+        findUploadFields(collection.fields);
+        // Add generic field names (base suggestions) - ONLY for single uploads (not hasMany arrays)
+        uploadFields.forEach(({ name, hasMany })=>{
+            // User requested to hide the array itself for hasMany fields
+            if (!hasMany) {
+                suggestions.push({
+                    id: name,
+                    display: name
+                });
+            }
+        });
+        // If we have document data, add specific filename suggestions
+        if (documentData) {
+            uploadFields.forEach(({ name, hasMany })=>{
+                const value = documentData[name] // Note: nested access logic simplified for now
+                ;
+                // Helper to extract filename from media doc (which might be ID or object)
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const getFilename = (item)=>{
+                    if (typeof item === 'object' && item && (item.filename || item.name)) {
+                        return item.filename || item.name;
+                    }
+                    // If it's just an ID, we can't show filename without populating. 
+                    // Assuming compose view usually fetches with depth > 0 or we rely on what we have.
+                    return null;
+                };
+                if (value) {
+                    if (hasMany && Array.isArray(value)) {
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        value.forEach((item)=>{
+                            const fname = getFilename(item);
+                            if (fname) {
+                                const suggestion = `${name}:${fname}`;
+                                suggestions.push({
+                                    id: suggestion,
+                                    display: suggestion
+                                });
+                            }
+                        });
+                    } else if (!hasMany) {
+                        // Single image - we already added the base name above.
+                        // We can optionally add the specific filename too if desired, 
+                        // but user request focused on arrays.
+                        // Adding the specific filename option for Single images too as it's explicit.
+                        const fname = getFilename(value);
+                        if (fname) {
+                            const suggestion = `${name}:${fname}`;
+                            suggestions.push({
+                                id: suggestion,
+                                display: suggestion
+                            });
+                        }
+                    }
+                }
+            });
+        }
+        return suggestions;
+    }, [
+        activeCollection,
+        config,
+        documentData
+    ]);
     useEffect(()=>{
         if (!hasInitialized.current || payloadValue === '') {
             setLocalValue(payloadValue || '');
@@ -28,8 +156,13 @@ export const PromptEditorField = (props)=>{
         payloadValue
     ]);
     const handleChange = useCallback((e)=>{
-        setLocalValue(e.target.value);
-    }, []);
+        const newValue = e.target.value;
+        setLocalValue(newValue);
+        // Also update Payload value immediately to prevent loss when Save is clicked
+        setValue(newValue);
+    }, [
+        setValue
+    ]);
     const handleBlur = useCallback(()=>{
         setValue(localValue);
     }, [
@@ -37,28 +170,41 @@ export const PromptEditorField = (props)=>{
         setValue
     ]);
     const displayTransform = useCallback((id)=>`{{ ${id} }}`, []);
+    const imageDisplayTransform = useCallback((id)=>`@${id}`, []);
     return /*#__PURE__*/ _jsxs("div", {
         className: "field-type textarea",
         children: [
             /*#__PURE__*/ _jsx(FieldLabel, {
                 label: field.label
             }),
-            /*#__PURE__*/ _jsx(MentionsInput, {
+            /*#__PURE__*/ _jsxs(MentionsInput, {
                 onBlur: handleBlur,
                 onChange: handleChange,
-                placeholder: "Type your prompt using {{ fieldName }} variables...",
+                placeholder: "Type {{ for fields }} or @imageField for images. For specific images use @imageField:filename.jpg",
                 style: defaultStyle,
                 value: localValue,
-                children: /*#__PURE__*/ _jsx(Mention, {
-                    data: suggestions,
-                    displayTransform: displayTransform,
-                    markup: "{{__id__}}",
-                    style: {
-                        backgroundColor: 'var(--theme-elevation-100)',
-                        padding: '2px 0'
-                    },
-                    trigger: "{"
-                })
+                children: [
+                    /*#__PURE__*/ _jsx(Mention, {
+                        data: suggestions,
+                        displayTransform: displayTransform,
+                        markup: "{{__id__}}",
+                        style: {
+                            backgroundColor: 'var(--theme-elevation-100)',
+                            padding: '2px 0'
+                        },
+                        trigger: "{"
+                    }),
+                    /*#__PURE__*/ _jsx(Mention, {
+                        data: imageFieldSuggestions,
+                        displayTransform: imageDisplayTransform,
+                        markup: "@__id__",
+                        style: {
+                            backgroundColor: 'var(--theme-elevation-150)',
+                            padding: '2px 0'
+                        },
+                        trigger: "@"
+                    })
+                ]
             }),
             /*#__PURE__*/ _jsx(FieldDescription, {
                 description: field?.admin?.description,

package/dist/fields/PromptEditorField/PromptEditorField.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/fields/PromptEditorField/PromptEditorField.tsx"],"sourcesContent":["'use client'\n\nimport type { TextareaFieldClientProps } from 'payload'\n\nimport { FieldDescription, FieldLabel, useField } from '@payloadcms/ui'\nimport React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'\nimport { Mention, MentionsInput } from 'react-mentions/dist/react-mentions.cjs.js'\n\nimport { useInstructions } from '../../providers/InstructionsProvider/useInstructions.js'\nimport { defaultStyle } from './defaultStyle.js'\n\nexport const PromptEditorField: React.FC<TextareaFieldClientProps> = (props) => {\n  const { field, path: pathFromContext } = props\n  const { setValue, value: payloadValue } = useField<string>({\n    path: pathFromContext,\n  })\n\n  const [localValue, setLocalValue] = useState(payloadValue || '')\n  const hasInitialized = useRef(false)\n\n  const { promptEditorSuggestions } = useInstructions()\n\n  const suggestions = useMemo(\n    () =>\n      promptEditorSuggestions.map((suggestion: string) => ({\n        id: suggestion,\n        display: suggestion,\n      })),\n    [promptEditorSuggestions],\n  )\n\n  useEffect(() => {\n    if (!hasInitialized.current || payloadValue === '') {\n      setLocalValue(payloadValue || '')\n      hasInitialized.current = true\n    }\n  }, [payloadValue])\n\n  const handleChange = useCallback((e: React.ChangeEvent<HTMLTextAreaElement>) => {\n    setLocalValue(e.target.value)\n  }, [])\n\n  const handleBlur = useCallback(() => {\n    setValue(localValue)\n  }, [localValue, setValue])\n\n  const displayTransform = useCallback((id: string) => `{{ ${id} }}`, [])\n\n  return (\n    <div className=\"field-type textarea\">\n      <FieldLabel label={field.label} />\n      <MentionsInput\n        onBlur={handleBlur}\n        onChange={handleChange}\n        placeholder=\"Type your prompt using {{ fieldName }} variables...\"\n        style={defaultStyle}\n        value={localValue}\n      >\n        <Mention\n          data={suggestions}\n          displayTransform={displayTransform}\n          markup=\"{{__id__}}\"\n          style={{\n            backgroundColor: 'var(--theme-elevation-100)',\n            padding: '2px 0',\n          }}\n          trigger=\"{\"\n        />\n      </MentionsInput>\n      <FieldDescription description={field?.admin?.description} path=\"\" />\n    </div>\n  )\n}\n"],"names":["FieldDescription","FieldLabel","useField","React","useCallback","useEffect","useMemo","useRef","useState","Mention","MentionsInput","useInstructions","defaultStyle","PromptEditorField","props","field","path","pathFromContext","setValue","value","payloadValue","localValue","setLocalValue","hasInitialized","promptEditorSuggestions","suggestions","map","suggestion","id","display","current","handleChange","e","target","handleBlur","displayTransform","div","className","label","onBlur","onChange","placeholder","style","data","markup","backgroundColor","padding","trigger","description","admin"],"mappings":"AAAA;;AAIA,SAASA,gBAAgB,EAAEC,UAAU,EAAEC,QAAQ,QAAQ,iBAAgB;AACvE,OAAOC,SAASC,WAAW,EAAEC,SAAS,EAAEC,OAAO,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,QAAO;AAChF,SAASC,OAAO,EAAEC,aAAa,QAAQ,4CAA2C;AAElF,SAASC,eAAe,QAAQ,0DAAyD;AACzF,SAASC,YAAY,QAAQ,oBAAmB;AAEhD,OAAO,MAAMC,oBAAwD,CAACC;IACpE,MAAM,EAAEC,KAAK,EAAEC,MAAMC,eAAe,EAAE,GAAGH;IACzC,MAAM,EAAEI,QAAQ,EAAEC,OAAOC,YAAY,EAAE,GAAGlB,SAAiB;QACzDc,MAAMC;IACR;IAEA,MAAM,CAACI,YAAYC,cAAc,GAAGd,SAASY,gBAAgB;IAC7D,MAAMG,iBAAiBhB,OAAO;IAE9B,MAAM,EAAEiB,uBAAuB,EAAE,GAAGb;IAEpC,MAAMc,cAAcnB,QAClB,IACEkB,wBAAwBE,GAAG,CAAC,CAACC,aAAwB,CAAA;gBACnDC,IAAID;gBACJE,SAASF;YACX,CAAA,IACF;QAACH;KAAwB;IAG3BnB,UAAU;QACR,IAAI,CAACkB,eAAeO,OAAO,IAAIV,iBAAiB,IAAI;YAClDE,cAAcF,gBAAgB;YAC9BG,eAAeO,OAAO,GAAG;QAC3B;IACF,GAAG;QAACV;KAAa;IAEjB,MAAMW,eAAe3B,YAAY,CAAC4B;QAChCV,cAAcU,EAAEC,MAAM,CAACd,KAAK;IAC9B,GAAG,EAAE;IAEL,MAAMe,aAAa9B,YAAY;QAC7Bc,SAASG;IACX,GAAG;QAACA;QAAYH;KAAS;IAEzB,MAAMiB,mBAAmB/B,YAAY,CAACwB,KAAe,CAAC,GAAG,EAAEA,GAAG,GAAG,CAAC,EAAE,EAAE;IAEtE,qBACE,MAACQ;QAAIC,WAAU;;0BACb,KAACpC;gBAAWqC,OAAOvB,MAAMuB,KAAK;;0BAC9B,KAAC5B;gBACC6B,QAAQL;gBACRM,UAAUT;gBACVU,aAAY;gBACZC,OAAO9B;gBACPO,OAAOE;0BAEP,cAAA,KAACZ;oBACCkC,MAAMlB;oBACNU,kBAAkBA;oBAClBS,QAAO;oBACPF,OAAO;wBACLG,iBAAiB;wBACjBC,SAAS;oBACX;oBACAC,SAAQ;;;0BAGZ,KAAC/C;gBAAiBgD,aAAajC,OAAOkC,OAAOD;gBAAahC,MAAK;;;;AAGrE,EAAC"}
+{"version":3,"sources":["../../../src/fields/PromptEditorField/PromptEditorField.tsx"],"sourcesContent":["'use client'\n\nimport type { TextareaFieldClientProps } from 'payload'\n\nimport { FieldDescription, FieldLabel, useConfig, useField } from '@payloadcms/ui'\nimport React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'\nimport { Mention, MentionsInput } from 'react-mentions/dist/react-mentions.cjs.js'\n\nimport { useInstructions } from '../../providers/InstructionsProvider/useInstructions.js'\nimport { defaultStyle } from './defaultStyle.js'\n\nexport const PromptEditorField: React.FC<TextareaFieldClientProps> = (props) => {\n  const { field, path: pathFromContext } = props\n  const { setValue, value: payloadValue } = useField<string>({\n    path: pathFromContext,\n  })\n\n  const [localValue, setLocalValue] = useState(payloadValue || '')\n  const hasInitialized = useRef(false)\n\n  const { activeCollection, promptEditorSuggestions } = useInstructions()\n  const { config } = useConfig()\n\n  const suggestions = useMemo(\n    () =>\n      promptEditorSuggestions.map((suggestion: string) => ({\n        id: suggestion,\n        display: suggestion,\n      })),\n    [promptEditorSuggestions],\n  )\n\n  // Extract document ID from URL if available (to get specific filenames)\n  const [documentData, setDocumentData] = useState<null | Record<string, unknown>>(null)\n  \n  useEffect(() => {\n    // Only run in browser\n    if (typeof window === 'undefined') {\n      return\n    }\n\n    // Allow time for verify window.location is stable (unlikely to change but good practice)\n    const segments = window.location.pathname.split('/')\n    const collectionsIndex = segments.indexOf('collections')\n    \n    if (collectionsIndex > -1 && segments.length > collectionsIndex + 2) {\n      const urlCollectionSlug = segments[collectionsIndex + 1]\n      const urlId = segments[collectionsIndex + 2]\n\n      // Only fetch if we are editing instructions for the same collection we are viewing\n      // and we haven't fetched yet (or ID changed)\n      if (urlCollectionSlug === activeCollection && urlId && urlId !== 'create') {\n         const fetchDocument = async () => {\n           try {\n              \n             const response = await fetch(`${String(config.serverURL)}${String(config.routes.api)}/${String(urlCollectionSlug)}/${String(urlId)}`)\n             if (response.ok) {\n               const data = await response.json()\n               setDocumentData(data)\n             }\n           } catch (_err) {\n             // Ignore error\n           }\n         }\n         void fetchDocument()\n      }\n    }\n  }, [activeCollection, config])\n\n  // Extract all upload fields from the current collection schema\n  const imageFieldSuggestions = useMemo(() => {\n    const suggestions: { display: string; id: string }[] = []\n    \n    // Use activeCollection from context which holds the target collection slug\n    const targetSlug = activeCollection\n    \n    if (!targetSlug || !config?.collections) {\n      return []\n    }\n\n    const collection = config.collections.find((c) => c.slug === targetSlug)\n    if (!collection?.fields) {\n      return []\n    }\n\n    const uploadFields: { hasMany: boolean; name: string }[] = []\n\n    // Recursive function to find upload fields\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const findUploadFields = (fields: any[], prefix = ''): void => {\n      for (const field of fields) {\n        if (field.type === 'upload' && field.name) {\n          const fieldPath = prefix ? `${prefix}.${String(field.name)}` : String(field.name)\n          uploadFields.push({ name: fieldPath, hasMany: field.hasMany === true })\n        }\n        // Check nested fields in groups, arrays, etc.\n        if (field.fields && Array.isArray(field.fields)) {\n          const newPrefix = field.name ? (prefix ? `${prefix}.${String(field.name)}` : String(field.name)) : prefix\n          findUploadFields(field.fields, newPrefix)\n        }\n      }\n    }\n\n    findUploadFields(collection.fields)\n    \n    // Add generic field names (base suggestions) - ONLY for single uploads (not hasMany arrays)\n    uploadFields.forEach(({ name, hasMany }) => {\n      // User requested to hide the array itself for hasMany fields\n      if (!hasMany) {\n        suggestions.push({ id: name, display: name })\n      }\n    })\n\n    // If we have document data, add specific filename suggestions\n    if (documentData) {\n      uploadFields.forEach(({ name, hasMany }) => {\n        const value = documentData[name] // Note: nested access logic simplified for now\n        \n        // Helper to extract filename from media doc (which might be ID or object)\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const getFilename = (item: any): null | string => {\n           if (typeof item === 'object' && item && (item.filename || item.name)) {\n             return item.filename || item.name\n           }\n           // If it's just an ID, we can't show filename without populating. \n           // Assuming compose view usually fetches with depth > 0 or we rely on what we have.\n           return null\n        }\n\n        if (value) {\n           if (hasMany && Array.isArray(value)) {\n             // eslint-disable-next-line @typescript-eslint/no-explicit-any\n             value.forEach((item: any) => {\n               const fname = getFilename(item)\n               if (fname) {\n                 const suggestion = `${name}:${fname}`\n                 suggestions.push({ id: suggestion, display: suggestion })\n               }\n             })\n           } else if (!hasMany) {\n             // Single image - we already added the base name above.\n             // We can optionally add the specific filename too if desired, \n             // but user request focused on arrays.\n             // Adding the specific filename option for Single images too as it's explicit.\n             const fname = getFilename(value)\n             if (fname) {\n                 const suggestion = `${name}:${fname}`\n                 suggestions.push({ id: suggestion, display: suggestion })\n             }\n           }\n        }\n      })\n    }\n    \n    return suggestions\n  }, [activeCollection, config, documentData])\n\n  useEffect(() => {\n    if (!hasInitialized.current || payloadValue === '') {\n      setLocalValue(payloadValue || '')\n      hasInitialized.current = true\n    }\n  }, [payloadValue])\n\n  const handleChange = useCallback((e: React.ChangeEvent<HTMLTextAreaElement>) => {\n    const newValue = e.target.value\n    setLocalValue(newValue)\n    // Also update Payload value immediately to prevent loss when Save is clicked\n    setValue(newValue)\n  }, [setValue])\n\n  const handleBlur = useCallback(() => {\n    setValue(localValue)\n  }, [localValue, setValue])\n\n  const displayTransform = useCallback((id: string) => `{{ ${id} }}`, [])\n  const imageDisplayTransform = useCallback((id: string) => `@${id}`, [])\n\n  return (\n    <div className=\"field-type textarea\">\n      <FieldLabel label={field.label} />\n      <MentionsInput\n        onBlur={handleBlur}\n        onChange={handleChange}\n        placeholder=\"Type {{ for fields }} or @imageField for images. For specific images use @imageField:filename.jpg\"\n        style={defaultStyle}\n        value={localValue}\n      >\n        <Mention\n          data={suggestions}\n          displayTransform={displayTransform}\n          markup=\"{{__id__}}\"\n          style={{\n            backgroundColor: 'var(--theme-elevation-100)',\n            padding: '2px 0',\n          }}\n          trigger=\"{\"\n        />\n        <Mention\n          data={imageFieldSuggestions}\n          displayTransform={imageDisplayTransform}\n          markup=\"@__id__\"\n          style={{\n            backgroundColor: 'var(--theme-elevation-150)',\n            padding: '2px 0',\n          }}\n          trigger=\"@\"\n        />\n      </MentionsInput>\n      <FieldDescription description={field?.admin?.description} path=\"\" />\n    </div>\n  )\n}\n"],"names":["FieldDescription","FieldLabel","useConfig","useField","React","useCallback","useEffect","useMemo","useRef","useState","Mention","MentionsInput","useInstructions","defaultStyle","PromptEditorField","props","field","path","pathFromContext","setValue","value","payloadValue","localValue","setLocalValue","hasInitialized","activeCollection","promptEditorSuggestions","config","suggestions","map","suggestion","id","display","documentData","setDocumentData","window","segments","location","pathname","split","collectionsIndex","indexOf","length","urlCollectionSlug","urlId","fetchDocument","response","fetch","String","serverURL","routes","api","ok","data","json","_err","imageFieldSuggestions","targetSlug","collections","collection","find","c","slug","fields","uploadFields","findUploadFields","prefix","type","name","fieldPath","push","hasMany","Array","isArray","newPrefix","forEach","getFilename","item","filename","fname","current","handleChange","e","newValue","target","handleBlur","displayTransform","imageDisplayTransform","div","className","label","onBlur","onChange","placeholder","style","markup","backgroundColor","padding","trigger","description","admin"],"mappings":"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"}

package/dist/fields/PromptEditorField/PromptEditorField.jsx

@@ -1,5 +1,5 @@
 'use client';
-import { FieldDescription, FieldLabel, useField } from '@payloadcms/ui';
+import { FieldDescription, FieldLabel, useConfig, useField } from '@payloadcms/ui';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Mention, MentionsInput } from 'react-mentions/dist/react-mentions.cjs.js';
 import { useInstructions } from '../../providers/InstructionsProvider/useInstructions.js';
@@ -11,11 +11,121 @@ export const PromptEditorField = (props) => {
     });
     const [localValue, setLocalValue] = useState(payloadValue || '');
     const hasInitialized = useRef(false);
-    const { promptEditorSuggestions } = useInstructions();
+    const { activeCollection, promptEditorSuggestions } = useInstructions();
+    const { config } = useConfig();
     const suggestions = useMemo(() => promptEditorSuggestions.map((suggestion) => ({
         id: suggestion,
         display: suggestion,
     })), [promptEditorSuggestions]);
+    // Extract document ID from URL if available (to get specific filenames)
+    const [documentData, setDocumentData] = useState(null);
+    useEffect(() => {
+        // Only run in browser
+        if (typeof window === 'undefined') {
+            return;
+        }
+        // Allow time for verify window.location is stable (unlikely to change but good practice)
+        const segments = window.location.pathname.split('/');
+        const collectionsIndex = segments.indexOf('collections');
+        if (collectionsIndex > -1 && segments.length > collectionsIndex + 2) {
+            const urlCollectionSlug = segments[collectionsIndex + 1];
+            const urlId = segments[collectionsIndex + 2];
+            // Only fetch if we are editing instructions for the same collection we are viewing
+            // and we haven't fetched yet (or ID changed)
+            if (urlCollectionSlug === activeCollection && urlId && urlId !== 'create') {
+                const fetchDocument = async () => {
+                    try {
+                        const response = await fetch(`${String(config.serverURL)}${String(config.routes.api)}/${String(urlCollectionSlug)}/${String(urlId)}`);
+                        if (response.ok) {
+                            const data = await response.json();
+                            setDocumentData(data);
+                        }
+                    }
+                    catch (_err) {
+                        // Ignore error
+                    }
+                };
+                void fetchDocument();
+            }
+        }
+    }, [activeCollection, config]);
+    // Extract all upload fields from the current collection schema
+    const imageFieldSuggestions = useMemo(() => {
+        const suggestions = [];
+        // Use activeCollection from context which holds the target collection slug
+        const targetSlug = activeCollection;
+        if (!targetSlug || !config?.collections) {
+            return [];
+        }
+        const collection = config.collections.find((c) => c.slug === targetSlug);
+        if (!collection?.fields) {
+            return [];
+        }
+        const uploadFields = [];
+        // Recursive function to find upload fields
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const findUploadFields = (fields, prefix = '') => {
+            for (const field of fields) {
+                if (field.type === 'upload' && field.name) {
+                    const fieldPath = prefix ? `${prefix}.${String(field.name)}` : String(field.name);
+                    uploadFields.push({ name: fieldPath, hasMany: field.hasMany === true });
+                }
+                // Check nested fields in groups, arrays, etc.
+                if (field.fields && Array.isArray(field.fields)) {
+                    const newPrefix = field.name ? (prefix ? `${prefix}.${String(field.name)}` : String(field.name)) : prefix;
+                    findUploadFields(field.fields, newPrefix);
+                }
+            }
+        };
+        findUploadFields(collection.fields);
+        // Add generic field names (base suggestions) - ONLY for single uploads (not hasMany arrays)
+        uploadFields.forEach(({ name, hasMany }) => {
+            // User requested to hide the array itself for hasMany fields
+            if (!hasMany) {
+                suggestions.push({ id: name, display: name });
+            }
+        });
+        // If we have document data, add specific filename suggestions
+        if (documentData) {
+            uploadFields.forEach(({ name, hasMany }) => {
+                const value = documentData[name]; // Note: nested access logic simplified for now
+                // Helper to extract filename from media doc (which might be ID or object)
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const getFilename = (item) => {
+                    if (typeof item === 'object' && item && (item.filename || item.name)) {
+                        return item.filename || item.name;
+                    }
+                    // If it's just an ID, we can't show filename without populating. 
+                    // Assuming compose view usually fetches with depth > 0 or we rely on what we have.
+                    return null;
+                };
+                if (value) {
+                    if (hasMany && Array.isArray(value)) {
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        value.forEach((item) => {
+                            const fname = getFilename(item);
+                            if (fname) {
+                                const suggestion = `${name}:${fname}`;
+                                suggestions.push({ id: suggestion, display: suggestion });
+                            }
+                        });
+                    }
+                    else if (!hasMany) {
+                        // Single image - we already added the base name above.
+                        // We can optionally add the specific filename too if desired, 
+                        // but user request focused on arrays.
+                        // Adding the specific filename option for Single images too as it's explicit.
+                        const fname = getFilename(value);
+                        if (fname) {
+                            const suggestion = `${name}:${fname}`;
+                            suggestions.push({ id: suggestion, display: suggestion });
+                        }
+                    }
+                }
+            });
+        }
+        return suggestions;
+    }, [activeCollection, config, documentData]);
     useEffect(() => {
         if (!hasInitialized.current || payloadValue === '') {
             setLocalValue(payloadValue || '');
@@ -23,19 +133,27 @@ export const PromptEditorField = (props) => {
         }
     }, [payloadValue]);
     const handleChange = useCallback((e) => {
-        setLocalValue(e.target.value);
-    }, []);
+        const newValue = e.target.value;
+        setLocalValue(newValue);
+        // Also update Payload value immediately to prevent loss when Save is clicked
+        setValue(newValue);
+    }, [setValue]);
     const handleBlur = useCallback(() => {
         setValue(localValue);
     }, [localValue, setValue]);
     const displayTransform = useCallback((id) => `{{ ${id} }}`, []);
+    const imageDisplayTransform = useCallback((id) => `@${id}`, []);
     return (<div className="field-type textarea">
       <FieldLabel label={field.label}/>
-      <MentionsInput onBlur={handleBlur} onChange={handleChange} placeholder="Type your prompt using {{ fieldName }} variables..." style={defaultStyle} value={localValue}>
+      <MentionsInput onBlur={handleBlur} onChange={handleChange} placeholder="Type {{ for fields }} or @imageField for images. For specific images use @imageField:filename.jpg" style={defaultStyle} value={localValue}>
         <Mention data={suggestions} displayTransform={displayTransform} markup="{{__id__}}" style={{
             backgroundColor: 'var(--theme-elevation-100)',
             padding: '2px 0',
         }} trigger="{"/>
+        <Mention data={imageFieldSuggestions} displayTransform={imageDisplayTransform} markup="@__id__" style={{
+            backgroundColor: 'var(--theme-elevation-150)',
+            padding: '2px 0',
+        }} trigger="@"/>
       </MentionsInput>
       <FieldDescription description={field?.admin?.description} path=""/>
     </div>);

package/dist/index.d.ts

@@ -1,3 +1,6 @@
+export type { GenerateArgs } from './ai/index.js';
 export { defaultPrompts, defaultSeedPrompts } from './ai/prompts.js';
 export { PayloadAiPluginLexicalEditorFeature } from './fields/LexicalEditor/feature.server.js';
+export type {} from './payload-ai.d.ts';
 export { payloadAiPlugin } from './plugin.js';
+export { fieldToJsonSchema } from './utilities/fieldToJsonSchema.js';

package/dist/index.js

@@ -1,5 +1,6 @@
 export { defaultPrompts, defaultSeedPrompts } from './ai/prompts.js';
 export { PayloadAiPluginLexicalEditorFeature } from './fields/LexicalEditor/feature.server.js';
 export { payloadAiPlugin } from './plugin.js';
+export { fieldToJsonSchema } from './utilities/fieldToJsonSchema.js';
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export { defaultPrompts, defaultSeedPrompts } from './ai/prompts.js'\n\nexport { PayloadAiPluginLexicalEditorFeature } from './fields/LexicalEditor/feature.server.js'\nexport { payloadAiPlugin } from './plugin.js'\n"],"names":["defaultPrompts","defaultSeedPrompts","PayloadAiPluginLexicalEditorFeature","payloadAiPlugin"],"mappings":"AAAA,SAASA,cAAc,EAAEC,kBAAkB,QAAQ,kBAAiB;AAEpE,SAASC,mCAAmC,QAAQ,2CAA0C;AAC9F,SAASC,eAAe,QAAQ,cAAa"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export type { GenerateArgs } from './ai/index.js'\n\nexport { defaultPrompts, defaultSeedPrompts } from './ai/prompts.js'\n\nexport { PayloadAiPluginLexicalEditorFeature } from './fields/LexicalEditor/feature.server.js'\n// Re-export to ensure payload.ai module augmentation is included\nexport type {} from './payload-ai.d.ts'\n\nexport { payloadAiPlugin } from './plugin.js'\nexport { fieldToJsonSchema } from './utilities/fieldToJsonSchema.js'\n"],"names":["defaultPrompts","defaultSeedPrompts","PayloadAiPluginLexicalEditorFeature","payloadAiPlugin","fieldToJsonSchema"],"mappings":"AAEA,SAASA,cAAc,EAAEC,kBAAkB,QAAQ,kBAAiB;AAEpE,SAASC,mCAAmC,QAAQ,2CAA0C;AAI9F,SAASC,eAAe,QAAQ,cAAa;AAC7C,SAASC,iBAAiB,QAAQ,mCAAkC"}

package/dist/init.js

@@ -1,7 +1,33 @@
 import { defaultSeedPrompts } from './ai/prompts.js';
-import { systemGenerate } from './ai/utils/systemGenerate.js';
 import { PLUGIN_INSTRUCTIONS_TABLE } from './defaults.js';
-import { getGenerationModels } from './utilities/getGenerationModels.js';
+// Defined capabilities mapping for init
+const CAPABILITY_MAP = [
+    {
+        id: 'text',
+        fields: [
+            'text',
+            'textarea'
+        ]
+    },
+    {
+        id: 'richtext',
+        fields: [
+            'richText'
+        ]
+    },
+    {
+        id: 'image',
+        fields: [
+            'upload'
+        ]
+    },
+    {
+        id: 'array',
+        fields: [
+            'array'
+        ]
+    }
+];
 export const init = async (payload, fieldSchemaPaths, pluginConfig)=>{
     if (!pluginConfig.generatePromptOnInit) {
         return;
@@ -10,20 +36,14 @@ export const init = async (payload, fieldSchemaPaths, pluginConfig)=>{
         payload.logger.info(`— AI Plugin: Initializing...`);
     }
     const paths = Object.keys(fieldSchemaPaths);
-    // Note: schema-path is globally unique, so we create one entry per path regardless of localization
-    // Localization info is kept for potential future use or debugging
-    const _isLocalized = pluginConfig._localization?.enabled && pluginConfig._localization.locales.length > 0;
-    const _locales = pluginConfig._localization?.locales || [];
     // Get all instructions for faster initialization
-    // Query with locale: 'all' to get entries from all locales when localization is enabled
     const { docs: allInstructions } = await payload.find({
         collection: PLUGIN_INSTRUCTIONS_TABLE,
         depth: 0,
-        locale: 'all',
         pagination: false,
         select: {
-            id: true,
             'field-type': true,
+            'model-id': true,
             'schema-path': true
         }
     });
@@ -31,7 +51,6 @@ export const init = async (payload, fieldSchemaPaths, pluginConfig)=>{
     for(let i = 0; i < paths.length; i++){
         const path = paths[i];
         const { type: fieldType, label: fieldLabel, relationTo } = fieldSchemaPaths[path];
-        // Find existing entry for this path (schema-path is globally unique, not per locale)
         let instructions = allInstructions.find((entry)=>entry['schema-path'] === path);
         if (!instructions) {
             let seed;
@@ -54,18 +73,21 @@ export const init = async (payload, fieldSchemaPaths, pluginConfig)=>{
                 }
                 continue;
             }
-            let generatedPrompt = '{{ title }}';
+            // Empty prompt - smart fallback will generate a contextual prompt at runtime
+            const generatedPrompt = '';
             if ('prompt' in seed) {
-                // find the model that has the generateText function
-                const models = getGenerationModels(pluginConfig);
-                const model = models && Array.isArray(models) ? models.find((model)=>model.generateText) : undefined;
-                generatedPrompt = await systemGenerate({
-                    prompt: seed.prompt,
-                    system: seed.system
-                }, model?.generateText);
-            }
-            const modelsForId = getGenerationModels(pluginConfig);
-            const modelForId = modelsForId && Array.isArray(modelsForId) ? modelsForId.find((a)=>a.fields.includes(fieldType)) : undefined;
+            // Prompt generation currently disabled during migration to AI SDK Providers
+            // TODO: Re-enable using a default provider from AI Settings if available
+            /*
+        generatedPrompt = await systemGenerate(
+          {
+            prompt: seed.prompt,
+            system: seed.system,
+          },
+          undefined // No generateTextFn currently
+        )
+        */ }
+            const modelForId = CAPABILITY_MAP.find((a)=>a.fields.includes(fieldType));
             const data = {
                 'model-id': modelForId?.id,
                 prompt: generatedPrompt,
@@ -79,44 +101,12 @@ export const init = async (payload, fieldSchemaPaths, pluginConfig)=>{
                 prompt: generatedPrompt,
                 ...seed.data
             }, `Prompt seeded for "${path}" field`);
-            try {
-                instructions = await payload.create({
-                    collection: PLUGIN_INSTRUCTIONS_TABLE,
-                    data
-                });
-            } catch (err) {
-                // Handle unique constraint violation - entry might already exist for another locale
-                const error = err;
-                if (error?.name === 'ValidationError' && error?.data?.errors?.some((e)=>e.path === 'schema-path')) {
-                    // Try to find the existing entry across all locales
-                    const { docs } = await payload.find({
-                        collection: PLUGIN_INSTRUCTIONS_TABLE,
-                        limit: 1,
-                        locale: 'all',
-                        select: {
-                            id: true,
-                            'field-type': true,
-                            'schema-path': true
-                        },
-                        where: {
-                            'schema-path': {
-                                equals: path
-                            }
-                        }
-                    });
-                    const existingEntry = docs[0];
-                    if (existingEntry) {
-                        instructions = existingEntry;
-                        if (pluginConfig.debugging) {
-                            payload.logger.info(`— AI Plugin: Entry already exists for ${path}, using existing entry`);
-                        }
-                    } else {
-                        payload.logger.error(err, `— AI Plugin: Error creating Compose settings for ${path}`);
-                    }
-                } else {
-                    payload.logger.error(err, `— AI Plugin: Error creating Compose settings for ${path}`);
-                }
-            }
+            instructions = await payload.create({
+                collection: PLUGIN_INSTRUCTIONS_TABLE,
+                data
+            }).catch((err)=>{
+                payload.logger.error(err, '— AI Plugin: Error creating Compose settings-');
+            });
             if (instructions?.id) {
                 fieldInstructionsMap[path] = {
                     id: instructions.id,
@@ -124,17 +114,25 @@ export const init = async (payload, fieldSchemaPaths, pluginConfig)=>{
                 };
             }
         } else {
-            if (instructions['field-type'] !== fieldType) {
-                const currentFieldType = instructions['field-type'];
-                payload.logger.warn(`— AI Plugin: Field type mismatch for ${path}! Was "${fieldType}", it is "${currentFieldType}" now. Updating...`);
+            const modelForId = CAPABILITY_MAP.find((a)=>a.fields.includes(fieldType));
+            if (instructions['field-type'] !== fieldType || !instructions['model-id']) {
+                payload.logger.warn(`— AI Plugin: Field config mismatch for ${path}! Updating...`);
+                const updateData = {
+                    'field-type': fieldType
+                };
+                // Only set model-id if it's missing or we have a better default
+                if (!instructions['model-id'] && modelForId?.id) {
+                    updateData['model-id'] = modelForId.id;
+                }
                 await payload.update({
                     id: instructions.id,
                     collection: PLUGIN_INSTRUCTIONS_TABLE,
-                    data: {
-                        'field-type': fieldType
-                    }
+                    data: updateData
                 });
                 instructions['field-type'] = fieldType;
+                if (updateData['model-id']) {
+                    instructions['model-id'] = updateData['model-id'];
+                }
             }
             fieldInstructionsMap[path] = {
                 id: instructions.id,