@bubblelab/bubble-runtime 0.1.14 → 0.1.16

package/dist/runtime/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA4B,MAAM,gBAAgB,CAAC"}

package/dist/runtime/types.js

@@ -1 +1,2 @@
 export {};
+//# sourceMappingURL=types.js.map

package/dist/types/index.js

@@ -1 +1,2 @@
 export {};
+//# sourceMappingURL=index.js.map

package/dist/utils/bubble-helper.d.ts

@@ -1,10 +1,10 @@
 import { BubbleFactory } from '@bubblelab/bubble-core';
-import { BubbleNodeType } from '@bubblelab/shared-schemas';
+import { BubbleName, BubbleNodeType } from '@bubblelab/shared-schemas';
 /**
  * Build a lookup map from className to bubble metadata
  */
 export declare function buildClassNameLookup(factory: BubbleFactory): Map<string, {
-    bubbleName: string;
+    bubbleName: BubbleName;
     className: string;
     nodeType: BubbleNodeType;
 }>;

package/dist/utils/bubble-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bubble-helper.d.ts","sourceRoot":"","sources":["../../src/utils/bubble-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,aAAa,GACrB,GAAG,CACJ,MAAM,EACN;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAA;CAAE,CACpE,CAiBA"}
+{"version":3,"file":"bubble-helper.d.ts","sourceRoot":"","sources":["../../src/utils/bubble-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEvE;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,aAAa,GACrB,GAAG,CACJ,MAAM,EACN;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAA;CAAE,CACxE,CAqBA"}

package/dist/utils/bubble-helper.js

@@ -8,7 +8,12 @@ export function buildClassNameLookup(factory) {
         const className = ctor.name;
         const bubbleName = ctor.bubbleName ?? className;
         const nodeType = ctor.type ?? 'unknown';
-        lookup.set(className, { bubbleName, className, nodeType });
+        lookup.set(className, {
+            bubbleName: bubbleName,
+            className,
+            nodeType,
+        });
     }
     return lookup;
 }
+//# sourceMappingURL=bubble-helper.js.map

