@modular-prompt/driver 0.11.15 → 0.13.1

package/dist/google-genai/google-genai-cache-controller.js

@@ -0,0 +1,127 @@
+import { createHash } from 'node:crypto';
+import { elementToPart, elementToContent, convertTools, mergeToolResultContents } from './element-converter.js';
+function parseTtlSeconds(ttl) {
+    const match = ttl.match(/^(\d+)s$/);
+    if (!match) {
+        throw new Error(`Invalid TTL format "${ttl}": expected "<digits>s" (e.g. "3600s")`);
+    }
+    return Number(match[1]);
+}
+export class GoogleGenAICacheController {
+    client;
+    config;
+    managedCaches = new Set();
+    cacheByHash = new Map();
+    inflightRequests = new Map();
+    ttlSeconds;
+    normalizedTtl;
+    constructor(client, config) {
+        this.client = client;
+        this.config = config;
+        this.ttlSeconds = parseTtlSeconds(this.config?.ttl || '3600s');
+        this.normalizedTtl = `${this.ttlSeconds}s`;
+    }
+    computeCacheKey(params) {
+        const payload = { model: params.model };
+        if (params.instructions && params.instructions.length > 0) {
+            payload.systemInstruction = params.instructions.map(el => elementToPart(el));
+        }
+        if (params.data && params.data.length > 0) {
+            payload.contents = params.data.map(el => elementToContent(el));
+        }
+        if (params.tools && params.tools.length > 0) {
+            payload.tools = convertTools(params.tools);
+        }
+        return createHash('sha256').update(JSON.stringify(payload)).digest('hex');
+    }
+    sweepExpired() {
+        const now = Date.now();
+        for (const [key, entry] of this.cacheByHash) {
+            if ((now - entry.createdAt) / 1000 >= this.ttlSeconds) {
+                this.cacheByHash.delete(key);
+                this.managedCaches.delete(entry.handle.ref);
+            }
+        }
+    }
+    recordQuery() {
+        // no-op: GoogleGenAI cache controller does not track query stats
+    }
+    async prepare(params) {
+        this.sweepExpired();
+        const cacheKey = this.computeCacheKey(params);
+        const existing = this.cacheByHash.get(cacheKey);
+        if (existing) {
+            return existing.handle;
+        }
+        const inflight = this.inflightRequests.get(cacheKey);
+        if (inflight) {
+            return inflight;
+        }
+        const promise = this.createCache(params, cacheKey);
+        this.inflightRequests.set(cacheKey, promise);
+        try {
+            return await promise;
+        }
+        finally {
+            this.inflightRequests.delete(cacheKey);
+        }
+    }
+    async createCache(params, cacheKey) {
+        const cacheConfig = {
+            ttl: this.normalizedTtl,
+            displayName: this.config?.displayName,
+        };
+        if (params.instructions && params.instructions.length > 0) {
+            cacheConfig.systemInstruction = params.instructions.map(el => elementToPart(el));
+        }
+        if (params.data && params.data.length > 0) {
+            cacheConfig.contents = mergeToolResultContents(params.data.map(el => elementToContent(el)));
+        }
+        if (params.tools && params.tools.length > 0) {
+            cacheConfig.tools = convertTools(params.tools);
+        }
+        Object.keys(cacheConfig).forEach(key => {
+            if (cacheConfig[key] === undefined) {
+                delete cacheConfig[key];
+            }
+        });
+        const cache = await this.client.caches.create({
+            model: params.model,
+            config: cacheConfig,
+        });
+        if (!cache.name) {
+            throw new Error('GoogleGenAI caches.create() returned a cache without a name');
+        }
+        const ref = cache.name;
+        this.managedCaches.add(ref);
+        const handle = {
+            ref,
+            includes: {
+                instructions: (params.instructions?.length ?? 0) > 0,
+                dataElementCount: params.data?.length ?? 0,
+                tools: (params.tools?.length ?? 0) > 0,
+            },
+        };
+        this.cacheByHash.set(cacheKey, { handle, createdAt: Date.now() });
+        return handle;
+    }
+    async invalidate(handle) {
+        await this.client.caches.delete({ name: handle.ref });
+        this.managedCaches.delete(handle.ref);
+        for (const [key, entry] of this.cacheByHash) {
+            if (entry.handle.ref === handle.ref) {
+                this.cacheByHash.delete(key);
+                break;
+            }
+        }
+    }
+    async close() {
+        await Promise.allSettled([...this.inflightRequests.values()]);
+        this.inflightRequests.clear();
+        const deletions = [...this.managedCaches].map(name => this.client.caches.delete({ name }).catch(() => { }));
+        await Promise.all(deletions);
+        this.managedCaches.clear();
+        this.cacheByHash.clear();
+    }
+}
+//# sourceMappingURL=google-genai-cache-controller.js.map

