@synergenius/flow-weaver 0.21.21 → 0.21.22

package/dist/api/generate-in-place.js

@@ -8,7 +8,7 @@
  * - Function body (between markers)
  */
 import { bodyGenerator } from '../body-generator.js';
-import { generateInlineRuntime, generateInlineDebugClient } from './inline-runtime.js';
+import { generateInlineRuntime } from './inline-runtime.js';
 import { isExecutePort, isSuccessPort, isFailurePort, isControlFlowPort } from '../constants.js';
 import { generateJSDocPortTag, assignPortOrders, generateNodeInstanceTag, } from '../annotation-generator.js';
 import { shouldWorkflowBeAsync } from '../generator/async-detection.js';
@@ -112,9 +112,11 @@ export function generateInPlace(sourceCode, ast, options = {}) {
     }
     // Step 5: Detect async from node composition + source signature
     // If any node is async, force async (even if source isn't marked async)
+    // In dev mode (!production), always force async so the debugger can pause execution
+    // at breakpoints (sendStatusChangedEvent must be awaited).
     const nodesRequireAsync = shouldWorkflowBeAsync(ast, ast.nodeTypes);
     const sourceIsAsync = detectFunctionIsAsync(result, ast.functionName);
-    const forceAsync = nodesRequireAsync;
+    const forceAsync = nodesRequireAsync || !production;
     const isAsync = forceAsync || sourceIsAsync;
     // Add async keyword to source if nodes or debug hooks require it
     const asyncSigResult = ensureAsyncKeyword(result, ast.functionName, forceAsync);
@@ -158,19 +160,11 @@ function generateRuntimeSection(functionName, production, moduleFormat = 'esm',
             lines.push(`import type { TDebugger } from '${externalRuntimePath}';`);
             // Declare __flowWeaverDebugger__ so body code can reference it
             lines.push('declare const __flowWeaverDebugger__: TDebugger | undefined;');
-            // Include inline debug client (createFlowWeaverDebugClient is not exported from runtime)
-            lines.push('');
-            lines.push(generateInlineDebugClient(moduleFormat));
         }
     }
     else {
         // Inline runtime: embed all types and classes directly
         lines.push(generateInlineRuntime(production));
-        // Add debug client (dev mode only)
-        if (!production) {
-            lines.push('');
-            lines.push(generateInlineDebugClient(moduleFormat));
-        }
     }
     return lines.join('\n');
 }

package/dist/api/generate.js

@@ -3,7 +3,7 @@ import { extractExitPorts, extractStartPorts, hasBranching } from '../ast/workfl
 import { isExecutePort } from '../constants.js';
 import { mapToTypeScript } from '../type-mappings.js';
 import { SourceMapGenerator } from 'source-map';
-import { generateInlineRuntime, generateInlineDebugClient, stripTypeScript } from './inline-runtime.js';
+import { generateInlineRuntime, stripTypeScript } from './inline-runtime.js';
 import { validateWorkflowAsync } from '../generator/async-detection.js';
 import { extractTypeDeclarationsFromFile } from './extract-types.js';
 import * as path from 'node:path';
@@ -100,13 +100,6 @@ export function generateCode(ast, options) {
                 ? `const { TDebugger } = require('${externalRuntimePath}');`
                 : `import type { TDebugger } from '${externalRuntimePath}';`);
             addLine();
-            // Include inline debug client (createFlowWeaverDebugClient is not exported from runtime)
-            const inlineDebugClient = generateInlineDebugClient(moduleFormat);
-            const debugClientLines = inlineDebugClient.split('\n');
-            debugClientLines.forEach((line) => {
-                lines.push(line);
-                addLine();
-            });
         }
         lines.push('');
         addLine();
@@ -121,15 +114,6 @@ export function generateCode(ast, options) {
         });
         lines.push('');
         addLine();
-        // Include inline debug client (dev mode only)
-        if (!production) {
-            const inlineDebugClient = generateInlineDebugClient(moduleFormat);
-            const debugClientLines = inlineDebugClient.split('\n');
-            debugClientLines.forEach((line) => {
-                lines.push(line);
-                addLine();
-            });
-        }
     }
     // Extract and include type declarations from source file (interfaces, type aliases)
     if (ast.sourceFile) {
@@ -374,7 +358,8 @@ export function generateCode(ast, options) {
         }
     }
     // Generate conditional async keyword and export keyword based on module format
-    const asyncKeyword = shouldBeAsync ? 'async ' : '';
+    // In dev mode, always async so the debugger can pause at breakpoints
+    const asyncKeyword = (shouldBeAsync || !production) ? 'async ' : '';
     const exportKeyword = generateFunctionExportKeyword(moduleFormat);
     lines.push(`${exportKeyword}${asyncKeyword}function ${ast.functionName}(`);
     addLine();
