@bubblelab/bubble-core 0.1.10 → 0.1.11

package/dist/index.d.ts

@@ -10,24 +10,41 @@ export { ToolBubble } from './types/tool-bubble-class.js';
 export { BubbleFlow } from './bubble-flow/bubble-flow-class.js';
 export type { BubbleTriggerEvent } from '@bubblelab/shared-schemas';
 export { HelloWorldBubble } from './bubbles/service-bubble/hello-world.js';
-export { AIAgentBubble, type StreamingCallback, type ToolHookContext, type ToolHookBefore, type ToolHookAfter, } from './bubbles/service-bubble/ai-agent.js';
+export { AIAgentBubble, type StreamingCallback, type ToolHookContext, type ToolHookBefore, type ToolHookAfter, type AfterLLMCallContext, type AfterLLMCallHook, type ConversationMessage, } from './bubbles/service-bubble/ai-agent.js';
 export { PostgreSQLBubble } from './bubbles/service-bubble/postgresql.js';
 export { SlackBubble } from './bubbles/service-bubble/slack.js';
+export { TelegramBubble } from './bubbles/service-bubble/telegram.js';
 export { ResendBubble } from './bubbles/service-bubble/resend.js';
 export { HttpBubble } from './bubbles/service-bubble/http.js';
 export { SlackFormatterAgentBubble } from './bubbles/workflow-bubble/slack-formatter-agent.js';
 export { StorageBubble } from './bubbles/service-bubble/storage.js';
 export { GoogleDriveBubble } from './bubbles/service-bubble/google-drive.js';
 export { GmailBubble } from './bubbles/service-bubble/gmail.js';
-export { GoogleSheetsBubble } from './bubbles/service-bubble/google-sheets.js';
+export { GoogleSheetsBubble } from './bubbles/service-bubble/google-sheets/index.js';
 export { GoogleCalendarBubble } from './bubbles/service-bubble/google-calendar.js';
 export { ApifyBubble } from './bubbles/service-bubble/apify/apify.js';
+export { FollowUpBossBubble } from './bubbles/service-bubble/followupboss.js';
+export { TwitterTool } from './bubbles/tool-bubble/twitter-tool.js';
+export { TikTokTool } from './bubbles/tool-bubble/tiktok-tool.js';
+export { GoogleMapsTool } from './bubbles/tool-bubble/google-maps-tool.js';
 export type { ApifyParamsInput, ApifyActorInput, } from './bubbles/service-bubble/apify/apify.js';
 export type { ActorId, ActorInput, ActorOutput, ActorSchema, } from './bubbles/service-bubble/apify/types.js';
 export type { APIFY_ACTOR_SCHEMAS } from './bubbles/service-bubble/apify/apify-scraper.schema.js';
+export { GithubBubble } from './bubbles/service-bubble/github.js';
+export type { GithubParamsInput } from './bubbles/service-bubble/github.js';
+export { ElevenLabsBubble } from './bubbles/service-bubble/eleven-labs.js';
+export type { ElevenLabsParamsInput } from './bubbles/service-bubble/eleven-labs.js';
+export { AGIIncBubble } from './bubbles/service-bubble/agi-inc.js';
+export type { AGIIncParamsInput } from './bubbles/service-bubble/agi-inc.js';
+export { AirtableBubble } from './bubbles/service-bubble/airtable.js';
+export type { AirtableParamsInput } from './bubbles/service-bubble/airtable.js';
+export { NotionBubble } from './bubbles/service-bubble/notion/notion.js';
+export type { FirecrawlParamsInput } from './bubbles/service-bubble/firecrawl.js';
+export { FirecrawlBubble } from './bubbles/service-bubble/firecrawl.js';
+export { InsForgeDbBubble } from './bubbles/service-bubble/insforge-db.js';
+export type { InsForgeDbParamsInput } from './bubbles/service-bubble/insforge-db.js';
 export { DatabaseAnalyzerWorkflowBubble } from './bubbles/workflow-bubble/database-analyzer.workflow.js';
 export { SlackNotifierWorkflowBubble } from './bubbles/workflow-bubble/slack-notifier.workflow.js';
-export { BubbleFlowGeneratorWorkflow } from './bubbles/workflow-bubble/bubbleflow-generator.workflow.js';
 export { SlackDataAssistantWorkflow } from './bubbles/workflow-bubble/slack-data-assistant.workflow.js';
 export { PDFFormOperationsWorkflow } from './bubbles/workflow-bubble/pdf-form-operations.workflow.js';
 export { PDFOcrWorkflow } from './bubbles/workflow-bubble/pdf-ocr.workflow.js';
