@bubblelab/bubble-core 0.1.9 → 0.1.11

package/dist/logging/WebhookStreamLogger.d.ts

@@ -0,0 +1,66 @@
+import { BubbleLogger, type LoggerConfig, type LogMetadata } from './BubbleLogger.js';
+import type { StreamCallback } from '@bubblelab/shared-schemas';
+import { BubbleError } from '../types/bubble-errors';
+interface WebhookStreamLoggerConfig extends Partial<Omit<LoggerConfig, 'pricingTable'>> {
+    pricingTable: Record<string, {
+        unit: string;
+        unitCost: number;
+    }>;
+    streamCallback?: StreamCallback;
+}
+/**
+ * Webhook-optimized streaming logger for terminal-friendly output
+ * Designed specifically for webhook streaming endpoints
+ * Shows only essential information with truncated data for readability
+ */
+export declare class WebhookStreamLogger extends BubbleLogger {
+    private streamCallback?;
+    constructor(flowName: string, options?: WebhookStreamLoggerConfig);
+    /**
+     * Override logBubbleExecution to emit clean, truncated events
+     */
+    logBubbleExecution(variableId: number, bubbleName: string, variableName: string, parameters?: Record<string, unknown>): string;
+    /**
+     * Override logBubbleExecutionComplete to emit clean results
+     */
+    logBubbleExecutionComplete(variableId: number, bubbleName: string, variableName: string, result?: unknown): string;
+    /**
+     * Log execution completion with beautiful, terminal-friendly formatting
+     * Makes the final result super clear and easy to read
+     */
+    logExecutionComplete(success: boolean, finalResult?: unknown, error?: string): void;
+    /**
+     * Override error method to emit clean error events
+     */
+    error(message: string, error?: BubbleError, metadata?: Partial<LogMetadata>): void;
+    /**
+     * Override warn method to emit clean warning events
+     */
+    warn(message: string, metadata?: Partial<LogMetadata>): void;
+    /**
+     * Override info method to emit clean info events
+     */
+    info(message: string, metadata?: Partial<LogMetadata>): void;
+    /**
+     * Set or update the stream callback
+     */
+    setStreamCallback(callback: StreamCallback): void;
+    /**
+     * Clear the stream callback
+     */
+    clearStreamCallback(): void;
+    /**
+     * Emit a streaming event if callback is set
+     */
+    private emitStreamEvent;
+    /**
+     * Get current execution time in milliseconds
+     */
+    private getCurrentExecutionTime;
+    /**
+     * Get current memory usage in bytes
+     */
+    private getCurrentMemoryUsage;
+}
+export {};
+//# sourceMappingURL=WebhookStreamLogger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WebhookStreamLogger.d.ts","sourceRoot":"","sources":["../../src/logging/WebhookStreamLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,KAAK,YAAY,EACjB,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAMrD,UAAU,yBACR,SAAQ,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IACnD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjE,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAmDD;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,YAAY;IACnD,OAAO,CAAC,cAAc,CAAC,CAAiB;gBAGtC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,yBAAgD;IAO3D;;OAEG;IACM,kBAAkB,CACzB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,MAAM;IAgCT;;OAEG;IACM,0BAA0B,CACjC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,MAAM,CAAC,EAAE,OAAO,GACf,MAAM;IAmCT;;;OAGG;IACH,oBAAoB,CAClB,OAAO,EAAE,OAAO,EAChB,WAAW,CAAC,EAAE,OAAO,EACrB,KAAK,CAAC,EAAE,MAAM,GACb,IAAI;IA2DP;;OAEG;IACM,KAAK,CACZ,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,WAAW,EACnB,QAAQ,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAC9B,IAAI;IAyBP;;OAEG;IACM,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAgBrE;;OAEG;IACM,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAgBrE;;OAEG;IACH,iBAAiB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAIjD;;OAEG;IACH,mBAAmB,IAAI,IAAI;IAI3B;;OAEG;IACH,OAAO,CAAC,eAAe;IAgBvB;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAK/B;;OAEG;IACH,OAAO,CAAC,qBAAqB;CAM9B"}

