@synergenius/flow-weaver 0.4.2 → 0.5.0

package/dist/cli/flow-weaver.mjs

@@ -27103,6 +27103,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(`    scopedCtx.sendStatusChangedEvent({`);
       lines.push(`      nodeTypeName: '${child.nodeType}',`);
       lines.push(`      id: '${child.id}',`);
@@ -28372,6 +28373,7 @@ function generateBranchingNodeCode(instance, branchNode, workflow, allNodeTypes,
   const functionName = branchNode.functionName;
   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}${ctxVar}.sendStatusChangedEvent({`);
   lines.push(`${indent}  nodeTypeName: '${functionName}',`);
   lines.push(`${indent}  id: '${instanceId}',`);
@@ -28739,6 +28741,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}  ${ctxVar}.sendStatusChangedEvent({`);
   lines.push(`${indent}    nodeTypeName: '${functionName}',`);
   lines.push(`${indent}    id: '${instanceId}',`);
@@ -28956,6 +28959,7 @@ function generateNodeCallWithContext(instance, nodeType, workflow, _availableVar
   const varDecl = useConst ? "const " : "";
   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}${ctxVar}.sendStatusChangedEvent({`);
   lines.push(`${indent}  nodeTypeName: '${functionName}',`);
   lines.push(`${indent}  id: '${instanceId}',`);
@@ -48732,6 +48736,7 @@ interface LLMResponse {
   content: string | null;
   toolCalls: LLMToolCall[];
   finishReason: 'stop' | 'tool_calls' | 'length' | 'error';
+  usage?: { promptTokens: number; completionTokens: number };
 }
 
 interface LLMToolCall {
@@ -48772,6 +48777,7 @@ interface LLMResponse {
   content: string | null;
   toolCalls: LLMToolCall[];
   finishReason: 'stop' | 'tool_calls' | 'length' | 'error';
+  usage?: { promptTokens: number; completionTokens: number };
 }
 
 interface LLMProvider {
@@ -48784,6 +48790,7 @@ var LLM_MOCK_PROVIDER = `const createMockProvider = (): LLMProvider => ({
       content: \`[Mock response to: \${lastMessage.content.slice(0, 50)}...]\`,
       toolCalls: [],
       finishReason: 'stop',
+      usage: { promptTokens: 10, completionTokens: 20 },
     };
   },
 });
@@ -48803,6 +48810,7 @@ var LLM_MOCK_PROVIDER_WITH_TOOLS = `const createMockProvider = (): LLMProvider =
           },
         ],
         finishReason: 'tool_calls',
+        usage: { promptTokens: 15, completionTokens: 30 },
       };
     }
 
@@ -48810,6 +48818,7 @@ var LLM_MOCK_PROVIDER_WITH_TOOLS = `const createMockProvider = (): LLMProvider =
       content: '[Mock answer] ' + last.content,
       toolCalls: [],
       finishReason: 'stop',
+      usage: { promptTokens: 10, completionTokens: 20 },
     };
   },
 });
@@ -59388,20 +59397,6 @@ function assignUnpositionedNodes(layers, diagramNodes, explicitPositions) {
     }
   }
 }
-function resolveHorizontalOverlaps(diagramNodes) {
-  const nodes = [...diagramNodes.values()].sort((a, b) => a.x - b.x);
-  for (let i = 1; i < nodes.length; i++) {
-    const prev = nodes[i - 1];
-    const curr = nodes[i];
-    const prevRightExtent = maxPortLabelExtent(prev.outputs);
-    const currLeftExtent = maxPortLabelExtent(curr.inputs);
-    const minGap = Math.max(prevRightExtent + LABEL_CLEARANCE + currLeftExtent, MIN_EDGE_GAP);
-    const actualGap = curr.x - (prev.x + prev.width);
-    if (actualGap < minGap) {
-      curr.x = prev.x + prev.width + minGap;
-    }
-  }
-}
 function buildDiagramGraph(ast, options = {}) {
   const themeName = options.theme ?? "dark";
   const nodeTypeMap = /* @__PURE__ */ new Map();
@@ -59510,7 +59505,6 @@ function buildDiagramGraph(ast, options = {}) {
         node.y = pos.y;
       }
     }
-    resolveHorizontalOverlaps(diagramNodes);
   } else if (nonePositioned) {
     const { layers } = layoutWorkflow(ast);
     assignLayerCoordinates(layers, diagramNodes);
@@ -94435,7 +94429,7 @@ function displayInstalledPackage(pkg) {
 }
 
 // src/cli/index.ts
-var version2 = true ? "0.4.2" : "0.0.0-dev";
+var version2 = true ? "0.5.0" : "0.0.0-dev";
 var program2 = new Command();
 program2.name("flow-weaver").description("Flow Weaver Annotations - Compile and validate workflow files").version(version2, "-v, --version", "Output the current version");
 program2.configureOutput({

package/dist/cli/templates/shared/llm-types.d.ts

@@ -5,11 +5,11 @@
  * They provide the common type system that all AI workflows need.
  */
 /** Core LLM types — embedded in all AI templates */
-export declare const LLM_CORE_TYPES = "interface LLMMessage {\n  role: 'system' | 'user' | 'assistant' | 'tool';\n  content: string;\n  toolCallId?: string;\n}\n\ninterface LLMResponse {\n  content: string | null;\n  toolCalls: LLMToolCall[];\n  finishReason: 'stop' | 'tool_calls' | 'length' | 'error';\n}\n\ninterface LLMToolCall {\n  id: string;\n  name: string;\n  arguments: Record<string, unknown>;\n}\n\ninterface LLMTool {\n  name: string;\n  description: string;\n  parameters: {\n    type: 'object';\n    properties: Record<string, { type: string }>;\n    required?: string[];\n  };\n}\n\ninterface LLMProvider {\n  chat(\n    messages: LLMMessage[],\n    options?: { tools?: LLMTool[]; systemPrompt?: string; model?: string; temperature?: number; maxTokens?: number }\n  ): Promise<LLMResponse>;\n}";
+export declare const LLM_CORE_TYPES = "interface LLMMessage {\n  role: 'system' | 'user' | 'assistant' | 'tool';\n  content: string;\n  toolCallId?: string;\n}\n\ninterface LLMResponse {\n  content: string | null;\n  toolCalls: LLMToolCall[];\n  finishReason: 'stop' | 'tool_calls' | 'length' | 'error';\n  usage?: { promptTokens: number; completionTokens: number };\n}\n\ninterface LLMToolCall {\n  id: string;\n  name: string;\n  arguments: Record<string, unknown>;\n}\n\ninterface LLMTool {\n  name: string;\n  description: string;\n  parameters: {\n    type: 'object';\n    properties: Record<string, { type: string }>;\n    required?: string[];\n  };\n}\n\ninterface LLMProvider {\n  chat(\n    messages: LLMMessage[],\n    options?: { tools?: LLMTool[]; systemPrompt?: string; model?: string; temperature?: number; maxTokens?: number }\n  ): Promise<LLMResponse>;\n}";
 /** Simplified LLM types — for templates that don't need tool calling */
-export declare const LLM_SIMPLE_TYPES = "interface LLMMessage {\n  role: 'system' | 'user' | 'assistant' | 'tool';\n  content: string;\n  toolCallId?: string;\n}\n\ninterface LLMToolCall {\n  id: string;\n  name: string;\n  arguments: Record<string, unknown>;\n}\n\ninterface LLMResponse {\n  content: string | null;\n  toolCalls: LLMToolCall[];\n  finishReason: 'stop' | 'tool_calls' | 'length' | 'error';\n}\n\ninterface LLMProvider {\n  chat(messages: LLMMessage[], options?: { systemPrompt?: string; model?: string; temperature?: number; maxTokens?: number }): Promise<LLMResponse>;\n}";
+export declare const LLM_SIMPLE_TYPES = "interface LLMMessage {\n  role: 'system' | 'user' | 'assistant' | 'tool';\n  content: string;\n  toolCallId?: string;\n}\n\ninterface LLMToolCall {\n  id: string;\n  name: string;\n  arguments: Record<string, unknown>;\n}\n\ninterface LLMResponse {\n  content: string | null;\n  toolCalls: LLMToolCall[];\n  finishReason: 'stop' | 'tool_calls' | 'length' | 'error';\n  usage?: { promptTokens: number; completionTokens: number };\n}\n\ninterface LLMProvider {\n  chat(messages: LLMMessage[], options?: { systemPrompt?: string; model?: string; temperature?: number; maxTokens?: number }): Promise<LLMResponse>;\n}";
 /** Mock provider factory code */
-export declare const LLM_MOCK_PROVIDER = "const createMockProvider = (): LLMProvider => ({\n  async chat(messages) {\n    const lastMessage = messages[messages.length - 1];\n    return {\n      content: `[Mock response to: ${lastMessage.content.slice(0, 50)}...]`,\n      toolCalls: [],\n      finishReason: 'stop',\n    };\n  },\n});\n\nconst llmProvider: LLMProvider = (globalThis as unknown as { __fw_llm_provider__?: LLMProvider }).__fw_llm_provider__ ?? createMockProvider();";
+export declare const LLM_MOCK_PROVIDER = "const createMockProvider = (): LLMProvider => ({\n  async chat(messages) {\n    const lastMessage = messages[messages.length - 1];\n    return {\n      content: `[Mock response to: ${lastMessage.content.slice(0, 50)}...]`,\n      toolCalls: [],\n      finishReason: 'stop',\n      usage: { promptTokens: 10, completionTokens: 20 },\n    };\n  },\n});\n\nconst llmProvider: LLMProvider = (globalThis as unknown as { __fw_llm_provider__?: LLMProvider }).__fw_llm_provider__ ?? createMockProvider();";
 /** Mock provider with tool calling support (for ai-agent) */
-export declare const LLM_MOCK_PROVIDER_WITH_TOOLS = "const createMockProvider = (): LLMProvider => ({\n  async chat(messages, options) {\n    const last = messages[messages.length - 1];\n    if (options?.tools && last.content.toLowerCase().includes('search')) {\n      return {\n        content: null,\n        toolCalls: [\n          {\n            id: 'call_' + Date.now(),\n            name: 'search',\n            arguments: { query: last.content },\n          },\n        ],\n        finishReason: 'tool_calls',\n      };\n    }\n\n    return {\n      content: '[Mock answer] ' + last.content,\n      toolCalls: [],\n      finishReason: 'stop',\n    };\n  },\n});\n\nconst llmProvider: LLMProvider = (globalThis as unknown as { __fw_llm_provider__?: LLMProvider }).__fw_llm_provider__ ?? createMockProvider();";
+export declare const LLM_MOCK_PROVIDER_WITH_TOOLS = "const createMockProvider = (): LLMProvider => ({\n  async chat(messages, options) {\n    const last = messages[messages.length - 1];\n    if (options?.tools && last.content.toLowerCase().includes('search')) {\n      return {\n        content: null,\n        toolCalls: [\n          {\n            id: 'call_' + Date.now(),\n            name: 'search',\n            arguments: { query: last.content },\n          },\n        ],\n        finishReason: 'tool_calls',\n        usage: { promptTokens: 15, completionTokens: 30 },\n      };\n    }\n\n    return {\n      content: '[Mock answer] ' + last.content,\n      toolCalls: [],\n      finishReason: 'stop',\n      usage: { promptTokens: 10, completionTokens: 20 },\n    };\n  },\n});\n\nconst llmProvider: LLMProvider = (globalThis as unknown as { __fw_llm_provider__?: LLMProvider }).__fw_llm_provider__ ?? createMockProvider();";
 //# sourceMappingURL=llm-types.d.ts.map

package/dist/cli/templates/shared/llm-types.js

@@ -15,6 +15,7 @@ interface LLMResponse {
   content: string | null;
   toolCalls: LLMToolCall[];
   finishReason: 'stop' | 'tool_calls' | 'length' | 'error';
+  usage?: { promptTokens: number; completionTokens: number };
 }
 
 interface LLMToolCall {
@@ -56,6 +57,7 @@ interface LLMResponse {
   content: string | null;
   toolCalls: LLMToolCall[];
   finishReason: 'stop' | 'tool_calls' | 'length' | 'error';
+  usage?: { promptTokens: number; completionTokens: number };
 }
 
 interface LLMProvider {
@@ -69,6 +71,7 @@ export const LLM_MOCK_PROVIDER = `const createMockProvider = (): LLMProvider =>
       content: \`[Mock response to: \${lastMessage.content.slice(0, 50)}...]\`,
       toolCalls: [],
       finishReason: 'stop',
+      usage: { promptTokens: 10, completionTokens: 20 },
     };
   },
 });
@@ -89,6 +92,7 @@ export const LLM_MOCK_PROVIDER_WITH_TOOLS = `const createMockProvider = (): LLMP
           },
         ],
         finishReason: 'tool_calls',