@@ -37,6 +54,7 @@ export { ListBubblesTool } from './bubbles/tool-bubble/list-bubbles-tool.js';
 export { GetBubbleDetailsTool } from './bubbles/tool-bubble/get-bubble-details-tool.js';
 export { SQLQueryTool } from './bubbles/tool-bubble/sql-query-tool.js';
 export { BubbleFlowValidationTool } from './bubbles/tool-bubble/bubbleflow-validation-tool.js';
+export { EditBubbleFlowTool } from './bubbles/tool-bubble/code-edit-tool.js';
 export { WebSearchTool } from './bubbles/tool-bubble/web-search-tool.js';
 export { WebScrapeTool } from './bubbles/tool-bubble/web-scrape-tool.js';
 export { WebCrawlTool } from './bubbles/tool-bubble/web-crawl-tool.js';
@@ -52,8 +70,9 @@ export type { YouTubeVideo, YouTubeTranscriptSegment, } from './bubbles/tool-bub
 export { BubbleFactory, type BubbleClassWithMetadata, } from './bubble-factory.js';
 export { BubbleLogger, LogLevel, type LogEntry, type LogMetadata, type LoggerConfig, } from './logging/BubbleLogger.js';
 export { StreamingBubbleLogger } from './logging/StreamingBubbleLogger.js';
+export { WebhookStreamLogger } from './logging/WebhookStreamLogger.js';
 export { MockDataGenerator } from '@bubblelab/shared-schemas';
-export { HumanMessage, AIMessage } from '@langchain/core/messages';
+export { HumanMessage, AIMessage, ToolMessage } from '@langchain/core/messages';
 export type { BaseMessage } from '@langchain/core/messages';
 export { parseJsonWithFallbacks } from './utils/json-parsing.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAG3C,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAGhE,YAAY,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EACL,aAAa,EACb,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,aAAa,GACnB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,oDAAoD,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,YAAY,EACV,gBAAgB,EAChB,eAAe,GAChB,MAAM,yCAAyC,CAAC;AAIjD,YAAY,EACV,OAAO,EACP,UAAU,EACV,WAAW,EACX,WAAW,GACZ,MAAM,yCAAyC,CAAC;AACjD,YAAY,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAGlG,OAAO,EAAE,8BAA8B,EAAE,MAAM,yDAAyD,CAAC;AACzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,EAAE,2BAA2B,EAAE,MAAM,4DAA4D,CAAC;AACzG,OAAO,EAAE,0BAA0B,EAAE,MAAM,4DAA4D,CAAC;AACxG,OAAO,EAAE,yBAAyB,EAAE,MAAM,2DAA2D,CAAC;AACtG,OAAO,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAG7F,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qDAAqD,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,YAAY,EACV,aAAa,EACb,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACtE,YAAY,EACV,YAAY,EACZ,cAAc,EACd,aAAa,GACd,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,YAAY,EACV,YAAY,EACZ,wBAAwB,GACzB,MAAM,uCAAuC,CAAC;AAG/C,OAAO,EACL,aAAa,EACb,KAAK,uBAAuB,GAC7B,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,YAAY,GAClB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAG3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACnE,YAAY,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -15,19 +15,30 @@ export { HelloWorldBubble } from './bubbles/service-bubble/hello-world.js';
 export { AIAgentBubble, } from './bubbles/service-bubble/ai-agent.js';
 export { PostgreSQLBubble } from './bubbles/service-bubble/postgresql.js';
 export { SlackBubble } from './bubbles/service-bubble/slack.js';
+export { TelegramBubble } from './bubbles/service-bubble/telegram.js';
 export { ResendBubble } from './bubbles/service-bubble/resend.js';
 export { HttpBubble } from './bubbles/service-bubble/http.js';
 export { SlackFormatterAgentBubble } from './bubbles/workflow-bubble/slack-formatter-agent.js';
 export { StorageBubble } from './bubbles/service-bubble/storage.js';
 export { GoogleDriveBubble } from './bubbles/service-bubble/google-drive.js';
 export { GmailBubble } from './bubbles/service-bubble/gmail.js';