package/dist/logging/WebhookStreamLogger.js

@@ -0,0 +1,291 @@
+import { BubbleLogger, LogLevel, } from './BubbleLogger.js';
+import { sanitizeErrorMessage, sanitizeErrorStack, } from '../utils/error-sanitizer.js';
+/**
+ * Helper function to format data for webhook stream display
+ * Truncates large objects/strings for terminal readability
+ */
+function formatForWebhookStream(data, maxLength = 200) {
+    if (data === null)
+        return 'null';
+    if (data === undefined)
+        return 'undefined';
+    // Handle strings
+    if (typeof data === 'string') {
+        if (data.length <= maxLength)
+            return data;
+        return data.substring(0, maxLength) + '...';
+    }
+    // Handle primitives
+    if (typeof data !== 'object') {
+        return String(data);
+    }
+    // Handle arrays
+    if (Array.isArray(data)) {
+        if (data.length === 0)
+            return '[]';
+        const preview = `[${data.length} items]`;
+        if (data.length <= 3) {
+            const items = data
+                .map((item) => formatForWebhookStream(item, 50))
+                .join(', ');
+            return items.length <= maxLength ? `[${items}]` : preview;
+        }
+        return preview;
+    }
+    // Handle objects
+    try {
+        const stringified = JSON.stringify(data);
+        if (stringified.length <= maxLength)
+            return stringified;
+        // Show object keys as preview
+        const keys = Object.keys(data);
+        if (keys.length === 0)
+            return '{}';
+        if (keys.length <= 3) {
+            return `{${keys.join(', ')}}`;
+        }
+        return `{${keys.slice(0, 3).join(', ')}, ... +${keys.length - 3} more}`;
+    }
+    catch {
+        return '[Complex Object]';
+    }
+}
+/**
+ * Webhook-optimized streaming logger for terminal-friendly output
+ * Designed specifically for webhook streaming endpoints
+ * Shows only essential information with truncated data for readability
+ */
+export class WebhookStreamLogger extends BubbleLogger {
+    streamCallback;
+    constructor(flowName, options = { pricingTable: {} }) {
+        const { streamCallback, ...loggerConfig } = options;
+        super(flowName, loggerConfig);
+        this.streamCallback = streamCallback;
+    }
+    /**
+     * Override logBubbleExecution to emit clean, truncated events
+     */
+    logBubbleExecution(variableId, bubbleName, variableName, parameters) {
+        // Call parent method and use the returned message
+        const logMessage = super.logBubbleExecution(variableId, bubbleName, variableName, parameters);
+        // Format parameters for webhook display - truncate to be terminal-friendly
+        const formattedParams = parameters
+            ? formatForWebhookStream(parameters, 150)
+            : undefined;
+        this.emitStreamEvent({
+            type: 'bubble_execution',
+            timestamp: new Date().toISOString(),
+            variableId,
+            message: logMessage,
+            bubbleName,
+            variableName,
+            additionalData: {
+                parameters: formattedParams,
+                variableId,
+            },
+            executionTime: this.getCurrentExecutionTime(),
+            memoryUsage: this.getCurrentMemoryUsage(),
+        });
+        return logMessage;
+    }
+    /**
+     * Override logBubbleExecutionComplete to emit clean results
+     */
+    logBubbleExecutionComplete(variableId, bubbleName, variableName, result) {
+        // Get individual bubble execution time BEFORE calling parent method
+        const individualExecutionTime = this.getBubbleExecutionTime(variableId);
+        // Call parent method and use the returned message
+        const logMessage = super.logBubbleExecutionComplete(variableId, bubbleName, variableName, result);
+        // Truncate result for webhook display
+        const formattedResult = result
+            ? formatForWebhookStream(result, 200)
+            : undefined;
+        this.emitStreamEvent({
+            type: 'bubble_execution_complete',
+            timestamp: new Date().toISOString(),
+            message: logMessage,
+            variableId,
+            bubbleName,
+            variableName,
+            additionalData: {
+                result: formattedResult,
+                variableId,
+            },
+            executionTime: individualExecutionTime,
+            memoryUsage: this.getCurrentMemoryUsage(),
+        });
+        return logMessage;
+    }
+    /**
+     * Log execution completion with beautiful, terminal-friendly formatting
+     * Makes the final result super clear and easy to read
+     */
+    logExecutionComplete(success, finalResult, error) {
+        const executionTime = (this.getCurrentExecutionTime() / 1000).toFixed(2);
+        const tokenUsage = this.getExecutionSummary().serviceUsage;
+        // Format the final result nicely for display - NO TRUNCATION
+        let displayResult;
+        if (success && finalResult !== undefined) {
+            try {
+                if (typeof finalResult === 'string') {
+                    displayResult = finalResult;
+                }
+                else {
+                    // For objects, extract string values and format them with actual newlines
+                    const formatted = JSON.stringify(finalResult, null, 2);
+                    // Replace escaped newlines with actual newlines for better readability
+                    // This makes the output much more readable in terminal
+                    displayResult = formatted.replace(/\\n/g, '\n');
+                }
+            }
+            catch {
+                displayResult = String(finalResult);
+            }
+        }
+        else if (error) {
+            displayResult = `Error: ${error}`;
+        }
+        else {
+            displayResult = 'No result returned';
+        }
+        // Create a beautiful, visually distinct message with better formatting
+        const separator = '═'.repeat(70);
+        const thinSeparator = '─'.repeat(70);
+        const message = success
+            ? `\n\n${separator}\n    ✓ FLOW COMPLETED SUCCESSFULLY\n${separator}\n\n⏱️  Execution Time: ${executionTime}s\n🎯 Tokens Used: ${tokenUsage?.reduce((acc, curr) => acc + curr.totalCost, 0).toFixed(6)} total (${tokenUsage?.reduce((acc, curr) => acc + curr.usage, 0).toFixed(6)} in + ${tokenUsage?.reduce((acc, curr) => acc + curr.usage, 0).toFixed(6)} out)\n\n${thinSeparator}\n📤 FINAL RESULT:\n${thinSeparator}\n\n${displayResult}\n\n${separator}\n`
+            : `\n\n${separator}\n    ✗ FLOW FAILED\n${separator}\n\n❌ Error: ${error || 'Unknown error'}\n\n${separator}\n`;
+        this.logLine(0, message, {
+            success,
+            finalResult,
+            error,
+        });
+        this.emitStreamEvent({
+            type: 'execution_complete',
+            timestamp: new Date().toISOString(),
+            message,
+            additionalData: {
+                success,
+                finalResult: displayResult,
+                error,
+                summary: {
+                    executionTime: this.getCurrentExecutionTime(),
+                    tokenUsage,
+                    success,
+                },
+            },
+            executionTime: this.getCurrentExecutionTime(),
+            memoryUsage: this.getCurrentMemoryUsage(),
+        });
+    }
+    /**
+     * Override error method to emit clean error events
+     */
+    error(message, error, metadata) {
+        super.error(message, error, metadata);
+        this.emitStreamEvent({
+            type: 'error',
+            timestamp: new Date().toISOString(),
+            message,
+            lineNumber: metadata?.lineNumber,
+            bubbleName: error?.bubbleName,
+            variableId: error?.variableId,
+            additionalData: {
+                ...metadata?.additionalData,
+                error: error
+                    ? {
+                        message: sanitizeErrorMessage(error.message),
+                        stack: sanitizeErrorStack(error),
+                        name: error.name,
+                    }
+                    : undefined,
+            },
+            executionTime: this.getCurrentExecutionTime(),
+            memoryUsage: this.getCurrentMemoryUsage(),
+            logLevel: LogLevel[LogLevel.ERROR],
+        });
+    }
+    /**
+     * Override warn method to emit clean warning events
+     */
+    warn(message, metadata) {
+        super.warn(message, metadata);
+        this.emitStreamEvent({
+            type: 'warn',
+            timestamp: new Date().toISOString(),
+            message,
+            lineNumber: metadata?.lineNumber,
+            bubbleName: metadata?.bubbleName,
+            variableName: metadata?.variableName,
+            additionalData: metadata?.additionalData,
+            executionTime: this.getCurrentExecutionTime(),
+            memoryUsage: this.getCurrentMemoryUsage(),
+            logLevel: LogLevel[LogLevel.WARN],
+        });
+    }
+    /**
+     * Override info method to emit clean info events
+     */
+    info(message, metadata) {
+        super.info(message, metadata);
+        this.emitStreamEvent({
+            type: 'info',
+            timestamp: new Date().toISOString(),
+            message,
+            lineNumber: metadata?.lineNumber,
+            bubbleName: metadata?.bubbleName,
+            variableName: metadata?.variableName,
+            additionalData: metadata?.additionalData,
+            executionTime: this.getCurrentExecutionTime(),
+            memoryUsage: this.getCurrentMemoryUsage(),
+            logLevel: LogLevel[LogLevel.INFO],
+        });
+    }
+    /**
+     * Set or update the stream callback
+     */
+    setStreamCallback(callback) {
+        this.streamCallback = callback;
+    }
+    /**
+     * Clear the stream callback
+     */
+    clearStreamCallback() {
+        this.streamCallback = undefined;
+    }
+    /**
+     * Emit a streaming event if callback is set
+     */
+    emitStreamEvent(event) {
+        if (this.streamCallback) {
+            try {
+                // Handle both sync and async callbacks
+                const result = this.streamCallback(event);
+                if (result instanceof Promise) {
+                    result.catch((error) => {
+                        console.error('Stream callback error:', error);
+                    });
+                }
+            }
+            catch (error) {
+                console.error('Stream callback error:', error);
+            }
+        }
+    }
+    /**
+     * Get current execution time in milliseconds
+     */
+    getCurrentExecutionTime() {
+        const summary = this.getExecutionSummary();
+        return summary.totalDuration;
+    }
+    /**
+     * Get current memory usage in bytes
+     */
+    getCurrentMemoryUsage() {
+        if (typeof process !== 'undefined' && process.memoryUsage) {
+            return process.memoryUsage().heapUsed;
+        }
+        return 0;
+    }
+}
+//# sourceMappingURL=WebhookStreamLogger.js.map