package/dist/google-genai/google-genai-cache-controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"google-genai-cache-controller.js","sourceRoot":"","sources":["../../src/google-genai/google-genai-cache-controller.ts"],"names":[],"mappings":"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"}

package/dist/google-genai/google-genai-driver.d.ts

@@ -1,5 +1,6 @@
 import type { CompiledPrompt } from '@modular-prompt/core';
 import type { AIDriver, QueryOptions, QueryResult, StreamResult } from '../types.js';
+import type { PromptCacheController } from '../cache-controller.js';
 /**
  * GoogleGenAI driver configuration
  */
@@ -8,6 +9,7 @@ export interface GoogleGenAIDriverConfig {
     model?: string;
     temperature?: number;
     defaultOptions?: Partial<GoogleGenAIQueryOptions>;
+    cacheController?: PromptCacheController;
 }
 /**
  * GoogleGenAI-specific query options
@@ -33,40 +35,14 @@ export declare class GoogleGenAIDriver implements AIDriver {
     private defaultTemperature;
     private _defaultOptions;
     private queryLogger;
+    private cacheController?;
     get defaultOptions(): Partial<GoogleGenAIQueryOptions>;
     set defaultOptions(value: Partial<GoogleGenAIQueryOptions>);
     constructor(config?: GoogleGenAIDriverConfig);
-    /**
-     * Convert Element to Part (flat text conversion)
-     * Used for systemInstruction and simple data
-     */
-    private elementToPart;
-    /**
-     * Convert kind+value to GoogleGenAI functionResponse
-     */
-    private toFunctionResponsePayload;
-    /**
-     * Convert Element to Content (structure-preserving conversion)
-     * Used for conversation history where role matters
-     */
-    private elementToContent;
-    /**
-     * Convert ChatMessage to GoogleGenAI Content format
-     */
+    private buildPromptPayload;
+    private buildGenerationConfig;
     private chatMessageToContent;
-    /**
-     * Merge consecutive tool result Contents into a single user message.
-     * Gemini API requires multiple functionResponses in one user message.
-     */
-    private mergeToolResultContents;
-    /**
-     * Convert JSON Schema to GoogleGenAI Schema format
-     */
     private convertJsonSchema;
-    /**
-     * Convert ToolDefinition[] to GoogleGenAI tools format
-     */
-    private convertTools;
     /**
      * Convert ToolChoice to GoogleGenAI FunctionCallingConfig
      */