+        usage: { promptTokens: 15, completionTokens: 30 },
       };
     }
 
@@ -96,6 +100,7 @@ export const LLM_MOCK_PROVIDER_WITH_TOOLS = `const createMockProvider = (): LLMP
       content: '[Mock answer] ' + last.content,
       toolCalls: [],
       finishReason: 'stop',
+      usage: { promptTokens: 10, completionTokens: 20 },
     };
   },
 });

package/dist/diagram/geometry.js

@@ -744,7 +744,7 @@ export function buildDiagramGraph(ast, options = {}) {
     const allPositioned = [...diagramNodes.keys()].every(id => explicitPositions.has(id));
     const nonePositioned = ![...diagramNodes.keys()].some(id => explicitPositions.has(id));
     if (allPositioned) {
-        // All nodes have explicit positions — apply them
+        // All nodes have explicit positions — apply them as-is
         for (const [id, pos] of explicitPositions) {
             const node = diagramNodes.get(id);
             if (node) {
@@ -752,9 +752,6 @@ export function buildDiagramGraph(ast, options = {}) {
                 node.y = pos.y;
             }
         }
-        // Resolve horizontal overlaps: scope nodes may be wider than the
-        // original positions anticipated, so push downstream nodes apart.
-        resolveHorizontalOverlaps(diagramNodes);
     }
     else if (nonePositioned) {
         // No positions — full auto-layout (original behavior)

package/dist/generator/code-utils.js

@@ -314,6 +314,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}ctx.sendStatusChangedEvent({`);
     lines.push(`${indent}  nodeTypeName: '${nodeName}',`);
     lines.push(`${indent}  id: '${nodeName}',`);

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

@@ -184,6 +184,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(`    scopedCtx.sendStatusChangedEvent({`);
             lines.push(`      nodeTypeName: '${child.nodeType}',`);
             lines.push(`      id: '${child.id}',`);

package/dist/generator/unified.js

@@ -887,6 +887,7 @@ bundleMode = false, preDeclaredSuccessFlags = new Set(), forceTrackSuccess = fal
     const functionName = branchNode.functionName;
     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}${ctxVar}.sendStatusChangedEvent({`);
     lines.push(`${indent}  nodeTypeName: '${functionName}',`);
     lines.push(`${indent}  id: '${instanceId}',`);
@@ -1197,6 +1198,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}  ${ctxVar}.sendStatusChangedEvent({`);
     lines.push(`${indent}    nodeTypeName: '${functionName}',`);
     lines.push(`${indent}    id: '${instanceId}',`);
@@ -1450,6 +1452,7 @@ branchingNodes = new Set() // Branching nodes set for port-aware STEP guards
     const varDecl = useConst ? 'const ' : '';
     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}${ctxVar}.sendStatusChangedEvent({`);
     lines.push(`${indent}  nodeTypeName: '${functionName}',`);
     lines.push(`${indent}  id: '${instanceId}',`);

package/package.json

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