package/dist/logging/WebhookStreamLogger.js.map

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

package/dist/types/available-tools.d.ts

@@ -1,4 +1,4 @@
 import { z } from 'zod';
-export declare const AvailableTools: z.ZodEnum<["web-search-tool", "web-scrape-tool", "web-crawl-tool", "web-extract-tool", "research-agent-tool", "reddit-scrape-tool", "instagram-tool", "list-bubbles-tool", "get-bubble-details-tool", "bubbleflow-validation-tool", "chart-js-tool", "sql-query-tool"]>;
+export declare const AvailableTools: z.ZodEnum<["web-search-tool", "web-scrape-tool", "web-crawl-tool", "web-extract-tool", "research-agent-tool", "reddit-scrape-tool", "instagram-tool", "list-bubbles-tool", "get-bubble-details-tool", "bubbleflow-validation-tool", "code-edit-tool", "chart-js-tool", "sql-query-tool"]>;
 export type AvailableTool = z.infer<typeof AvailableTools>;
 //# sourceMappingURL=available-tools.d.ts.map

package/dist/types/available-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"available-tools.d.ts","sourceRoot":"","sources":["../../src/types/available-tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,cAAc,yQAgBgB,CAAC;AAE5C,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC"}
+{"version":3,"file":"available-tools.d.ts","sourceRoot":"","sources":["../../src/types/available-tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,cAAc,2RAiBgB,CAAC;AAE5C,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC"}

package/dist/types/available-tools.js

@@ -15,6 +15,7 @@ export const AvailableTools = z.enum([
     'list-bubbles-tool',
     'get-bubble-details-tool',
     'bubbleflow-validation-tool',
+    'code-edit-tool',
     'chart-js-tool',
     'sql-query-tool',
 ]);

package/dist/types/available-tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"available-tools.js","sourceRoot":"","sources":["../../src/types/available-tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,4DAA4D;AAC5D,oEAAoE;AACpE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,IAAI,CAAC;IACnC,YAAY;IACZ,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,kBAAkB;IAClB,qBAAqB;IACrB,oBAAoB;IACpB,qBAAqB;IACrB,gBAAgB;IAChB,4EAA4E;IAC5E,mBAAmB;IACnB,yBAAyB;IACzB,4BAA4B;IAC5B,eAAe;IACf,gBAAgB;CACwB,CAAC,CAAC"}
+{"version":3,"file":"available-tools.js","sourceRoot":"","sources":["../../src/types/available-tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,4DAA4D;AAC5D,oEAAoE;AACpE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,IAAI,CAAC;IACnC,YAAY;IACZ,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,kBAAkB;IAClB,qBAAqB;IACrB,oBAAoB;IACpB,qBAAqB;IACrB,gBAAgB;IAChB,4EAA4E;IAC5E,mBAAmB;IACnB,yBAAyB;IACzB,4BAA4B;IAC5B,gBAAgB;IAChB,eAAe;IACf,gBAAgB;CACwB,CAAC,CAAC"}

package/dist/types/base-bubble-class.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import type { IBubble, BubbleContext, BubbleResult, BubbleOperationResult } from './bubble.js';
+import type { IBubble, BubbleContext, BubbleResult, BubbleOperationResult } from '@bubblelab/bubble-core';
 /**
  * Abstract base class for all bubble types
  * Implements common properties and methods defined in IBubble interface
@@ -15,12 +15,14 @@ export declare abstract class BaseBubble<TParams = unknown, TResult extends Bubb
     protected readonly params: TParams;
     protected context?: BubbleContext;
     previousResult: BubbleResult<BubbleOperationResult> | undefined;
-    constructor(params: unknown, context?: BubbleContext);
+    protected readonly instanceId?: string;
+    constructor(params: unknown, context?: BubbleContext, instanceId?: string);
     /**
      * Compute child context based on dependency graph and current unique id.
-     * Finds the node matching currentUniqueId, then determines this child's unique id as
-     * `${currentUniqueId}.${this.name}#k` for the next ordinal k, and assigns the variableId from
-     * the dependency graph if present, otherwise keeps parent's variableId.
+     * Finds the node matching currentUniqueId, then determines this child's unique id as:
+     * - If instanceId is provided: `${currentUniqueId}.${this.name}#${instanceId}`
+     * - Otherwise: `${currentUniqueId}.${this.name}#k` for the next ordinal k
+     * Assigns the variableId from the dependency graph if present, otherwise keeps parent's variableId.
      */
     private computeChildContext;
     saveResult<R extends BubbleOperationResult>(result: BubbleResult<R>): void;

package/dist/types/base-bubble-class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-bubble-class.d.ts","sourceRoot":"","sources":["../../src/types/base-bubble-class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EACV,OAAO,EACP,aAAa,EACb,YAAY,EACZ,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAUrB;;;GAGG;AACH,8BAAsB,UAAU,CAC9B,OAAO,GAAG,OAAO,EACjB,OAAO,SAAS,qBAAqB,GAAG,qBAAqB,CAC7D,YAAW,OAAO,CAAC,OAAO,CAAC;IAE3B,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACnD,SAAgB,YAAY,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACzD,SAAgB,gBAAgB,EAAE,MAAM,CAAC;IACzC,SAAgB,eAAe,EAAE,MAAM,CAAC;IACxC,SAAgB,KAAK,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAyB,IAAI,EACzB,SAAS,GACT,UAAU,GACV,MAAM,GACN,IAAI,GACJ,OAAO,CAAC;IAEZ,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACnC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAC3B,cAAc,EAAE,YAAY,CAAC,qBAAqB,CAAC,GAAG,SAAS,CAAC;gBAE3D,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,aAAa;IAkEpD;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAqE3B,UAAU,CAAC,CAAC,SAAS,qBAAqB,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI;IAI1E,gBAAgB,IAAI,IAAI;IAIxB;;;OAGG;IACH,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAWjC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAsG9C;;;OAGG;IACH,kBAAkB,IAAI,YAAY,CAAC,OAAO,CAAC;IAI3C;;;OAGG;IACH,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC;IAc/D;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;CAC5E"}
+{"version":3,"file":"base-bubble-class.d.ts","sourceRoot":"","sources":["../../src/types/base-bubble-class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EACV,OAAO,EACP,aAAa,EACb,YAAY,EACZ,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAUhC;;;GAGG;AACH,8BAAsB,UAAU,CAC9B,OAAO,GAAG,OAAO,EACjB,OAAO,SAAS,qBAAqB,GAAG,qBAAqB,CAC7D,YAAW,OAAO,CAAC,OAAO,CAAC;IAE3B,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACnD,SAAgB,YAAY,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACzD,SAAgB,gBAAgB,EAAE,MAAM,CAAC;IACzC,SAAgB,eAAe,EAAE,MAAM,CAAC;IACxC,SAAgB,KAAK,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAyB,IAAI,EACzB,SAAS,GACT,UAAU,GACV,MAAM,GACN,IAAI,GACJ,OAAO,CAAC;IAEZ,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACnC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAC3B,cAAc,EAAE,YAAY,CAAC,qBAAqB,CAAC,GAAG,SAAS,CAAC;IACvE,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;gBAE3B,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,aAAa,EAAE,UAAU,CAAC,EAAE,MAAM;IAyDzE;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;IA0F3B,UAAU,CAAC,CAAC,SAAS,qBAAqB,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI;IAI1E,gBAAgB,IAAI,IAAI;IAIxB;;;OAGG;IACH,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAWjC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IA8H9C;;;OAGG;IACH,kBAAkB,IAAI,YAAY,CAAC,OAAO,CAAC;IAI3C;;;OAGG;IACH,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC;IAc/D;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;CAC5E"}

package/dist/types/base-bubble-class.js

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { randomUUID } from 'crypto';
 import { MockDataGenerator } from '@bubblelab/shared-schemas';
 import { BubbleValidationError, BubbleExecutionError, } from './bubble-errors.js';
-import { sanitizeParams } from '../utils/param-helper.js';
+import { sanitizeParams } from '@bubblelab/shared-schemas';
 /**
  * Abstract base class for all bubble types
  * Implements common properties and methods defined in IBubble interface
@@ -17,7 +17,8 @@ export class BaseBubble {
     params;
     context;
     previousResult;
-    constructor(params, context) {
+    instanceId;
+    constructor(params, context, instanceId) {
         // Use static properties from the class - typed as required static metadata
         const ctor = this.constructor;
         this.name = ctor.bubbleName;
@@ -26,36 +27,29 @@ export class BaseBubble {
         this.shortDescription = ctor.shortDescription;
         this.longDescription = ctor.longDescription;
         this.alias = ctor.alias;
+        this.instanceId = instanceId;
         try {
             this.params = this.schema.parse(params);
+            const normalizedContext = context;
             // Enrich context with child variableId/currentUniqueId if dependencyGraph is provided
-            if (context && context.dependencyGraph && context.currentUniqueId) {
-                console.debug('Computing child context');
-                const next = this.computeChildContext(context);
+            if (normalizedContext &&
+                normalizedContext.dependencyGraph &&
+                normalizedContext.currentUniqueId) {
+                const next = this.computeChildContext(normalizedContext);
                 this.context = next;
-                console.debug('Computed child context unique id:', this.context?.currentUniqueId);
+                console.debug('[BaseBubble] Computed child context unique id:', this.context?.currentUniqueId);
                 //Prnt the var id of the computed child context
-                console.debug('Computed child context variable id:', this.context?.variableId);
+                console.debug('[BaseBubble] Computed child context variable id:', this.context?.variableId);
             }
             else {
-                this.context = context;
+                this.context = normalizedContext;
             }
         }
         catch (error) {
-            // Parse Zod validation errors to make them more user-friendly
-            if (error instanceof z.ZodError) {
-                const errorMessages = error.errors.map((err) => {
-                    const path = err.path.length > 0 ? `${err.path.join('.')}: ` : '';
-                    return `${path}${err.message}`;
-                });
-                throw new BubbleValidationError(`Parameter validation failed: ${errorMessages.join(', ')}`, {
-                    variableId: context?.variableId,
-                    bubbleName: ctor.bubbleName,
-                    validationErrors: errorMessages,
-                    cause: error,
-                });
-            }
-            throw new BubbleValidationError(`Parameter validation failed: ${String(error)}`, {
+            const errorMessage = error instanceof z.ZodError
+                ? `Input Schema validation failed: ${error.errors.map((e) => `${e.path.join('.')}: ${e.message}`).join(', ')}`
+                : `Input Schema validation failed: ${error instanceof Error ? error.message : 'Unknown validation error'}`;
+            throw new BubbleValidationError(errorMessage, {
                 variableId: context?.variableId,
                 bubbleName: ctor.bubbleName,
                 cause: error instanceof Error ? error : undefined,
@@ -64,9 +58,10 @@ export class BaseBubble {
     }
     /**
      * Compute child context based on dependency graph and current unique id.
-     * Finds the node matching currentUniqueId, then determines this child's unique id as
-     * `${currentUniqueId}.${this.name}#k` for the next ordinal k, and assigns the variableId from
-     * the dependency graph if present, otherwise keeps parent's variableId.
+     * Finds the node matching currentUniqueId, then determines this child's unique id as:
+     * - If instanceId is provided: `${currentUniqueId}.${this.name}#${instanceId}`
+     * - Otherwise: `${currentUniqueId}.${this.name}#k` for the next ordinal k
+     * Assigns the variableId from the dependency graph if present, otherwise keeps parent's variableId.
      */
     computeChildContext(parentContext) {
         const graph = parentContext.dependencyGraph;
@@ -84,10 +79,14 @@ export class BaseBubble {
             }
             return null;
         };
+        console.log('Current ID:', this.name);
+        console.log('Current varid:', this.context?.variableId);
+        console.log('Finding parent node by uniqueId:', currentId);
         const parentNode = currentId ? findByUniqueId(graph, currentId) : graph;
         // If the current bubble matches the node at currentUniqueId, don't advance; keep IDs from that node
         if (parentNode && parentNode.name === this.name) {
-            const sameNodeVarId = parentNode.variableId ??
+            const sameNodeVarId = parentContext.variableId ??
+                parentNode.variableId ??
                 parentContext.variableId;
             return {
                 ...parentContext,
@@ -96,22 +95,30 @@ export class BaseBubble {
                 __uniqueIdCounters__: { ...(parentContext.__uniqueIdCounters__ || {}) },
             };
         }
-        // Determine this bubble's ordinal under the parent using a counter map
+        // Determine this bubble's identifier under the parent
         const children = parentNode?.dependencies || [];
-        const counterKey = `${currentId || 'ROOT'}|${this.name}`;
         const counters = { ...(parentContext.__uniqueIdCounters__ || {}) };
+        let selectedChild = undefined;
+        // Use ordinal counter as before
+        const counterKey = `${currentId || 'ROOT'}|${this.name}`;
         const ordinal = (counters[counterKey] || 0) + 1;
+        const suffix = `#${ordinal}`;
         counters[counterKey] = ordinal;
         // Try to select the nth child by name for an exact uniqueId match
         const sameNameChildren = children.filter((c) => c.name === this.name);
-        const selectedChild = sameNameChildren[ordinal - 1];
+        selectedChild = sameNameChildren[ordinal - 1];
         const childUniqueId = selectedChild?.uniqueId ||
             (currentId
-                ? `${currentId}.${this.name}#${ordinal}`
-                : `${this.name}#${ordinal}`);
+                ? `${currentId}.${this.name}${suffix}`
+                : `${this.name}${suffix}`);
         // Try to find a matching child node to get variableId; fallback to parent's
-        const matchingChild = selectedChild ||
-            children.find((c) => c.uniqueId === childUniqueId || c.name === this.name);
+        let matchingChild = children.find((c) => c.variableName === this.instanceId);
+        console.log(`[BaseBubble] ${this.name}.computeChildContext: Matching child by variableName:`, matchingChild);
+        // if no match is found fallback to || c.uniqueId === childUniqueId || c.name === this.name
+        if (!matchingChild) {
+            matchingChild = children.find((c) => c.uniqueId === childUniqueId || c.name === this.name);
+            console.log(`[BaseBubble] ${this.name}.computeChildContext: Matching child by uniqueId:`, matchingChild);
+        }
         const childVariableId = (matchingChild && typeof matchingChild.variableId === 'number'
             ? matchingChild.variableId
             : parentContext.variableId) || parentContext.variableId;
@@ -158,16 +165,33 @@ export class BaseBubble {
             logger?.logBubbleExecutionComplete(this.context?.variableId ?? -999, this.name, this.name, savedResult);
             return savedResult;
         }
-        const result = await this.performAction(this.context);
+        let result;
+        try {
+            result = await this.performAction(this.context);
+        }
+        catch (error) {
+            console.error('Error executing bubble:', error);
+            this.context?.logger?.logBubbleExecutionComplete(this.context?.variableId ?? -999, this.name, this.name, {
+                success: false,
+                error: error instanceof Error ? error.message : 'Unknown error',
+                executionId: randomUUID(),
+                timestamp: new Date(),
+            });
+            this.context?.logger?.error(`[${this.name}] Unexpected error when performing action: ${error instanceof Error ? error.message : 'Unknown error'}`);
+            throw new BubbleExecutionError(error instanceof Error ? error.message : 'Unknown error', {
+                variableId: this.context?.variableId,
+                bubbleName: this.name,
+                executionPhase: 'execution',
+                cause: error instanceof Error ? error : undefined,
+            });
+        }
         // Validate result if schema is provided
         if (this.resultSchema) {
             try {
                 const validatedResult = this.resultSchema.parse(result);
                 const finalResult = {
                     success: result.success,
-                    // For data we strip out any excessive fields
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    data: (({ ...rest }) => rest)(validatedResult),
+                    data: result,
                     executionId: randomUUID(),
                     error: validatedResult.error || '',
                     timestamp: new Date(),
@@ -180,14 +204,13 @@ export class BaseBubble {
                 return finalResult;
             }
             catch (validationError) {
-                // Throw execution error for result validation failures
+                // Validation error for result validation failures
                 const errorMessage = validationError instanceof z.ZodError
                     ? `Result schema validation failed: ${validationError.errors.map((e) => `${e.path.join('.')}: ${e.message}`).join(', ')}`
                     : `Result validation failed: ${validationError instanceof Error ? validationError.message : 'Unknown validation error'}`;
-                throw new BubbleExecutionError(errorMessage, {
+                throw new BubbleValidationError(errorMessage, {
                     variableId: this.context?.variableId,
                     bubbleName: this.name,
-                    executionPhase: 'validation',
                     cause: validationError instanceof Error ? validationError : undefined,
                 });
             }