@@ -488,8 +473,8 @@ function generateWorkflowFunction(workflow, production, allWorkflows, generatedW
     // Generate function signature
     const startPorts = extractStartPorts(workflow);
     const exitPorts = extractExitPorts(workflow);
-    const asyncKeyword = shouldBeAsync ? 'async ' : '';
-    lines.push(`${asyncKeyword}function ${workflow.functionName}(`);
+    const asyncKeyword2 = (shouldBeAsync || !production) ? 'async ' : '';
+    lines.push(`${asyncKeyword2}function ${workflow.functionName}(`);
     // STEP Port Architecture: execute is first parameter
     lines.push(`  execute: boolean = true,`);
     // Collect param names and types for destructuring

package/dist/api/inline-runtime.d.ts

@@ -18,14 +18,6 @@ export declare function stripTypeScript(code: string): string;
  */
 export declare function generateInlineRuntime(production: boolean, exportClasses?: boolean, outputFormat?: TOutputFormat): string;
 import type { TModuleFormat } from '../ast/types.js';
-/**
- * Generates inline WebSocket debug client for auto-detection from env var
- * Only included in development mode builds
- *
- * @param moduleFormat - The module format to use for imports ('esm' or 'cjs')
- * @param outputFormat - Output format: 'typescript' (default) or 'javascript' (strips types)
- */
-export declare function generateInlineDebugClient(moduleFormat?: TModuleFormat, outputFormat?: TOutputFormat): string;
 /**
  * Generates a standalone runtime module file for multi-workflow bundles.
  * This exports all runtime types and classes so individual workflow files can import them.

package/dist/api/inline-runtime.js

@@ -303,12 +303,13 @@ export function generateInlineRuntime(production, exportClasses = false, outputF
     lines.push('  }');
     lines.push('');
     // createScope
-    lines.push('  createScope(_parentNodeName: string, _parentIndex: number, _scopeName: string, cleanScope: boolean = false): GeneratedExecutionContext {');
+    lines.push('  createScope(_parentNodeName: string, _parentIndex: number, _scopeName: string, cleanScope: boolean = false, isAsyncOverride?: boolean): GeneratedExecutionContext {');
+    lines.push('    const effectiveIsAsync = isAsyncOverride !== undefined ? isAsyncOverride : this.isAsync;');
     if (production) {
-        lines.push('    const scopedContext = new GeneratedExecutionContext(this.isAsync, this.abortSignal);');
+        lines.push('    const scopedContext = new GeneratedExecutionContext(effectiveIsAsync, this.abortSignal);');
     }
     else {
-        lines.push('    const scopedContext = new GeneratedExecutionContext(this.isAsync, this.flowWeaverDebugger, this.abortSignal);');
+        lines.push('    const scopedContext = new GeneratedExecutionContext(effectiveIsAsync, this.flowWeaverDebugger, this.abortSignal);');
     }
     lines.push('    // For per-port function scopes (cleanScope=true), start with empty variables');
     lines.push('    // For node-level scopes (cleanScope=false), inherit parent variables');
@@ -388,12 +389,12 @@ export function generateInlineRuntime(production, exportClasses = false, outputF
         lines.push('    }');
         lines.push('  }');
         lines.push('');
-        lines.push('  private sendVariableSetEvent(args: {');
+        lines.push('  private async sendVariableSetEvent(args: {');
         lines.push('    identifier: TVariableIdentification;');
         lines.push('    value: unknown;');
-        lines.push('  }): void {');
+        lines.push('  }): Promise<void> {');
         lines.push('    if (this.flowWeaverDebugger) {');
-        lines.push('      this.flowWeaverDebugger.sendEvent({');
+        lines.push('      await this.flowWeaverDebugger.sendEvent({');
         lines.push('        type: "VARIABLE_SET",');
         lines.push('        ...args,');
         lines.push('        innerFlowInvocation: this.flowWeaverDebugger.innerFlowInvocation,');
@@ -401,16 +402,16 @@ export function generateInlineRuntime(production, exportClasses = false, outputF
         lines.push('    }');
         lines.push('  }');
         lines.push('');
-        lines.push('  sendLogErrorEvent(args: {');
+        lines.push('  async sendLogErrorEvent(args: {');
         lines.push('    nodeTypeName: string;');
         lines.push('    id: string;');
         lines.push('    scope?: string;');
         lines.push('    side?: "start" | "exit";');
         lines.push('    executionIndex: number;');
         lines.push('    error: string;');
-        lines.push('  }): void {');
+        lines.push('  }): Promise<void> {');
         lines.push('    if (this.flowWeaverDebugger) {');
-        lines.push('      this.flowWeaverDebugger.sendEvent({');
+        lines.push('      await this.flowWeaverDebugger.sendEvent({');
         lines.push('        type: "LOG_ERROR",');
         lines.push('        ...args,');
         lines.push('        innerFlowInvocation: this.flowWeaverDebugger.innerFlowInvocation,');
@@ -418,13 +419,13 @@ export function generateInlineRuntime(production, exportClasses = false, outputF
         lines.push('    }');
         lines.push('  }');
         lines.push('');
-        lines.push('  sendWorkflowCompletedEvent(args: {');
+        lines.push('  async sendWorkflowCompletedEvent(args: {');
         lines.push('    executionIndex: number;');
         lines.push('    status: "SUCCEEDED" | "FAILED" | "CANCELLED";');
         lines.push('    result?: unknown;');
-        lines.push('  }): void {');
+        lines.push('  }): Promise<void> {');
         lines.push('    if (this.flowWeaverDebugger) {');
-        lines.push('      this.flowWeaverDebugger.sendEvent({');
+        lines.push('      await this.flowWeaverDebugger.sendEvent({');
         lines.push('        type: "WORKFLOW_COMPLETED",');
         lines.push('        ...args,');
         lines.push('        innerFlowInvocation: this.flowWeaverDebugger.innerFlowInvocation,');
@@ -490,92 +491,6 @@ export function generateInlineRuntime(production, exportClasses = false, outputF
     }
     return output;
 }
-/**
- * Generates inline WebSocket debug client for auto-detection from env var
- * Only included in development mode builds
- *
- * @param moduleFormat - The module format to use for imports ('esm' or 'cjs')
- * @param outputFormat - Output format: 'typescript' (default) or 'javascript' (strips types)
- */
-export function generateInlineDebugClient(moduleFormat = 'esm', outputFormat = 'typescript') {
-    const lines = [];
-    lines.push('// ============================================================================');
-    lines.push('// Inline Debug Client (auto-created from FLOW_WEAVER_DEBUG env var)');
-    lines.push('// ============================================================================');
-    lines.push('');
-    lines.push('/* eslint-disable @typescript-eslint/no-explicit-any, no-console */');
-    lines.push('function createFlowWeaverDebugClient(url: string, workflowExportName: string): any {');
-    lines.push('  let ws: any = null;');
-    lines.push('  let connected = false;');
-    lines.push('  let queue: string[] = [];');
-    lines.push('  const sessionId = Math.random().toString(36).substring(2, 15);');
-    lines.push('');
-    lines.push('  const connect = async () => {');
-    lines.push('    try {');
-    lines.push("      // Node.js environment - dynamically load 'ws' package");
-    // Generate format-appropriate import for 'ws' package
-    if (moduleFormat === 'cjs') {
-        // CommonJS: use require() directly
-        lines.push("      const wsModule = require('ws');");
-    }
-    else {
-        // ESM: use dynamic import
-        lines.push("      const wsModule = await import('ws');");
-    }
-    lines.push('      const WS: any = wsModule.default || wsModule;');
-    lines.push('      ws = new WS(url);');
-    lines.push('');
-    lines.push("      ws.on('open', () => {");
-    lines.push('        connected = true;');
-    lines.push('        // Send connect message');
-    lines.push('        ws.send(JSON.stringify({');
-    lines.push("          type: 'connect',");
-    lines.push('          sessionId,');
-    lines.push('          workflowExportName,');
-    lines.push('          clientInfo: {');
-    lines.push('            platform: process.platform,');
-    lines.push('            nodeVersion: process.version,');
-    lines.push('            pid: process.pid');
-    lines.push('          }');
-    lines.push('        }));');
-    lines.push('');
-    lines.push('        // Flush queued events');
-    lines.push('        while (queue.length > 0) {');
-    lines.push('          const msg = queue.shift();');
-    lines.push('          if (ws.readyState === 1) ws.send(msg);');
-    lines.push('        }');
-    lines.push('      });');
-    lines.push('');
-    lines.push("      ws.on('error', () => { connected = false; });");
-    lines.push("      ws.on('close', () => { connected = false; });");
-    lines.push('    } catch (err: unknown) {');
-    lines.push("      // Silently fail if 'ws' package not available");
-    lines.push("      console.warn('[Flow Weaver] Debug client failed to connect:', err instanceof Error ? err.message : String(err));");
-    lines.push('    }');
-    lines.push('  };');
-    lines.push('');
-    lines.push('  return {');
-    lines.push('    sendEvent: (event: unknown) => {');
-    lines.push("      const message = JSON.stringify({ type: 'event', sessionId, event });");
-    lines.push('      if (!ws) connect().catch(() => {});');
-    lines.push('      if (connected && ws.readyState === 1) {');
-    lines.push('        ws.send(message);');
-    lines.push('      } else {');
-    lines.push('        queue.push(message);');
-    lines.push('      }');
-    lines.push('    },');
-    lines.push('    innerFlowInvocation: false,');
-    lines.push('    sessionId');
-    lines.push('  };');
-    lines.push('}');
-    lines.push('/* eslint-enable @typescript-eslint/no-explicit-any, no-console */');
-    lines.push('');
-    const output = lines.join('\n');
-    if (outputFormat === 'javascript') {
-        return stripTypeScript(output);
-    }
-    return output;
-}
 /**
  * Generates a standalone runtime module file for multi-workflow bundles.
  * This exports all runtime types and classes so individual workflow files can import them.
@@ -595,14 +510,6 @@ export function generateStandaloneRuntimeModule(production, moduleFormat = 'esm'
     const inlineRuntime = generateInlineRuntime(production, true);
     lines.push(inlineRuntime);
     lines.push('');
-    // Include debug client in development mode
-    if (!production) {
-        const debugClient = generateInlineDebugClient(moduleFormat);
-        // Add export to the createFlowWeaverDebugClient function
-        const exportedDebugClient = debugClient.replace('function createFlowWeaverDebugClient', 'export function createFlowWeaverDebugClient');
-        lines.push(exportedDebugClient);
-        lines.push('');
-    }
     if (moduleFormat === 'cjs') {
         // CommonJS exports
         lines.push('// ============================================================================');
@@ -610,9 +517,6 @@ export function generateStandaloneRuntimeModule(production, moduleFormat = 'esm'
         lines.push('// ============================================================================');
         lines.push('');
         const exports = ['GeneratedExecutionContext', 'CancellationError'];
-        if (!production) {
-            exports.push('createFlowWeaverDebugClient', 'TDebugger');
-        }
         lines.push(`module.exports = { ${exports.join(', ')} };`);
     }
     // For ESM, exports are added via 'export' keyword in the generated code

package/dist/cli/flow-weaver.mjs

@@ -9671,7 +9671,7 @@ var VERSION;
 var init_generated_version = __esm({
   "src/generated-version.ts"() {
     "use strict";
-    VERSION = "0.21.21";
+    VERSION = "0.21.22";
   }
 });
 
@@ -10261,8 +10261,9 @@ function generateScopeFunctionClosure(scopeName, parentNodeId, parentNodeType, w
   lines.push(``);
   const safeParentId = toValidIdentifier(parentNodeId);
   lines.push(`    // Create scoped context for child nodes`);
+  const isAsyncOverrideArg = isAsync2 ? "" : ", false";
   lines.push(
-    `    const scopedCtx = ctx.createScope('${parentNodeId}', ${safeParentId}Idx!, '${scopeName}', true);`
+    `    const scopedCtx = ctx.createScope('${parentNodeId}', ${safeParentId}Idx!, '${scopeName}', true${isAsyncOverrideArg});`
   );
   lines.push(``);
   if (scopedOutputPorts.length > 0) {
@@ -10329,7 +10330,7 @@ function generateScopeFunctionClosure(scopeName, parentNodeId, parentNodeType, w
       lines.push(`    // Execute: ${child.id} (${child.nodeType})`);
       lines.push(`    scopedCtx.checkAborted('${child.id}');`);
       lines.push(`    const ${safeChildId}Idx = scopedCtx.addExecution('${child.id}');`);
-      lines.push(`    if (typeof globalThis !== 'undefined') (globalThis as any).__fw_current_node_id__ = '${child.id}';`);
+      lines.push(`    if (typeof globalThis !== 'undefined') (globalThis as unknown as { __fw_current_node_id__?: string }).__fw_current_node_id__ = '${child.id}';`);
       lines.push(`    ${awaitPrefix}scopedCtx.sendStatusChangedEvent({`);
       lines.push(`      nodeTypeName: '${child.nodeType}',`);
       lines.push(`      id: '${child.id}',`);
@@ -10373,7 +10374,8 @@ function generateScopeFunctionClosure(scopeName, parentNodeId, parentNodeType, w
         skipPorts: preHandledPorts,
         emitInputEvents: true,
         setCall: childSetCall,
-        nodeTypeName: child.nodeType
+        nodeTypeName: child.nodeType,
+        production
       });
       argLines.forEach((line) => lines.push(line));
       if (childNodeType.expression) {
@@ -10441,7 +10443,7 @@ function generateScopeFunctionClosure(scopeName, parentNodeId, parentNodeType, w
   lines.push(``);
   lines.push(`    // Extract return values from child outputs`);
   const returnObj = [];
-  const getCallAfterMerge = isAsync2 ? "await ctx.getVariable" : "ctx.getVariable";
+  const getCallAfterMerge = isAsync2 ? "await scopedCtx.getVariable" : "scopedCtx.getVariable";
   lines.push(`    const scopeExitIdx = ctx.addExecution('${parentNodeId}_scope_exit');`);
   scopedInputPorts.forEach((portName) => {
     const connection = workflow.connections.find((conn) => {
@@ -10460,7 +10462,7 @@ function generateScopeFunctionClosure(scopeName, parentNodeId, parentNodeType, w
       const defaultValue = portName === "success" ? "true" : portName === "failure" ? "false" : "undefined";
       if (isStepPort2) {
         lines.push(
-          `    const ${varName} = ctx.hasVariable(${varAddr}) ? ${getCallAfterMerge}(${varAddr}) as ${portType} : ${defaultValue};`
+          `    const ${varName} = scopedCtx.hasVariable(${varAddr}) ? ${getCallAfterMerge}(${varAddr}) as ${portType} : ${defaultValue};`
         );
       } else {
         lines.push(`    const ${varName} = ${getCallAfterMerge}(${varAddr}) as ${portType};`);
@@ -10550,7 +10552,8 @@ function buildNodeArgumentsWithContext(opts) {
     emitInputEvents = false,
     setCall = "await ctx.setVariable",
     nodeTypeName,
-    bundleMode = false
+    bundleMode = false,
+    production = false
   } = opts;
   const safeId = toValidIdentifier(id);
   const inputConnections = workflow.connections.filter((conn) => conn.to.node === id);
@@ -10648,13 +10651,14 @@ function buildNodeArgumentsWithContext(opts) {
         const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
         const needsGuard = portConfig.optional && !isConstSource;
         if (portConfig.dataType === "FUNCTION") {
+          lines.push(`${indent}const __resolveFunction = typeof resolveFunction === 'function' ? resolveFunction : (p: unknown) => ({ fn: typeof p === 'function' ? p : () => { throw new Error('Cannot resolve function reference'); }, source: 'direct' as const });`);
           const rawVarName = `${varName}_raw`;
           if (needsGuard) {
             lines.push(
               `${indent}const ${rawVarName} = ${sourceIdx} !== undefined ? ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx} }) : undefined;`
             );
             lines.push(
-              `${indent}const ${varName}_resolved = ${rawVarName} !== undefined ? resolveFunction(${rawVarName}) : undefined;`
+              `${indent}const ${varName}_resolved = ${rawVarName} !== undefined ? __resolveFunction(${rawVarName}) : undefined;`
             );
             lines.push(
               `${indent}const ${varName} = ${varName}_resolved?.fn as ${portType};`
@@ -10664,7 +10668,7 @@ function buildNodeArgumentsWithContext(opts) {
               `${indent}const ${rawVarName} = ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx}${nonNullAssert} });`
             );
             lines.push(
-              `${indent}const ${varName}_resolved = resolveFunction(${rawVarName});`
+              `${indent}const ${varName}_resolved = __resolveFunction(${rawVarName});`
             );
             lines.push(
               `${indent}const ${varName} = ${varName}_resolved.fn as ${portType};`
@@ -10721,10 +10725,11 @@ function buildNodeArgumentsWithContext(opts) {
         const ternary = attempts.join(" ?? ");
         const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
         if (portConfig.dataType === "FUNCTION") {
+          lines.push(`${indent}const __resolveFunction = typeof resolveFunction === 'function' ? resolveFunction : (p: unknown) => ({ fn: typeof p === 'function' ? p : () => { throw new Error('Cannot resolve function reference'); }, source: 'direct' as const });`);
           const rawVarName = `${varName}_raw`;
           lines.push(`${indent}const ${rawVarName} = ${ternary};`);
           lines.push(
-            `${indent}const ${varName}_resolved = ${rawVarName} !== undefined ? resolveFunction(${rawVarName}) : undefined;`
+            `${indent}const ${varName}_resolved = ${rawVarName} !== undefined ? __resolveFunction(${rawVarName}) : undefined;`
           );
           lines.push(
             `${indent}const ${varName} = ${varName}_resolved?.fn as ${portType};`
@@ -10758,7 +10763,7 @@ function buildNodeArgumentsWithContext(opts) {
     } else {
       const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
       lines.push(
-        `${indent}let ${varName}!: ${portType}; // Required port '${portName}' has no connection`
+        `${indent}let ${varName}: ${portType} = undefined as unknown as ${portType}; // Required port '${portName}' has no connection`
       );
       args.push(varName);
       emitSetEvent();
@@ -10783,7 +10788,7 @@ function buildNodeArgumentsWithContext(opts) {
       );
       return childNodeType?.isAsync === true;
     });
-    const scopeIsAsync = isAsync2 || node.isAsync || hasAsyncChild;
+    const scopeIsAsync = node.isAsync || hasAsyncChild;
     const scopeFunctionCode = generateScopeFunctionClosure(
       scopeName,
       id,
@@ -10791,8 +10796,7 @@ function buildNodeArgumentsWithContext(opts) {
       workflow,
       childInstances,
       scopeIsAsync,
-      false
-      // production mode
+      production
     );
     lines.push(`${indent}const ${scopeFunctionVar} = ${scopeFunctionCode};`);
     args.push(scopeFunctionVar);
@@ -10843,15 +10847,7 @@ function getPullExecutionConfig(instance, nodeType) {
 function generateControlFlowWithExecutionContext(workflow, nodeTypes, isAsync2, production = false, bundleMode = false) {
   const lines = [];
   if (!production) {
-    lines.push(`  // Use passed debugger or auto-detect from environment variable`);
-    lines.push(`  const __effectiveDebugger__ = (`);
-    lines.push(`    typeof __flowWeaverDebugger__ !== 'undefined' ? __flowWeaverDebugger__ :`);
-    lines.push(`    typeof process !== 'undefined' && process.env.FLOW_WEAVER_DEBUG`);
-    lines.push(
-      `      ? createFlowWeaverDebugClient(process.env.FLOW_WEAVER_DEBUG, '${workflow.functionName}')`
-    );
-    lines.push(`      : undefined`);
-    lines.push(`  );`);
+    lines.push(`  const __effectiveDebugger__ = typeof __flowWeaverDebugger__ !== 'undefined' ? __flowWeaverDebugger__ : undefined;`);
     lines.push("");
   }
   lines.push(`  // Recursion depth protection`);
@@ -10862,6 +10858,9 @@ function generateControlFlowWithExecutionContext(workflow, nodeTypes, isAsync2,
   );
   lines.push(`  }`);
   lines.push("");
+  if (!production) {
+    isAsync2 = true;
+  }
   const asyncArg = isAsync2 ? "true" : "false";
   if (production) {
     lines.push(`  const ctx = new GeneratedExecutionContext(${asyncArg}, __abortSignal__);`);
@@ -10874,8 +10873,8 @@ function generateControlFlowWithExecutionContext(workflow, nodeTypes, isAsync2,
   if (!production) {
     lines.push(`  // Debug controller for step-through debugging and checkpoint/resume`);
     lines.push(`  const __ctrl__: TDebugController = (`);
-    lines.push(`    typeof globalThis !== 'undefined' && (globalThis as any).__fw_debug_controller__`);
-    lines.push(`      ? (globalThis as any).__fw_debug_controller__`);
+    lines.push(`    typeof globalThis !== 'undefined' && (globalThis as unknown as { __fw_debug_controller__?: TDebugController }).__fw_debug_controller__`);
+    lines.push(`      ? (globalThis as unknown as { __fw_debug_controller__?: TDebugController }).__fw_debug_controller__`);
     lines.push(`      : { beforeNode: () => true, afterNode: () => {} }`);
     lines.push(`  );`);
     lines.push("");
@@ -11751,7 +11750,7 @@ function generateBranchingNodeCode(instance, branchNode, workflow, allNodeTypes,
   }
   lines.push(`${indent}${ctxVar}.checkAborted('${instanceId}');`);
   lines.push(`${indent}${safeId}Idx = ${ctxVar}.addExecution('${instanceId}');`);
-  lines.push(`${indent}if (typeof globalThis !== 'undefined') (globalThis as any).__fw_current_node_id__ = '${instanceId}';`);
+  lines.push(`${indent}if (typeof globalThis !== 'undefined') (globalThis as unknown as { __fw_current_node_id__?: string }).__fw_current_node_id__ = '${instanceId}';`);
   lines.push(`${indent}${awaitPrefix}${ctxVar}.sendStatusChangedEvent({`);
   lines.push(`${indent}  nodeTypeName: '${functionName}',`);
   lines.push(`${indent}  id: '${instanceId}',`);
@@ -11781,7 +11780,8 @@ function generateBranchingNodeCode(instance, branchNode, workflow, allNodeTypes,
     emitInputEvents: true,
     setCall,
     nodeTypeName: functionName,
-    bundleMode
+    bundleMode,
+    production
   });
   const awaitKeyword = branchNode.isAsync ? "await " : "";
   if (branchNode.expression) {
@@ -12129,7 +12129,7 @@ function generateBranchingNodeCode(instance, branchNode, workflow, allNodeTypes,
   }
   generatedNodes.add(instanceId);
 }
-function generatePullNodeWithContext(instance, nodeType, workflow, lines, indent, isAsync2, ctxVar = "ctx", bundleMode = false) {
+function generatePullNodeWithContext(instance, nodeType, workflow, lines, indent, isAsync2, ctxVar = "ctx", bundleMode = false, production = false) {
   const instanceId = instance.id;
   const safeId = toValidIdentifier(instanceId);
   const functionName = nodeType.functionName;
@@ -12144,7 +12144,7 @@ function generatePullNodeWithContext(instance, nodeType, workflow, lines, indent
   lines.push(`${indent}  }`);
   lines.push(`${indent}  ${ctxVar}.checkAborted('${instanceId}');`);
   lines.push(`${indent}  ${safeId}Idx = ${ctxVar}.addExecution('${instanceId}');`);
-  lines.push(`${indent}  if (typeof globalThis !== 'undefined') (globalThis as any).__fw_current_node_id__ = '${instanceId}';`);
+  lines.push(`${indent}  if (typeof globalThis !== 'undefined') (globalThis as unknown as { __fw_current_node_id__?: string }).__fw_current_node_id__ = '${instanceId}';`);
   lines.push(`${indent}  ${awaitPrefix}${ctxVar}.sendStatusChangedEvent({`);
   lines.push(`${indent}    nodeTypeName: '${functionName}',`);
   lines.push(`${indent}    id: '${instanceId}',`);
@@ -12165,7 +12165,8 @@ function generatePullNodeWithContext(instance, nodeType, workflow, lines, indent
     emitInputEvents: true,
     setCall,
     nodeTypeName: functionName,
-    bundleMode
+    bundleMode,
+    production
   });
   const resultVar = `${safeId}Result`;
   if (nodeType.variant === "MAP_ITERATOR") {
@@ -12247,7 +12248,7 @@ function generateNodeCallWithContext(instance, nodeType, workflow, _availableVar
   const fullInstance = workflow.instances.find((i) => i.id === instanceId);
   const pullConfig = fullInstance ? getPullExecutionConfig(fullInstance, nodeType) : { enabled: false, triggerPort: "execute" };
   if (pullConfig.enabled) {
-    generatePullNodeWithContext(instance, nodeType, workflow, lines, indent, isAsync2, ctxVar, bundleMode);
+    generatePullNodeWithContext(instance, nodeType, workflow, lines, indent, isAsync2, ctxVar, bundleMode, production);
     return;
   }
   const stepInputs = Object.entries(nodeType.inputs).filter(([portName, portConfig]) => {
@@ -12373,7 +12374,7 @@ function generateNodeCallWithContext(instance, nodeType, workflow, _availableVar
   const awaitPrefix = isAsync2 ? "await " : "";
   lines.push(`${indent}${ctxVar}.checkAborted('${instanceId}');`);
   lines.push(`${indent}${varDecl}${safeId}Idx = ${ctxVar}.addExecution('${instanceId}');`);
-  lines.push(`${indent}if (typeof globalThis !== 'undefined') (globalThis as any).__fw_current_node_id__ = '${instanceId}';`);
+  lines.push(`${indent}if (typeof globalThis !== 'undefined') (globalThis as unknown as { __fw_current_node_id__?: string }).__fw_current_node_id__ = '${instanceId}';`);
   lines.push(`${indent}${awaitPrefix}${ctxVar}.sendStatusChangedEvent({`);
   lines.push(`${indent}  nodeTypeName: '${functionName}',`);
   lines.push(`${indent}  id: '${instanceId}',`);
@@ -12395,7 +12396,8 @@ function generateNodeCallWithContext(instance, nodeType, workflow, _availableVar
     emitInputEvents: true,
     setCall,
     nodeTypeName: functionName,
-    bundleMode
+    bundleMode,
+    production
   });
   const resultVar = `${safeId}Result`;
   const awaitKeyword = nodeType.isAsync ? "await " : "";
@@ -17227,15 +17229,18 @@ function generateInlineRuntime(production, exportClasses = false, outputFormat =
   lines.push("  }");
   lines.push("");
   lines.push(
-    "  createScope(_parentNodeName: string, _parentIndex: number, _scopeName: string, cleanScope: boolean = false): GeneratedExecutionContext {"
+    "  createScope(_parentNodeName: string, _parentIndex: number, _scopeName: string, cleanScope: boolean = false, isAsyncOverride?: boolean): GeneratedExecutionContext {"
+  );
+  lines.push(
+    "    const effectiveIsAsync = isAsyncOverride !== undefined ? isAsyncOverride : this.isAsync;"
   );
   if (production) {
     lines.push(
-      "    const scopedContext = new GeneratedExecutionContext(this.isAsync, this.abortSignal);"
+      "    const scopedContext = new GeneratedExecutionContext(effectiveIsAsync, this.abortSignal);"
     );
   } else {
     lines.push(
-      "    const scopedContext = new GeneratedExecutionContext(this.isAsync, this.flowWeaverDebugger, this.abortSignal);"
+      "    const scopedContext = new GeneratedExecutionContext(effectiveIsAsync, this.flowWeaverDebugger, this.abortSignal);"
     );
   }
   lines.push("    // For per-port function scopes (cleanScope=true), start with empty variables");
@@ -17314,12 +17319,12 @@ function generateInlineRuntime(production, exportClasses = false, outputFormat =
     lines.push("    }");
     lines.push("  }");
     lines.push("");
-    lines.push("  private sendVariableSetEvent(args: {");
+    lines.push("  private async sendVariableSetEvent(args: {");
     lines.push("    identifier: TVariableIdentification;");
     lines.push("    value: unknown;");
-    lines.push("  }): void {");
+    lines.push("  }): Promise<void> {");
     lines.push("    if (this.flowWeaverDebugger) {");
-    lines.push("      this.flowWeaverDebugger.sendEvent({");
+    lines.push("      await this.flowWeaverDebugger.sendEvent({");
     lines.push('        type: "VARIABLE_SET",');
     lines.push("        ...args,");
     lines.push("        innerFlowInvocation: this.flowWeaverDebugger.innerFlowInvocation,");
@@ -17327,16 +17332,16 @@ function generateInlineRuntime(production, exportClasses = false, outputFormat =
     lines.push("    }");
     lines.push("  }");
     lines.push("");
-    lines.push("  sendLogErrorEvent(args: {");
+    lines.push("  async sendLogErrorEvent(args: {");
     lines.push("    nodeTypeName: string;");
     lines.push("    id: string;");
     lines.push("    scope?: string;");
     lines.push('    side?: "start" | "exit";');
     lines.push("    executionIndex: number;");
     lines.push("    error: string;");
-    lines.push("  }): void {");
+    lines.push("  }): Promise<void> {");
     lines.push("    if (this.flowWeaverDebugger) {");
-    lines.push("      this.flowWeaverDebugger.sendEvent({");
+    lines.push("      await this.flowWeaverDebugger.sendEvent({");
     lines.push('        type: "LOG_ERROR",');
     lines.push("        ...args,");
     lines.push("        innerFlowInvocation: this.flowWeaverDebugger.innerFlowInvocation,");
@@ -17344,13 +17349,13 @@ function generateInlineRuntime(production, exportClasses = false, outputFormat =
     lines.push("    }");
     lines.push("  }");
     lines.push("");
-    lines.push("  sendWorkflowCompletedEvent(args: {");
+    lines.push("  async sendWorkflowCompletedEvent(args: {");
     lines.push("    executionIndex: number;");
     lines.push('    status: "SUCCEEDED" | "FAILED" | "CANCELLED";');
     lines.push("    result?: unknown;");
-    lines.push("  }): void {");
+    lines.push("  }): Promise<void> {");
     lines.push("    if (this.flowWeaverDebugger) {");
-    lines.push("      this.flowWeaverDebugger.sendEvent({");
+    lines.push("      await this.flowWeaverDebugger.sendEvent({");
     lines.push('        type: "WORKFLOW_COMPLETED",');
     lines.push("        ...args,");
     lines.push("        innerFlowInvocation: this.flowWeaverDebugger.innerFlowInvocation,");
@@ -17413,85 +17418,6 @@ function generateInlineRuntime(production, exportClasses = false, outputFormat =
   }
   return output;
 }
-function generateInlineDebugClient(moduleFormat = "esm", outputFormat = "typescript") {
-  const lines = [];
-  lines.push("// ============================================================================");
-  lines.push("// Inline Debug Client (auto-created from FLOW_WEAVER_DEBUG env var)");
-  lines.push("// ============================================================================");
-  lines.push("");
-  lines.push("/* eslint-disable @typescript-eslint/no-explicit-any, no-console */");
-  lines.push(
-    "function createFlowWeaverDebugClient(url: string, workflowExportName: string): any {"
-  );
-  lines.push("  let ws: any = null;");
-  lines.push("  let connected = false;");
-  lines.push("  let queue: string[] = [];");
-  lines.push("  const sessionId = Math.random().toString(36).substring(2, 15);");
-  lines.push("");
-  lines.push("  const connect = async () => {");
-  lines.push("    try {");
-  lines.push("      // Node.js environment - dynamically load 'ws' package");
-  if (moduleFormat === "cjs") {
-    lines.push("      const wsModule = require('ws');");
-  } else {
-    lines.push("      const wsModule = await import('ws');");
-  }
-  lines.push("      const WS: any = wsModule.default || wsModule;");
-  lines.push("      ws = new WS(url);");
-  lines.push("");
-  lines.push("      ws.on('open', () => {");
-  lines.push("        connected = true;");
-  lines.push("        // Send connect message");
-  lines.push("        ws.send(JSON.stringify({");
-  lines.push("          type: 'connect',");
-  lines.push("          sessionId,");
-  lines.push("          workflowExportName,");
-  lines.push("          clientInfo: {");
-  lines.push("            platform: process.platform,");
-  lines.push("            nodeVersion: process.version,");
-  lines.push("            pid: process.pid");
-  lines.push("          }");
-  lines.push("        }));");
-  lines.push("");
-  lines.push("        // Flush queued events");
-  lines.push("        while (queue.length > 0) {");
-  lines.push("          const msg = queue.shift();");
-  lines.push("          if (ws.readyState === 1) ws.send(msg);");
-  lines.push("        }");
-  lines.push("      });");
-  lines.push("");
-  lines.push("      ws.on('error', () => { connected = false; });");
-  lines.push("      ws.on('close', () => { connected = false; });");
-  lines.push("    } catch (err: unknown) {");
-  lines.push("      // Silently fail if 'ws' package not available");
-  lines.push(
-    "      console.warn('[Flow Weaver] Debug client failed to connect:', err instanceof Error ? err.message : String(err));"
-  );
-  lines.push("    }");
-  lines.push("  };");
-  lines.push("");
-  lines.push("  return {");
-  lines.push("    sendEvent: (event: unknown) => {");
-  lines.push("      const message = JSON.stringify({ type: 'event', sessionId, event });");
-  lines.push("      if (!ws) connect().catch(() => {});");
-  lines.push("      if (connected && ws.readyState === 1) {");
-  lines.push("        ws.send(message);");
-  lines.push("      } else {");
-  lines.push("        queue.push(message);");
-  lines.push("      }");
-  lines.push("    },");
-  lines.push("    innerFlowInvocation: false,");
-  lines.push("    sessionId");
-  lines.push("  };");
-  lines.push("}");
-  lines.push("/* eslint-enable @typescript-eslint/no-explicit-any, no-console */");
-  lines.push("");
-  const output = lines.join("\n");
-  if (outputFormat === "javascript") {
-    return stripTypeScript(output);
-  }
-  return output;
-}
 function generateStandaloneRuntimeModule(production, moduleFormat = "esm") {
   const lines = [];
   lines.push("// ============================================================================");
@@ -17502,24 +17428,12 @@ function generateStandaloneRuntimeModule(production, moduleFormat = "esm") {
   const inlineRuntime = generateInlineRuntime(production, true);
   lines.push(inlineRuntime);
   lines.push("");
-  if (!production) {
-    const debugClient = generateInlineDebugClient(moduleFormat);
-    const exportedDebugClient = debugClient.replace(
-      "function createFlowWeaverDebugClient",
-      "export function createFlowWeaverDebugClient"
-    );
-    lines.push(exportedDebugClient);
-    lines.push("");
-  }
   if (moduleFormat === "cjs") {
     lines.push("// ============================================================================");
     lines.push("// Exports");
     lines.push("// ============================================================================");
     lines.push("");
     const exports2 = ["GeneratedExecutionContext", "CancellationError"];
-    if (!production) {
-      exports2.push("createFlowWeaverDebugClient", "TDebugger");
-    }
     lines.push(`module.exports = { ${exports2.join(", ")} };`);
   }
   lines.push("");
@@ -17708,12 +17622,6 @@ function generateCode(ast, options) {
         moduleFormat === "cjs" ? `const { TDebugger } = require('${externalRuntimePath}');` : `import type { TDebugger } from '${externalRuntimePath}';`
       );
       addLine();
-      const inlineDebugClient = generateInlineDebugClient(moduleFormat);
-      const debugClientLines = inlineDebugClient.split("\n");
-      debugClientLines.forEach((line) => {
-        lines.push(line);
-        addLine();
-      });
     }
     lines.push("");
     addLine();
@@ -17726,14 +17634,6 @@ function generateCode(ast, options) {
     });
     lines.push("");
     addLine();
