@agentforge/patterns 0.16.36 → 0.16.38

package/dist/index.cjs

@@ -411,9 +411,9 @@ function stringifyActionArguments(arguments_) {
 function getLatestThought(thoughts) {
   return thoughts[thoughts.length - 1]?.content ?? "";
 }
-function debugIfVerbose(logger5, verbose, message, data) {
+function debugIfVerbose(logger6, verbose, message, data) {
   if (verbose) {
-    logger5.debug(message, data);
+    logger6.debug(message, data);
   }
 }
 
@@ -3412,9 +3412,10 @@ function createWorkerNode(config) {
   };
 }
 
-// src/multi-agent/agent.ts
+// src/multi-agent/agent-graph.ts
 var import_langgraph4 = require("@langchain/langgraph");
-var logger4 = createPatternLogger("agentforge:patterns:multi-agent:system");
+
+// src/multi-agent/agent-workers.ts
 function getToolName(tool) {
   if (!tool || typeof tool !== "object") {
     return "unknown";
@@ -3428,36 +3429,82 @@ function getToolName(tool) {
   }
   return "unknown";
 }
-function createMultiAgentSystem(config) {
-  const {
-    supervisor,
-    workers,
-    aggregator,
-    maxIterations = 10,
-    verbose = false,
-    checkpointer
-  } = config;
-  const workflow = new import_langgraph4.StateGraph(MultiAgentState);
-  const supervisorConfig = { ...supervisor, maxIterations, verbose };
-  const supervisorNode = createSupervisorNode(supervisorConfig);
-  workflow.addNode("supervisor", supervisorNode);
-  const workerIds = [];
-  const workerCapabilities = {};
-  for (const workerConfig of workers) {
-    const workerNode = createWorkerNode({
-      ...workerConfig,
-      verbose
+function toWorkerCapabilities(worker) {
+  return {
+    skills: worker.capabilities,
+    tools: worker.tools?.map((tool) => getToolName(tool)) || [],
+    available: true,
+    currentWorkload: 0
+  };
+}
+function toWorkerConfig(worker, fallbackModel) {
+  return {
+    id: worker.name,
+    capabilities: toWorkerCapabilities(worker),
+    model: worker.model || fallbackModel,
+    tools: worker.tools,
+    systemPrompt: worker.systemPrompt
+  };
+}
+
+// src/multi-agent/agent-runtime.ts
+function mergeWorkers(input, workerCapabilities) {
+  return {
+    ...input,
+    workers: {
+      ...workerCapabilities,
+      ...input.workers || {}
+    }
+  };
+}
+function wrapCompiledSystem(system, workerCapabilities) {
+  const originalInvoke = system.invoke.bind(system);
+  system.invoke = (async function(input, config) {
+    return originalInvoke(
+      mergeWorkers(input, workerCapabilities),
+      config
+    );
+  });
+  const originalStream = system.stream.bind(system);
+  system.stream = (async function(input, config) {
+    return originalStream(
+      mergeWorkers(input, workerCapabilities),
+      config
+    );
+  });
+  return system;
+}
+function registerWorkerCapabilities(system, workers) {
+  if (!system._workerRegistry) {
+    system._workerRegistry = {};
+  }
+  for (const worker of workers) {
+    system._workerRegistry[worker.name] = toWorkerCapabilities(worker);
+  }
+  if (!system._originalInvoke) {
+    system._originalInvoke = system.invoke.bind(system);
+    system.invoke = (async function(input, config) {
+      return system._originalInvoke(
+        mergeWorkers(input, system._workerRegistry || {}),
+        config
+      );
     });
-    workflow.addNode(workerConfig.id, workerNode);
-    workerIds.push(workerConfig.id);
-    workerCapabilities[workerConfig.id] = workerConfig.capabilities;
   }
-  const aggregatorNode = createAggregatorNode({
-    ...aggregator,
-    verbose
-  });
-  workflow.addNode("aggregator", aggregatorNode);
-  const supervisorRouter = (state) => {
+  if (!system._originalStream) {
+    system._originalStream = system.stream.bind(system);
+    system.stream = (async function(input, config) {
+      return system._originalStream(
+        mergeWorkers(input, system._workerRegistry || {}),
+        config
+      );
+    });
+  }
+}
+
+// src/multi-agent/agent-graph.ts
+var logger4 = createPatternLogger("agentforge:patterns:multi-agent:system");
+function createSupervisorRouter() {
+  return (state) => {
     logger4.debug("Supervisor router executing", {
       status: state.status,
       ...state.currentAgent ? { currentAgent: state.currentAgent } : {},
@@ -3473,7 +3520,7 @@ function createMultiAgentSystem(config) {
     }
     if (state.currentAgent && state.currentAgent !== "supervisor") {
       if (state.currentAgent.includes(",")) {
-        const agents = state.currentAgent.split(",").map((a) => a.trim());
+        const agents = state.currentAgent.split(",").map((agent) => agent.trim());
         logger4.info("Supervisor router: parallel routing", {
           agents,
           count: agents.length
@@ -3488,7 +3535,9 @@ function createMultiAgentSystem(config) {
     logger4.debug("Supervisor router: staying at supervisor");
     return "supervisor";
   };
-  const workerRouter = (state) => {
+}
+function createWorkerRouter() {
+  return (state) => {
     logger4.debug("Worker router executing", {
       iteration: state.iteration,
       completedTasks: state.completedTasks.length
@@ -3496,54 +3545,66 @@ function createMultiAgentSystem(config) {
     logger4.debug("Worker router: returning to supervisor");
     return "supervisor";
   };
-  const aggregatorRouter = (state) => {
+}
+function createAggregatorRouter() {
+  return (state) => {
     logger4.info("Aggregator router: ending workflow", {
       completedTasks: state.completedTasks.length,
       status: state.status
     });
     return import_langgraph4.END;
   };
-  workflow.setEntryPoint("supervisor");
-  workflow.addConditionalEdges("supervisor", supervisorRouter, [
+}
+function createCompiledMultiAgentSystem(config) {
+  const {
+    supervisor,
+    workers,
+    aggregator,
+    maxIterations = 10,
+    verbose = false,
+    checkpointer
+  } = config;
+  const workflow = new import_langgraph4.StateGraph(MultiAgentState);
+  const workerIds = [];
+  const workerCapabilities = {};
+  workflow.addNode(
+    "supervisor",
+    createSupervisorNode({ ...supervisor, maxIterations, verbose })
+  );
+  for (const workerConfig of workers) {
+    workflow.addNode(
+      workerConfig.id,
+      createWorkerNode({
+        ...workerConfig,
+        verbose
+      })
+    );
+    workerIds.push(workerConfig.id);
+    workerCapabilities[workerConfig.id] = workerConfig.capabilities;
+  }
+  workflow.addNode(
     "aggregator",
-    import_langgraph4.END,
-    ...workerIds
-  ]);
+    createAggregatorNode({
+      ...aggregator,
+      verbose
+    })
+  );
+  const supervisorRouter = createSupervisorRouter();
+  const workerRouter = createWorkerRouter();
+  const aggregatorRouter = createAggregatorRouter();
+  workflow.setEntryPoint("supervisor");
+  workflow.addConditionalEdges("supervisor", supervisorRouter, ["aggregator", import_langgraph4.END, ...workerIds]);
   for (const workerId of workerIds) {
     workflow.addConditionalEdges(workerId, workerRouter, ["supervisor"]);
   }
   workflow.addConditionalEdges("aggregator", aggregatorRouter, [import_langgraph4.END]);
-  const compiled = workflow.compile(checkpointer ? { checkpointer } : void 0);
-  const originalInvoke = compiled.invoke.bind(compiled);
-  compiled.invoke = (async function(input, config2) {
-    const mergedInput = {
-      ...input,
-      workers: {
-        ...workerCapabilities,
-        ...input.workers || {}
-      }
-    };
-    return originalInvoke(
-      mergedInput,
-      config2
-    );
-  });
-  const originalStream = compiled.stream.bind(compiled);
-  compiled.stream = (async function(input, config2) {
-    const mergedInput = {
-      ...input,
-      workers: {
-        ...workerCapabilities,
-        ...input.workers || {}
-      }
-    };
-    return originalStream(
-      mergedInput,
-      config2
-    );
-  });
-  return compiled;
+  const compiled = workflow.compile(
+    checkpointer ? { checkpointer } : void 0
+  );
+  return wrapCompiledSystem(compiled, workerCapabilities);
 }
+
+// src/multi-agent/agent-builder.ts
 var MultiAgentSystemBuilder = class {
   config;
   additionalWorkers = [];
@@ -3554,55 +3615,15 @@ var MultiAgentSystemBuilder = class {
       workers: config.workers || []
     };
   }
-  /**
-   * Register workers with the system builder
-   *
-   * @param workers - Array of worker configurations
-   * @returns this builder for chaining
-   *
-   * @example
-   * ```typescript
-   * const builder = new MultiAgentSystemBuilder({
-   *   supervisor: { llm, strategy: 'skill-based' },
-   *   aggregator: { llm },
-   * });
-   *
-   * builder.registerWorkers([
-   *   {
-   *     name: 'math_worker',
-   *     capabilities: ['math', 'calculations'],
-   *     tools: [calculatorTool],
-   *   },
-   * ]);
-   *
-   * const system = builder.build();
-   * ```
-   */
   registerWorkers(workers) {
     if (this.compiled) {
       throw new Error("Cannot register workers after the system has been compiled");
     }
     for (const worker of workers) {
-      this.additionalWorkers.push({
-        id: worker.name,
-        capabilities: {
-          skills: worker.capabilities,
-          tools: worker.tools?.map((t) => getToolName(t)) || [],
-          available: true,
-          currentWorkload: 0
-        },
-        model: worker.model || this.config.supervisor.model,
-        tools: worker.tools,
-        systemPrompt: worker.systemPrompt
-      });
+      this.additionalWorkers.push(toWorkerConfig(worker, this.config.supervisor.model));
     }
     return this;
   }
-  /**
-   * Build and compile the multi-agent system
-   *
-   * @returns Compiled LangGraph workflow
-   */
   build() {
     if (this.compiled) {
       throw new Error("System has already been compiled");
@@ -3612,59 +3633,23 @@ var MultiAgentSystemBuilder = class {
       throw new Error("At least one worker must be registered before building the system");
     }
     this.compiled = true;
-    return createMultiAgentSystem({
+    return createCompiledMultiAgentSystem({
       ...this.config,
       workers: allWorkers
     });
   }
 };
+
+// src/multi-agent/agent.ts
+var logger5 = createPatternLogger("agentforge:patterns:multi-agent:system");
+function createMultiAgentSystem(config) {
+  return createCompiledMultiAgentSystem(config);
+}
 function registerWorkers(system, workers) {
-  console.warn(
+  logger5.warn(
     "[AgentForge] registerWorkers() on a compiled system only updates worker capabilities in state.\nIt does NOT add worker nodes to the graph. Use MultiAgentSystemBuilder for proper worker registration.\nSee: https://github.com/TVScoundrel/agentforge/blob/main/packages/patterns/docs/multi-agent-pattern.md"
   );
-  if (!system._workerRegistry) {
-    system._workerRegistry = {};
-  }
-  for (const worker of workers) {
-    system._workerRegistry[worker.name] = {
-      skills: worker.capabilities,
-      tools: worker.tools?.map((t) => getToolName(t)) || [],
-      available: true,
-      currentWorkload: 0
-    };
-  }
-  if (!system._originalInvoke) {
-    system._originalInvoke = system.invoke.bind(system);
-    system.invoke = (async function(input, config) {
-      const mergedInput = {
-        ...input,
-        workers: {
-          ...system._workerRegistry || {},
-          ...input.workers || {}
-        }
-      };
-      return system._originalInvoke(
-        mergedInput,
-        config
-      );
-    });
-  }
-  if (!system._originalStream) {
-    system._originalStream = system.stream.bind(system);
-    system.stream = (async function(input, config) {
-      const mergedInput = {
-        ...input,
-        workers: {
-          ...system._workerRegistry || {},
-          ...input.workers || {}
-        }
-      };
-      return system._originalStream(
-        mergedInput,
-        config
-      );
-    });
-  }
+  registerWorkerCapabilities(system, workers);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.d.cts

@@ -3452,10 +3452,37 @@ declare function createSupervisorNode(config: SupervisorConfig): (state: MultiAg
  */
 declare function createWorkerNode(config: WorkerConfig): (state: MultiAgentStateType, runConfig?: WorkerExecutionConfig) => Promise<Partial<MultiAgentStateType>>;
 
+interface RegisterWorkerInput {
+    name: string;
+    description?: string;
+    capabilities: string[];
+    tools?: WorkerConfig['tools'];
+    systemPrompt?: string;
+}
+interface BuilderWorkerInput extends RegisterWorkerInput {
+    model?: WorkerConfig['model'];
+}
+interface MultiAgentSystemWithRegistry extends CompiledStateGraph<MultiAgentStateType, unknown> {
+    _workerRegistry?: Record<string, WorkerCapabilities>;
+    _originalInvoke?: (input: Partial<MultiAgentStateType>, config?: RunnableConfig) => ReturnType<MultiAgentSystemWithRegistry['invoke']>;
+    _originalStream?: (input: Partial<MultiAgentStateType>, config?: RunnableConfig) => ReturnType<MultiAgentSystemWithRegistry['stream']>;
+}
+
+declare class MultiAgentSystemBuilder {
+    private config;
+    private additionalWorkers;
+    private compiled;
+    constructor(config: Omit<MultiAgentSystemConfig, 'workers'> & {
+        workers?: WorkerConfig[];
+    });
+    registerWorkers(workers: BuilderWorkerInput[]): this;
+    build(): MultiAgentSystemWithRegistry;
+}
+
 /**
  * Multi-Agent System Factory
  *
- * This module provides the main factory function for creating multi-agent systems.
+ * This module provides the public facade for creating multi-agent systems.
  *
  * @module patterns/multi-agent/agent
  */
@@ -3545,66 +3572,6 @@ declare function createWorkerNode(config: WorkerConfig): (state: MultiAgentState
  * ```
  */
 declare function createMultiAgentSystem(config: MultiAgentSystemConfig): MultiAgentSystemWithRegistry;
-/**
- * Multi-agent system builder for dynamic worker registration
- *
- * This builder allows you to register workers before compiling the graph.
- * Once compiled, the graph is immutable and workers cannot be added.
- */
-declare class MultiAgentSystemBuilder {
-    private config;
-    private additionalWorkers;
-    private compiled;
-    constructor(config: Omit<MultiAgentSystemConfig, 'workers'> & {
-        workers?: WorkerConfig[];
-    });
-    /**
-     * Register workers with the system builder
-     *
-     * @param workers - Array of worker configurations
-     * @returns this builder for chaining
-     *
-     * @example
-     * ```typescript
-     * const builder = new MultiAgentSystemBuilder({
-     *   supervisor: { llm, strategy: 'skill-based' },
-     *   aggregator: { llm },
-     * });
-     *
-     * builder.registerWorkers([
-     *   {
-     *     name: 'math_worker',
-     *     capabilities: ['math', 'calculations'],
-     *     tools: [calculatorTool],
-     *   },
-     * ]);
-     *
-     * const system = builder.build();
-     * ```
-     */
-    registerWorkers(workers: Array<{
-        name: string;
-        description?: string;
-        capabilities: string[];
-        tools?: WorkerConfig['tools'];
-        systemPrompt?: string;
-        model?: WorkerConfig['model'];
-    }>): this;
-    /**
-     * Build and compile the multi-agent system
-     *
-     * @returns Compiled LangGraph workflow
-     */
-    build(): MultiAgentSystemWithRegistry;
-}
-/**
- * Extended multi-agent system with worker registration support
- */
-interface MultiAgentSystemWithRegistry extends CompiledStateGraph<MultiAgentStateType, unknown> {
-    _workerRegistry?: Record<string, WorkerCapabilities>;
-    _originalInvoke?: MultiAgentSystemWithRegistry['invoke'];
-    _originalStream?: MultiAgentSystemWithRegistry['stream'];
-}
 /**
  * Register workers with a compiled multi-agent system
  *
@@ -3632,13 +3599,7 @@ interface MultiAgentSystemWithRegistry extends CompiledStateGraph<MultiAgentStat
  *
  * @deprecated Use `MultiAgentSystemBuilder` instead for proper worker registration
  */
-declare function registerWorkers(system: MultiAgentSystemWithRegistry, workers: Array<{
-    name: string;
-    description?: string;
-    capabilities: string[];
-    tools?: WorkerConfig['tools'];
-    systemPrompt?: string;
-}>): void;
+declare function registerWorkers(system: MultiAgentSystemWithRegistry, workers: RegisterWorkerInput[]): void;
 
 /**
  * Generate a cache key for a tool call based on tool name and arguments

package/dist/index.d.ts

@@ -3452,10 +3452,37 @@ declare function createSupervisorNode(config: SupervisorConfig): (state: MultiAg
  */
 declare function createWorkerNode(config: WorkerConfig): (state: MultiAgentStateType, runConfig?: WorkerExecutionConfig) => Promise<Partial<MultiAgentStateType>>;
 
+interface RegisterWorkerInput {
+    name: string;
+    description?: string;
+    capabilities: string[];
+    tools?: WorkerConfig['tools'];
+    systemPrompt?: string;
+}
+interface BuilderWorkerInput extends RegisterWorkerInput {
+    model?: WorkerConfig['model'];
+}
+interface MultiAgentSystemWithRegistry extends CompiledStateGraph<MultiAgentStateType, unknown> {
+    _workerRegistry?: Record<string, WorkerCapabilities>;
+    _originalInvoke?: (input: Partial<MultiAgentStateType>, config?: RunnableConfig) => ReturnType<MultiAgentSystemWithRegistry['invoke']>;
+    _originalStream?: (input: Partial<MultiAgentStateType>, config?: RunnableConfig) => ReturnType<MultiAgentSystemWithRegistry['stream']>;
+}
+
+declare class MultiAgentSystemBuilder {
+    private config;
+    private additionalWorkers;
+    private compiled;
+    constructor(config: Omit<MultiAgentSystemConfig, 'workers'> & {
+        workers?: WorkerConfig[];
+    });
+    registerWorkers(workers: BuilderWorkerInput[]): this;
+    build(): MultiAgentSystemWithRegistry;
+}
+
 /**
  * Multi-Agent System Factory
  *
- * This module provides the main factory function for creating multi-agent systems.
+ * This module provides the public facade for creating multi-agent systems.
  *
  * @module patterns/multi-agent/agent
  */
@@ -3545,66 +3572,6 @@ declare function createWorkerNode(config: WorkerConfig): (state: MultiAgentState
  * ```
  */
 declare function createMultiAgentSystem(config: MultiAgentSystemConfig): MultiAgentSystemWithRegistry;
-/**
- * Multi-agent system builder for dynamic worker registration
- *
- * This builder allows you to register workers before compiling the graph.
- * Once compiled, the graph is immutable and workers cannot be added.
- */
-declare class MultiAgentSystemBuilder {
-    private config;
-    private additionalWorkers;
-    private compiled;
-    constructor(config: Omit<MultiAgentSystemConfig, 'workers'> & {
-        workers?: WorkerConfig[];
-    });
-    /**
-     * Register workers with the system builder
-     *
-     * @param workers - Array of worker configurations
-     * @returns this builder for chaining
-     *
-     * @example
-     * ```typescript
-     * const builder = new MultiAgentSystemBuilder({
-     *   supervisor: { llm, strategy: 'skill-based' },
-     *   aggregator: { llm },
-     * });
-     *
-     * builder.registerWorkers([
-     *   {
-     *     name: 'math_worker',
-     *     capabilities: ['math', 'calculations'],
-     *     tools: [calculatorTool],
-     *   },
-     * ]);
-     *
-     * const system = builder.build();
-     * ```
-     */
-    registerWorkers(workers: Array<{
-        name: string;
-        description?: string;
-        capabilities: string[];
-        tools?: WorkerConfig['tools'];
-        systemPrompt?: string;
-        model?: WorkerConfig['model'];
-    }>): this;
-    /**
-     * Build and compile the multi-agent system
-     *
-     * @returns Compiled LangGraph workflow
-     */
-    build(): MultiAgentSystemWithRegistry;
-}
-/**
- * Extended multi-agent system with worker registration support
- */
-interface MultiAgentSystemWithRegistry extends CompiledStateGraph<MultiAgentStateType, unknown> {
-    _workerRegistry?: Record<string, WorkerCapabilities>;
-    _originalInvoke?: MultiAgentSystemWithRegistry['invoke'];
-    _originalStream?: MultiAgentSystemWithRegistry['stream'];
-}
 /**
  * Register workers with a compiled multi-agent system
  *
@@ -3632,13 +3599,7 @@ interface MultiAgentSystemWithRegistry extends CompiledStateGraph<MultiAgentStat
  *
  * @deprecated Use `MultiAgentSystemBuilder` instead for proper worker registration
  */
-declare function registerWorkers(system: MultiAgentSystemWithRegistry, workers: Array<{
-    name: string;
-    description?: string;
-    capabilities: string[];
-    tools?: WorkerConfig['tools'];
-    systemPrompt?: string;
-}>): void;
+declare function registerWorkers(system: MultiAgentSystemWithRegistry, workers: RegisterWorkerInput[]): void;
 
 /**
  * Generate a cache key for a tool call based on tool name and arguments

package/dist/index.js

@@ -313,9 +313,9 @@ function stringifyActionArguments(arguments_) {
 function getLatestThought(thoughts) {
   return thoughts[thoughts.length - 1]?.content ?? "";
 }
-function debugIfVerbose(logger5, verbose, message, data) {
+function debugIfVerbose(logger6, verbose, message, data) {
   if (verbose) {
-    logger5.debug(message, data);
+    logger6.debug(message, data);
   }
 }
 
@@ -3314,9 +3314,10 @@ function createWorkerNode(config) {
   };
 }
 
-// src/multi-agent/agent.ts
-import { StateGraph as StateGraph4, END as END4 } from "@langchain/langgraph";
-var logger4 = createPatternLogger("agentforge:patterns:multi-agent:system");
+// src/multi-agent/agent-graph.ts
+import { END as END4, StateGraph as StateGraph4 } from "@langchain/langgraph";
+
+// src/multi-agent/agent-workers.ts
 function getToolName(tool) {
   if (!tool || typeof tool !== "object") {
     return "unknown";
@@ -3330,36 +3331,82 @@ function getToolName(tool) {
   }
   return "unknown";
 }
-function createMultiAgentSystem(config) {
-  const {
-    supervisor,
-    workers,
-    aggregator,
-    maxIterations = 10,
-    verbose = false,
-    checkpointer
-  } = config;
-  const workflow = new StateGraph4(MultiAgentState);
-  const supervisorConfig = { ...supervisor, maxIterations, verbose };
-  const supervisorNode = createSupervisorNode(supervisorConfig);
-  workflow.addNode("supervisor", supervisorNode);
-  const workerIds = [];
-  const workerCapabilities = {};
-  for (const workerConfig of workers) {
-    const workerNode = createWorkerNode({
-      ...workerConfig,
-      verbose
+function toWorkerCapabilities(worker) {
+  return {
+    skills: worker.capabilities,
+    tools: worker.tools?.map((tool) => getToolName(tool)) || [],
+    available: true,
+    currentWorkload: 0
+  };
+}
+function toWorkerConfig(worker, fallbackModel) {
+  return {
+    id: worker.name,
+    capabilities: toWorkerCapabilities(worker),
+    model: worker.model || fallbackModel,
+    tools: worker.tools,
+    systemPrompt: worker.systemPrompt
+  };
+}
+
+// src/multi-agent/agent-runtime.ts
+function mergeWorkers(input, workerCapabilities) {
+  return {
+    ...input,
+    workers: {
+      ...workerCapabilities,
+      ...input.workers || {}
+    }
+  };
+}
+function wrapCompiledSystem(system, workerCapabilities) {
+  const originalInvoke = system.invoke.bind(system);
+  system.invoke = (async function(input, config) {
+    return originalInvoke(
+      mergeWorkers(input, workerCapabilities),
+      config
+    );
+  });
+  const originalStream = system.stream.bind(system);
+  system.stream = (async function(input, config) {
+    return originalStream(
+      mergeWorkers(input, workerCapabilities),
+      config
+    );
+  });
+  return system;
+}
+function registerWorkerCapabilities(system, workers) {
+  if (!system._workerRegistry) {
+    system._workerRegistry = {};
+  }
+  for (const worker of workers) {
+    system._workerRegistry[worker.name] = toWorkerCapabilities(worker);
+  }
+  if (!system._originalInvoke) {
+    system._originalInvoke = system.invoke.bind(system);
+    system.invoke = (async function(input, config) {
+      return system._originalInvoke(
+        mergeWorkers(input, system._workerRegistry || {}),
+        config
+      );
     });
-    workflow.addNode(workerConfig.id, workerNode);
-    workerIds.push(workerConfig.id);
-    workerCapabilities[workerConfig.id] = workerConfig.capabilities;
   }
-  const aggregatorNode = createAggregatorNode({
-    ...aggregator,
-    verbose
-  });
-  workflow.addNode("aggregator", aggregatorNode);
-  const supervisorRouter = (state) => {
+  if (!system._originalStream) {
+    system._originalStream = system.stream.bind(system);
+    system.stream = (async function(input, config) {
+      return system._originalStream(
+        mergeWorkers(input, system._workerRegistry || {}),
+        config
+      );
+    });
+  }
+}
+
+// src/multi-agent/agent-graph.ts
+var logger4 = createPatternLogger("agentforge:patterns:multi-agent:system");
+function createSupervisorRouter() {
+  return (state) => {
     logger4.debug("Supervisor router executing", {
       status: state.status,
       ...state.currentAgent ? { currentAgent: state.currentAgent } : {},
@@ -3375,7 +3422,7 @@ function createMultiAgentSystem(config) {
     }
     if (state.currentAgent && state.currentAgent !== "supervisor") {
       if (state.currentAgent.includes(",")) {
-        const agents = state.currentAgent.split(",").map((a) => a.trim());
+        const agents = state.currentAgent.split(",").map((agent) => agent.trim());
         logger4.info("Supervisor router: parallel routing", {
           agents,
           count: agents.length
@@ -3390,7 +3437,9 @@ function createMultiAgentSystem(config) {
     logger4.debug("Supervisor router: staying at supervisor");
     return "supervisor";
   };
-  const workerRouter = (state) => {
+}
+function createWorkerRouter() {
+  return (state) => {
     logger4.debug("Worker router executing", {
       iteration: state.iteration,
       completedTasks: state.completedTasks.length
@@ -3398,54 +3447,66 @@ function createMultiAgentSystem(config) {
     logger4.debug("Worker router: returning to supervisor");
     return "supervisor";
   };
-  const aggregatorRouter = (state) => {
+}
+function createAggregatorRouter() {
+  return (state) => {
     logger4.info("Aggregator router: ending workflow", {
       completedTasks: state.completedTasks.length,
       status: state.status
     });
     return END4;
   };
-  workflow.setEntryPoint("supervisor");
-  workflow.addConditionalEdges("supervisor", supervisorRouter, [
+}
+function createCompiledMultiAgentSystem(config) {
+  const {
+    supervisor,
+    workers,
+    aggregator,
+    maxIterations = 10,
+    verbose = false,
+    checkpointer
+  } = config;
+  const workflow = new StateGraph4(MultiAgentState);
+  const workerIds = [];
+  const workerCapabilities = {};
+  workflow.addNode(
+    "supervisor",
+    createSupervisorNode({ ...supervisor, maxIterations, verbose })
+  );
+  for (const workerConfig of workers) {
+    workflow.addNode(
+      workerConfig.id,
+      createWorkerNode({
+        ...workerConfig,
+        verbose
+      })
+    );
+    workerIds.push(workerConfig.id);
+    workerCapabilities[workerConfig.id] = workerConfig.capabilities;
+  }
+  workflow.addNode(
     "aggregator",
-    END4,
-    ...workerIds
-  ]);
+    createAggregatorNode({
+      ...aggregator,
+      verbose
+    })
+  );
+  const supervisorRouter = createSupervisorRouter();
+  const workerRouter = createWorkerRouter();
+  const aggregatorRouter = createAggregatorRouter();
+  workflow.setEntryPoint("supervisor");
+  workflow.addConditionalEdges("supervisor", supervisorRouter, ["aggregator", END4, ...workerIds]);
   for (const workerId of workerIds) {
     workflow.addConditionalEdges(workerId, workerRouter, ["supervisor"]);
   }
   workflow.addConditionalEdges("aggregator", aggregatorRouter, [END4]);
-  const compiled = workflow.compile(checkpointer ? { checkpointer } : void 0);
-  const originalInvoke = compiled.invoke.bind(compiled);
-  compiled.invoke = (async function(input, config2) {
-    const mergedInput = {
-      ...input,
-      workers: {
-        ...workerCapabilities,
-        ...input.workers || {}
-      }
-    };
-    return originalInvoke(
-      mergedInput,
-      config2
-    );
-  });
-  const originalStream = compiled.stream.bind(compiled);
-  compiled.stream = (async function(input, config2) {
-    const mergedInput = {
-      ...input,
-      workers: {
-        ...workerCapabilities,
-        ...input.workers || {}
-      }
-    };
-    return originalStream(
-      mergedInput,
-      config2
-    );
-  });
-  return compiled;
+  const compiled = workflow.compile(
+    checkpointer ? { checkpointer } : void 0
+  );
+  return wrapCompiledSystem(compiled, workerCapabilities);
 }
+
+// src/multi-agent/agent-builder.ts
 var MultiAgentSystemBuilder = class {
   config;
   additionalWorkers = [];
@@ -3456,55 +3517,15 @@ var MultiAgentSystemBuilder = class {
       workers: config.workers || []
     };
   }
-  /**
-   * Register workers with the system builder
-   *
-   * @param workers - Array of worker configurations
-   * @returns this builder for chaining
-   *
-   * @example
-   * ```typescript
-   * const builder = new MultiAgentSystemBuilder({
-   *   supervisor: { llm, strategy: 'skill-based' },
-   *   aggregator: { llm },
-   * });
-   *
-   * builder.registerWorkers([
-   *   {
-   *     name: 'math_worker',
-   *     capabilities: ['math', 'calculations'],
-   *     tools: [calculatorTool],
-   *   },
-   * ]);
-   *
-   * const system = builder.build();
-   * ```
-   */
   registerWorkers(workers) {
     if (this.compiled) {
       throw new Error("Cannot register workers after the system has been compiled");
     }
     for (const worker of workers) {
-      this.additionalWorkers.push({
-        id: worker.name,
-        capabilities: {
-          skills: worker.capabilities,
-          tools: worker.tools?.map((t) => getToolName(t)) || [],
-          available: true,
-          currentWorkload: 0
-        },
-        model: worker.model || this.config.supervisor.model,
-        tools: worker.tools,
-        systemPrompt: worker.systemPrompt
-      });
+      this.additionalWorkers.push(toWorkerConfig(worker, this.config.supervisor.model));
     }
     return this;
   }
-  /**
-   * Build and compile the multi-agent system
-   *
-   * @returns Compiled LangGraph workflow
-   */
   build() {
     if (this.compiled) {
       throw new Error("System has already been compiled");
@@ -3514,59 +3535,23 @@ var MultiAgentSystemBuilder = class {
       throw new Error("At least one worker must be registered before building the system");
     }
     this.compiled = true;
-    return createMultiAgentSystem({
+    return createCompiledMultiAgentSystem({
       ...this.config,
       workers: allWorkers
     });
   }
 };
+
+// src/multi-agent/agent.ts
+var logger5 = createPatternLogger("agentforge:patterns:multi-agent:system");
+function createMultiAgentSystem(config) {
+  return createCompiledMultiAgentSystem(config);
+}
 function registerWorkers(system, workers) {
-  console.warn(
+  logger5.warn(
     "[AgentForge] registerWorkers() on a compiled system only updates worker capabilities in state.\nIt does NOT add worker nodes to the graph. Use MultiAgentSystemBuilder for proper worker registration.\nSee: https://github.com/TVScoundrel/agentforge/blob/main/packages/patterns/docs/multi-agent-pattern.md"
   );
-  if (!system._workerRegistry) {
-    system._workerRegistry = {};
-  }
-  for (const worker of workers) {
-    system._workerRegistry[worker.name] = {
-      skills: worker.capabilities,
-      tools: worker.tools?.map((t) => getToolName(t)) || [],
-      available: true,
-      currentWorkload: 0
-    };
-  }
-  if (!system._originalInvoke) {
-    system._originalInvoke = system.invoke.bind(system);
-    system.invoke = (async function(input, config) {
-      const mergedInput = {
-        ...input,
-        workers: {
-          ...system._workerRegistry || {},
-          ...input.workers || {}
-        }
-      };
-      return system._originalInvoke(
-        mergedInput,
-        config
-      );
-    });
-  }
-  if (!system._originalStream) {
-    system._originalStream = system.stream.bind(system);
-    system.stream = (async function(input, config) {
-      const mergedInput = {
-        ...input,
-        workers: {
-          ...system._workerRegistry || {},
-          ...input.workers || {}
-        }
-      };
-      return system._originalStream(
-        mergedInput,
-        config
-      );
-    });
-  }
+  registerWorkerCapabilities(system, workers);
 }
 export {
   AgentMessageSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentforge/patterns",
-  "version": "0.16.36",
+  "version": "0.16.38",
   "description": "Production-ready agent workflow patterns for TypeScript including ReAct and Planner-Executor, built on LangGraph.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -41,13 +41,13 @@
     "url": "https://github.com/TVScoundrel/agentforge/issues"
   },
   "dependencies": {
-    "@agentforge/core": "0.16.36",
+    "@agentforge/core": "0.16.38",
     "@langchain/core": "^1.1.17",
     "@langchain/langgraph": "^1.1.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@agentforge/testing": "0.16.36",
+    "@agentforge/testing": "0.16.38",
     "@eslint/js": "^9.17.0",
     "@types/node": "^22.10.2",
     "eslint": "^9.17.0",