package/dist/utils/bubble-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"bubble-helper.js","sourceRoot":"","sources":["../../src/utils/bubble-helper.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAsB;IAKtB,MAAM,MAAM,GAAG,IAAI,GAAG,EAGnB,CAAC;IACJ,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,EAA+B,CAAC;IAE1D,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,MAAM,SAAS,GAAI,IAAoC,CAAC,IAAI,CAAC;QAC7D,MAAM,UAAU,GACb,IAA2C,CAAC,UAAU,IAAI,SAAS,CAAC;QACvE,MAAM,QAAQ,GACX,IAA6C,CAAC,IAAI,IAAI,SAAS,CAAC;QACnE,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"bubble-helper.js","sourceRoot":"","sources":["../../src/utils/bubble-helper.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAsB;IAKtB,MAAM,MAAM,GAAG,IAAI,GAAG,EAGnB,CAAC;IACJ,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,EAA+B,CAAC;IAE1D,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,MAAM,SAAS,GAAI,IAAoC,CAAC,IAAI,CAAC;QAC7D,MAAM,UAAU,GACb,IAA2C,CAAC,UAAU,IAAI,SAAS,CAAC;QACvE,MAAM,QAAQ,GACX,IAA6C,CAAC,IAAI,IAAI,SAAS,CAAC;QACnE,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE;YACpB,UAAU,EAAE,UAAwB;YACpC,SAAS;YACT,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/utils/normalize-control-flow.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Normalizes braceless control flow statements by wrapping them with braces.
+ * This prevents issues when injecting logging or other statements into the code.
+ *
+ * Transforms:
+ *   if (x) doSomething();
+ *   else doOther();
+ *
+ * Into:
+ *   if (x) { doSomething(); }
+ *   else { doOther(); }
+ */
+export declare function normalizeBracelessControlFlow(code: string): string;
+//# sourceMappingURL=normalize-control-flow.d.ts.map

package/dist/utils/normalize-control-flow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-control-flow.d.ts","sourceRoot":"","sources":["../../src/utils/normalize-control-flow.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAkClE"}

package/dist/utils/normalize-control-flow.js

@@ -0,0 +1,179 @@
+import { parse } from '@typescript-eslint/typescript-estree';
+/**
+ * Normalizes braceless control flow statements by wrapping them with braces.
+ * This prevents issues when injecting logging or other statements into the code.
+ *
+ * Transforms:
+ *   if (x) doSomething();
+ *   else doOther();
+ *
+ * Into:
+ *   if (x) { doSomething(); }
+ *   else { doOther(); }
+ */
+export function normalizeBracelessControlFlow(code) {
+    let ast;
+    try {
+        ast = parse(code, {
+            range: true,
+            loc: true,
+            sourceType: 'module',
+            ecmaVersion: 2022,
+        });
+    }
+    catch {
+        // If parsing fails, return original code
+        return code;
+    }
+    const insertions = [];
+    // Collect all braceless control flow bodies
+    collectBracelessBodies(ast, code, insertions);
+    if (insertions.length === 0) {
+        return code;
+    }
+    // Sort insertions by position in reverse order to preserve positions during modification
+    insertions.sort((a, b) => b.openBracePos - a.openBracePos);
+    // Apply insertions
+    let result = code;
+    for (const insertion of insertions) {
+        result = applyBraceInsertion(result, insertion);
+    }
+    return result;
+}
+function collectBracelessBodies(node, code, insertions) {
+    if (!node || typeof node !== 'object')
+        return;
+    // Check if statement
+    if (node.type === 'IfStatement') {
+        const ifStmt = node;
+        // Check consequent (then branch)
+        if (ifStmt.consequent.type !== 'BlockStatement') {
+            const insertion = createBraceInsertion(ifStmt, ifStmt.consequent, code, 'consequent');
+            if (insertion) {
+                insertions.push(insertion);
+            }
+        }
+        // Check alternate (else branch) - but not if it's another IfStatement (else if)
+        if (ifStmt.alternate &&
+            ifStmt.alternate.type !== 'BlockStatement' &&
+            ifStmt.alternate.type !== 'IfStatement') {
+            const insertion = createBraceInsertion(ifStmt, ifStmt.alternate, code, 'alternate');
+            if (insertion) {
+                insertions.push(insertion);
+            }
+        }
+    }
+    // Check for statement
+    if (node.type === 'ForStatement') {
+        const forStmt = node;
+        if (forStmt.body.type !== 'BlockStatement') {
+            const insertion = createBraceInsertion(forStmt, forStmt.body, code);
+            if (insertion) {
+                insertions.push(insertion);
+            }
+        }
+    }
+    // Check for-in statement
+    if (node.type === 'ForInStatement') {
+        const forInStmt = node;
+        if (forInStmt.body.type !== 'BlockStatement') {
+            const insertion = createBraceInsertion(forInStmt, forInStmt.body, code);
+            if (insertion) {
+                insertions.push(insertion);
+            }
+        }
+    }
+    // Check for-of statement
+    if (node.type === 'ForOfStatement') {
+        const forOfStmt = node;
+        if (forOfStmt.body.type !== 'BlockStatement') {
+            const insertion = createBraceInsertion(forOfStmt, forOfStmt.body, code);
+            if (insertion) {
+                insertions.push(insertion);
+            }
+        }
+    }
+    // Check while statement
+    if (node.type === 'WhileStatement') {
+        const whileStmt = node;
+        if (whileStmt.body.type !== 'BlockStatement') {
+            const insertion = createBraceInsertion(whileStmt, whileStmt.body, code);
+            if (insertion) {
+                insertions.push(insertion);
+            }
+        }
+    }
+    // Check do-while statement
+    if (node.type === 'DoWhileStatement') {
+        const doWhileStmt = node;
+        if (doWhileStmt.body.type !== 'BlockStatement') {
+            const insertion = createBraceInsertion(doWhileStmt, doWhileStmt.body, code);
+            if (insertion) {
+                insertions.push(insertion);
+            }
+        }
+    }
+    // Recursively process children
+    for (const key of Object.keys(node)) {
+        if (key === 'parent' || key === 'loc' || key === 'range')
+            continue;
+        const child = node[key];
+        if (Array.isArray(child)) {
+            for (const item of child) {
+                if (item && typeof item === 'object' && 'type' in item) {
+                    collectBracelessBodies(item, code, insertions);
+                }
+            }
+        }
+        else if (child && typeof child === 'object' && 'type' in child) {
+            collectBracelessBodies(child, code, insertions);
+        }
+    }
+}
+function createBraceInsertion(parent, body, code, branchType) {
+    if (!body.range)
+        return null;
+    // For 'else' branches, we need to find where the 'else' keyword ends
+    let openBracePos;
+    if (branchType === 'alternate') {
+        // Find the 'else' keyword before this statement
+        // Search backwards from the body start to find 'else'
+        const searchStart = Math.max(0, body.range[0] - 20);
+        const searchRegion = code.substring(searchStart, body.range[0]);
+        const elseMatch = searchRegion.match(/else\s*$/);
+        if (elseMatch) {
+            openBracePos = body.range[0];
+        }
+        else {
+            openBracePos = body.range[0];
+        }
+    }
+    else if (branchType === 'consequent') {
+        // For 'if' consequent, insert after the closing paren of condition
+        openBracePos = body.range[0];
+    }
+    else {
+        // For for/while loops, insert after the closing paren
+        openBracePos = body.range[0];
+    }
+    // Get the indentation of the parent statement
+    const parentLine = code.substring(0, parent.range[0]).split('\n').pop() || '';
+    const indentation = parentLine.match(/^\s*/)?.[0] || '';
+    return {
+        openBracePos,
+        closeBracePos: body.range[1],
+        indentation,
+    };
+}
+function applyBraceInsertion(code, insertion) {
+    const { openBracePos, closeBracePos, indentation } = insertion;
+    // Get the content between the positions
+    const beforeOpen = code.substring(0, openBracePos);
+    const bodyContent = code.substring(openBracePos, closeBracePos);
+    const afterClose = code.substring(closeBracePos);
+    // Always put the statement on its own line inside the braces
+    // This ensures logging can be injected after the statement but before the closing brace
+    const bodyIndent = indentation + '  ';
+    return `${beforeOpen}{\n${bodyIndent}${bodyContent.trim()}\n${indentation}}${afterClose}`;
+}
+//# sourceMappingURL=normalize-control-flow.js.map

package/dist/utils/normalize-control-flow.js.map

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

package/dist/utils/parameter-formatter.d.ts

@@ -1,10 +1,13 @@
 /**
  * Utility functions for formatting bubble parameters
  */
+import { BubbleParameter, ParsedBubbleWithInfo } from '@bubblelab/shared-schemas';
 /**
- * Build parameters object string from bubble parameters
+ * Check if a string contains function literal patterns.
+ * When function literals are present, the source code must be preserved as-is
+ * because functions cannot be safely serialized or condensed to single-line.
  */
-import { BubbleParameter, ParsedBubbleWithInfo } from '@bubblelab/shared-schemas';
+export declare function containsFunctionLiteral(value: string): boolean;
 export declare function buildParametersObject(parameters: BubbleParameter[], variableId?: number, includeLoggerConfig?: boolean, dependencyGraphLiteral?: string, currentUniqueId?: string): string;
 /**
  * Format a parameter value based on its type
@@ -15,13 +18,19 @@ export declare function formatParameterValue(value: unknown, type: string): stri
  * Returns an array of objects with at least a name field, or null if parsing fails.
  */
 export declare function parseToolsParamValue(raw: unknown): Array<Record<string, unknown>> | null;
+/**
+ * Condense a parameters string to a single line.
+ * Used when parameters don't contain function literals.
+ */
+export declare function condenseToSingleLine(input: string): string;
 /**
  * Replace a bubble instantiation with updated parameters
  *
  * This function:
- * 1. Replaces the bubble instantiation line with a single-line version
- * 2. Deletes all lines that were part of the original multi-line parameters
- * 3. Uses bubble.location.endLine to know exactly where to stop deleting
+ * 1. Replaces the bubble instantiation line with updated parameters
+ * 2. Preserves multi-line structure when function literals are present
+ * 3. Condenses to single-line otherwise
+ * 4. Uses bubble.location.endLine to know exactly where to stop deleting
  */
 export declare function replaceBubbleInstantiation(lines: string[], bubble: ParsedBubbleWithInfo): void;
 //# sourceMappingURL=parameter-formatter.d.ts.map

package/dist/utils/parameter-formatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parameter-formatter.d.ts","sourceRoot":"","sources":["../../src/utils/parameter-formatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,OAAO,EACL,eAAe,EACf,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAEnC,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,eAAe,EAAE,EAC7B,UAAU,CAAC,EAAE,MAAM,EACnB,mBAAmB,GAAE,OAAc,EACnC,sBAAsB,CAAC,EAAE,MAAM,EAC/B,eAAe,GAAE,MAAW,GAC3B,MAAM,CA2ER;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CA8CzE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,OAAO,GACX,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAyBvC;AAoID;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,EAAE,oBAAoB,QA+E7B"}
+{"version":3,"file":"parameter-formatter.d.ts","sourceRoot":"","sources":["../../src/utils/parameter-formatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,eAAe,EACf,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAkBnC;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE9D;AAuBD,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,eAAe,EAAE,EAC7B,UAAU,CAAC,EAAE,MAAM,EACnB,mBAAmB,GAAE,OAAc,EACnC,sBAAsB,CAAC,EAAE,MAAM,EAC/B,eAAe,GAAE,MAAW,GAC3B,MAAM,CAgJR;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAsDzE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,OAAO,GACX,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAyBvC;AAoID;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAQ1D;AAmCD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,EAAE,oBAAoB,QA0E7B"}

package/dist/utils/parameter-formatter.js

@@ -1,53 +1,128 @@
 /**
  * Utility functions for formatting bubble parameters
  */
+const INVOCATION_KEY_EXPR = '__bubbleFlowSelf?.__getInvocationCallSiteKey?.() ?? ""';
+/**
+ * Patterns that indicate function literals in source code.
+ * Used to detect when parameters contain functions that cannot be safely condensed.
+ */
+const FUNCTION_LITERAL_PATTERNS = [
+    'func:', // Object property with function value
+    '=>', // Arrow function
+    'function(', // Function expression
+    'function (', // Function expression with space
+    'async(', // Async arrow function
+    'async (', // Async function with space
+];
+/**
+ * Check if a string contains function literal patterns.
+ * When function literals are present, the source code must be preserved as-is
+ * because functions cannot be safely serialized or condensed to single-line.
+ */
+export function containsFunctionLiteral(value) {
+    return FUNCTION_LITERAL_PATTERNS.some((pattern) => value.includes(pattern));
+}
+function buildInvocationOverrideReference(variableId) {
+    if (typeof variableId !== 'number') {
+        return undefined;
+    }
+    return `globalThis["__bubbleInvocationDependencyGraphs"]?.[${INVOCATION_KEY_EXPR}]?.[${JSON.stringify(String(variableId))}]`;
+}
+function buildDependencyGraphExpression(dependencyGraphLiteral, overrideRef) {
+    if (overrideRef) {
+        return `${overrideRef} ?? ${dependencyGraphLiteral}`;
+    }
+    return dependencyGraphLiteral;
+}
 export function buildParametersObject(parameters, variableId, includeLoggerConfig = true, dependencyGraphLiteral, currentUniqueId = '') {
     if (!parameters || parameters.length === 0) {
         return '{}';
     }
+    const dependencyGraphLiteralSafe = dependencyGraphLiteral && dependencyGraphLiteral.length > 0
+        ? dependencyGraphLiteral
+        : undefined;
+    const invocationOverrideRef = buildInvocationOverrideReference(variableId);
+    const dependencyGraphExpr = dependencyGraphLiteralSafe !== undefined
+        ? buildDependencyGraphExpression(dependencyGraphLiteralSafe, invocationOverrideRef)
+        : (invocationOverrideRef ?? undefined);
+    const currentUniqueIdLiteral = JSON.stringify(currentUniqueId);
+    const currentUniqueIdExpr = invocationOverrideRef !== undefined
+        ? `${invocationOverrideRef}?.uniqueId ?? ${currentUniqueIdLiteral}`
+        : currentUniqueIdLiteral;
     // Handle single variable parameter case (e.g., new GoogleDriveBubble(params))
     if (parameters.length === 1 && parameters[0].type === 'variable') {
         const paramValue = formatParameterValue(parameters[0].value, parameters[0].type);
         if (includeLoggerConfig) {
-            const depGraphPart = dependencyGraphLiteral && dependencyGraphLiteral.length > 0
-                ? `, dependencyGraph: ${dependencyGraphLiteral}`
+            const variableIdExpr = typeof variableId === 'number'
+                ? `(__bubbleFlowSelf?.__computeInvocationVariableId?.(${variableId}) ?? ${variableId})`
+                : 'undefined';
+            const depGraphPart = dependencyGraphExpr !== undefined
+                ? `, dependencyGraph: ${dependencyGraphExpr}`
                 : '';
-            const currentIdPart = `, currentUniqueId: ${JSON.stringify(currentUniqueId)}`;
-            return `${paramValue}, {logger: __bubbleFlowSelf.logger, variableId: ${variableId}${depGraphPart}${currentIdPart}}`;
+            const currentIdPart = `, currentUniqueId: ${currentUniqueIdExpr}`;
+            const invocationKeyPart = ', invocationCallSiteKey: __bubbleFlowSelf?.__getInvocationCallSiteKey?.()';
+            return `${paramValue}, {logger: __bubbleFlowSelf.logger, variableId: ${variableIdExpr}${depGraphPart}${currentIdPart}${invocationKeyPart}}`;
         }
         return paramValue;
     }
-    // Handle single variable parameter + credentials case (e.g., new GoogleDriveBubble(params) with injected credentials)
-    if (parameters.length === 2 &&
-        parameters.some((p) => p.type === 'variable') &&
-        parameters.some((p) => p.name === 'credentials' && p.type === 'object')) {
-        const paramsParam = parameters.find((p) => p.type === 'variable');
-        const credentialsParam = parameters.find((p) => p.name === 'credentials' && p.type === 'object');
-        if (paramsParam && credentialsParam) {
+    const nonCredentialParams = parameters.filter((p) => p.name !== 'credentials');
+    const credentialsParam = parameters.find((p) => p.name === 'credentials' && p.type === 'object');
+    // Separate spreads from regular properties
+    const spreadParams = nonCredentialParams.filter((p) => p.source === 'spread');
+    const regularParams = nonCredentialParams.filter((p) => p.source !== 'spread');
+    // Handle single variable parameter + credentials case (existing logic)
+    if (credentialsParam &&
+        nonCredentialParams.length === 1 &&
+        nonCredentialParams[0].type === 'variable') {
+        const paramsParam = nonCredentialParams[0];
+        // Only spread if the parameter source is 'first-arg' (represents entire first argument),
+        // or if source is undefined (backward compatibility) and name is 'arg0' (parser's fallback).
+        const shouldSpread = paramsParam.source === 'first-arg' ||
+            (paramsParam.source === undefined && paramsParam.name === 'arg0');
+        if (shouldSpread) {
             const paramsValue = formatParameterValue(paramsParam.value, paramsParam.type);
             const credentialsValue = formatParameterValue(credentialsParam.value, credentialsParam.type);
             if (includeLoggerConfig) {
-                const depGraphPart = dependencyGraphLiteral && dependencyGraphLiteral.length > 0
-                    ? `, dependencyGraph: ${dependencyGraphLiteral}`
+                const variableIdExpr = typeof variableId === 'number'
+                    ? `(__bubbleFlowSelf?.__computeInvocationVariableId?.(${variableId}) ?? ${variableId})`
+                    : 'undefined';
+                const depGraphPart = dependencyGraphExpr !== undefined
+                    ? `, dependencyGraph: ${dependencyGraphExpr}`
                     : '';
-                const currentIdPart = `, currentUniqueId: ${JSON.stringify(currentUniqueId)}`;
-                return `{...${paramsValue}, credentials: ${credentialsValue}}, {logger: __bubbleFlowSelf.logger, variableId: ${variableId}${depGraphPart}${currentIdPart}}`;
+                const currentIdPart = `, currentUniqueId: ${currentUniqueIdExpr}`;
+                const invocationKeyPart = ', invocationCallSiteKey: __bubbleFlowSelf?.__getInvocationCallSiteKey?.()';
+                return `{...${paramsValue}, credentials: ${credentialsValue}}, {logger: __bubbleFlowSelf.logger, variableId: ${variableIdExpr}${depGraphPart}${currentIdPart}${invocationKeyPart}}`;
             }
             return `{...${paramsValue}, credentials: ${credentialsValue}}`;
         }
     }
-    const paramEntries = parameters.map((param) => {
+    // Build parameter entries: regular properties first, then spreads
+    const regularEntries = regularParams.map((param) => {
         const value = formatParameterValue(param.value, param.type);
         return `${param.name}: ${value}`;
     });
-    const paramsString = `{\n    ${paramEntries.join(',\n    ')}\n  }`;
+    const spreadEntries = spreadParams.map((param) => {
+        const value = formatParameterValue(param.value, param.type);
+        return `...${value}`;
+    });
+    // Combine all entries: regular properties, spreads, then credentials
+    const allEntries = [...regularEntries, ...spreadEntries];
+    if (credentialsParam) {
+        const credentialsValue = formatParameterValue(credentialsParam.value, credentialsParam.type);
+        allEntries.push(`credentials: ${credentialsValue}`);
+    }
+    const paramsString = `{\n    ${allEntries.join(',\n    ')}\n  }`;
     // Only add the logger configuration if explicitly requested
     if (includeLoggerConfig) {
-        const depGraphPart = dependencyGraphLiteral && dependencyGraphLiteral.length > 0
-            ? `, dependencyGraph: ${dependencyGraphLiteral}`
+        const variableIdExpr = typeof variableId === 'number'
+            ? `(__bubbleFlowSelf?.__computeInvocationVariableId?.(${variableId}) ?? ${variableId})`
+            : 'undefined';
+        const depGraphPart = dependencyGraphExpr !== undefined
+            ? `, dependencyGraph: ${dependencyGraphExpr}`
             : '';
-        const currentIdPart = `, currentUniqueId: ${JSON.stringify(currentUniqueId)}`;
-        return `${paramsString}, {logger: __bubbleFlowSelf.logger, variableId: ${variableId}${depGraphPart}${currentIdPart}}`;
+        const currentIdPart = `, currentUniqueId: ${currentUniqueIdExpr}`;
+        const invocationKeyPart = ', invocationCallSiteKey: __bubbleFlowSelf?.__getInvocationCallSiteKey?.()';
+        return `${paramsString}, {logger: __bubbleFlowSelf.logger, variableId: ${variableIdExpr}${depGraphPart}${currentIdPart}${invocationKeyPart}}`;
     }
     return paramsString;
 }
@@ -75,6 +150,10 @@ export function formatParameterValue(value, type) {
             // If caller provided a source literal string, keep it as code
             if (typeof value === 'string') {
                 const trimmed = value.trim();
+                // Preserve source code if it contains function literals
+                if (containsFunctionLiteral(trimmed)) {
+                    return value;
+                }
                 if ((trimmed.startsWith('{') && trimmed.endsWith('}')) ||
                     trimmed.startsWith('new ')) {
                     return value;
@@ -84,6 +163,10 @@ export function formatParameterValue(value, type) {
         case 'array':
             if (typeof value === 'string') {
                 const trimmed = value.trim();
+                // Preserve source code if it contains function literals
+                if (containsFunctionLiteral(trimmed)) {
+                    return value;
+                }
                 if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
                     return value;
                 }
@@ -250,29 +333,73 @@ function stripCommentsOutsideStrings(input) {
     }
     return result;
 }
+/**
+ * Condense a parameters string to a single line.
+ * Used when parameters don't contain function literals.
+ */
+export function condenseToSingleLine(input) {
+    return input
+        .replace(/\s*\n\s*/g, ' ')
+        .replace(/\s{2,}/g, ' ')
+        .replace(/\{\s+/g, '{ ')
+        .replace(/\s+\}/g, ' }')
+        .replace(/\s*,\s*/g, ', ')
+        .trim();
+}
+/**
+ * Replace lines in an array, handling both single-line and multi-line replacements.
+ * Returns the number of lines that were effectively added or removed.
+ */
+function replaceLines(lines, startIndex, deleteCount, replacement) {
+    const replacementLines = replacement.split('\n');
+    const isMultiLine = replacementLines.length > 1;
+    if (isMultiLine) {
+        // Multi-line replacement: replace first line, delete old lines, insert remaining
+        lines[startIndex] = replacementLines[0];
+        if (deleteCount > 0) {
+            lines.splice(startIndex + 1, deleteCount);
+        }
+        if (replacementLines.length > 1) {
+            lines.splice(startIndex + 1, 0, ...replacementLines.slice(1));
+        }
+        return replacementLines.length - 1 - deleteCount;
+    }
+    else {
+        // Single-line replacement
+        lines[startIndex] = replacement;
+        if (deleteCount > 0) {
+            lines.splice(startIndex + 1, deleteCount);
+        }
+        return -deleteCount;
+    }
+}
 /**
  * Replace a bubble instantiation with updated parameters
  *
  * This function:
- * 1. Replaces the bubble instantiation line with a single-line version
- * 2. Deletes all lines that were part of the original multi-line parameters
- * 3. Uses bubble.location.endLine to know exactly where to stop deleting
+ * 1. Replaces the bubble instantiation line with updated parameters
+ * 2. Preserves multi-line structure when function literals are present
+ * 3. Condenses to single-line otherwise
+ * 4. Uses bubble.location.endLine to know exactly where to stop deleting
  */
 export function replaceBubbleInstantiation(lines, bubble) {
+    if (bubble.invocationCallSiteKey) {
+        // Invocation-specific clones are logical constructs and shouldn't rewrite source
+        return;
+    }
     const { location, className, parameters } = bubble;
-    // Build the new single-line instantiation
+    // Build the parameters object string
     const dependencyGraphLiteral = JSON.stringify(bubble.dependencyGraph || { name: bubble.bubbleName, dependencies: [] }).replace(/</g, '\u003c');
-    let parametersObject = buildParametersObject(parameters, bubble.variableId, true, dependencyGraphLiteral, String(bubble.variableId));
-    // Remove JS/TS comments that would otherwise break single-line formatting
+    const currentUniqueIdValue = bubble.dependencyGraph?.uniqueId ?? String(bubble.variableId);
+    let parametersObject = buildParametersObject(parameters, bubble.variableId, true, dependencyGraphLiteral, currentUniqueIdValue);
+    // Remove JS/TS comments that would otherwise break formatting
     parametersObject = stripCommentsOutsideStrings(parametersObject);
-    // Condense to single line
-    parametersObject = parametersObject
-        .replace(/\s*\n\s*/g, ' ')
-        .replace(/\s{2,}/g, ' ')
-        .replace(/\{\s+/g, '{ ')
-        .replace(/\s+\}/g, ' }')
-        .replace(/\s*,\s*/g, ', ')
-        .trim();
+    // Check if parameters contain function literals before condensing
+    // Function literals cannot be safely condensed to single-line
+    const hasFunctions = containsFunctionLiteral(parametersObject);
+    if (!hasFunctions) {
+        parametersObject = condenseToSingleLine(parametersObject);
+    }
     const newInstantiationBase = `new ${className}(${parametersObject})`;
     // Find the line with the bubble instantiation
     for (let i = location.startLine - 1; i < lines.length; i++) {
@@ -286,12 +413,8 @@ export function replaceBubbleInstantiation(lines, bubble) {
                 const actionCall = bubble.hasActionCall ? '.action()' : '';
                 const newExpression = `${hadAwait ? 'await ' : ''}${newInstantiationBase}${actionCall}`;
                 const replacement = `${indentation}${declaration} ${variableName} = ${newExpression}`;
-                lines[i] = replacement;
-                // Delete all lines that were part of the old multi-line parameters
                 const linesToDelete = location.endLine - (i + 1);
-                if (linesToDelete > 0) {
-                    lines.splice(i + 1, linesToDelete);
-                }
+                replaceLines(lines, i, linesToDelete, replacement);
             }
             // Pattern 2: Anonymous bubble (await new Bubble(...).action())
             else if (bubble.variableName.startsWith('_anonymous_')) {
@@ -301,12 +424,8 @@ export function replaceBubbleInstantiation(lines, bubble) {
                 const newExpression = `${hadAwait ? 'await ' : ''}${newInstantiationBase}${actionCall}`;
                 const beforeClean = beforePattern.replace(/\bawait\s*$/, '');
                 const replacement = `${beforeClean}${newExpression}`;
-                lines[i] = replacement;
-                // Delete all lines that were part of the old multi-line parameters
                 const linesToDelete = location.endLine - (i + 1);
-                if (linesToDelete > 0) {
-                    lines.splice(i + 1, linesToDelete);
-                }
+                replaceLines(lines, i, linesToDelete, replacement);
             }
             break;
         }