n8n-nodes-vercel-ai-sdk-universal-temp 0.1.36 → 0.1.38

package/dist/nodes/UniversalAI/UniversalAI.node.js

@@ -119,52 +119,69 @@ let googleCacheManager = null;
 const createdCaches = new Map();
 async function createGoogleCache(exec, index, apiKey, systemPrompt, tools) {
     try {
-        if (!googleCacheManager) {
-            const { GoogleAICacheManager } = require('@google/generative-ai/server');
-            googleCacheManager = new GoogleAICacheManager(apiKey);
-        }
         const useGoogleCache = exec.getNodeParameter('useGoogleCache', index, false);
         if (!useGoogleCache) {
             return null;
         }
+        if (!googleCacheManager) {
+            const { GoogleGenAI } = await Promise.resolve().then(() => __importStar(require('@google/genai')));
+            googleCacheManager = new GoogleGenAI({ apiKey });
+        }
         const hasContent = (systemPrompt && systemPrompt.trim()) || (tools && Object.keys(tools).length > 0);
         if (!hasContent) {
-            console.log('UniversalAI: Creating minimal cache for prompt-only content');
+            console.log('UniversalAI: No content to cache, skipping cache creation');
+            return null;
         }
         const cacheKeyData = {
             system: systemPrompt || '',
             tools: tools ? Object.keys(tools).sort() : [],
-            hasContent,
+            model: 'gemini-2.0-flash-001',
         };
         const cacheKeyString = JSON.stringify(cacheKeyData);
         const existingCache = createdCaches.get(cacheKeyString);
-        if (existingCache && (Date.now() - existingCache.createdAt) < (existingCache.ttlSeconds * 1000)) {
+        if (existingCache && (Date.now() - existingCache.createdAt) < (existingCache.ttlSeconds * 1000 * 0.83)) {
             console.log('UniversalAI: Reusing existing cache:', existingCache.name);
             return existingCache.name;
         }
         const ttlSeconds = 3600;
-        const cacheName = `cache_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-        console.log('UniversalAI: Creating Google cache:', {
-            name: cacheName,
+        const displayName = `universal_ai_cache_${Date.now()}`;
+        console.log('UniversalAI: Creating Google cache with config:', {
+            displayName,
             hasSystem: !!systemPrompt,
             hasTools: !!tools && Object.keys(tools).length > 0,
             ttlSeconds
         });
         const cacheConfig = {
             model: 'gemini-2.0-flash-001',
-            ttlSeconds,
-            displayName: cacheName,
+            config: {
+                displayName,
+                ttl: `${ttlSeconds}s`,
+            },
         };
         if (systemPrompt && systemPrompt.trim()) {
-            cacheConfig.systemInstruction = {
+            cacheConfig.config.systemInstruction = {
                 parts: [{ text: systemPrompt }],
             };
+            console.log('UniversalAI: Added system instruction to cache');
         }
         if (tools && Object.keys(tools).length > 0) {
-            cacheConfig.tools = Object.values(tools);
+            cacheConfig.config.tools = Object.values(tools);
+            console.log('UniversalAI: Added tools to cache:', Object.keys(tools));
+        }
+        cacheConfig.config.contents = [
+            {
+                parts: [{ text: "This is cached content for context." }],
+                role: "user"
+            }
+        ];
+        console.log('UniversalAI: Final cache config:', JSON.stringify(cacheConfig, null, 2));
+        console.log('UniversalAI: About to call googleCacheManager.caches.create()...');
+        const result = await googleCacheManager.caches.create(cacheConfig);
+        console.log('UniversalAI: Cache creation API call completed, result:', result);
+        const cachedContentName = result.name;
+        if (!cachedContentName) {
+            throw new Error('Failed to get cached content name from creation response');
         }
-        console.log('UniversalAI: Cache config before creation:', cacheConfig);
-        const { name: cachedContentName } = await googleCacheManager.create(cacheConfig);
         createdCaches.set(cacheKeyString, {
             name: cachedContentName,
             createdAt: Date.now(),
@@ -175,9 +192,13 @@ async function createGoogleCache(exec, index, apiKey, systemPrompt, tools) {
     }
     catch (error) {
         console.error('UniversalAI: Failed to create Google cache:', error);
+        console.log('UniversalAI: Falling back to non-cached execution');
         return null;
     }
 }
+function canUseCache(systemPrompt, tools) {
+    return true;
+}
 const messageSchema = zod_1.z.object({
     role: zod_1.z.enum(['system', 'user', 'assistant']),
     content: zod_1.z.any(),
@@ -330,32 +351,6 @@ async function getBinaryData(fileContentInput, itemBinary, exec, itemIndex) {
     }
     return null;
 }
-function formatTextWithGroundingLinks(text, groundingMetadata) {
-    if (!(groundingMetadata === null || groundingMetadata === void 0 ? void 0 : groundingMetadata.groundingSupports) || !(groundingMetadata === null || groundingMetadata === void 0 ? void 0 : groundingMetadata.groundingChunks)) {
-        return text;
-    }
-    let formattedText = text;
-    const supports = groundingMetadata.groundingSupports;
-    const chunks = groundingMetadata.groundingChunks;
-    const sortedSupports = supports
-        .filter((support) => { var _a; return ((_a = support.groundingChunkIndices) === null || _a === void 0 ? void 0 : _a.length) > 0; })
-        .sort((a, b) => b.segment.startIndex - a.segment.startIndex);
-    for (const support of sortedSupports) {
-        const segment = support.segment;
-        const chunkIndex = support.groundingChunkIndices[0];
-        const chunk = chunks[chunkIndex];
-        if (chunk === null || chunk === void 0 ? void 0 : chunk.web) {
-            const startIndex = segment.startIndex;
-            const endIndex = segment.endIndex;
-            const segmentText = text.substring(startIndex, endIndex);
-            const linkUrl = chunk.web.uri;
-            const beforeSegment = formattedText.substring(0, startIndex);
-            const afterSegment = formattedText.substring(endIndex);
-            formattedText = `${beforeSegment}[${segmentText}](${linkUrl})${afterSegment}`;
-        }
-    }
-    return formattedText;
-}
 function formatTextResult(result, includeRequestBody, provider) {
     var _a, _b, _c, _d;
     let { text, reasoning } = result;
@@ -386,9 +381,6 @@ function formatTextResult(result, includeRequestBody, provider) {
         baseResult.groundingMetadata = (_a = providerMetadata === null || providerMetadata === void 0 ? void 0 : providerMetadata.google) === null || _a === void 0 ? void 0 : _a.groundingMetadata;
         baseResult.safetyRatings = (_b = providerMetadata === null || providerMetadata === void 0 ? void 0 : providerMetadata.google) === null || _b === void 0 ? void 0 : _b.safetyRatings;
         baseResult.urlContextMetadata = (_c = providerMetadata === null || providerMetadata === void 0 ? void 0 : providerMetadata.google) === null || _c === void 0 ? void 0 : _c.urlContextMetadata;
-        if (baseResult.groundingMetadata) {
-            baseResult.textWithLinks = formatTextWithGroundingLinks(text, baseResult.groundingMetadata);
-        }
     }
     if (includeRequestBody) {
         const requestBody = (_d = result.request) === null || _d === void 0 ? void 0 : _d.body;
@@ -427,9 +419,15 @@ function formatUsage(result, provider) {
     return usage;
 }
 function getCacheMetrics(result, provider) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     const metadata = result.experimental_providerMetadata;
     const metrics = {};
+    console.log('UniversalAI: Checking cache metrics from metadata:', {
+        provider,
+        hasMetadata: !!metadata,
+        metadataKeys: metadata ? Object.keys(metadata) : [],
+        googleMetadata: metadata === null || metadata === void 0 ? void 0 : metadata.google,
+    });
     switch (provider) {
         case 'deepseek':
             if (((_a = metadata === null || metadata === void 0 ? void 0 : metadata.deepseek) === null || _a === void 0 ? void 0 : _a.promptCacheHitTokens) !== undefined) {
@@ -448,24 +446,51 @@ function getCacheMetrics(result, provider) {
             }
             break;
         case 'google':
-            if (((_f = (_e = metadata === null || metadata === void 0 ? void 0 : metadata.google) === null || _e === void 0 ? void 0 : _e.usageMetadata) === null || _f === void 0 ? void 0 : _f.cachedContentTokenCount) !== undefined) {
+            console.log('UniversalAI: Google metadata structure:', {
+                google: metadata === null || metadata === void 0 ? void 0 : metadata.google,
+                usageMetadata: (_e = metadata === null || metadata === void 0 ? void 0 : metadata.google) === null || _e === void 0 ? void 0 : _e.usageMetadata,
+                candidates: (_f = metadata === null || metadata === void 0 ? void 0 : metadata.google) === null || _f === void 0 ? void 0 : _f.candidates,
+            });
+            if (((_h = (_g = metadata === null || metadata === void 0 ? void 0 : metadata.google) === null || _g === void 0 ? void 0 : _g.usageMetadata) === null || _h === void 0 ? void 0 : _h.cachedContentTokenCount) !== undefined) {
                 metrics.cachedContentTokenCount = metadata.google.usageMetadata.cachedContentTokenCount;
+                console.log('UniversalAI: Found cachedContentTokenCount in usageMetadata:', metrics.cachedContentTokenCount);
+            }
+            if (((_k = (_j = result.response) === null || _j === void 0 ? void 0 : _j.usageMetadata) === null || _k === void 0 ? void 0 : _k.cachedContentTokenCount) !== undefined) {
+                metrics.cachedContentTokenCount = result.response.usageMetadata.cachedContentTokenCount;
+                console.log('UniversalAI: Found cachedContentTokenCount in response metadata:', metrics.cachedContentTokenCount);
             }
-            if (((_h = (_g = metadata === null || metadata === void 0 ? void 0 : metadata.google) === null || _g === void 0 ? void 0 : _g.usageMetadata) === null || _h === void 0 ? void 0 : _h.thoughtsTokenCount) !== undefined) {
+            if (((_p = (_o = (_m = (_l = metadata === null || metadata === void 0 ? void 0 : metadata.google) === null || _l === void 0 ? void 0 : _l.candidates) === null || _m === void 0 ? void 0 : _m[0]) === null || _o === void 0 ? void 0 : _o.usageMetadata) === null || _p === void 0 ? void 0 : _p.cachedContentTokenCount) !== undefined) {
+                metrics.cachedContentTokenCount = metadata.google.candidates[0].usageMetadata.cachedContentTokenCount;
+                console.log('UniversalAI: Found cachedContentTokenCount in candidates metadata:', metrics.cachedContentTokenCount);
+            }
+            if (((_r = (_q = metadata === null || metadata === void 0 ? void 0 : metadata.google) === null || _q === void 0 ? void 0 : _q.usageMetadata) === null || _r === void 0 ? void 0 : _r.thoughtsTokenCount) !== undefined) {
                 metrics.thoughtsTokenCount = metadata.google.usageMetadata.thoughtsTokenCount;
+                console.log('UniversalAI: Found thoughtsTokenCount:', metrics.thoughtsTokenCount);
+            }
+            if (((_t = (_s = metadata === null || metadata === void 0 ? void 0 : metadata.google) === null || _s === void 0 ? void 0 : _s.usageMetadata) === null || _t === void 0 ? void 0 : _t.cacheTokensUsed) !== undefined) {
+                metrics.cacheTokensUsed = metadata.google.usageMetadata.cacheTokensUsed;
+                console.log('UniversalAI: Found cacheTokensUsed:', metrics.cacheTokensUsed);
             }
+            console.log('UniversalAI: Final Google cache metrics:', metrics);
             break;
     }
+    console.log('UniversalAI: Extracted cache metrics:', metrics);
     return metrics;
 }
 function formatResponse(result) {
-    var _a, _b, _c, _d;
-    return {
+    var _a, _b, _c, _d, _e;
+    const response = {
         id: (_a = result.response) === null || _a === void 0 ? void 0 : _a.id,
         modelId: (_b = result.response) === null || _b === void 0 ? void 0 : _b.modelId,
         timestamp: (_c = result.response) === null || _c === void 0 ? void 0 : _c.timestamp,
         headers: (_d = result.response) === null || _d === void 0 ? void 0 : _d.headers,
     };
+    console.log('UniversalAI: Response metadata:', {
+        hasResponse: !!result.response,
+        responseKeys: result.response ? Object.keys(result.response) : [],
+        usageMetadata: (_e = result.response) === null || _e === void 0 ? void 0 : _e.usageMetadata,
+    });
+    return response;
 }
 async function getProvider(provider, apiKey, baseURL) {
     const cacheKey = `${provider}:${apiKey}:${baseURL || ''}`;
@@ -559,6 +584,7 @@ class UniversalAI {
     async execute() {
         const items = this.getInputData();
         const returnData = [];
+        const errorData = [];
         const provider = this.getNodeParameter('provider', 0);
         const credentialType = {
             google: 'googleGenerativeAIApi',
@@ -576,19 +602,24 @@ class UniversalAI {
         const aiProvider = await getProvider(provider, credentials.apiKey, credentials.baseUrl);
         for (let i = 0; i < items.length; i++) {
             try {
-                const result = await processItem(this, i, provider, aiProvider);
+                const result = await processItem(this, i, provider, aiProvider, credentials.apiKey);
                 returnData.push(...result);
             }
             catch (error) {
                 if (this.continueOnFail()) {
-                    const errorMessage = error instanceof Error ? error.message : String(error);
-                    returnData.push({
-                        json: {
-                            error: errorMessage,
-                            itemIndex: i,
-                            timestamp: new Date().toISOString(),
-                            nodeName: this.getNode().name,
-                        },
+                    const errorOutput = {
+                        success: false,
+                        error: error instanceof Error ? error.message : String(error),
+                        itemIndex: i,
+                        timestamp: new Date().toISOString(),
+                        nodeName: this.getNode().name,
+                        provider,
+                    };
+                    if (error instanceof Error && error.stack) {
+                        errorOutput.stack = error.stack;
+                    }
+                    errorData.push({
+                        json: errorOutput,
                         pairedItem: { item: i },
                     });
                 }
@@ -598,23 +629,24 @@ class UniversalAI {
                     }
                     throw new n8n_workflow_1.NodeOperationError(this.getNode(), error, {
                         itemIndex: i,
+                        description: `Failed to process item ${i + 1}`,
                     });
                 }
             }
         }
-        return [returnData];
+        return [returnData, errorData];
     }
 }
 exports.UniversalAI = UniversalAI;
-async function processItem(exec, index, provider, aiProvider) {
+async function processItem(exec, index, provider, aiProvider, apiKey) {
     const operation = exec.getNodeParameter('operation', index);
     const model = exec.getNodeParameter('model', index);
     const options = exec.getNodeParameter('options', index, {});
     const input = await buildInput(exec, index);
     const modelSettings = getModelSettings(exec, index, provider, operation, options);
     return operation === 'generateText'
-        ? await generateTextOperation(exec, index, provider, aiProvider, model, modelSettings, input, options)
-        : await generateObjectOperation(exec, index, provider, aiProvider, model, modelSettings, input, options);
+        ? await generateTextOperation(exec, index, provider, aiProvider, model, modelSettings, input, options, apiKey)
+        : await generateObjectOperation(exec, index, provider, aiProvider, model, modelSettings, input, options, apiKey);
 }
 function getModelSettings(exec, index, provider, operation, options) {
     const settings = {};
@@ -638,86 +670,72 @@ function getModelSettings(exec, index, provider, operation, options) {
     }
     return settings;
 }
-function buildGoogleProviderOptions(exec, index) {
+function buildGoogleProviderOptions(exec, index, cachedContentName) {
     const thinkingBudgetValue = Number(exec.getNodeParameter('thinkingBudget', index, 0));
     const includeThoughts = exec.getNodeParameter('includeThoughts', index, false);
     const options = {};
-    if (!Number.isNaN(thinkingBudgetValue)) {
+    if (!Number.isNaN(thinkingBudgetValue) && thinkingBudgetValue > 0) {
         options.thinkingConfig = {
             thinkingBudget: thinkingBudgetValue,
             includeThoughts,
         };
     }
+    if (cachedContentName) {
+        options.cachedContent = cachedContentName;
+    }
     return Object.keys(options).length > 0 ? options : undefined;
 }
-async function generateTextOperation(exec, index, provider, aiProvider, model, modelSettings, input, options) {
-    var _a, _b;
+async function generateTextOperation(exec, index, provider, aiProvider, model, modelSettings, input, options, apiKey) {
     const enableStreaming = exec.getNodeParameter('enableStreaming', index, false);
     const includeRequestBody = options.includeRequestBody;
     const tools = provider === 'google' ? await buildGoogleTools(exec, index) : undefined;
-    const params = {
-        model: aiProvider(model, modelSettings),
-        ...input,
-        ...(tools && { tools }),
-    };
+    let cachedContentName = null;
+    let googleProviderOptions;
     if (provider === 'google') {
         const useGoogleCache = exec.getNodeParameter('useGoogleCache', index, false);
-        console.log('UniversalAI: Cache debug - Provider is Google, useGoogleCache:', useGoogleCache);
-        if (useGoogleCache) {
-            console.log('UniversalAI: Cache enabled, attempting to create cache...');
+        if (useGoogleCache && canUseCache(input.system, tools)) {
+            console.log('UniversalAI: Creating Google cache...');
             try {
-                const credentials = await exec.getCredentials('googleGenerativeAIApi');
-                const apiKey = credentials === null || credentials === void 0 ? void 0 : credentials.apiKey;
-                if (apiKey) {
-                    console.log('UniversalAI: Got API key, calling createGoogleCache...');
-                    const cachedContentName = await createGoogleCache(exec, index, apiKey, input.system, tools);
-                    console.log('UniversalAI: Cache creation result:', cachedContentName);
-                    if (cachedContentName) {
-                        const googleProviderOptions = buildGoogleProviderOptions(exec, index);
-                        params.providerOptions = {
-                            google: {
-                                ...googleProviderOptions,
-                                cachedContent: cachedContentName,
-                            },
-                        };
-                        if (params.system)
-                            delete params.system;
-                        if (params.tools)
-                            delete params.tools;
-                        console.log('UniversalAI: Using Google cache (system/tools moved to cache):', cachedContentName);
-                        console.log('UniversalAI: Request params after cache processing:', {
-                            hasSystem: !!params.system,
-                            hasTools: !!params.tools,
-                            hasCachedContent: !!((_b = (_a = params.providerOptions) === null || _a === void 0 ? void 0 : _a.google) === null || _b === void 0 ? void 0 : _b.cachedContent),
-                        });
-                    }
-                    else {
-                        console.log('UniversalAI: No cache created, continuing without cache');
-                    }
+                cachedContentName = await createGoogleCache(exec, index, apiKey, input.system, tools);
+                if (cachedContentName) {
+                    console.log('UniversalAI: Successfully created/retrieved cache:', cachedContentName);
                 }
                 else {
-                    console.log('UniversalAI: No API key found for cache creation');
+                    console.log('UniversalAI: Cache creation returned null, continuing without cache');
                 }
             }
             catch (error) {
                 console.warn('UniversalAI: Cache creation failed, continuing without cache:', error);
             }
         }
-        else {
-            console.log('UniversalAI: Cache not enabled for this request');
+        googleProviderOptions = buildGoogleProviderOptions(exec, index, cachedContentName || undefined);
+    }
+    const params = {
+        model: aiProvider(model, modelSettings),
+        ...input,
+    };
+    if (cachedContentName) {
+        console.log('UniversalAI: Using cache, removing system and tools from request params');
+        if (params.system) {
+            console.log('UniversalAI: Removed system instruction from request (moved to cache)');
+            delete params.system;
+        }
+        if (params.tools) {
+            console.log('UniversalAI: Removed tools from request (moved to cache)');
+            delete params.tools;
         }
     }
     else {
-        console.log('UniversalAI: Cache debug - Provider is not Google, cache not applicable');
-    }
-    if (provider === 'google' && !params.providerOptions) {
-        const googleProviderOptions = buildGoogleProviderOptions(exec, index);
-        if (googleProviderOptions) {
-            params.providerOptions = {
-                google: googleProviderOptions,
-            };
+        if (tools) {
+            params.tools = tools;
         }
     }
+    if (provider === 'google' && googleProviderOptions) {
+        params.providerOptions = {
+            google: googleProviderOptions,
+        };
+        console.log('UniversalAI: Added Google provider options:', googleProviderOptions);
+    }
     const numericOptionKeys = [
         'maxTokens',
         'temperature',
@@ -733,6 +751,12 @@ async function generateTextOperation(exec, index, provider, aiProvider, model, m
             params[key] = value;
         }
     }
+    console.log('UniversalAI: Final request params:', {
+        hasSystem: !!params.system,
+        hasTools: !!params.tools,
+        hasCachedContent: !!cachedContentName,
+        providerOptions: params.providerOptions,
+    });
     if (enableStreaming) {
         return await handleStreaming(params, provider, includeRequestBody);
     }
@@ -742,6 +766,7 @@ async function generateTextOperation(exec, index, provider, aiProvider, model, m
         hasProviderMetadata: !!result.experimental_providerMetadata,
         providerMetadata: result.experimental_providerMetadata,
         usage: result.usage,
+        response: result.response,
     });
     const formattedResult = formatTextResult(result, includeRequestBody, provider);
     return [{ json: formattedResult }];
@@ -766,9 +791,6 @@ async function buildGoogleTools(exec, index) {
     return tools;
 }
 async function handleStreaming(params, provider, includeRequestBody) {
-    if (provider === 'google' && params.providerOptions) {
-        params.providerOptions.google.streaming = true;
-    }
     const stream = await (0, ai_1.streamText)(params);
     const chunks = [];
     let fullText = '';
@@ -795,73 +817,48 @@ async function handleStreaming(params, provider, includeRequestBody) {
     chunks.push({ json: finalJson });
     return chunks;
 }
-async function generateObjectOperation(exec, index, provider, aiProvider, model, modelSettings, input, options) {
-    var _a, _b;
+async function generateObjectOperation(exec, index, provider, aiProvider, model, modelSettings, input, options, apiKey) {
     const schemaName = exec.getNodeParameter('schemaName', index, '');
     const schemaDescription = exec.getNodeParameter('schemaDescription', index, '');
     const rawSchema = exec.getNodeParameter('schema', index);
     const parsedSchema = parseAndValidateSchema(rawSchema, exec);
-    const params = {
-        model: aiProvider(model, modelSettings),
-        schema: (0, ai_1.jsonSchema)(parsedSchema),
-        schemaName,
-        schemaDescription,
-        ...input,
-    };
+    let cachedContentName = null;
+    let googleProviderOptions;
     if (provider === 'google') {
         const useGoogleCache = exec.getNodeParameter('useGoogleCache', index, false);
-        console.log('UniversalAI: Cache debug - Object generation, Provider is Google, useGoogleCache:', useGoogleCache);
-        if (useGoogleCache) {
-            console.log('UniversalAI: Cache enabled for object generation, attempting to create cache...');
+        if (useGoogleCache && canUseCache(input.system, undefined)) {
+            console.log('UniversalAI: Creating Google cache for object generation...');
             try {
-                const credentials = await exec.getCredentials('googleGenerativeAIApi');
-                const apiKey = credentials === null || credentials === void 0 ? void 0 : credentials.apiKey;
-                if (apiKey) {
-                    console.log('UniversalAI: Got API key for object generation, calling createGoogleCache...');
-                    const cachedContentName = await createGoogleCache(exec, index, apiKey, input.system, undefined);
-                    console.log('UniversalAI: Object generation cache creation result:', cachedContentName);
-                    if (cachedContentName) {
-                        const googleProviderOptions = buildGoogleProviderOptions(exec, index);
-                        params.providerOptions = {
-                            google: {
-                                ...googleProviderOptions,
-                                cachedContent: cachedContentName,
-                            },
-                        };
-                        if (params.system)
-                            delete params.system;
-                        console.log('UniversalAI: Using Google cache for object generation (system moved to cache):', cachedContentName);
-                        console.log('UniversalAI: Object generation request params after cache processing:', {
-                            hasSystem: !!params.system,
-                            hasCachedContent: !!((_b = (_a = params.providerOptions) === null || _a === void 0 ? void 0 : _a.google) === null || _b === void 0 ? void 0 : _b.cachedContent),
-                        });
-                    }
-                    else {
-                        console.log('UniversalAI: No cache created for object generation, continuing without cache');
-                    }
+                cachedContentName = await createGoogleCache(exec, index, apiKey, input.system, undefined);
+                if (cachedContentName) {
+                    console.log('UniversalAI: Successfully created/retrieved cache for object generation:', cachedContentName);
                 }
                 else {
-                    console.log('UniversalAI: No API key found for object generation cache creation');
+                    console.log('UniversalAI: Cache creation for object generation returned null, continuing without cache');
                 }
             }
             catch (error) {
                 console.warn('UniversalAI: Cache creation failed for object generation, continuing without cache:', error);
             }
         }
-        else {
-            console.log('UniversalAI: Cache not enabled for object generation');
-        }
+        googleProviderOptions = buildGoogleProviderOptions(exec, index, cachedContentName || undefined);
     }
-    else {
-        console.log('UniversalAI: Cache debug - Object generation provider is not Google, cache not applicable');
+    const params = {
+        model: aiProvider(model, modelSettings),
+        schema: (0, ai_1.jsonSchema)(parsedSchema),
+        schemaName,
+        schemaDescription,
+        ...input,
+    };
+    if (cachedContentName && params.system) {
+        console.log('UniversalAI: Using cache for object generation, removing system from request params');
+        delete params.system;
     }
-    if (provider === 'google' && !params.providerOptions) {
-        const googleProviderOptions = buildGoogleProviderOptions(exec, index);
-        if (googleProviderOptions) {
-            params.providerOptions = {
-                google: googleProviderOptions,
-            };
-        }
+    if (provider === 'google' && googleProviderOptions) {
+        params.providerOptions = {
+            google: googleProviderOptions,
+        };
+        console.log('UniversalAI: Added Google provider options for object generation:', googleProviderOptions);
     }
     const numericOptionKeys = [
         'temperature',
@@ -877,6 +874,11 @@ async function generateObjectOperation(exec, index, provider, aiProvider, model,
             params[key] = value;
         }
     }
+    console.log('UniversalAI: Final object generation request params:', {
+        hasSystem: !!params.system,
+        hasCachedContent: !!cachedContentName,
+        providerOptions: params.providerOptions,
+    });
     const result = await (0, ai_1.generateObject)(params);
     console.log('UniversalAI: Debug - generateObject result:', {
         provider,