-export { GoogleSheetsBubble } from './bubbles/service-bubble/google-sheets.js';
+export { GoogleSheetsBubble } from './bubbles/service-bubble/google-sheets/index.js';
 export { GoogleCalendarBubble } from './bubbles/service-bubble/google-calendar.js';
 export { ApifyBubble } from './bubbles/service-bubble/apify/apify.js';
+export { FollowUpBossBubble } from './bubbles/service-bubble/followupboss.js';
+export { TwitterTool } from './bubbles/tool-bubble/twitter-tool.js';
+export { TikTokTool } from './bubbles/tool-bubble/tiktok-tool.js';
+export { GoogleMapsTool } from './bubbles/tool-bubble/google-maps-tool.js';
+export { GithubBubble } from './bubbles/service-bubble/github.js';
+export { ElevenLabsBubble } from './bubbles/service-bubble/eleven-labs.js';
+export { AGIIncBubble } from './bubbles/service-bubble/agi-inc.js';
+export { AirtableBubble } from './bubbles/service-bubble/airtable.js';
+export { NotionBubble } from './bubbles/service-bubble/notion/notion.js';
+export { FirecrawlBubble } from './bubbles/service-bubble/firecrawl.js';
+export { InsForgeDbBubble } from './bubbles/service-bubble/insforge-db.js';
 // Export workflow bubbles
 export { DatabaseAnalyzerWorkflowBubble } from './bubbles/workflow-bubble/database-analyzer.workflow.js';
 export { SlackNotifierWorkflowBubble } from './bubbles/workflow-bubble/slack-notifier.workflow.js';
-export { BubbleFlowGeneratorWorkflow } from './bubbles/workflow-bubble/bubbleflow-generator.workflow.js';
 export { SlackDataAssistantWorkflow } from './bubbles/workflow-bubble/slack-data-assistant.workflow.js';
 export { PDFFormOperationsWorkflow } from './bubbles/workflow-bubble/pdf-form-operations.workflow.js';
 export { PDFOcrWorkflow } from './bubbles/workflow-bubble/pdf-ocr.workflow.js';
@@ -38,6 +49,7 @@ export { ListBubblesTool } from './bubbles/tool-bubble/list-bubbles-tool.js';
 export { GetBubbleDetailsTool } from './bubbles/tool-bubble/get-bubble-details-tool.js';
 export { SQLQueryTool } from './bubbles/tool-bubble/sql-query-tool.js';
 export { BubbleFlowValidationTool } from './bubbles/tool-bubble/bubbleflow-validation-tool.js';
+export { EditBubbleFlowTool } from './bubbles/tool-bubble/code-edit-tool.js';
 export { WebSearchTool } from './bubbles/tool-bubble/web-search-tool.js';
 export { WebScrapeTool } from './bubbles/tool-bubble/web-scrape-tool.js';
 export { WebCrawlTool } from './bubbles/tool-bubble/web-crawl-tool.js';
@@ -52,9 +64,10 @@ export { BubbleFactory, } from './bubble-factory.js';
 // Export logging utilities
 export { BubbleLogger, LogLevel, } from './logging/BubbleLogger.js';
 export { StreamingBubbleLogger } from './logging/StreamingBubbleLogger.js';
+export { WebhookStreamLogger } from './logging/WebhookStreamLogger.js';
 // Re-export MockDataGenerator from shared-schemas for convenience
 export { MockDataGenerator } from '@bubblelab/shared-schemas';
 // Re-export langchain message types for use in API and other packages
-export { HumanMessage, AIMessage } from '@langchain/core/messages';
+export { HumanMessage, AIMessage, ToolMessage } from '@langchain/core/messages';
 export { parseJsonWithFallbacks } from './utils/json-parsing.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

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

package/dist/logging/BubbleLogger.d.ts

@@ -1,5 +1,6 @@
 import { BubbleError } from '../types/bubble-errors';
