drizzle-cube 0.5.8 → 0.6.1

package/dist/server/execution/result-post-processor.d.ts

@@ -0,0 +1,10 @@
+import { SemanticQuery } from '../types/index.js';
+import { DatabaseAdapter } from '../adapters/base-adapter.js';
+/**
+ * Normalise time-dimension values in result rows and apply gap filling.
+ *
+ * @param data Raw rows from the database executor
+ * @param query The semantic query (for timeDimensions + measures)
+ * @param databaseAdapter Adapter used to convert engine-specific date results
+ */
+export declare function postProcessResultRows(data: unknown, query: SemanticQuery, databaseAdapter: DatabaseAdapter): Record<string, unknown>[];

package/dist/server/{server/executor.d.ts → executor.d.ts}

@@ -1,4 +1,5 @@
-import { SecurityContext, SemanticQuery, QueryResult, DatabaseExecutor, Cube, CacheConfig, ExplainOptions, ExplainResult, ExecutionOptions, QueryAnalysis, RLSSetupFn } from './types';
+import { SecurityContext, SemanticQuery, QueryResult, DatabaseExecutor, Cube, CacheConfig, ExplainOptions, ExplainResult, ExecutionOptions, QueryAnalysis, RLSSetupFn } from './types/index.js';
+import { PlanOptimiser } from './logical-plan/index.js';
 export declare class QueryExecutor {
     private dbExecutor;
     private queryBuilder;
@@ -8,11 +9,13 @@ export declare class QueryExecutor {
     private funnelQueryBuilder;
     private flowQueryBuilder;
     private retentionQueryBuilder;
-    private cacheConfig?;
     private logicalPlanBuilder;
     private planOptimiser;
+    private modeRouter;
+    private resultCache;
+    private filterCachePreloader;
     private rlsSetup?;
-    constructor(dbExecutor: DatabaseExecutor, cacheConfig?: CacheConfig, rlsSetup?: RLSSetupFn);
+    constructor(dbExecutor: DatabaseExecutor, cacheConfig?: CacheConfig, rlsSetup?: RLSSetupFn, planOptimiser?: PlanOptimiser);
     /**
      * Execute a function within a RLS-configured transaction context.
      * If no rlsSetup function is configured, the function is called directly.
@@ -33,7 +36,7 @@ export declare class QueryExecutor {
      * Build a logical plan for a query without executing it.
      * Useful for testing, debugging, and plan inspection.
      */
-    buildLogicalPlan(cubes: Map<string, Cube>, query: SemanticQuery, securityContext: SecurityContext): import('./logical-plan').QueryNode;
+    buildLogicalPlan(cubes: Map<string, Cube>, query: SemanticQuery, securityContext: SecurityContext): import('./logical-plan/index.js').QueryNode;
     /**
      * Analyze planning decisions for a regular query using the same logical
      * planning path as execution and dry-run SQL generation.
@@ -55,34 +58,41 @@ export declare class QueryExecutor {
     private executeComparisonQuery;
     private buildComparisonExecutionPlan;
     /**
-     * Execute a funnel query with caching support
+     * Execute an analysis query (funnel/flow/retention) with caching support.
+     * Wraps the inner execute callback with cache-set logic; the three analysis
+     * modes share identical wrapper behaviour, differing only in which inner
+     * execute method they invoke.
+     *
+     * Cache metadata is intentionally NOT attached here: fresh results across all
+     * query modes (regular, comparison, and analysis) uniformly carry no `cache`
+     * field — only cache *hits* (handled in execute()) carry cache metadata.
      */
-    private executeFunnelQueryWithCache;
+    private executeAnalysisQueryWithCache;
     /**
      * Execute a funnel analysis query
      */
     private executeFunnelQuery;
-    /**
-     * Execute a flow query with caching support
-     */
-    private executeFlowQueryWithCache;
     /**
      * Execute a flow analysis query
      * Produces Sankey diagram data (nodes and links)
      */
     private executeFlowQuery;
-    /**
-     * Execute a retention query with caching support
-     */
-    private executeRetentionQueryWithCache;
     /**
      * Execute a retention analysis query
      * Calculates cohort-based retention rates
      */
     private executeRetentionQuery;
     /**
-     * Standard query execution (non-comparison)
-     * This is the core execution logic extracted for use by comparison queries
+     * Standard (regular/non-comparison) query execution.
+     *
+     * This is the single core execution path used by both the regular query mode
+     * and comparison-mode period sub-queries. It always runs the dev-time
+     * security-context validation and propagates planner warnings; the optional
+     * `cacheKey` controls whether the fresh result is written to the cache.
+     *
+     * @param cacheKey - When provided (and a cache provider is configured), the
+     *   fresh result is written to the cache. Pass `undefined` to skip caching
+     *   (e.g. comparison period sub-queries cache at the comparison level).
      */
     private executeStandardQuery;
     /**
@@ -90,8 +100,9 @@ export declare class QueryExecutor {
      */
     private createQueryContext;
     /**
-     * Normalize engine type for optimiser passes.
-     * SingleStore follows MySQL SQL semantics for planner choices.
+     * Resolve the real database engine type for optimiser passes.
+     * Returns the true engine for all 7 supported engines (no collapsing);
+     * passes decide for themselves whether to treat e.g. SingleStore like MySQL.
      */
     private getOptimiserEngineType;
     /**
@@ -145,6 +156,12 @@ export declare class QueryExecutor {
         sql: string;
         params?: any[];
     }>;
+    /**
+     * Generic dry-run SQL generator for analysis modes (funnel/flow/retention).
+     * The three modes share an identical shape (mode guard → config validation →
+     * build query → toSQL()), differing only in which builder/config they use.
+     */
+    private dryRunAnalysis;
     /**
      * Execute EXPLAIN on a query to get the execution plan
      * Generates the SQL using the same secure path as execute/generateSQL,
@@ -163,21 +180,7 @@ export declare class QueryExecutor {
      * Generate SQL using unified approach (works for both single and multi-cube)
      */
     private generateUnifiedSQL;
-    private resolveQueryMode;
-    private validateQueryForMode;
     private executeQueryByModeWithCache;
-    private executeRegularQueryWithCache;
-    private cacheResult;
     private generateSqlForMode;
     private generateComparisonSQL;
-    /**
-     * Generate annotations for UI metadata - unified approach
-     */
-    private generateAnnotations;
-    /**
-     * Pre-build filter SQL and store in cache for reuse across CTEs and main query
-     * This enables parameter deduplication - the same filter values are shared
-     * rather than appearing as separate parameters in different parts of the query
-     */
-    private preloadFilterCache;
 }

package/dist/server/{server/executors → executors}/base-executor.d.ts

@@ -1,6 +1,6 @@
 import { SQL } from 'drizzle-orm';
-import { DrizzleDatabase, DatabaseExecutor, ExplainOptions, ExplainResult, IndexInfo } from '../types';
-import { DatabaseAdapter } from '../adapters/base-adapter';
+import { DrizzleDatabase, DatabaseExecutor, ExplainOptions, ExplainResult, IndexInfo } from '../types/index.js';
+import { DatabaseAdapter } from '../adapters/base-adapter.js';
 /**
  * Abstract base class for database executors
  */

package/dist/server/{server/executors → executors}/databend-executor.d.ts

@@ -1,6 +1,6 @@
 import { SQL } from 'drizzle-orm';
-import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types';
-import { BaseDatabaseExecutor } from './base-executor';
+import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types/index.js';
+import { BaseDatabaseExecutor } from './base-executor.js';
 export declare class DatabendExecutor extends BaseDatabaseExecutor {
     execute<T = any[]>(query: SQL | any, numericFields?: string[]): Promise<T>;
     /**

package/dist/server/{server/executors → executors}/duckdb-executor.d.ts

@@ -1,6 +1,6 @@
 import { SQL } from 'drizzle-orm';
-import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types';
-import { BaseDatabaseExecutor } from './base-executor';
+import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types/index.js';
+import { BaseDatabaseExecutor } from './base-executor.js';
 export declare class DuckDBExecutor extends BaseDatabaseExecutor {
     execute<T = any[]>(query: SQL | any, numericFields?: string[]): Promise<T>;
     /**

package/dist/server/executors/explain-utils.d.ts

@@ -0,0 +1,28 @@
+import { SQL } from 'drizzle-orm';
+/**
+ * Rebuild a parameterized SQL string into a Drizzle SQL object with `params`
+ * bound as real driver parameters.
+ *
+ * @param sqlString - SQL produced by Drizzle's `.toSQL()`, containing either `?`
+ *   placeholders (mysql/sqlite/singlestore/snowflake) or `$n` placeholders
+ *   (postgres/duckdb/databend)
+ * @param params - Bound parameter values, in order
+ * @param style - Placeholder style used by `sqlString`
+ */
+export declare function buildBoundSql(sqlString: string, params: unknown[], style: 'question' | 'dollar'): SQL;
+/**
+ * Normalize raw MySQL EXPLAIN result rows into the column shape the MySQL parser
+ * expects. Extracted from MySQLExecutor.explainQuery to keep that method simple.
+ */
+export declare function normalizeMySQLExplainRows(result: unknown): any[];
+/**
+ * Normalize raw SQLite EXPLAIN QUERY PLAN result rows into the column shape the
+ * SQLite parser expects. Extracted from SQLiteExecutor.explainQuery.
+ */
+export declare function normalizeSQLiteExplainRows(result: unknown): any[];
+/**
+ * Extract the textual plan lines from PostgreSQL EXPLAIN result rows. Handles the
+ * differing column-name casing across drivers. Extracted from
+ * PostgresExecutor.explainQuery.
+ */
+export declare function extractPostgresExplainLines(rows: any[]): string[];

package/dist/server/{server/executors → executors}/index.d.ts

@@ -1,16 +1,16 @@
-import { DrizzleDatabase, DatabaseExecutor } from '../types';
+import { DrizzleDatabase, DatabaseExecutor } from '../types/index.js';
 /**
  * Database executors for different database engines
  * Handles SQL execution with proper type coercion
  */
-export { BaseDatabaseExecutor } from './base-executor';
-export { PostgresExecutor, createPostgresExecutor } from './postgres-executor';
-export { MySQLExecutor, createMySQLExecutor } from './mysql-executor';
-export { SQLiteExecutor, createSQLiteExecutor } from './sqlite-executor';
-export { SingleStoreExecutor, createSingleStoreExecutor } from './singlestore-executor';
-export { DuckDBExecutor, createDuckDBExecutor } from './duckdb-executor';
-export { DatabendExecutor, createDatabendExecutor } from './databend-executor';
-export { SnowflakeExecutor, createSnowflakeExecutor } from './snowflake-executor';
+export { BaseDatabaseExecutor } from './base-executor.js';
+export { PostgresExecutor, createPostgresExecutor } from './postgres-executor.js';
+export { MySQLExecutor, createMySQLExecutor } from './mysql-executor.js';
+export { SQLiteExecutor, createSQLiteExecutor } from './sqlite-executor.js';
+export { SingleStoreExecutor, createSingleStoreExecutor } from './singlestore-executor.js';
+export { DuckDBExecutor, createDuckDBExecutor } from './duckdb-executor.js';
+export { DatabendExecutor, createDatabendExecutor } from './databend-executor.js';
+export { SnowflakeExecutor, createSnowflakeExecutor } from './snowflake-executor.js';
 /**
  * Auto-detect database type and create appropriate executor
  * @param db - Drizzle database instance

package/dist/server/{server/executors → executors}/mysql-executor.d.ts

@@ -1,6 +1,6 @@
 import { SQL } from 'drizzle-orm';
-import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types';
-import { BaseDatabaseExecutor } from './base-executor';
+import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types/index.js';
+import { BaseDatabaseExecutor } from './base-executor.js';
 export declare class MySQLExecutor extends BaseDatabaseExecutor {
     execute<T = any[]>(query: SQL | any, numericFields?: string[]): Promise<T>;
     /**

package/dist/server/{server/executors → executors}/postgres-executor.d.ts

@@ -1,6 +1,6 @@
 import { SQL } from 'drizzle-orm';
-import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types';
-import { BaseDatabaseExecutor } from './base-executor';
+import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types/index.js';
+import { BaseDatabaseExecutor } from './base-executor.js';
 export declare class PostgresExecutor extends BaseDatabaseExecutor {
     execute<T = any[]>(query: SQL | any, numericFields?: string[]): Promise<T>;
     /**

package/dist/server/{server/executors → executors}/singlestore-executor.d.ts

@@ -1,5 +1,5 @@
-import { DrizzleDatabase } from '../types';
-import { MySQLExecutor } from './mysql-executor';
+import { DrizzleDatabase } from '../types/index.js';
+import { MySQLExecutor } from './mysql-executor.js';
 export declare class SingleStoreExecutor extends MySQLExecutor {
     getEngineType(): 'singlestore';
 }

package/dist/server/{server/executors → executors}/snowflake-executor.d.ts

@@ -1,6 +1,6 @@
 import { SQL } from 'drizzle-orm';
-import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types';
-import { BaseDatabaseExecutor } from './base-executor';
+import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types/index.js';
+import { BaseDatabaseExecutor } from './base-executor.js';
 export declare class SnowflakeExecutor extends BaseDatabaseExecutor {
     execute<T = any[]>(query: SQL | any, numericFields?: string[]): Promise<T>;
     /**

package/dist/server/{server/executors → executors}/sqlite-executor.d.ts

@@ -1,6 +1,6 @@
 import { SQL } from 'drizzle-orm';
-import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types';
-import { BaseDatabaseExecutor } from './base-executor';
+import { DrizzleDatabase, ExplainOptions, ExplainResult, IndexInfo } from '../types/index.js';
+import { BaseDatabaseExecutor } from './base-executor.js';
 export declare class SQLiteExecutor extends BaseDatabaseExecutor {
     execute<T = any[]>(query: SQL | any, numericFields?: string[]): Promise<T>;
     /**

package/dist/server/{server/explain → explain}/databend-parser.d.ts

@@ -1,4 +1,4 @@
-import { ExplainResult } from '../types/executor';
+import { ExplainResult } from '../types/executor.js';
 /**
  * Parse Databend EXPLAIN output
  *

package/dist/server/{server/explain → explain}/duckdb-parser.d.ts

@@ -1,4 +1,4 @@
-import { ExplainResult } from '../types/executor';
+import { ExplainResult } from '../types/executor.js';
 /**
  * Parse DuckDB EXPLAIN output
  *

package/dist/server/explain/explain-tree.d.ts

@@ -0,0 +1,20 @@
+import { ExplainOperation } from '../types/executor.js';
+/** Stack entry tracking an operation and its indentation depth. */
+export interface ExplainStackEntry {
+    indent: number;
+    op: ExplainOperation;
+}
+/**
+ * Insert an operation into the hierarchical tree using the indentation stack.
+ *
+ * Pops the stack until the top entry has strictly less indentation than the
+ * incoming operation, then attaches the operation either as a root (pushed to
+ * `operations`) or as a child of the current stack top. Finally pushes the
+ * operation onto the stack so subsequent deeper lines can nest under it.
+ */
+export declare function pushOperationToTree(stack: ExplainStackEntry[], operations: ExplainOperation[], operation: ExplainOperation, indent: number): void;
+/**
+ * Count indentation level based on tree drawing characters and spaces.
+ * Used by DuckDB and Databend parsers.
+ */
+export declare function countTreeIndent(line: string): number;

package/dist/server/explain/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * EXPLAIN plan parsers
+ * Normalize raw EXPLAIN output from different databases to a common format
+ */
+export { parsePostgresExplain } from './postgres-parser.js';
+export { parseMySQLExplain } from './mysql-parser.js';
+export { parseSQLiteExplain } from './sqlite-parser.js';
+export { parseDuckDBExplain } from './duckdb-parser.js';
+export type { ExplainOperation, ExplainResult, ExplainSummary, ExplainOptions } from '../types/executor.js';

package/dist/server/{server/explain → explain}/mysql-parser.d.ts

@@ -1,4 +1,4 @@
-import { ExplainResult } from '../types/executor';
+import { ExplainResult } from '../types/executor.js';
 /**
  * MySQL EXPLAIN row structure
  * Standard columns returned by EXPLAIN

package/dist/server/{server/explain → explain}/postgres-parser.d.ts

@@ -1,4 +1,4 @@
-import { ExplainResult } from '../types/executor';
+import { ExplainResult } from '../types/executor.js';
 /**
  * Parse PostgreSQL EXPLAIN output (text format)
  *

package/dist/server/{server/explain → explain}/snowflake-parser.d.ts

@@ -1,4 +1,4 @@
-import { ExplainResult } from '../types/executor';
+import { ExplainResult } from '../types/executor.js';
 /**
  * Parse Snowflake EXPLAIN output
  *

package/dist/server/{server/explain → explain}/sqlite-parser.d.ts

@@ -1,4 +1,4 @@
-import { ExplainResult } from '../types/executor';
+import { ExplainResult } from '../types/executor.js';
 /**
  * SQLite EXPLAIN QUERY PLAN row structure
  */

package/dist/server/{server/filter-cache.d.ts → filter-cache.d.ts}

@@ -1,5 +1,5 @@
 import { SQL } from 'drizzle-orm';
-import { Filter, FilterCondition } from './types';
+import { Filter, FilterCondition, FilterCache } from './types/index.js';
 /**
  * Generates a deterministic cache key for a filter
  * Keys are based on filter content (member, operator, values) not object identity
@@ -26,7 +26,7 @@ export interface FilterCacheStats {
  * - Key by content: Filters with same member/operator/values share SQL
  * - Thread-safe: No shared mutable state between queries
  */
-export declare class FilterCacheManager {
+export declare class FilterCacheManager implements FilterCache {
     private cache;
     private stats;
     /**

package/dist/server/{server/gap-filler.d.ts → gap-filler.d.ts}

@@ -1,5 +1,11 @@
-import { SemanticQuery } from './types/query';
-import { TimeGranularity } from './types/core';
+import { SemanticQuery } from './types/query.js';
+import { TimeGranularity } from './types/core.js';
+/**
+ * Maximum number of time buckets gap filling will generate. Beyond this, gap
+ * filling is skipped entirely (data is returned unmodified) to avoid both
+ * runaway memory use and silent truncation of real rows.
+ */
+export declare const MAX_GAP_FILL_BUCKETS = 10000;
 export interface GapFillerConfig {
     /** The time dimension key (e.g., 'Sales.date') */
     timeDimensionKey: string;

package/dist/server/google-BOnRIN1w.cjs

@@ -0,0 +1,2 @@
+function e(t){let n={};for(let[r,i]of Object.entries(t))if(r===`type`&&typeof i==`string`)n[r]=i.toUpperCase();else if(r===`properties`&&typeof i==`object`&&i){let t={};for(let[n,r]of Object.entries(i))typeof r==`object`&&r?t[n]=e(r):t[n]=r;n[r]=t}else r===`items`&&typeof i==`object`&&i?n[r]=e(i):n[r]=i;return n}function t(e){return e===`STOP`?`stop`:e===`MAX_TOKENS`?`max_tokens`:e}function*n(e){if(e.text&&!e.thought&&(yield{type:`text_delta`,text:e.text}),e.functionCall){let t=`gemini-tc-${Date.now()}-${Math.random().toString(36).slice(2,7)}`,n=e.thoughtSignature?{thoughtSignature:e.thoughtSignature}:void 0;yield{type:`tool_use_start`,id:t,name:e.functionCall.name,...n?{metadata:n}:{}},yield{type:`tool_input_delta`,json:JSON.stringify(e.functionCall.args||{})},yield{type:`tool_use_end`}}}function r(e){let t=e._toolResults;if(t&&t.length>0)return{role:`user`,parts:t.map(e=>({functionResponse:{name:e.toolName||e.toolUseId,response:{content:e.content,isError:e.isError||!1}}}))};let n=typeof e.content==`string`?e.content:JSON.stringify(e.content);return n?{role:`user`,parts:[{text:n}]}:null}function i(e){let t=[];for(let n of e)if(n.type===`text`&&n.text)t.push({text:n.text});else if(n.type===`tool_use`){let e={functionCall:{name:n.name,args:n.input||{}}};n.metadata?.thoughtSignature&&(e.thoughtSignature=n.metadata.thoughtSignature),t.push(e)}return t}function a(e){if(e.role===`tool_result`)return r(e);if(e.role===`user`)return{role:`user`,parts:[{text:typeof e.content==`string`?e.content:JSON.stringify(e.content)}]};if(e.role===`assistant`){if(typeof e.content==`string`)return{role:`model`,parts:[{text:e.content}]};let t=i(e.content);return t.length>0?{role:`model`,parts:t}:null}return null}var o=class{apiKey;sdk;initialized=!1;constructor(e){this.apiKey=e}async ensureSDK(){if(!this.initialized){try{this.sdk=await Promise.resolve().then(()=>require("./dist-BOdf-GQO.cjs"))}catch{throw Error(`@google/generative-ai is required for the Google provider. Install it with: npm install @google/generative-ai`)}this.initialized=!0}}async createStream(e){await this.ensureSDK();let{GoogleGenerativeAI:t}=this.sdk,n=new t(this.apiKey).getGenerativeModel({model:e.model,systemInstruction:e.system,generationConfig:{maxOutputTokens:e.maxTokens}}),{messages:r}=this.formatMessages(e.messages,e.system),i=this.formatTools(e.tools);return(await n.generateContentStream({contents:r,tools:i.length>0?[{functionDeclarations:i}]:void 0})).stream}async*parseStreamEvents(e){let r=`stop`,i=!1;for await(let a of e){let e=a;e.usageMetadata&&(yield{type:`message_meta`,inputTokens:e.usageMetadata.promptTokenCount,outputTokens:e.usageMetadata.candidatesTokenCount,stopReason:``});let o=e.candidates?.[0];if(!o)continue;o.finishReason&&(r=t(o.finishReason));let s=o.content?.parts;if(s)for(let e of s)for(let t of n(e))t.type===`tool_use_start`&&(i=!0),yield t}yield{type:`message_meta`,stopReason:i?`tool_use`:r}}formatTools(t){return t.map(t=>({name:t.name,description:t.description,parameters:e(t.parameters)}))}formatMessages(e,t){let n=[];for(let t of e){let e=a(t);e&&n.push(e)}return{messages:n}}formatToolResults(e){return{role:`tool_result`,content:e.map(e=>`${e.toolName||e.toolUseId}: ${e.content}`).join(`
+`),_toolResults:e}}shouldContinue(e){return e===`tool_use`}formatError(e){if(!e||!(e instanceof Error))return`Something went wrong. Please try again.`;let t=e.message||``,n=e;return n.status===429?`Too many requests. Please wait a moment and try again.`:n.status===403||n.status===401?`Authentication failed. Please check your API key configuration.`:n.status===503||n.status===500?`The AI service is temporarily unavailable. Please try again in a moment.`:t.includes(`SAFETY`)?`The request was blocked by safety filters. Please rephrase your request.`:t.includes(`RECITATION`)?`The response was blocked due to recitation concerns. Please try a different query.`:t.startsWith(`{`)||t.startsWith(`[`)?`The AI service encountered an error. Please try again.`:t}};exports.GoogleProvider=o;

package/dist/{adapters/google-CFYljAOF.js → server/google-CvKM9yVM.js}

@@ -9,7 +9,76 @@ function e(t) {
 	} else r === "items" && typeof i == "object" && i ? n[r] = e(i) : n[r] = i;
 	return n;
 }
-var t = class {
+function t(e) {
+	return e === "STOP" ? "stop" : e === "MAX_TOKENS" ? "max_tokens" : e;
+}
+function* n(e) {
+	if (e.text && !e.thought && (yield {
+		type: "text_delta",
+		text: e.text
+	}), e.functionCall) {
+		let t = `gemini-tc-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`, n = e.thoughtSignature ? { thoughtSignature: e.thoughtSignature } : void 0;
+		yield {
+			type: "tool_use_start",
+			id: t,
+			name: e.functionCall.name,
+			...n ? { metadata: n } : {}
+		}, yield {
+			type: "tool_input_delta",
+			json: JSON.stringify(e.functionCall.args || {})
+		}, yield { type: "tool_use_end" };
+	}
+}
+function r(e) {
+	let t = e._toolResults;
+	if (t && t.length > 0) return {
+		role: "user",
+		parts: t.map((e) => ({ functionResponse: {
+			name: e.toolName || e.toolUseId,
+			response: {
+				content: e.content,
+				isError: e.isError || !1
+			}
+		} }))
+	};
+	let n = typeof e.content == "string" ? e.content : JSON.stringify(e.content);
+	return n ? {
+		role: "user",
+		parts: [{ text: n }]
+	} : null;
+}
+function i(e) {
+	let t = [];
+	for (let n of e) if (n.type === "text" && n.text) t.push({ text: n.text });
+	else if (n.type === "tool_use") {
+		let e = { functionCall: {
+			name: n.name,
+			args: n.input || {}
+		} };
+		n.metadata?.thoughtSignature && (e.thoughtSignature = n.metadata.thoughtSignature), t.push(e);
+	}
+	return t;
+}
+function a(e) {
+	if (e.role === "tool_result") return r(e);
+	if (e.role === "user") return {
+		role: "user",
+		parts: [{ text: typeof e.content == "string" ? e.content : JSON.stringify(e.content) }]
+	};
+	if (e.role === "assistant") {
+		if (typeof e.content == "string") return {
+			role: "model",
+			parts: [{ text: e.content }]
+		};
+		let t = i(e.content);
+		return t.length > 0 ? {
+			role: "model",
+			parts: t
+		} : null;
+	}
+	return null;
+}
+var o = class {
 	apiKey;
 	sdk;
 	initialized = !1;
@@ -42,41 +111,24 @@ var t = class {
 		})).stream;
 	}
 	async *parseStreamEvents(e) {
-		let t = "stop", n = !1;
-		for await (let r of e) {
-			let e = r;
+		let r = "stop", i = !1;
+		for await (let a of e) {
+			let e = a;
 			e.usageMetadata && (yield {
 				type: "message_meta",
 				inputTokens: e.usageMetadata.promptTokenCount,
 				outputTokens: e.usageMetadata.candidatesTokenCount,
 				stopReason: ""
 			});
-			let i = e.candidates?.[0];
-			if (!i) continue;
-			i.finishReason && (t = i.finishReason === "STOP" ? "stop" : i.finishReason === "MAX_TOKENS" ? "max_tokens" : i.finishReason);
-			let a = i.content?.parts;
-			if (a) {
-				for (let e of a) if (e.text && !e.thought && (yield {
-					type: "text_delta",
-					text: e.text
-				}), e.functionCall) {
-					n = !0;
-					let t = `gemini-tc-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`, r = e.thoughtSignature ? { thoughtSignature: e.thoughtSignature } : void 0;
-					yield {
-						type: "tool_use_start",
-						id: t,
-						name: e.functionCall.name,
-						...r ? { metadata: r } : {}
-					}, yield {
-						type: "tool_input_delta",
-						json: JSON.stringify(e.functionCall.args || {})
-					}, yield { type: "tool_use_end" };
-				}
-			}
+			let o = e.candidates?.[0];
+			if (!o) continue;
+			o.finishReason && (r = t(o.finishReason));
+			let s = o.content?.parts;
+			if (s) for (let e of s) for (let t of n(e)) t.type === "tool_use_start" && (i = !0), yield t;
 		}
 		yield {
 			type: "message_meta",
-			stopReason: n ? "tool_use" : t
+			stopReason: i ? "tool_use" : r
 		};
 	}
 	formatTools(t) {
@@ -88,49 +140,9 @@ var t = class {
 	}
 	formatMessages(e, t) {
 		let n = [];
-		for (let t of e) if (t.role === "tool_result") {
-			let e = t._toolResults;
-			if (e && e.length > 0) n.push({
-				role: "user",
-				parts: e.map((e) => ({ functionResponse: {
-					name: e.toolName || e.toolUseId,
-					response: {
-						content: e.content,
-						isError: e.isError || !1
-					}
-				} }))
-			});
-			else {
-				let e = typeof t.content == "string" ? t.content : JSON.stringify(t.content);
-				e && n.push({
-					role: "user",
-					parts: [{ text: e }]
-				});
-			}
-		} else if (t.role === "user") {
-			let e = typeof t.content == "string" ? t.content : JSON.stringify(t.content);
-			n.push({
-				role: "user",
-				parts: [{ text: e }]
-			});
-		} else if (t.role === "assistant") if (typeof t.content == "string") n.push({
-			role: "model",
-			parts: [{ text: t.content }]
-		});
-		else {
-			let e = t.content, r = [];
-			for (let t of e) if (t.type === "text" && t.text) r.push({ text: t.text });
-			else if (t.type === "tool_use") {
-				let e = { functionCall: {
-					name: t.name,
-					args: t.input || {}
-				} };
-				t.metadata?.thoughtSignature && (e.thoughtSignature = t.metadata.thoughtSignature), r.push(e);
-			}
-			r.length > 0 && n.push({
-				role: "model",
-				parts: r
-			});
+		for (let t of e) {
+			let e = a(t);
+			e && n.push(e);
 		}
 		return { messages: n };
 	}
@@ -151,4 +163,4 @@ var t = class {
 	}
 };
 //#endregion
-export { t as GoogleProvider };
+export { o as GoogleProvider };