package/dist/google-genai/google-genai-driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"google-genai-driver.d.ts","sourceRoot":"","sources":["../../src/google-genai/google-genai-driver.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAW,MAAM,sBAAsB,CAAC;AACpE,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAqD,MAAM,aAAa,CAAC;AAKxI;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC;CACnD;AAED;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,YAAY;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE;QACf,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;KAC3C,CAAC;CACH;AAmBD;;GAEG;AACH,qBAAa,iBAAkB,YAAW,QAAQ;IAChD,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,eAAe,CAAmC;IAC1D,OAAO,CAAC,WAAW,CAAkC;IAErD,IAAI,cAAc,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAErD;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,uBAAuB,CAAC,EAEzD;gBAEW,MAAM,GAAE,uBAA4B;IAahD;;;OAGG;IACH,OAAO,CAAC,aAAa;IAwDrB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAcjC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IA8CxB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAsC5B;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAmB/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAQzB;;OAEG;IACH,OAAO,CAAC,YAAY;IASpB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAiBzB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAgBxB;;OAEG;IACG,KAAK,CACT,MAAM,EAAE,cAAc,EACtB,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,WAAW,CAAC;IAoHvB;;OAEG;IACG,WAAW,CACf,MAAM,EAAE,cAAc,EACtB,OAAO,CAAC,EAAE,uBAAuB,GAChC,OAAO,CAAC,YAAY,CAAC;IAyKxB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}
+{"version":3,"file":"google-genai-driver.d.ts","sourceRoot":"","sources":["../../src/google-genai/google-genai-driver.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAqC,MAAM,aAAa,CAAC;AAIxH,OAAO,KAAK,EAAE,qBAAqB,EAAe,MAAM,wBAAwB,CAAC;AAIjF;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAClD,eAAe,CAAC,EAAE,qBAAqB,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,YAAY;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE;QACf,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;KAC3C,CAAC;CACH;AAmBD;;GAEG;AACH,qBAAa,iBAAkB,YAAW,QAAQ;IAChD,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,eAAe,CAAmC;IAC1D,OAAO,CAAC,WAAW,CAAkC;IACrD,OAAO,CAAC,eAAe,CAAC,CAAwB;IAEhD,IAAI,cAAc,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAErD;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,uBAAuB,CAAC,EAEzD;gBAEW,MAAM,GAAE,uBAA4B;YAclC,kBAAkB;IAkDhC,OAAO,CAAC,qBAAqB;IAoD7B,OAAO,CAAC,oBAAoB;IAmC5B,OAAO,CAAC,iBAAiB;IAKzB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAiBzB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAoBxB;;OAEG;IACG,KAAK,CACT,MAAM,EAAE,cAAc,EACtB,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,WAAW,CAAC;IAsEvB;;OAEG;IACG,WAAW,CACf,MAAM,EAAE,cAAc,EACtB,OAAO,CAAC,EAAE,uBAAuB,GAChC,OAAO,CAAC,YAAY,CAAC;IA2HxB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}

package/dist/google-genai/google-genai-driver.js

@@ -2,6 +2,8 @@ import { GoogleGenAI, FunctionCallingConfigMode } from '@google/genai';
 import { hasToolCalls, isToolResult } from '../types.js';
 import { contentToString } from '../content-utils.js';
 import { QueryLogger } from '../query-logger.js';
+import { partitionPrompt } from '../cache-utils.js';
+import { elementToPart, elementToContent, toFunctionResponsePayload, convertTools, mergeToolResultContents } from './element-converter.js';
 /**
  * Map finish reasons from GoogleGenAI to our format
  */
@@ -27,6 +29,7 @@ export class GoogleGenAIDriver {
     defaultTemperature;
     _defaultOptions;
     queryLogger = new QueryLogger('GoogleGenAI');
+    cacheController;
     get defaultOptions() {
         return this._defaultOptions;
     }
@@ -42,212 +45,126 @@ export class GoogleGenAIDriver {
         this.defaultModel = config.model || 'gemma-3-27b';
         this.defaultTemperature = config.temperature ?? 0.7;
         this._defaultOptions = config.defaultOptions || {};
+        this.cacheController = config.cacheController;
     }
-    /**
-     * Convert Element to Part (flat text conversion)
-     * Used for systemInstruction and simple data
-     */
-    elementToPart(element) {
-        if (typeof element === 'string') {
-            return { text: element };
-        }
-        switch (element.type) {
-            case 'text':
-                return { text: element.content };
-            case 'message': {
-                // Flatten message as text
-                if (element.role === 'tool') {
-                    // ToolResultMessageElement doesn't have content property
-                    const toolResultEl = element;
-                    const textValue = toolResultEl.kind === 'text' ? String(toolResultEl.value) : JSON.stringify(toolResultEl.value);
-                    return { text: `${element.role}: ${textValue}` };
-                }
-                const messageContent = contentToString(element.content);
-                return { text: `${element.role}: ${messageContent}` };
-            }
-            case 'material': {
-                const materialContent = contentToString(element.content);
-                return { text: `# ${element.title}\n${materialContent}` };
-            }
-            case 'chunk': {
-                const chunkContent = contentToString(element.content);
-                const chunkHeader = element.index !== undefined && element.total !== undefined
-                    ? `[Chunk ${element.index + 1}/${element.total} of ${element.partOf}]`
-                    : `[Chunk of ${element.partOf}]`;
-                return { text: `${chunkHeader}\n${chunkContent}` };
-            }
-            case 'section':
-            case 'subsection': {
-                // Section/SubSection elements should be compiled before reaching here
-                // If they do reach here, flatten their items recursively
-                const flattenItems = (items) => {
-                    return items.map(item => {
-                        if (typeof item === 'string')
-                            return item;
-                        if (typeof item === 'function')
-                            return ''; // DynamicContent should be resolved before this point
-                        return this.elementToPart(item).text || '';
-                    }).filter(Boolean).join('\n');
-                };
-                return { text: flattenItems(element.items) };
+    async buildPromptPayload(prompt, mergedOptions, model) {
+        if (this.cacheController) {
+            const partition = partitionPrompt(prompt);
+            const hasCacheableContent = partition.cacheable.instructions.length > 0 ||
+                partition.cacheable.data.length > 0 ||
+                (mergedOptions.tools && mergedOptions.tools.length > 0);
+            if (hasCacheableContent) {
+                const handle = await this.cacheController.prepare({
+                    model,
+                    instructions: partition.cacheable.instructions,
+                    data: partition.cacheable.data,
+                    tools: mergedOptions.tools,
+                });
+                const instructionsForRequest = handle.includes.instructions
+                    ? partition.volatile.instructions
+                    : [...partition.cacheable.instructions, ...partition.volatile.instructions];
+                const uncachedInstructionParts = instructionsForRequest.length > 0
+                    ? instructionsForRequest.map(el => elementToPart(el))
+                    : undefined;
+                const dataForRequest = handle.includes.dataElementCount >= partition.cacheable.data.length
+                    ? partition.volatile.data
+                    : [...partition.cacheable.data, ...partition.volatile.data];
+                const volatileElements = [...dataForRequest, ...partition.volatile.output];
+                const contents = volatileElements.length > 0
+                    ? mergeToolResultContents(volatileElements.map(el => elementToContent(el)))
+                    : [{ parts: [{ text: 'Please process according to the instructions.' }] }];
+                return { systemInstructionParts: uncachedInstructionParts, contents, cacheHandle: handle };
             }
-            case 'json':
-                return { text: typeof element.content === 'string' ? element.content : JSON.stringify(element.content, null, 2) };
-            default:
-                return { text: JSON.stringify(element) };
         }
+        const systemInstructionParts = prompt.instructions?.map(el => elementToPart(el));
+        const allDataElements = [...(prompt.data || []), ...(prompt.output || [])];
+        const contents = allDataElements.length > 0
+            ? mergeToolResultContents(allDataElements.map(el => elementToContent(el)))
+            : [{ parts: [{ text: 'Please process according to the instructions.' }] }];
+        return { systemInstructionParts, contents, cacheHandle: null };
     }
-    /**
-     * Convert kind+value to GoogleGenAI functionResponse
-     */
-    toFunctionResponsePayload(kind, value) {
-        if (kind === 'text') {
-            return { output: String(value) };
+    buildGenerationConfig(mergedOptions, cacheHandle, systemInstructionParts, prompt) {
+        const config = {
+            temperature: mergedOptions.temperature ?? this.defaultTemperature,
+            maxOutputTokens: mergedOptions.maxTokens,
+            topP: mergedOptions.topP,
+            topK: mergedOptions.topK,
+            candidateCount: mergedOptions.candidateCount,
+            stopSequences: mergedOptions.stopSequences,
+            thinkingConfig: mergedOptions.thinkingConfig ??
+                (mergedOptions.mode === 'thinking' ? { thinkingLevel: 'HIGH' } : undefined),
+        };
+        if (cacheHandle) {
+            config.cachedContent = cacheHandle.ref;
+            if (!cacheHandle.includes.tools && mergedOptions.tools && mergedOptions.tools.length > 0) {
+                config.tools = convertTools(mergedOptions.tools);
+            }
         }
-        else if (kind === 'data') {
-            // Check if value is a plain object
-            if (value !== null && typeof value === 'object' && !Array.isArray(value) && Object.getPrototypeOf(value) === Object.prototype) {
-                return value;
+        else {
+            if (mergedOptions.tools && mergedOptions.tools.length > 0) {
+                config.tools = convertTools(mergedOptions.tools);
             }
-            return { output: value };
         }
-        else { // 'error'
-            return { error: value };
+        if (systemInstructionParts && systemInstructionParts.length > 0) {
+            config.systemInstruction = systemInstructionParts;
         }
-    }
-    /**
-     * Convert Element to Content (structure-preserving conversion)
-     * Used for conversation history where role matters
-     */
-    elementToContent(element) {
-        if (typeof element === 'string') {
-            return { parts: [{ text: element }] };
+        if (prompt.metadata?.outputSchema) {
+            config.responseMimeType = 'application/json';
+            config.responseSchema = this.convertJsonSchema(prompt.metadata.outputSchema);
         }
-        if (element.type === 'message') {
-            if (element.role === 'tool') {
-                // ToolResultMessageElement
-                const toolResultEl = element;
-                return {
-                    role: 'user',
-                    parts: [{
-                            functionResponse: {
-                                name: toolResultEl.name,
-                                response: this.toFunctionResponsePayload(toolResultEl.kind, toolResultEl.value)
-                            }
-                        }]
-                };
-            }
-            else if ('toolCalls' in element && element.toolCalls) {
-                const parts = [];
-                const content = contentToString(element.content);
-                if (content)
-                    parts.push({ text: content });
-                for (const tc of element.toolCalls) {
-                    parts.push({ functionCall: { name: tc.name, args: tc.arguments } });
-                }
-                return { role: 'model', parts };
-            }
-            else {
-                // Role conversion:
-                // - assistant → model
-                // - system → user (Gemini API doesn't support system role in contents)
-                // - user → user
-                const role = element.role === 'assistant' ? 'model' : 'user';
-                const messageContent = contentToString(element.content);
-                return {
-                    role,
-                    parts: [{ text: messageContent }]
-                };
-            }
+        if (mergedOptions.toolChoice) {
+            config.toolConfig = {
+                functionCallingConfig: this.convertToolChoice(mergedOptions.toolChoice),
+            };
         }
-        // Non-message elements: convert to Part and wrap in Content without role
-        return {
-            parts: [this.elementToPart(element)]
-        };
+        Object.keys(config).forEach(key => {
+            if (config[key] === undefined) {
+                delete config[key];
+            }
+        });
+        return config;
     }
-    /**
-     * Convert ChatMessage to GoogleGenAI Content format
-     */
     chatMessageToContent(message) {
         if (hasToolCalls(message)) {
-            // AssistantToolCallMessage
             const parts = [];
             const textContent = contentToString(message.content);
             if (textContent) {
                 parts.push({ text: textContent });
             }
             for (const tc of message.toolCalls) {
-                parts.push({
-                    functionCall: {
-                        name: tc.name,
-                        args: tc.arguments
-                    }
-                });
+                const part = {
+                    functionCall: { name: tc.name, args: tc.arguments }
+                };
+                if (typeof tc.metadata?.thoughtSignature === 'string') {
+                    part.thoughtSignature = tc.metadata.thoughtSignature;
+                }
+                parts.push(part);
             }
             return { role: 'model', parts };
         }
         else if (isToolResult(message)) {
-            // ToolResultMessage
             return {
                 role: 'user',
                 parts: [{
                         functionResponse: {
                             name: message.name,
-                            response: this.toFunctionResponsePayload(message.kind, message.value)
+                            response: toFunctionResponsePayload(message.kind, message.value)
                         }
                     }]
             };
         }
         else {
-            // StandardChatMessage
             return {
                 role: message.role === 'assistant' ? 'model' : 'user',
                 parts: [{ text: contentToString(message.content) }]
             };
         }
     }
-    /**
-     * Merge consecutive tool result Contents into a single user message.
-     * Gemini API requires multiple functionResponses in one user message.
-     */
-    mergeToolResultContents(contents) {
-        const merged = [];
-        for (const c of contents) {
-            const prev = merged[merged.length - 1];
-            if (prev &&
-                c.role === 'user' &&
-                prev.role === 'user' &&
-                c.parts?.length === 1 && c.parts[0].functionResponse &&
-                prev.parts && prev.parts.length > 0 && prev.parts[0].functionResponse) {
-                prev.parts.push(c.parts[0]);
-            }
-            else {
-                merged.push(c);
-            }
-        }
-        return merged;
-    }
-    /**
-     * Convert JSON Schema to GoogleGenAI Schema format
-     */
     convertJsonSchema(schema) {
         if (!schema || typeof schema !== 'object')
             return undefined;
-        // GoogleGenAI uses a specific schema format
-        // For now, we'll pass it through and let the API handle it
         return schema;
     }
-    /**
-     * Convert ToolDefinition[] to GoogleGenAI tools format
-     */
-    convertTools(tools) {
-        const functionDeclarations = tools.map(tool => ({
-            name: tool.name,
-            description: tool.description,
-            parametersJsonSchema: tool.parameters,
-        }));
-        return [{ functionDeclarations }];
-    }
     /**
      * Convert ToolChoice to GoogleGenAI FunctionCallingConfig
      */
@@ -277,11 +194,15 @@ export class GoogleGenAIDriver {
         for (const part of parts) {
             if (part.functionCall) {
                 const fc = part.functionCall;
-                toolCalls.push({
+                const toolCall = {
                     id: fc.id || `call_${toolCalls.length}`,
                     name: fc.name || '',
                     arguments: fc.args ?? {},
-                });
+                };
+                if (typeof part.thoughtSignature === 'string') {
+                    toolCall.metadata = { thoughtSignature: part.thoughtSignature };
+                }
+                toolCalls.push(toolCall);
             }
         }
         return toolCalls;
@@ -294,52 +215,10 @@ export class GoogleGenAIDriver {
             // Merge options with defaults
             const mergedOptions = { ...this.defaultOptions, ...options };
             this.queryLogger.mark(mergedOptions);
-            // Convert prompt to GoogleGenAI format
-            // Instructions → systemInstruction (Part[])
-            const systemInstructionParts = prompt.instructions?.map(el => this.elementToPart(el));
-            // Data + Output → contents (Content[])
-            const allDataElements = [...(prompt.data || []), ...(prompt.output || [])];
-            const contents = allDataElements.length > 0
-                ? this.mergeToolResultContents(allDataElements.map(el => this.elementToContent(el)))
-                : [{ parts: [{ text: 'Please process according to the instructions.' }] }];
-            // Create generation config
-            const config = {
-                temperature: mergedOptions.temperature ?? this.defaultTemperature,
-                maxOutputTokens: mergedOptions.maxTokens,
-                topP: mergedOptions.topP,
-                topK: mergedOptions.topK,
-                candidateCount: mergedOptions.candidateCount,
-                stopSequences: mergedOptions.stopSequences,
-                thinkingConfig: mergedOptions.thinkingConfig ??
-                    (mergedOptions.mode === 'thinking' ? { thinkingLevel: 'HIGH' } : undefined),
-            };
-            // Add system instruction if present
-            if (systemInstructionParts && systemInstructionParts.length > 0) {
-                config.systemInstruction = systemInstructionParts;
-            }
-            // Handle structured outputs
-            if (prompt.metadata?.outputSchema) {
-                config.responseMimeType = 'application/json';
-                config.responseSchema = this.convertJsonSchema(prompt.metadata.outputSchema);
-            }
-            // Add tools configuration
-            if (mergedOptions.tools && mergedOptions.tools.length > 0) {
-                config.tools = this.convertTools(mergedOptions.tools);
-            }
-            if (mergedOptions.toolChoice) {
-                config.toolConfig = {
-                    functionCallingConfig: this.convertToolChoice(mergedOptions.toolChoice),
-                };
-            }
-            // Remove undefined values
-            Object.keys(config).forEach(key => {
-                if (config[key] === undefined) {
-                    delete config[key];
-                }
-            });
-            // Get model name
             const model = mergedOptions.model || this.defaultModel;
-            // Generate content
+            const { systemInstructionParts, contents, cacheHandle } = await this.buildPromptPayload(prompt, mergedOptions, model);
+            const config = this.buildGenerationConfig(mergedOptions, cacheHandle, systemInstructionParts, prompt);
+            this.cacheController?.recordQuery?.();
             const response = await this.client.models.generateContent({
                 model,
                 contents,
@@ -399,52 +278,10 @@ export class GoogleGenAIDriver {
     async streamQuery(prompt, options) {
         const mergedOptions = { ...this.defaultOptions, ...options };
         this.queryLogger.mark(mergedOptions);
-        // Convert prompt to GoogleGenAI format
-        // Instructions → systemInstruction (Part[])
-        const systemInstructionParts = prompt.instructions?.map(el => this.elementToPart(el));
-        // Data + Output → contents (Content[])
-        const allDataElements = [...(prompt.data || []), ...(prompt.output || [])];
-        const contents = allDataElements.length > 0
-            ? allDataElements.map(el => this.elementToContent(el))
-            : [{ parts: [{ text: 'Please process according to the instructions.' }] }];
-        // Create generation config
-        const config = {
-            temperature: mergedOptions.temperature ?? this.defaultTemperature,
-            maxOutputTokens: mergedOptions.maxTokens,
-            topP: mergedOptions.topP,
-            topK: mergedOptions.topK,
-            candidateCount: mergedOptions.candidateCount,
-            stopSequences: mergedOptions.stopSequences,
-            thinkingConfig: mergedOptions.thinkingConfig ??
-                (mergedOptions.mode === 'thinking' ? { thinkingLevel: 'HIGH' } : undefined),
-        };
-        // Add system instruction if present
-        if (systemInstructionParts && systemInstructionParts.length > 0) {
-            config.systemInstruction = systemInstructionParts;
-        }
-        // Handle structured outputs
-        if (prompt.metadata?.outputSchema) {
-            config.responseMimeType = 'application/json';
-            config.responseSchema = this.convertJsonSchema(prompt.metadata.outputSchema);
-        }
-        // Add tools configuration
-        if (mergedOptions.tools && mergedOptions.tools.length > 0) {
-            config.tools = this.convertTools(mergedOptions.tools);
-        }
-        if (mergedOptions.toolChoice) {
-            config.toolConfig = {
-                functionCallingConfig: this.convertToolChoice(mergedOptions.toolChoice),
-            };
-        }
-        // Remove undefined values
-        Object.keys(config).forEach(key => {
-            if (config[key] === undefined) {
-                delete config[key];
-            }
-        });
-        // Get model name
         const model = mergedOptions.model || this.defaultModel;
-        // Generate content stream
+        const { systemInstructionParts, contents, cacheHandle } = await this.buildPromptPayload(prompt, mergedOptions, model);
+        const config = this.buildGenerationConfig(mergedOptions, cacheHandle, systemInstructionParts, prompt);
+        this.cacheController?.recordQuery?.();
         const streamResponse = await this.client.models.generateContentStream({
             model,
             contents,
@@ -550,7 +387,7 @@ export class GoogleGenAIDriver {
      * Close the client
      */
     async close() {
-        // GoogleGenAI client doesn't need explicit closing
+        await this.cacheController?.close();
     }
 }
 //# sourceMappingURL=google-genai-driver.js.map