-import type { TokenUsage, ExecutionSummary } from '@bubblelab/shared-schemas';
+import type { ExecutionSummary } from '@bubblelab/shared-schemas';
+import { CredentialType } from '@bubblelab/shared-schemas';
 export declare enum LogLevel {
     TRACE = 0,
     DEBUG = 1,
@@ -16,6 +17,12 @@ export interface LogEntry {
     metadata: LogMetadata;
     duration?: number;
 }
+export interface LogServiceUsage {
+    usage: number;
+    service: CredentialType;
+    unit: string;
+    subService?: string;
+}
 export interface LogMetadata {
     flowName: string;
     variableId?: number;
@@ -23,11 +30,11 @@ export interface LogMetadata {
     functionName?: string;
     bubbleName?: string;
     variableName?: string;
-    operationType?: 'bubble_instantiation' | 'bubble_execution' | 'variable_assignment' | 'condition' | 'loop_iteration' | 'script' | 'bubble_execution_complete';
+    operationType?: 'bubble_instantiation' | 'bubble_execution' | 'variable_assignment' | 'condition' | 'loop_iteration' | 'script' | 'bubble_execution_complete' | 'function_call';
     memoryUsage?: NodeJS.MemoryUsage;
     stackTrace?: string;
     additionalData?: Record<string, unknown>;
-    tokenUsage?: TokenUsage;
+    serviceUsage?: LogServiceUsage;
 }
 export interface LoggerConfig {
     minLevel: LogLevel;
@@ -37,6 +44,11 @@ export interface LoggerConfig {
     maxLogEntries: number;
     bufferSize: number;
     flushInterval?: number;
+    pricingTable: Record<string, {
+        unit: string;
+        unitCost: number;
+    }>;
+    userCredentialMapping?: Map<number, Set<CredentialType>>;
 }
 export declare class BubbleLogger {
     private flowName;
@@ -50,9 +62,21 @@ export declare class BubbleLogger {
     private peakMemoryUsage?;
     private buffer;
     private flushTimer?;
-    private cumulativeTokenUsageByModel;
+    cumulativeServiceUsageByService: Map<string, Map<number, {
+        usage: number;
+        service: CredentialType;
+        subService?: string;
+        unit: string;
+    }>>;
     private bubbleStartTimes;
-    constructor(flowName: string, config?: Partial<LoggerConfig>);
+    private functionCallStartTimes;
+    private userCredentialMapping?;
+    constructor(flowName: string, config: Partial<Omit<LoggerConfig, 'pricingTable'>> & {
+        pricingTable: Record<string, {
+            unit: string;
+            unitCost: number;
+        }>;
+    });
     /**
      * Log execution at a specific line with timing information
      * Returns the message for backward compatibility, use shouldLogLine() to check if logging occurred
@@ -82,22 +106,15 @@ export declare class BubbleLogger {
      * Log control flow operations
      */
     logControlFlow(lineNumber: number, type: 'condition' | 'loop_iteration', condition: string, result?: boolean): void;
+    protected getServiceUsageKey(service: LogServiceUsage, unitCost?: number): string;
     /**
-     * Add token usage to cumulative tracking per model
-     */
-    addTokenUsage(tokenUsage: TokenUsage): void;
-    /**
-     * Get current cumulative token usage (aggregated across all models)
+     * Add token usage to cumulative tracking per model and variable ID
      */
-    getTokenUsage(): TokenUsage;
-    /**
-     * Get cumulative token usage broken down by model
-     */
-    getTokenUsageByModel(): Map<string, Omit<TokenUsage, 'modelName'>>;
+    addServiceUsage(serviceUsage: LogServiceUsage, variableId?: number): void;
     /**
      * Log token usage
      */
-    logTokenUsage(tokenUsage: TokenUsage, message?: string, metadata?: Partial<LogMetadata>): string;
+    logTokenUsage(serviceUsage: LogServiceUsage, message?: string, metadata?: Partial<LogMetadata>): string;
     /**
      * Log AI agent tool call start
      */
@@ -106,6 +123,18 @@ export declare class BubbleLogger {
      * Log AI agent tool call completion
      */
     logToolCallComplete(toolCallId: string, toolName: string, toolInput: unknown, toolOutput: unknown, duration: number, message?: string): string;
+    /**
+     * Log transformation function call start
+     */
+    logFunctionCallStart(variableId: number, functionName: string, functionInput: unknown, lineNumber?: number): string;
+    /**
+     * Log transformation function call completion
+     */
+    logFunctionCallComplete(variableId: number, functionName: string, functionOutput: unknown, duration: number, lineNumber?: number): string;
+    /**
+     * Get execution time for a function call
+     */
+    protected getFunctionCallExecutionTime(variableId: number): number;
     /**
      * General logging method with different levels
      */

package/dist/logging/BubbleLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BubbleLogger.d.ts","sourceRoot":"","sources":["../../src/logging/BubbleLogger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BubbleLogger.d.ts","sourceRoot":"","sources":["../../src/logging/BubbleLogger.ts"],"names":[],"mappings":"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"}

package/dist/logging/BubbleLogger.js

@@ -1,3 +1,4 @@
+const SHOULD_ENABLE_TOKEN_USAGE_LOGGING_IN_CONSOLE = false;
 export var LogLevel;
 (function (LogLevel) {
     LogLevel[LogLevel["TRACE"] = 0] = "TRACE";
@@ -19,12 +20,18 @@ export class BubbleLogger {
     peakMemoryUsage;
     buffer = [];
     flushTimer;
-    // Track cumulative token usage per model
-    cumulativeTokenUsageByModel = new Map();
+    // Track cumulative raw usage by service, then by variable ID
+    // Structure: serviceKey -> variableId -> usage data
+    cumulativeServiceUsageByService = new Map();
     // Track individual bubble execution times
     bubbleStartTimes = new Map();
-    constructor(flowName, config = {}) {
+    // Track individual function call execution times
+    functionCallStartTimes = new Map();
+    // Store user credential mapping for cost calculation
+    userCredentialMapping;
+    constructor(flowName, config) {
         this.flowName = flowName;
+        const { pricingTable, userCredentialMapping, ...restConfig } = config;
         this.config = {
             minLevel: LogLevel.INFO,
             enableTiming: true,
@@ -33,8 +40,10 @@ export class BubbleLogger {
             maxLogEntries: 10000,
             bufferSize: 100,
             flushInterval: 1000,
-            ...config,
+            ...restConfig,
+            pricingTable,
         };
+        this.userCredentialMapping = userCredentialMapping;
         this.startTime = Date.now();
         this.lastLogTime = this.startTime;
         this.executionId = `${flowName}-${this.startTime}-${Math.random().toString(36).substring(7)}`;
@@ -162,81 +171,74 @@ export class BubbleLogger {
             additionalData: { condition, result },
         });
     }
-    /**
-     * Add token usage to cumulative tracking per model
-     */
-    addTokenUsage(tokenUsage) {
-        const modelName = tokenUsage.modelName || 'unknown';
-        // Get or create entry for this model
-        const existing = this.cumulativeTokenUsageByModel.get(modelName) || {
-            inputTokens: 0,
-            outputTokens: 0,
-            totalTokens: 0,
-        };
-        // Add to the cumulative usage for this model
-        existing.inputTokens += tokenUsage.inputTokens;
-        existing.outputTokens += tokenUsage.outputTokens;
-        existing.totalTokens += tokenUsage.totalTokens;
-        this.cumulativeTokenUsageByModel.set(modelName, existing);
-    }
-    /**
-     * Get current cumulative token usage (aggregated across all models)
-     */
-    getTokenUsage() {
-        // Aggregate token usage across all models
-        const aggregated = {
-            inputTokens: 0,
-            outputTokens: 0,
-            totalTokens: 0,
-        };
-        for (const usage of this.cumulativeTokenUsageByModel.values()) {
-            aggregated.inputTokens += usage.inputTokens;
-            aggregated.outputTokens += usage.outputTokens;
-        }
-        // Recalculate total instead of summing reported totals
-        // This ensures accuracy when models (like Gemini) report incorrect totalTokens
-        aggregated.totalTokens = aggregated.inputTokens + aggregated.outputTokens;
-        return aggregated;
+    getServiceUsageKey(service, unitCost) {
+        //Combine service, subservice and unit into a single string
+        //Optionally include unitCost to differentiate between user and system credentials
+        const baseKey = `${service.service}${service.subService ? `:${service.subService}` : ''}:${service.unit}`;
+        return unitCost !== undefined ? `${baseKey}:${unitCost}` : baseKey;
     }
     /**
-     * Get cumulative token usage broken down by model
+     * Add token usage to cumulative tracking per model and variable ID
      */
-    getTokenUsageByModel() {
-        // Create a new map with recalculated totalTokens for each model
-        const recalculated = new Map();
-        for (const [modelName, usage,] of this.cumulativeTokenUsageByModel.entries()) {
-            recalculated.set(modelName, {
-                inputTokens: usage.inputTokens,
-                outputTokens: usage.outputTokens,
-                // Recalculate total for consistency
-                totalTokens: usage.inputTokens + usage.outputTokens,
-            });
+    addServiceUsage(serviceUsage, variableId) {
+        const serviceKey = this.getServiceUsageKey(serviceUsage);
+        // Get or create the service entry
+        if (!this.cumulativeServiceUsageByService.has(serviceKey)) {
+            this.cumulativeServiceUsageByService.set(serviceKey, new Map());
         }
-        return recalculated;
+        const serviceMap = this.cumulativeServiceUsageByService.get(serviceKey);
+        // If variableId is provided, track per variable ID
+        // If not provided, use 0 as a fallback (for backward compatibility)
+        const varId = variableId ?? 0;
+        const existing = serviceMap.get(varId) || {
+            usage: 0,
+            service: serviceUsage.service,
+            subService: serviceUsage.subService,
+            unit: serviceUsage.unit,
+        };
+        serviceMap.set(varId, {
+            usage: existing.usage + serviceUsage.usage,
+            service: existing.service,
+            subService: existing.subService,
+            unit: existing.unit,
+        });
     }
     /**
      * Log token usage
      */
-    logTokenUsage(tokenUsage, message, metadata) {
-        const modelName = tokenUsage.modelName || 'unknown';
+    logTokenUsage(serviceUsage, message, metadata) {
         const logMessage = message ||
-            `Token usage (${modelName}): ${tokenUsage.inputTokens} input + ${tokenUsage.outputTokens} output = ${tokenUsage.totalTokens} total`;
-        // Add token usage to cumulative tracking per model
-        this.addTokenUsage(tokenUsage);
-        // Convert Map to object for logging
-        const tokenUsageByModel = Object.fromEntries(this.cumulativeTokenUsageByModel.entries());
-        this.info(logMessage, {
-            ...metadata,
-            tokenUsage,
-            operationType: metadata?.operationType || 'bubble_execution',
-            additionalData: {
-                ...metadata?.additionalData,
-                tokenUsage,
-                variableId: metadata?.variableId,
-                cumulativeTokenUsage: this.getTokenUsage(), // Aggregated total
-                cumulativeTokenUsageByModel: tokenUsageByModel, // Per-model breakdown
-            },
-        });
+            `Service usage (${this.getServiceUsageKey(serviceUsage)}): ${serviceUsage.usage} units`;
+        // Add token usage to cumulative tracking per model and variable ID
+        this.addServiceUsage(serviceUsage, metadata?.variableId);
+        // Convert Map to object for logging (flattened for backward compatibility)
+        const serviceUsageByService = {};
+        for (const [serviceKey, varIdMap,] of this.cumulativeServiceUsageByService.entries()) {
+            // Aggregate usage across all variable IDs for display
+            let totalUsage = 0;
+            for (const usageData of varIdMap.values()) {
+                totalUsage += usageData.usage;
+            }
+            serviceUsageByService[serviceKey] = {
+                usage: totalUsage,
+                service: Array.from(varIdMap.values())[0]?.service,
+                subService: Array.from(varIdMap.values())[0]?.subService,
+                unit: Array.from(varIdMap.values())[0]?.unit,
+            };
+        }
+        if (SHOULD_ENABLE_TOKEN_USAGE_LOGGING_IN_CONSOLE) {
+            this.info(logMessage, {
+                ...metadata,
+                serviceUsage,
+                operationType: metadata?.operationType || 'bubble_execution',
+                additionalData: {
+                    ...metadata?.additionalData,
+                    serviceUsage,
+                    variableId: metadata?.variableId,
+                    cumulativeServiceUsageByService: serviceUsageByService, // Per-service breakdown
+                },
+            });
+        }
         return logMessage;
     }
     /**
@@ -275,6 +277,55 @@ export class BubbleLogger {
         });
         return logMessage;
     }
+    /**
+     * Log transformation function call start
+     */
+    logFunctionCallStart(variableId, functionName, functionInput, lineNumber) {
+        // Track start time for this function call
+        this.functionCallStartTimes.set(variableId, Date.now());
+        const logMessage = `Starting step: ${functionName}`;
+        this.log(LogLevel.DEBUG, logMessage, {
+            variableId,
+            lineNumber,
+            operationType: 'function_call',
+            additionalData: {
+                functionName,
+                functionInput,
+                phase: 'function_call_start',
+            },
+        });
+        return logMessage;
+    }
+    /**
+     * Log transformation function call completion
+     */
+    logFunctionCallComplete(variableId, functionName, functionOutput, duration, lineNumber) {
+        const logMessage = `Completed step: ${functionName}`;
+        this.log(LogLevel.DEBUG, logMessage, {
+            variableId,
+            lineNumber,
+            operationType: 'function_call',
+            additionalData: {
+                functionName,
+                functionOutput,
+                duration,
+                phase: 'function_call_complete',
+            },
+        });
+        // Clean up the start time for this function call
+        this.functionCallStartTimes.delete(variableId);
+        return logMessage;
+    }
+    /**
+     * Get execution time for a function call
+     */
+    getFunctionCallExecutionTime(variableId) {
+        const functionCallStartTime = this.functionCallStartTimes.get(variableId);
+        if (!functionCallStartTime) {
+            return 0;
+        }
+        return Date.now() - functionCallStartTime;
+    }
     /**
      * General logging method with different levels
      */
@@ -410,11 +461,6 @@ export class BubbleLogger {
             }
         }
         slowestLines.sort((a, b) => b.duration - a.duration);
-        // Convert Map to plain object for tokenUsageByModel (with recalculated totals)
-        const tokenUsageByModel = {};
-        for (const [modelName, usage] of this.getTokenUsageByModel().entries()) {
-            tokenUsageByModel[modelName] = usage;
-        }
         // Extract errors and warnings with details
         const errors = errorLogs.map((log) => ({
             message: log.message,
@@ -432,12 +478,67 @@ export class BubbleLogger {
             lineNumber: log.metadata.lineNumber,
             additionalData: log.metadata.additionalData,
         }));
+        // If pricing table is empty or undefined, print a warning
+        if (!this.config.pricingTable ||
+            Object.keys(this.config.pricingTable).length === 0) {
+            console.warn('Pricing table is empty, no pricing data will be available. To track cost tracking, please set the pricing table in the logger config.');
+        }
+        const serviceUsage = [];
+        // Calculate service usage based on pricing table, per variable ID
+        // Create separate entries for user credentials (unitCost = 0) vs system credentials
+        // Key format: serviceKey:unitCost to differentiate between user and system credentials
+        const aggregatedServiceUsage = new Map();
+        for (const [serviceKey, varIdMap,] of this.cumulativeServiceUsageByService.entries()) {
+            // Use the full key (service:subService:unit) to look up pricing
+            // This matches the key format used in the pricing table
+            const pricingKey = serviceKey; // key is already in format "service:subService:unit"
+            const pricing = this.config.pricingTable[pricingKey];
+            const systemUnitCost = pricing?.unitCost || 0;
+            // Process each variable ID's usage separately
+            for (const [variableId, usageData] of varIdMap.entries()) {
+                // Check if this variable ID used a user credential for this service type
+                const userCredsForVarId = this.userCredentialMapping?.get(variableId);
+                const usedUserCredential = userCredsForVarId?.has(usageData.service) ?? false;
+                // Set unitCost to 0 if user credential was used, otherwise use pricing table
+                const unitCost = usedUserCredential ? 0 : systemUnitCost;
+                const costForThisVarId = usageData.usage * unitCost;
+                // Create a key that includes unitCost to separate user vs system credential usage
+                const usageKey = `${serviceKey}:${unitCost}`;
+                // Aggregate by usage key (serviceKey:unitCost)
+                const existing = aggregatedServiceUsage.get(usageKey);
+                if (existing) {
+                    existing.usage += usageData.usage;
+                    existing.totalCost += costForThisVarId;
+                }
+                else {
+                    aggregatedServiceUsage.set(usageKey, {
+                        service: usageData.service,
+                        usage: usageData.usage,
+                        subService: usageData.subService,
+                        unit: usageData.unit,
+                        unitCost: unitCost,
+                        totalCost: costForThisVarId,
+                    });
+                }
+            }
+        }
+        // Convert aggregated map to ServiceUsage array
+        for (const [, aggregated] of aggregatedServiceUsage.entries()) {
+            serviceUsage.push({
+                service: aggregated.service,
+                usage: aggregated.usage,
+                subService: aggregated.subService,
+                unit: aggregated.unit,
+                unitCost: aggregated.unitCost,
+                totalCost: aggregated.totalCost,
+            });
+        }
         return {
             totalDuration,
             errors,
             warnings,
-            tokenUsage: this.getTokenUsage(), // Aggregated token usage across all models
-            tokenUsageByModel, // Per-model breakdown
+            serviceUsage,
+            totalCost: serviceUsage.reduce((acc, curr) => acc + curr.totalCost, 0),
         };
     }
     /**