@ai-stack/payloadcms 3.68.0 → 3.76.0-beta.0

package/dist/endpoints/fetchVoices.js

@@ -35,34 +35,51 @@ export const fetchVoices = {
                     status: 400
                 });
             }
-            // Call ElevenLabs API to fetch voices
-            const response = await fetch('https://api.elevenlabs.io/v1/voices', {
-                headers: {
-                    'xi-api-key': apiKey
+            // Call ElevenLabs API to fetch voices with timeout
+            const controller = new AbortController();
+            const timeoutId = setTimeout(()=>controller.abort(), 15000) // 15s timeout
+            ;
+            try {
+                const response = await fetch('https://api.elevenlabs.io/v1/voices', {
+                    headers: {
+                        'xi-api-key': apiKey
+                    },
+                    signal: controller.signal
+                });
+                clearTimeout(timeoutId);
+                if (!response.ok) {
+                    const errorText = await response.text();
+                    return Response.json({
+                        message: `ElevenLabs API error: ${errorText}`
+                    }, {
+                        status: response.status
+                    });
                 }
-            });
-            if (!response.ok) {
-                const errorText = await response.text();
+                const data = await response.json();
+                // Transform voices to match our schema
+                const voices = (data.voices || []).map((voice)=>({
+                        id: voice.voice_id,
+                        name: voice.name,
+                        category: voice.category || 'premade',
+                        enabled: true,
+                        labels: voice.labels || {},
+                        preview_url: voice.preview_url || ''
+                    }));
                 return Response.json({
-                    message: `ElevenLabs API error: ${errorText}`
-                }, {
-                    status: response.status
+                    success: true,
+                    voices
                 });
+            } catch (error) {
+                clearTimeout(timeoutId);
+                if (error instanceof Error && error.name === 'AbortError') {
+                    return Response.json({
+                        message: 'ElevenLabs API request timed out'
+                    }, {
+                        status: 504
+                    });
+                }
+                throw error;
             }
-            const data = await response.json();
-            // Transform voices to match our schema
-            const voices = (data.voices || []).map((voice)=>({
-                    id: voice.voice_id,
-                    name: voice.name,
-                    category: voice.category || 'premade',
-                    enabled: true,
-                    labels: voice.labels || {},
-                    preview_url: voice.preview_url || ''
-                }));
-            return Response.json({
-                success: true,
-                voices
-            });
         } catch (error) {
             req.payload.logger.error(error, 'Error fetching ElevenLabs voices');
             return Response.json({

package/dist/endpoints/fetchVoices.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/endpoints/fetchVoices.ts"],"sourcesContent":["import type { Endpoint, PayloadRequest } from 'payload'\n\nimport { PLUGIN_API_ENDPOINT_FETCH_VOICES } from '../defaults.js'\n\ninterface ElevenLabsVoice {\n  category?: string\n  labels?: Record<string, string>\n  name: string\n  preview_url?: string\n  voice_id: string\n}\n\nexport const fetchVoices: Endpoint = {\n  handler: async (req: PayloadRequest) => {\n    try {\n      // Check authentication\n      if (!req.user) {\n        return Response.json({ message: 'Authentication required' }, { status: 401 })\n      }\n\n      // Fetch AI Settings global to get the encrypted API key\n      const aiSettings = await req.payload.findGlobal({\n        slug: 'ai-settings',\n        context: { unsafe: true },\n      })\n\n      // Find the ElevenLabs provider block\n      const elevenlabsProvider = aiSettings?.providers?.find(\n        (provider: any) => provider.blockType === 'elevenlabs' && provider.enabled,\n      )\n\n      if (!elevenlabsProvider) {\n        return Response.json(\n          { message: 'ElevenLabs provider not found or not enabled in AI Settings' },\n          { status: 400 },\n        )\n      }\n\n      // Get the API key (already decrypted by afterRead hook due to unsafe context)\n      const apiKey = elevenlabsProvider.apiKey\n\n      if (!apiKey) {\n        return Response.json(\n          {\n            message: 'API key not found. Please configure your ElevenLabs API key in AI Settings.',\n          },\n          { status: 400 },\n        )\n      }\n\n      // Call ElevenLabs API to fetch voices\n      const response = await fetch('https://api.elevenlabs.io/v1/voices', {\n        headers: {\n          'xi-api-key': apiKey,\n        },\n      })\n\n      if (!response.ok) {\n        const errorText = await response.text()\n        return Response.json(\n          { message: `ElevenLabs API error: ${errorText}` },\n          { status: response.status },\n        )\n      }\n\n      const data = await response.json()\n\n      // Transform voices to match our schema\n      const voices = (data.voices || []).map((voice: ElevenLabsVoice) => ({\n        id: voice.voice_id,\n        name: voice.name,\n        category: voice.category || 'premade',\n        enabled: true,\n        labels: voice.labels || {},\n        preview_url: voice.preview_url || '',\n      }))\n\n      return Response.json({\n        success: true,\n        voices,\n      })\n    } catch (error) {\n      req.payload.logger.error(error, 'Error fetching ElevenLabs voices')\n      return Response.json(\n        { message: error instanceof Error ? error.message : 'Internal server error' },\n        { status: 500 },\n      )\n    }\n  },\n  method: 'post',\n  path: PLUGIN_API_ENDPOINT_FETCH_VOICES,\n}\n"],"names":["PLUGIN_API_ENDPOINT_FETCH_VOICES","fetchVoices","handler","req","user","Response","json","message","status","aiSettings","payload","findGlobal","slug","context","unsafe","elevenlabsProvider","providers","find","provider","blockType","enabled","apiKey","response","fetch","headers","ok","errorText","text","data","voices","map","voice","id","voice_id","name","category","labels","preview_url","success","error","logger","Error","method","path"],"mappings":"AAEA,SAASA,gCAAgC,QAAQ,iBAAgB;AAUjE,OAAO,MAAMC,cAAwB;IACnCC,SAAS,OAAOC;QACd,IAAI;YACF,uBAAuB;YACvB,IAAI,CAACA,IAAIC,IAAI,EAAE;gBACb,OAAOC,SAASC,IAAI,CAAC;oBAAEC,SAAS;gBAA0B,GAAG;oBAAEC,QAAQ;gBAAI;YAC7E;YAEA,wDAAwD;YACxD,MAAMC,aAAa,MAAMN,IAAIO,OAAO,CAACC,UAAU,CAAC;gBAC9CC,MAAM;gBACNC,SAAS;oBAAEC,QAAQ;gBAAK;YAC1B;YAEA,qCAAqC;YACrC,MAAMC,qBAAqBN,YAAYO,WAAWC,KAChD,CAACC,WAAkBA,SAASC,SAAS,KAAK,gBAAgBD,SAASE,OAAO;YAG5E,IAAI,CAACL,oBAAoB;gBACvB,OAAOV,SAASC,IAAI,CAClB;oBAAEC,SAAS;gBAA8D,GACzE;oBAAEC,QAAQ;gBAAI;YAElB;YAEA,8EAA8E;YAC9E,MAAMa,SAASN,mBAAmBM,MAAM;YAExC,IAAI,CAACA,QAAQ;gBACX,OAAOhB,SAASC,IAAI,CAClB;oBACEC,SAAS;gBACX,GACA;oBAAEC,QAAQ;gBAAI;YAElB;YAEA,sCAAsC;YACtC,MAAMc,WAAW,MAAMC,MAAM,uCAAuC;gBAClEC,SAAS;oBACP,cAAcH;gBAChB;YACF;YAEA,IAAI,CAACC,SAASG,EAAE,EAAE;gBAChB,MAAMC,YAAY,MAAMJ,SAASK,IAAI;gBACrC,OAAOtB,SAASC,IAAI,CAClB;oBAAEC,SAAS,CAAC,sBAAsB,EAAEmB,UAAU,CAAC;gBAAC,GAChD;oBAAElB,QAAQc,SAASd,MAAM;gBAAC;YAE9B;YAEA,MAAMoB,OAAO,MAAMN,SAAShB,IAAI;YAEhC,uCAAuC;YACvC,MAAMuB,SAAS,AAACD,CAAAA,KAAKC,MAAM,IAAI,EAAE,AAAD,EAAGC,GAAG,CAAC,CAACC,QAA4B,CAAA;oBAClEC,IAAID,MAAME,QAAQ;oBAClBC,MAAMH,MAAMG,IAAI;oBAChBC,UAAUJ,MAAMI,QAAQ,IAAI;oBAC5Bf,SAAS;oBACTgB,QAAQL,MAAMK,MAAM,IAAI,CAAC;oBACzBC,aAAaN,MAAMM,WAAW,IAAI;gBACpC,CAAA;YAEA,OAAOhC,SAASC,IAAI,CAAC;gBACnBgC,SAAS;gBACTT;YACF;QACF,EAAE,OAAOU,OAAO;YACdpC,IAAIO,OAAO,CAAC8B,MAAM,CAACD,KAAK,CAACA,OAAO;YAChC,OAAOlC,SAASC,IAAI,CAClB;gBAAEC,SAASgC,iBAAiBE,QAAQF,MAAMhC,OAAO,GAAG;YAAwB,GAC5E;gBAAEC,QAAQ;YAAI;QAElB;IACF;IACAkC,QAAQ;IACRC,MAAM3C;AACR,EAAC"}
+{"version":3,"sources":["../../src/endpoints/fetchVoices.ts"],"sourcesContent":["import type { Endpoint, PayloadRequest } from 'payload'\n\nimport { PLUGIN_API_ENDPOINT_FETCH_VOICES } from '../defaults.js'\n\ninterface ElevenLabsVoice {\n  category?: string\n  labels?: Record<string, string>\n  name: string\n  preview_url?: string\n  voice_id: string\n}\n\nexport const fetchVoices: Endpoint = {\n  handler: async (req: PayloadRequest) => {\n    try {\n      // Check authentication\n      if (!req.user) {\n        return Response.json({ message: 'Authentication required' }, { status: 401 })\n      }\n\n      // Fetch AI Settings global to get the encrypted API key\n      const aiSettings = await req.payload.findGlobal({\n        slug: 'ai-settings',\n        context: { unsafe: true },\n      })\n\n      // Find the ElevenLabs provider block\n      const elevenlabsProvider = aiSettings?.providers?.find(\n        (provider: any) => provider.blockType === 'elevenlabs' && provider.enabled,\n      )\n\n      if (!elevenlabsProvider) {\n        return Response.json(\n          { message: 'ElevenLabs provider not found or not enabled in AI Settings' },\n          { status: 400 },\n        )\n      }\n\n      // Get the API key (already decrypted by afterRead hook due to unsafe context)\n      const apiKey = elevenlabsProvider.apiKey\n\n      if (!apiKey) {\n        return Response.json(\n          {\n            message: 'API key not found. Please configure your ElevenLabs API key in AI Settings.',\n          },\n          { status: 400 },\n        )\n      }\n\n      // Call ElevenLabs API to fetch voices with timeout\n      const controller = new AbortController()\n      const timeoutId = setTimeout(() => controller.abort(), 15000) // 15s timeout\n\n      try {\n        const response = await fetch('https://api.elevenlabs.io/v1/voices', {\n          headers: {\n            'xi-api-key': apiKey,\n          },\n          signal: controller.signal,\n        })\n\n        clearTimeout(timeoutId)\n\n        if (!response.ok) {\n          const errorText = await response.text()\n          return Response.json(\n            { message: `ElevenLabs API error: ${errorText}` },\n            { status: response.status },\n          )\n        }\n\n        const data = await response.json()\n\n        // Transform voices to match our schema\n        const voices = (data.voices || []).map((voice: ElevenLabsVoice) => ({\n          id: voice.voice_id,\n          name: voice.name,\n          category: voice.category || 'premade',\n          enabled: true,\n          labels: voice.labels || {},\n          preview_url: voice.preview_url || '',\n        }))\n\n        return Response.json({\n          success: true,\n          voices,\n        })\n      } catch (error: unknown) {\n        clearTimeout(timeoutId)\n        if (error instanceof Error && error.name === 'AbortError') {\n          return Response.json({ message: 'ElevenLabs API request timed out' }, { status: 504 })\n        }\n        throw error\n      }\n    } catch (error) {\n      req.payload.logger.error(error, 'Error fetching ElevenLabs voices')\n      return Response.json(\n        { message: error instanceof Error ? error.message : 'Internal server error' },\n        { status: 500 },\n      )\n    }\n  },\n  method: 'post',\n  path: PLUGIN_API_ENDPOINT_FETCH_VOICES,\n}\n"],"names":["PLUGIN_API_ENDPOINT_FETCH_VOICES","fetchVoices","handler","req","user","Response","json","message","status","aiSettings","payload","findGlobal","slug","context","unsafe","elevenlabsProvider","providers","find","provider","blockType","enabled","apiKey","controller","AbortController","timeoutId","setTimeout","abort","response","fetch","headers","signal","clearTimeout","ok","errorText","text","data","voices","map","voice","id","voice_id","name","category","labels","preview_url","success","error","Error","logger","method","path"],"mappings":"AAEA,SAASA,gCAAgC,QAAQ,iBAAgB;AAUjE,OAAO,MAAMC,cAAwB;IACnCC,SAAS,OAAOC;QACd,IAAI;YACF,uBAAuB;YACvB,IAAI,CAACA,IAAIC,IAAI,EAAE;gBACb,OAAOC,SAASC,IAAI,CAAC;oBAAEC,SAAS;gBAA0B,GAAG;oBAAEC,QAAQ;gBAAI;YAC7E;YAEA,wDAAwD;YACxD,MAAMC,aAAa,MAAMN,IAAIO,OAAO,CAACC,UAAU,CAAC;gBAC9CC,MAAM;gBACNC,SAAS;oBAAEC,QAAQ;gBAAK;YAC1B;YAEA,qCAAqC;YACrC,MAAMC,qBAAqBN,YAAYO,WAAWC,KAChD,CAACC,WAAkBA,SAASC,SAAS,KAAK,gBAAgBD,SAASE,OAAO;YAG5E,IAAI,CAACL,oBAAoB;gBACvB,OAAOV,SAASC,IAAI,CAClB;oBAAEC,SAAS;gBAA8D,GACzE;oBAAEC,QAAQ;gBAAI;YAElB;YAEA,8EAA8E;YAC9E,MAAMa,SAASN,mBAAmBM,MAAM;YAExC,IAAI,CAACA,QAAQ;gBACX,OAAOhB,SAASC,IAAI,CAClB;oBACEC,SAAS;gBACX,GACA;oBAAEC,QAAQ;gBAAI;YAElB;YAEA,mDAAmD;YACnD,MAAMc,aAAa,IAAIC;YACvB,MAAMC,YAAYC,WAAW,IAAMH,WAAWI,KAAK,IAAI,OAAO,cAAc;;YAE5E,IAAI;gBACF,MAAMC,WAAW,MAAMC,MAAM,uCAAuC;oBAClEC,SAAS;wBACP,cAAcR;oBAChB;oBACAS,QAAQR,WAAWQ,MAAM;gBAC3B;gBAEAC,aAAaP;gBAEb,IAAI,CAACG,SAASK,EAAE,EAAE;oBAChB,MAAMC,YAAY,MAAMN,SAASO,IAAI;oBACrC,OAAO7B,SAASC,IAAI,CAClB;wBAAEC,SAAS,CAAC,sBAAsB,EAAE0B,UAAU,CAAC;oBAAC,GAChD;wBAAEzB,QAAQmB,SAASnB,MAAM;oBAAC;gBAE9B;gBAEA,MAAM2B,OAAO,MAAMR,SAASrB,IAAI;gBAEhC,uCAAuC;gBACvC,MAAM8B,SAAS,AAACD,CAAAA,KAAKC,MAAM,IAAI,EAAE,AAAD,EAAGC,GAAG,CAAC,CAACC,QAA4B,CAAA;wBAClEC,IAAID,MAAME,QAAQ;wBAClBC,MAAMH,MAAMG,IAAI;wBAChBC,UAAUJ,MAAMI,QAAQ,IAAI;wBAC5BtB,SAAS;wBACTuB,QAAQL,MAAMK,MAAM,IAAI,CAAC;wBACzBC,aAAaN,MAAMM,WAAW,IAAI;oBACpC,CAAA;gBAEA,OAAOvC,SAASC,IAAI,CAAC;oBACnBuC,SAAS;oBACTT;gBACF;YACF,EAAE,OAAOU,OAAgB;gBACvBf,aAAaP;gBACb,IAAIsB,iBAAiBC,SAASD,MAAML,IAAI,KAAK,cAAc;oBACzD,OAAOpC,SAASC,IAAI,CAAC;wBAAEC,SAAS;oBAAmC,GAAG;wBAAEC,QAAQ;oBAAI;gBACtF;gBACA,MAAMsC;YACR;QACF,EAAE,OAAOA,OAAO;YACd3C,IAAIO,OAAO,CAACsC,MAAM,CAACF,KAAK,CAACA,OAAO;YAChC,OAAOzC,SAASC,IAAI,CAClB;gBAAEC,SAASuC,iBAAiBC,QAAQD,MAAMvC,OAAO,GAAG;YAAwB,GAC5E;gBAAEC,QAAQ;YAAI;QAElB;IACF;IACAyC,QAAQ;IACRC,MAAMlD;AACR,EAAC"}

package/dist/endpoints/index.js

@@ -4,6 +4,7 @@ import { filterEditorSchemaByNodes } from '../ai/utils/filterEditorSchemaByNodes
 import { PLUGIN_AI_JOBS_TABLE, PLUGIN_API_ENDPOINT_GENERATE, PLUGIN_API_ENDPOINT_GENERATE_UPLOAD, PLUGIN_API_ENDPOINT_VIDEOGEN_WEBHOOK, PLUGIN_INSTRUCTIONS_TABLE, PLUGIN_NAME } from '../defaults.js';
 import { registerEditorHelper } from '../libraries/handlebars/helpers.js';
 import { replacePlaceholders } from '../libraries/handlebars/replacePlaceholders.js';
+import { buildSmartPrompt, isGenericPrompt } from '../utilities/buildSmartPrompt.js';
 import { extractImageData } from '../utilities/extractImageData.js';
 import { fetchImages } from '../utilities/fetchImages.js';
 import { fieldToJsonSchema } from '../utilities/fieldToJsonSchema.js';
@@ -37,10 +38,31 @@ export const endpoints = (pluginConfig)=>({
                     }
                     const { custom: { [PLUGIN_NAME]: { editorConfig = {} } = {} } = {} } = collection.admin;
                     const { schema: editorSchema = {} } = editorConfig;
-                    const { prompt: promptTemplate = '' } = instructions;
+                    let { prompt: promptTemplate = '' } = instructions;
+                    // Smart fallback: if prompt is generic, build a contextual prompt from field metadata
+                    if (isGenericPrompt(promptTemplate)) {
+                        const schemaPath = String(instructions['schema-path']);
+                        promptTemplate = buildSmartPrompt({
+                            documentData: contextData,
+                            payload: req.payload,
+                            schemaPath
+                        });
+                        if (pluginConfig.debugging) {
+                            req.payload.logger.info({
+                                smartPrompt: promptTemplate
+                            }, `— AI Plugin: Using smart fallback prompt for ${schemaPath}`);
+                        }
+                    }
                     let allowedEditorSchema = editorSchema;
                     if (allowedEditorNodes.length) {
                         allowedEditorSchema = filterEditorSchemaByNodes(editorSchema, allowedEditorNodes);
+                        // Debug: Log what nodes were received and what definitions remain
+                        if (pluginConfig.debugging) {
+                            req.payload.logger.info({
+                                receivedNodes: allowedEditorNodes,
+                                remainingDefinitions: Object.keys(allowedEditorSchema.definitions || {})
+                            }, '— AI Plugin: Schema filtering debug');
+                        }
                     }
                     const schemaPath = String(instructions['schema-path']);
                     const parts = (schemaPath || '').split('.') || [];
@@ -74,11 +96,13 @@ export const endpoints = (pluginConfig)=>({
                     }
                     // Build per-field JSON schema for structured generation when applicable
                     let jsonSchema = allowedEditorSchema;
+                    let targetField;
                     try {
                         const targetCollection = req.payload.config.collections.find((c)=>c.slug === collectionName);
                         if (targetCollection && fieldName) {
-                            const targetField = getFieldBySchemaPath(targetCollection, schemaPath);
+                            targetField = getFieldBySchemaPath(targetCollection, schemaPath);
                             const supported = [
+                                'array',
                                 'text',
                                 'textarea',
                                 'select',
@@ -90,23 +114,37 @@ export const endpoints = (pluginConfig)=>({
                             ];
                             const t = String(targetField?.type || '');
                             if (targetField && supported.includes(t)) {
-                                jsonSchema = fieldToJsonSchema(targetField, {
-                                    nameOverride: fieldName
-                                });
+                                // For array fields, use count from array-settings if available
+                                if (t === 'array') {
+                                    const arraySettings = instructions['array-settings'] || {};
+                                    const count = arraySettings.count || 3;
+                                    // Override the field's maxRows with the requested count
+                                    const modifiedField = {
+                                        ...targetField,
+                                        maxRows: count,
+                                        minRows: count
+                                    };
+                                    jsonSchema = fieldToJsonSchema(modifiedField, {
+                                        nameOverride: fieldName
+                                    });
+                                } else {
+                                    jsonSchema = fieldToJsonSchema(targetField, {
+                                        nameOverride: fieldName
+                                    });
+                                }
                             }
                         }
                     } catch (e) {
                         req.payload.logger.error(e, '— AI Plugin: Error building field JSON schema');
                     }
                     // Get model settings from instruction
-                    const settingsName = instructions['model-id'] === 'richtext' ? 'richtext-settings' : instructions['model-id'] === 'text' ? 'text-settings' : undefined;
+                    const settingsName = instructions['model-id'] === 'richtext' ? 'richtext-settings' : instructions['model-id'] === 'text' ? 'text-settings' : instructions['model-id'] === 'array' ? 'array-settings' : undefined;
                     if (!settingsName) {
                         throw new Error(`Unsupported model-id: ${instructions['model-id']}`);
                     }
                     const modelSettings = instructions[settingsName] || {};
                     // Resolve @field:filename references from the prompt
-                    const { images: resolvedImages, processedPrompt } = await resolveImageReferences(prompts.prompt, contextData, req);
-                    console.log('resolvedImagesL  ', resolvedImages);
+                    const { images: resolvedImages, processedPrompt } = await resolveImageReferences(prompts.prompt, contextData, req, collectionName);
                     // Extract hardcoded URLs from the processed prompt
                     const hardcodedImages = extractImageData(processedPrompt);
                     // Combine images
@@ -121,16 +159,60 @@ export const endpoints = (pluginConfig)=>({
                             images = imageParts;
                         }
                     }
-                    // Use payload.ai.streamObject directly! 🎉
+                    let promptToUse = processedPrompt;
+                    let systemToUse = prompts.system;
+                    // let messagesToUse: any = undefined
+                    // Execute beforeGenerate hooks
+                    if (targetField && targetField.custom?.ai?.beforeGenerate) {
+                        const beforeHooks = targetField.custom.ai.beforeGenerate;
+                        for (const hook of beforeHooks){
+                            const result = await hook({
+                                doc: contextData,
+                                field: targetField,
+                                headers: req.headers,
+                                instructions,
+                                payload: req.payload,
+                                prompt: promptToUse,
+                                req,
+                                system: systemToUse
+                            });
+                            if (result) {
+                                if (result.prompt) promptToUse = result.prompt;
+                                if (result.system) systemToUse = result.system;
+                            }
+                        }
+                    }
                     const streamResult = await req.payload.ai.streamObject({
                         // extractAttachments: modelSettings.extractAttachments as boolean | undefined,
                         images,
                         maxTokens: modelSettings.maxTokens,
+                        // messages: messagesToUse,
                         model: modelSettings.model,
+                        onFinish: async ({ object })=>{
+                            if (targetField && targetField.custom?.ai?.afterGenerate) {
+                                const afterHooks = targetField.custom.ai.afterGenerate;
+                                for (const hook of afterHooks){
+                                    await hook({
+                                        doc: contextData,
+                                        field: targetField,
+                                        headers: req.headers,
+                                        instructions,
+                                        payload: req.payload,
+                                        req,
+                                        result: object
+                                    });
+                                }
+                            }
+                        },
                         prompt: processedPrompt,
                         provider: modelSettings.provider,
+                        providerOptions: {
+                            openai: {
+                                strictJsonSchema: true
+                            }
+                        },
                         schema: jsonSchema,
-                        system: prompts.system,
+                        system: systemToUse,
                         temperature: modelSettings.temperature
                     });
                     return streamResult;
@@ -189,18 +271,31 @@ export const endpoints = (pluginConfig)=>({
                             req
                         });
                     }
-                    const { images: sampleImages = [], prompt: promptTemplate = '' } = instructions;
+                    let { prompt: promptTemplate = '' } = instructions;
+                    const { images: sampleImages = [] } = instructions;
                     const schemaPath = String(instructions['schema-path']);
                     registerEditorHelper(req.payload, schemaPath);
+                    // Smart fallback: if prompt is generic, build a contextual prompt from field metadata
+                    if (isGenericPrompt(promptTemplate)) {
+                        promptTemplate = buildSmartPrompt({
+                            documentData: contextData,
+                            payload: req.payload,
+                            schemaPath
+                        });
+                        if (pluginConfig.debugging) {
+                            req.payload.logger.info({
+                                smartPrompt: promptTemplate
+                            }, `— AI Plugin: Using smart fallback prompt for ${schemaPath}`);
+                        }
+                    }
                     const extendedContext = extendContextWithPromptFields(contextData, {
                         type: String(instructions['field-type']),
                         collection: collectionSlug
                     }, pluginConfig);
                     const text = await replacePlaceholders(promptTemplate, extendedContext);
-                    const modelId = instructions['model-id'];
                     const uploadCollectionSlug = instructions['relation-to'];
                     // Resolve @field:filename references from the prompt
-                    const { images: resolvedImages, processedPrompt } = await resolveImageReferences(text, contextData, req);
+                    const { images: resolvedImages, processedPrompt } = await resolveImageReferences(text, contextData, req, collectionSlug);
                     // Extract hardcoded URLs from the processed prompt and merge with resolved images and sample images
                     const images = [
                         ...extractImageData(processedPrompt),
@@ -209,30 +304,113 @@ export const endpoints = (pluginConfig)=>({
                     ];
                     // Process images - convert to ImagePart format using helper
                     const editImages = await fetchImages(req, images);
+                    let promptToUse = text;
+                    let targetField;
+                    try {
+                        const targetCollection = req.payload.config.collections.find((c)=>c.slug === collectionSlug);
+                        if (targetCollection && schemaPath) {
+                            targetField = getFieldBySchemaPath(targetCollection, schemaPath);
+                        }
+                    } catch (e) {
+                        req.payload.logger.error(e, '— AI Plugin: Error finding field for hooks');
+                    }
+                    if (targetField && targetField.custom?.ai?.beforeGenerate) {
+                        const beforeHooks = targetField.custom.ai.beforeGenerate;
+                        for (const hook of beforeHooks){
+                            const result = await hook({
+                                doc: contextData,
+                                field: targetField,
+                                headers: req.headers,
+                                instructions,
+                                payload: req.payload,
+                                prompt: promptToUse,
+                                req
+                            });
+                            if (result) {
+                                if (result.prompt) {
+                                    promptToUse = result.prompt;
+                                }
+                                if (result.instructions) {
+                                    instructions = {
+                                        ...instructions,
+                                        ...result.instructions
+                                    };
+                                }
+                            }
+                        }
+                    }
                     if (pluginConfig.debugging) {
                         req.payload.logger.info({
-                            text
+                            text: promptToUse
                         }, `— AI Plugin: Executing media generation`);
                     }
                     // Prepare callback URL for async jobs
                     const serverURL = req.payload.config?.serverURL || process.env.SERVER_URL || process.env.NEXT_PUBLIC_SERVER_URL;
                     const callbackUrl = serverURL ? `${serverURL.replace(/\/$/, '')}/api${PLUGIN_API_ENDPOINT_VIDEOGEN_WEBHOOK}?instructionId=${instructionId}` : undefined;
                     // Get model settings
+                    // Re-evaluate settings name and settings in case instructions changed
+                    const modelId = instructions['model-id'];
                     const settingsName = modelId === 'image' ? 'image-settings' : modelId === 'video' ? 'video-settings' : modelId === 'tts' ? 'tts-settings' : undefined;
                     if (!settingsName) {
                         throw new Error(`Unsupported model-id: ${modelId}`);
                     }
-                    const modelSettings = instructions[settingsName] || {};
+                    // Get model settings from instruction
+                    const instructionSettings = instructions[settingsName] || {};
+                    // Fallback to AISettings global defaults if instruction-level settings are missing
+                    let globalDefaults = {};
+                    if (!instructionSettings.provider || !instructionSettings.model) {
+                        try {
+                            const aiSettings = await req.payload.findGlobal({
+                                slug: 'ai-settings',
+                                context: {
+                                    unsafe: true
+                                }
+                            });
+                            // Map modelId to the corresponding default settings key
+                            const defaultsKey = modelId === 'image' ? 'image' : modelId === 'video' ? 'video' : modelId === 'tts' ? 'tts' : undefined;
+                            if (defaultsKey && aiSettings?.defaults?.[defaultsKey]) {
+                                globalDefaults = aiSettings.defaults[defaultsKey];
+                                if (pluginConfig.debugging) {
+                                    req.payload.logger.info({
+                                        globalDefaults
+                                    }, `— AI Plugin: Using AISettings defaults for ${modelId}`);
+                                }
+                            }
+                        } catch (e) {
+                            req.payload.logger.error(e, '— AI Plugin: Error fetching AISettings defaults');
+                        }
+                    }
+                    // Merge: instruction settings take priority over global defaults
+                    // Filter out null/undefined values so they don't overwrite valid defaults
+                    const filteredInstructionSettings = Object.fromEntries(Object.entries(instructionSettings).filter(([_, v])=>v != null));
+                    const modelSettings = {
+                        ...globalDefaults,
+                        ...filteredInstructionSettings
+                    };
                     // Use payload.ai.generateMedia directly! 🎉
                     const result = await req.payload.ai.generateMedia({
                         callbackUrl,
                         images: editImages,
                         instructionId,
                         model: modelSettings.model,
-                        prompt: text,
+                        prompt: promptToUse,
                         provider: modelSettings.provider,
                         ...modelSettings
                     });
+                    if (targetField && targetField.custom?.ai?.afterGenerate) {
+                        const afterHooks = targetField.custom.ai.afterGenerate;
+                        for (const hook of afterHooks){
+                            await hook({
+                                doc: contextData,
+                                field: targetField,
+                                headers: req.headers,
+                                instructions,
+                                payload: req.payload,
+                                req,
+                                result
+                            });
+                        }
+                    }
                     // If model returned a file immediately, proceed with upload
                     if (result && 'file' in result) {
                         let assetData;