-    if (!production) {
-      const inlineDebugClient = generateInlineDebugClient(moduleFormat);
-      const debugClientLines = inlineDebugClient.split("\n");
-      debugClientLines.forEach((line) => {
-        lines.push(line);
-        addLine();
-      });
-    }
   }
   if (ast.sourceFile) {
     const extractedTypes = extractTypeDeclarationsFromFile(ast.sourceFile);
@@ -17943,7 +17843,7 @@ function generateCode(ast, options) {
     } catch {
     }
   }
-  const asyncKeyword = shouldBeAsync ? "async " : "";
+  const asyncKeyword = shouldBeAsync || !production ? "async " : "";
   const exportKeyword = generateFunctionExportKeyword(moduleFormat);
   lines.push(`${exportKeyword}${asyncKeyword}function ${ast.functionName}(`);
   addLine();
@@ -18040,8 +17940,8 @@ function generateWorkflowFunction(workflow, production, allWorkflows, generatedW
   );
   const startPorts = extractStartPorts(workflow);
   const exitPorts = extractExitPorts(workflow);
-  const asyncKeyword = shouldBeAsync ? "async " : "";
-  lines.push(`${asyncKeyword}function ${workflow.functionName}(`);
+  const asyncKeyword2 = shouldBeAsync || !production ? "async " : "";
+  lines.push(`${asyncKeyword2}function ${workflow.functionName}(`);
   lines.push(`  execute: boolean = true,`);
   const paramEntries = [];
   Object.entries(startPorts).forEach(([portName, portDef]) => {
@@ -19055,7 +18955,7 @@ function generateInPlace(sourceCode, ast, options = {}) {
   }
   const nodesRequireAsync = shouldWorkflowBeAsync(ast, ast.nodeTypes);
   const sourceIsAsync = detectFunctionIsAsync(result, ast.functionName);
-  const forceAsync = nodesRequireAsync;
+  const forceAsync = nodesRequireAsync || !production;
   const isAsync2 = forceAsync || sourceIsAsync;
   const asyncSigResult = ensureAsyncKeyword(result, ast.functionName, forceAsync);
   if (asyncSigResult.changed) {
@@ -19089,15 +18989,9 @@ function generateRuntimeSection(functionName, production, moduleFormat = "esm",
     if (!production) {
       lines.push(`import type { TDebugger } from '${externalRuntimePath}';`);
       lines.push("declare const __flowWeaverDebugger__: TDebugger | undefined;");
-      lines.push("");
-      lines.push(generateInlineDebugClient(moduleFormat));
     }
   } else {
     lines.push(generateInlineRuntime(production));
-    if (!production) {
-      lines.push("");
-      lines.push(generateInlineDebugClient(moduleFormat));
-    }
   }
   return lines.join("\n");
 }
@@ -93281,7 +93175,7 @@ function displayInstalledPackage(pkg) {
 // src/cli/index.ts
 init_logger();
 init_error_utils();
-var version2 = true ? "0.21.21" : "0.0.0-dev";
+var version2 = true ? "0.21.22" : "0.0.0-dev";
 var program2 = new Command();
 program2.name("fw").description("Flow Weaver Annotations - Compile and validate workflow files").option("-v, --version", "Output the current version").option("--no-color", "Disable colors").option("--color", "Force colors").on("option:version", () => {
   logger.banner(version2);

package/dist/generated-version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.21.21";
+export declare const VERSION = "0.21.22";
 //# sourceMappingURL=generated-version.d.ts.map

package/dist/generated-version.js

@@ -1,3 +1,3 @@
 // Auto-generated by scripts/generate-version.ts — do not edit manually
-export const VERSION = '0.21.21';
+export const VERSION = '0.21.22';
 //# sourceMappingURL=generated-version.js.map

package/dist/generator/code-utils.d.ts

@@ -40,6 +40,7 @@ export type TBuildNodeArgsOptions = {
     setCall?: string;
     nodeTypeName?: string;
     bundleMode?: boolean;
+    production?: boolean;
 };
 /**
  * Builds the argument list for a node function call by resolving input port values.

package/dist/generator/code-utils.js

@@ -147,7 +147,7 @@ export function buildMergeExpression(sources, strategy) {
  * @returns Array of argument expressions to pass to the node function
  */
 export function buildNodeArgumentsWithContext(opts) {
-    const { node, workflow, id, lines, indent = '    ', getCall = 'await ctx.getVariable', isAsync = true, instanceParent, skipPorts, emitInputEvents = false, setCall = 'await ctx.setVariable', nodeTypeName, bundleMode = false, } = opts;
+    const { node, workflow, id, lines, indent = '    ', getCall = 'await ctx.getVariable', isAsync = true, instanceParent, skipPorts, emitInputEvents = false, setCall = 'await ctx.setVariable', nodeTypeName, bundleMode = false, production = false, } = opts;
     const safeId = toValidIdentifier(id);
     const inputConnections = workflow.connections.filter((conn) => conn.to.node === id);
     const args = [];
@@ -260,15 +260,18 @@ export function buildNodeArgumentsWithContext(opts) {
                 const needsGuard = portConfig.optional && !isConstSource;
                 // For FUNCTION type ports, add resolution step to handle registry IDs
                 if (portConfig.dataType === 'FUNCTION') {
+                    // Emit inline resolveFunction stub if not already declared in scope
+                    // This avoids a ReferenceError in self-contained generated code
+                    lines.push(`${indent}const __resolveFunction = typeof resolveFunction === 'function' ? resolveFunction : (p: unknown) => ({ fn: typeof p === 'function' ? p : () => { throw new Error('Cannot resolve function reference'); }, source: 'direct' as const });`);
                     const rawVarName = `${varName}_raw`;
                     if (needsGuard) {
                         lines.push(`${indent}const ${rawVarName} = ${sourceIdx} !== undefined ? ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx} }) : undefined;`);
-                        lines.push(`${indent}const ${varName}_resolved = ${rawVarName} !== undefined ? resolveFunction(${rawVarName}) : undefined;`);
+                        lines.push(`${indent}const ${varName}_resolved = ${rawVarName} !== undefined ? __resolveFunction(${rawVarName}) : undefined;`);
                         lines.push(`${indent}const ${varName} = ${varName}_resolved?.fn as ${portType};`);
                     }
                     else {
                         lines.push(`${indent}const ${rawVarName} = ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx}${nonNullAssert} });`);
-                        lines.push(`${indent}const ${varName}_resolved = resolveFunction(${rawVarName});`);
+                        lines.push(`${indent}const ${varName}_resolved = __resolveFunction(${rawVarName});`);
                         lines.push(`${indent}const ${varName} = ${varName}_resolved.fn as ${portType};`);
                     }
                 }
@@ -326,9 +329,10 @@ export function buildNodeArgumentsWithContext(opts) {
                 const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
                 // For FUNCTION type ports, add resolution step to handle registry IDs
                 if (portConfig.dataType === 'FUNCTION') {
+                    lines.push(`${indent}const __resolveFunction = typeof resolveFunction === 'function' ? resolveFunction : (p: unknown) => ({ fn: typeof p === 'function' ? p : () => { throw new Error('Cannot resolve function reference'); }, source: 'direct' as const });`);
                     const rawVarName = `${varName}_raw`;
                     lines.push(`${indent}const ${rawVarName} = ${ternary};`);
-                    lines.push(`${indent}const ${varName}_resolved = ${rawVarName} !== undefined ? resolveFunction(${rawVarName}) : undefined;`);
+                    lines.push(`${indent}const ${varName}_resolved = ${rawVarName} !== undefined ? __resolveFunction(${rawVarName}) : undefined;`);
                     lines.push(`${indent}const ${varName} = ${varName}_resolved?.fn as ${portType};`);
                 }
                 else {
@@ -365,7 +369,7 @@ export function buildNodeArgumentsWithContext(opts) {
         else {
             // Required port has no connection, expression, or default - use typed undefined fallback
             const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
-            lines.push(`${indent}let ${varName}!: ${portType}; // Required port '${portName}' has no connection`);
+            lines.push(`${indent}let ${varName}: ${portType} = undefined as unknown as ${portType}; // Required port '${portName}' has no connection`);
             args.push(varName);
             emitSetEvent();
         }
@@ -392,18 +396,17 @@ export function buildNodeArgumentsWithContext(opts) {
             return inst.parent.id === id && inst.parent.scope === scopeName;
         });
         // Generate scope function closure
-        // The scope function's async/sync nature should match the workflow context (isAsync parameter).
-        // If the workflow is async, the scope function must be async to use await for context operations.
-        // We also consider node.isAsync for cases where the node type explicitly expects async callbacks.
-        // PHASE 9 FIX: Also check if any child node in the scope is async - if so, the scope
-        // function must be async to properly await those child node calls.
+        // Scope function async/sync must match what the PARENT NODE expects from its callback.
+        // A sync parent node (e.g., forEach) calls the callback synchronously — if the scope
+        // function is async it returns a Promise, causing `.field` accesses to yield `undefined`.
+        // Only make the scope function async if the parent node itself is async or a child is async.
+        // Do NOT inherit the workflow-level isAsync flag (which is true in dev mode for debugging).
         const hasAsyncChild = childInstances.some((child) => {
             const childNodeType = workflow.nodeTypes?.find((nt) => nt.name === child.nodeType || nt.functionName === child.nodeType);
             return childNodeType?.isAsync === true;
         });
-        const scopeIsAsync = isAsync || node.isAsync || hasAsyncChild;
-        const scopeFunctionCode = generateScopeFunctionClosure(scopeName, id, node, workflow, childInstances, scopeIsAsync, false // production mode
-        );
+        const scopeIsAsync = node.isAsync || hasAsyncChild;
+        const scopeFunctionCode = generateScopeFunctionClosure(scopeName, id, node, workflow, childInstances, scopeIsAsync, production);
         lines.push(`${indent}const ${scopeFunctionVar} = ${scopeFunctionCode};`);
         args.push(scopeFunctionVar);
     });
@@ -416,7 +419,7 @@ export function generateNodeWithExecutionContext(node, workflow, lines, isAsync,
     const getCall = isAsync ? 'await ctx.getVariable' : 'ctx.getVariable';
     const setCall = isAsync ? 'await ctx.setVariable' : 'ctx.setVariable';
     lines.push(`${indent}const ${safeNodeName}Idx = ctx.addExecution('${nodeName}');`);
-    lines.push(`${indent}if (typeof globalThis !== 'undefined') (globalThis as any).__fw_current_node_id__ = '${nodeName}';`);
+    lines.push(`${indent}if (typeof globalThis !== 'undefined') (globalThis as unknown as { __fw_current_node_id__?: string }).__fw_current_node_id__ = '${nodeName}';`);
     lines.push(`${indent}${awaitPrefix}ctx.sendStatusChangedEvent({`);
     lines.push(`${indent}  nodeTypeName: '${nodeName}',`);
     lines.push(`${indent}  id: '${nodeName}',`);

package/dist/generator/scope-function-generator.js

@@ -79,6 +79,10 @@ import { mapToTypeScript } from '../type-mappings.js';
  */
 export function generateScopeFunctionClosure(scopeName, parentNodeId, parentNodeType, workflow, childInstances, isAsync, production) {
     const lines = [];
+    // NOTE: Scope function async/sync is determined by the caller (buildNodeArgumentsWithContext)
+    // based on whether the parent node or its children are async. We do NOT force async in dev
+    // mode here because the parent node function calls this callback synchronously — if we
+    // return a Promise from an async closure, the parent gets Promise objects instead of values.
     // Extract scoped ports for this scope
     const scopedOutputPorts = []; // Parameters to the scope function
     const scopedInputPorts = []; // Return values from the scope function
@@ -112,9 +116,11 @@ export function generateScopeFunctionClosure(scopeName, parentNodeId, parentNode
     lines.push(``);
     // Create scoped execution context for isolation
     // Pass cleanScope=true for per-port function scopes (each call gets fresh variables)
+    // When the scope function is sync, override isAsync to false so context ops return values directly
     const safeParentId = toValidIdentifier(parentNodeId);
     lines.push(`    // Create scoped context for child nodes`);
-    lines.push(`    const scopedCtx = ctx.createScope('${parentNodeId}', ${safeParentId}Idx!, '${scopeName}', true);`);
+    const isAsyncOverrideArg = isAsync ? '' : ', false';
+    lines.push(`    const scopedCtx = ctx.createScope('${parentNodeId}', ${safeParentId}Idx!, '${scopeName}', true${isAsyncOverrideArg});`);
     lines.push(``);
     // Set scope parameter values in execution context
     // These become available to child nodes as outputs from the parent node
@@ -185,7 +191,7 @@ export function generateScopeFunctionClosure(scopeName, parentNodeId, parentNode
             lines.push(`    // Execute: ${child.id} (${child.nodeType})`);
             lines.push(`    scopedCtx.checkAborted('${child.id}');`);
             lines.push(`    const ${safeChildId}Idx = scopedCtx.addExecution('${child.id}');`);
-            lines.push(`    if (typeof globalThis !== 'undefined') (globalThis as any).__fw_current_node_id__ = '${child.id}';`);
+            lines.push(`    if (typeof globalThis !== 'undefined') (globalThis as unknown as { __fw_current_node_id__?: string }).__fw_current_node_id__ = '${child.id}';`);
             lines.push(`    ${awaitPrefix}scopedCtx.sendStatusChangedEvent({`);
             lines.push(`      nodeTypeName: '${child.nodeType}',`);
             lines.push(`      id: '${child.id}',`);
@@ -232,6 +238,7 @@ export function generateScopeFunctionClosure(scopeName, parentNodeId, parentNode
                 emitInputEvents: true,
                 setCall: childSetCall,
                 nodeTypeName: child.nodeType,
+                production,
             });
             // Add argument building lines
             argLines.forEach((line) => lines.push(line));
@@ -304,8 +311,11 @@ export function generateScopeFunctionClosure(scopeName, parentNodeId, parentNode
     // These are the outputs of child nodes that become the scope function's return value
     lines.push(`    // Extract return values from child outputs`);
     const returnObj = [];
-    // After mergeScope, use ctx (parent context) not scopedCtx for all variable access
-    const getCallAfterMerge = isAsync ? 'await ctx.getVariable' : 'ctx.getVariable';
+    // Read return values from scopedCtx (not ctx) because:
+    // 1. scopedCtx still has all variables after mergeScope (merge copies, doesn't move)
+    // 2. scopedCtx.isAsync matches the scope function's sync/async nature, so getVariable
+    //    returns values directly (not Promises) when the scope function is sync
+    const getCallAfterMerge = isAsync ? 'await scopedCtx.getVariable' : 'scopedCtx.getVariable';
     // Create per-iteration execution index for scoped exit ports (so each iteration shows separately in UI)
     // Use ctx (parent context) not scopedCtx so indices accumulate across iterations
     lines.push(`    const scopeExitIdx = ctx.addExecution('${parentNodeId}_scope_exit');`);
@@ -330,7 +340,7 @@ export function generateScopeFunctionClosure(scopeName, parentNodeId, parentNode
             const isStepPort = portName === 'success' || portName === 'failure';
             const defaultValue = portName === 'success' ? 'true' : portName === 'failure' ? 'false' : 'undefined';
             if (isStepPort) {
-                lines.push(`    const ${varName} = ctx.hasVariable(${varAddr}) ? ${getCallAfterMerge}(${varAddr}) as ${portType} : ${defaultValue};`);
+                lines.push(`    const ${varName} = scopedCtx.hasVariable(${varAddr}) ? ${getCallAfterMerge}(${varAddr}) as ${portType} : ${defaultValue};`);
             }
             else {
                 lines.push(`    const ${varName} = ${getCallAfterMerge}(${varAddr}) as ${portType};`);

package/dist/generator/unified.js

@@ -80,15 +80,9 @@ function getPullExecutionConfig(instance, nodeType) {
  */
 export function generateControlFlowWithExecutionContext(workflow, nodeTypes, isAsync, production = false, bundleMode = false) {
     const lines = [];
-    // In development mode, determine effective debugger (from parameter or environment)
+    // In development mode, use the injected debugger if available
     if (!production) {
-        lines.push(`  // Use passed debugger or auto-detect from environment variable`);
-        lines.push(`  const __effectiveDebugger__ = (`);
-        lines.push(`    typeof __flowWeaverDebugger__ !== 'undefined' ? __flowWeaverDebugger__ :`);
-        lines.push(`    typeof process !== 'undefined' && process.env.FLOW_WEAVER_DEBUG`);
-        lines.push(`      ? createFlowWeaverDebugClient(process.env.FLOW_WEAVER_DEBUG, '${workflow.functionName}')`);
-        lines.push(`      : undefined`);
-        lines.push(`  );`);
+        lines.push(`  const __effectiveDebugger__ = typeof __flowWeaverDebugger__ !== 'undefined' ? __flowWeaverDebugger__ : undefined;`);
         lines.push('');
     }
     // Recursion depth protection: prevent infinite recursion in workflows
@@ -101,6 +95,12 @@ export function generateControlFlowWithExecutionContext(workflow, nodeTypes, isA
     // In development mode, pass the effective debugger (from parameter or environment)
     // In production mode, omit the debugger parameter
     // Always pass abort signal for cancellation support
+    // In dev mode, always treat as async so the debugger can pause execution
+    // at breakpoints (sendStatusChangedEvent must be awaited for this to work).
+    // Production mode respects the original isAsync to avoid overhead.
+    if (!production) {
+        isAsync = true; // eslint-disable-line no-param-reassign
+    }
     const asyncArg = isAsync ? 'true' : 'false';
     if (production) {
         lines.push(`  const ctx = new GeneratedExecutionContext(${asyncArg}, __abortSignal__);`);
@@ -115,8 +115,8 @@ export function generateControlFlowWithExecutionContext(workflow, nodeTypes, isA
     if (!production) {
         lines.push(`  // Debug controller for step-through debugging and checkpoint/resume`);
         lines.push(`  const __ctrl__: TDebugController = (`);
-        lines.push(`    typeof globalThis !== 'undefined' && (globalThis as any).__fw_debug_controller__`);
-        lines.push(`      ? (globalThis as any).__fw_debug_controller__`);
+        lines.push(`    typeof globalThis !== 'undefined' && (globalThis as unknown as { __fw_debug_controller__?: TDebugController }).__fw_debug_controller__`);
+        lines.push(`      ? (globalThis as unknown as { __fw_debug_controller__?: TDebugController }).__fw_debug_controller__`);
         lines.push(`      : { beforeNode: () => true, afterNode: () => {} }`);
         lines.push(`  );`);
         lines.push('');
@@ -958,7 +958,7 @@ bundleMode = false, preDeclaredSuccessFlags = new Set(), forceTrackSuccess = fal
     }
     lines.push(`${indent}${ctxVar}.checkAborted('${instanceId}');`);
     lines.push(`${indent}${safeId}Idx = ${ctxVar}.addExecution('${instanceId}');`);
-    lines.push(`${indent}if (typeof globalThis !== 'undefined') (globalThis as any).__fw_current_node_id__ = '${instanceId}';`);
+    lines.push(`${indent}if (typeof globalThis !== 'undefined') (globalThis as unknown as { __fw_current_node_id__?: string }).__fw_current_node_id__ = '${instanceId}';`);
     lines.push(`${indent}${awaitPrefix}${ctxVar}.sendStatusChangedEvent({`);
     lines.push(`${indent}  nodeTypeName: '${functionName}',`);
     lines.push(`${indent}  id: '${instanceId}',`);
@@ -991,6 +991,7 @@ bundleMode = false, preDeclaredSuccessFlags = new Set(), forceTrackSuccess = fal
         setCall,
         nodeTypeName: functionName,
         bundleMode,
+        production,
     });
     const awaitKeyword = branchNode.isAsync ? 'await ' : '';
     if (branchNode.expression) {
@@ -1262,7 +1263,7 @@ bundleMode = false, preDeclaredSuccessFlags = new Set(), forceTrackSuccess = fal
     generatedNodes.add(instanceId);
 }
 function generatePullNodeWithContext(instance, nodeType, workflow, lines, indent, isAsync, ctxVar = 'ctx', // Context variable name (for scoped contexts)
-bundleMode = false) {
+bundleMode = false, production = false) {
     const instanceId = instance.id;
     const safeId = toValidIdentifier(instanceId);
     const functionName = nodeType.functionName;
@@ -1283,7 +1284,7 @@ bundleMode = false) {
     lines.push(`${indent}  }`);
     lines.push(`${indent}  ${ctxVar}.checkAborted('${instanceId}');`);
     lines.push(`${indent}  ${safeId}Idx = ${ctxVar}.addExecution('${instanceId}');`);
-    lines.push(`${indent}  if (typeof globalThis !== 'undefined') (globalThis as any).__fw_current_node_id__ = '${instanceId}';`);
+    lines.push(`${indent}  if (typeof globalThis !== 'undefined') (globalThis as unknown as { __fw_current_node_id__?: string }).__fw_current_node_id__ = '${instanceId}';`);
     lines.push(`${indent}  ${awaitPrefix}${ctxVar}.sendStatusChangedEvent({`);
     lines.push(`${indent}    nodeTypeName: '${functionName}',`);
     lines.push(`${indent}    id: '${instanceId}',`);
@@ -1306,6 +1307,7 @@ bundleMode = false) {
         setCall,
         nodeTypeName: functionName,
         bundleMode,
+        production,
     });
     const resultVar = `${safeId}Result`;
     // Check if this is a workflow call (IMPORTED_WORKFLOW or WORKFLOW variant)
@@ -1407,7 +1409,7 @@ production = false // When false, emit debug controller hooks (beforeNode/afterN
         : { enabled: false, triggerPort: 'execute' };
     // If this is a pull execution node, wrap it in a lazy function
     if (pullConfig.enabled) {
-        generatePullNodeWithContext(instance, nodeType, workflow, lines, indent, isAsync, ctxVar, bundleMode);
+        generatePullNodeWithContext(instance, nodeType, workflow, lines, indent, isAsync, ctxVar, bundleMode, production);
         return;
     }
     const stepInputs = Object.entries(nodeType.inputs).filter(([portName, portConfig]) => {
@@ -1556,7 +1558,7 @@ production = false // When false, emit debug controller hooks (beforeNode/afterN
     const awaitPrefix = isAsync ? 'await ' : '';
     lines.push(`${indent}${ctxVar}.checkAborted('${instanceId}');`);
     lines.push(`${indent}${varDecl}${safeId}Idx = ${ctxVar}.addExecution('${instanceId}');`);
-    lines.push(`${indent}if (typeof globalThis !== 'undefined') (globalThis as any).__fw_current_node_id__ = '${instanceId}';`);
+    lines.push(`${indent}if (typeof globalThis !== 'undefined') (globalThis as unknown as { __fw_current_node_id__?: string }).__fw_current_node_id__ = '${instanceId}';`);
     lines.push(`${indent}${awaitPrefix}${ctxVar}.sendStatusChangedEvent({`);
     lines.push(`${indent}  nodeTypeName: '${functionName}',`);
     lines.push(`${indent}  id: '${instanceId}',`);
@@ -1579,6 +1581,7 @@ production = false // When false, emit debug controller hooks (beforeNode/afterN
         setCall,
         nodeTypeName: functionName,
         bundleMode,
+        production,
     });
     const resultVar = `${safeId}Result`;
     const awaitKeyword = nodeType.isAsync ? 'await ' : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synergenius/flow-weaver",
-  "version": "0.21.21",
+  "version": "0.21.22",
   "description": "Deterministic workflow compiler for AI agents. Compiles to standalone TypeScript, no runtime dependencies.",
   "private": false,
   "type": "module",