@agentforge/patterns 0.10.5 → 0.10.7

package/dist/index.cjs

@@ -108,6 +108,7 @@ var MessageSchema = import_zod.z.object({
   role: MessageRoleSchema,
   content: import_zod.z.string(),
   name: import_zod.z.string().optional(),
+  tool_call_id: import_zod.z.string().optional(),
   metadata: import_zod.z.record(import_zod.z.any()).optional()
 });
 var ThoughtSchema = import_zod.z.object({
@@ -343,6 +344,13 @@ function createReasoningNode(llm, tools, systemPrompt, maxIterations, verbose =
         if (msg.role === "user") return new import_messages.HumanMessage(msg.content);
         if (msg.role === "assistant") return new import_messages.AIMessage(msg.content);
         if (msg.role === "system") return new import_messages.SystemMessage(msg.content);
+        if (msg.role === "tool") {
+          return new import_messages.ToolMessage({
+            content: msg.content,
+            tool_call_id: msg.tool_call_id,
+            name: msg.name
+          });
+        }
         return new import_messages.HumanMessage(msg.content);
       })
     ];
@@ -379,7 +387,7 @@ ${scratchpadText}`));
       thoughts: thought ? [{ content: thought, timestamp: Date.now() }] : [],
       actions: toolCalls,
       iteration: 1,
-      // Increment iteration
+      // Add 1 to iteration counter (uses additive reducer)
       shouldContinue,
       response: toolCalls.length === 0 ? thought : void 0
       // Final response if no tool calls
@@ -509,7 +517,7 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
     };
   };
 }
-function createObservationNode(verbose = false) {
+function createObservationNode(verbose = false, returnIntermediateSteps = false) {
   return async (state) => {
     const observations = state.observations || [];
     const thoughts = state.thoughts || [];
@@ -520,37 +528,36 @@ function createObservationNode(verbose = false) {
       iteration
     });
     const recentObservations = observations.slice(-10);
-    const currentStep = state.iteration;
-    const latestThought = thoughts[thoughts.length - 1]?.content || "";
     const latestActions = actions.slice(-10);
-    const latestObservations = recentObservations;
-    const scratchpadEntry = {
-      step: currentStep,
-      thought: latestThought,
+    const observationMessages = recentObservations.map((obs) => {
+      const content = obs.error ? `Error: ${obs.error}` : typeof obs.result === "string" ? obs.result : JSON.stringify(obs.result, null, 2);
+      return {
+        role: "tool",
+        content,
+        name: latestActions.find((a) => a.id === obs.toolCallId)?.name,
+        tool_call_id: obs.toolCallId
+        // Include tool_call_id for proper ToolMessage construction
+      };
+    });
+    const scratchpadEntries = returnIntermediateSteps ? [{
+      step: state.iteration,
+      thought: thoughts[thoughts.length - 1]?.content || "",
       action: latestActions.map((a) => `${a.name}(${JSON.stringify(a.arguments)})`).join(", "),
-      observation: latestObservations.map((obs) => {
+      observation: recentObservations.map((obs) => {
         if (obs.error) {
           return `Error: ${obs.error}`;
         }
         return typeof obs.result === "string" ? obs.result : JSON.stringify(obs.result);
       }).join("; "),
       timestamp: Date.now()
-    };
-    const observationMessages = latestObservations.map((obs) => {
-      const content = obs.error ? `Error: ${obs.error}` : typeof obs.result === "string" ? obs.result : JSON.stringify(obs.result, null, 2);
-      return {
-        role: "tool",
-        content,
-        name: latestActions.find((a) => a.id === obs.toolCallId)?.name
-      };
-    });
+    }] : [];
     observationLogger.debug("Observation node complete", {
       iteration,
-      scratchpadUpdated: true,
+      scratchpadUpdated: returnIntermediateSteps,
       messageCount: observationMessages.length
     });
     return {
-      scratchpad: [scratchpadEntry],
+      scratchpad: scratchpadEntries,
       messages: observationMessages
     };
   };
@@ -587,7 +594,7 @@ function createReActAgent(config, options) {
     verbose
   );
   const actionNode = createActionNode(toolArray, verbose, enableDeduplication);
-  const observationNode = createObservationNode(verbose);
+  const observationNode = createObservationNode(verbose, returnIntermediateSteps);
   const shouldContinue = (state) => {
     if (stopCondition && stopCondition(state)) {
       return import_langgraph.END;
@@ -2615,7 +2622,8 @@ function createSupervisorNode(config) {
         activeAssignments: assignments,
         // Multiple assignments for parallel execution!
         messages,
-        iteration: state.iteration + 1
+        // Add 1 to iteration counter (uses additive reducer)
+        iteration: 1
       };
     } catch (error) {
       logger2.error("Supervisor node error", {

package/dist/index.d.cts

@@ -16,21 +16,28 @@ import { ToolRegistry, Tool, LogLevel } from '@agentforge/core';
 
 /**
  * Base message schema
+ *
+ * Note: tool_call_id is required for messages with role='tool' to properly
+ * construct ToolMessage instances in LangChain. It links tool results back
+ * to their corresponding tool calls.
  */
 declare const MessageSchema: z.ZodObject<{
     role: z.ZodEnum<["system", "user", "assistant", "tool"]>;
     content: z.ZodString;
     name: z.ZodOptional<z.ZodString>;
+    tool_call_id: z.ZodOptional<z.ZodString>;
     metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
 }, "strip", z.ZodTypeAny, {
     role: "system" | "user" | "assistant" | "tool";
     content: string;
     name?: string | undefined;
+    tool_call_id?: string | undefined;
     metadata?: Record<string, any> | undefined;
 }, {
     role: "system" | "user" | "assistant" | "tool";
     content: string;
     name?: string | undefined;
+    tool_call_id?: string | undefined;
     metadata?: Record<string, any> | undefined;
 }>;
 type Message = z.infer<typeof MessageSchema>;
@@ -2817,6 +2824,14 @@ declare function createWorkerNode(config: WorkerConfig): (state: MultiAgentState
  */
 declare function createAggregatorNode(config?: AggregatorConfig): (state: MultiAgentStateType) => Promise<Partial<MultiAgentStateType>>;
 
+/**
+ * Multi-Agent System Factory
+ *
+ * This module provides the main factory function for creating multi-agent systems.
+ *
+ * @module patterns/multi-agent/agent
+ */
+
 /**
  * Create a multi-agent coordination system
  *
@@ -2901,11 +2916,7 @@ declare function createAggregatorNode(config?: AggregatorConfig): (state: MultiA
  * );
  * ```
  */
-declare function createMultiAgentSystem(config: MultiAgentSystemConfig): CompiledStateGraph<{
-    [x: string]: unknown;
-}, {
-    [x: string]: unknown;
-}, "__start__", _langchain_langgraph.StateDefinition, _langchain_langgraph.StateDefinition, _langchain_langgraph.StateDefinition, unknown, unknown, unknown>;
+declare function createMultiAgentSystem(config: MultiAgentSystemConfig): MultiAgentSystemWithRegistry;
 /**
  * Multi-agent system builder for dynamic worker registration
  *
@@ -2956,16 +2967,12 @@ declare class MultiAgentSystemBuilder {
      *
      * @returns Compiled LangGraph workflow
      */
-    build(): CompiledStateGraph<{
-        [x: string]: unknown;
-    }, {
-        [x: string]: unknown;
-    }, "__start__", _langchain_langgraph.StateDefinition, _langchain_langgraph.StateDefinition, _langchain_langgraph.StateDefinition, unknown, unknown, unknown>;
+    build(): MultiAgentSystemWithRegistry;
 }
 /**
  * Extended multi-agent system with worker registration support
  */
-interface MultiAgentSystemWithRegistry extends CompiledStateGraph<MultiAgentStateType, Partial<MultiAgentStateType>, '__start__' | 'supervisor' | 'aggregator' | string> {
+interface MultiAgentSystemWithRegistry extends CompiledStateGraph<any, any, any> {
     _workerRegistry?: Record<string, WorkerCapabilities>;
     _originalInvoke?: typeof CompiledStateGraph.prototype.invoke;
     _originalStream?: typeof CompiledStateGraph.prototype.stream;

package/dist/index.d.ts

@@ -16,21 +16,28 @@ import { ToolRegistry, Tool, LogLevel } from '@agentforge/core';
 
 /**
  * Base message schema
+ *
+ * Note: tool_call_id is required for messages with role='tool' to properly
+ * construct ToolMessage instances in LangChain. It links tool results back
+ * to their corresponding tool calls.
  */
 declare const MessageSchema: z.ZodObject<{
     role: z.ZodEnum<["system", "user", "assistant", "tool"]>;
     content: z.ZodString;
     name: z.ZodOptional<z.ZodString>;
+    tool_call_id: z.ZodOptional<z.ZodString>;
     metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
 }, "strip", z.ZodTypeAny, {
     role: "system" | "user" | "assistant" | "tool";
     content: string;
     name?: string | undefined;
+    tool_call_id?: string | undefined;
     metadata?: Record<string, any> | undefined;
 }, {
     role: "system" | "user" | "assistant" | "tool";
     content: string;
     name?: string | undefined;
+    tool_call_id?: string | undefined;
     metadata?: Record<string, any> | undefined;
 }>;
 type Message = z.infer<typeof MessageSchema>;
@@ -2817,6 +2824,14 @@ declare function createWorkerNode(config: WorkerConfig): (state: MultiAgentState
  */
 declare function createAggregatorNode(config?: AggregatorConfig): (state: MultiAgentStateType) => Promise<Partial<MultiAgentStateType>>;
 
+/**
+ * Multi-Agent System Factory
+ *
+ * This module provides the main factory function for creating multi-agent systems.
+ *
+ * @module patterns/multi-agent/agent
+ */
+
 /**
  * Create a multi-agent coordination system
  *
@@ -2901,11 +2916,7 @@ declare function createAggregatorNode(config?: AggregatorConfig): (state: MultiA
  * );
  * ```
  */
-declare function createMultiAgentSystem(config: MultiAgentSystemConfig): CompiledStateGraph<{
-    [x: string]: unknown;
-}, {
-    [x: string]: unknown;
-}, "__start__", _langchain_langgraph.StateDefinition, _langchain_langgraph.StateDefinition, _langchain_langgraph.StateDefinition, unknown, unknown, unknown>;
+declare function createMultiAgentSystem(config: MultiAgentSystemConfig): MultiAgentSystemWithRegistry;
 /**
  * Multi-agent system builder for dynamic worker registration
  *
@@ -2956,16 +2967,12 @@ declare class MultiAgentSystemBuilder {
      *
      * @returns Compiled LangGraph workflow
      */
-    build(): CompiledStateGraph<{
-        [x: string]: unknown;
-    }, {
-        [x: string]: unknown;
-    }, "__start__", _langchain_langgraph.StateDefinition, _langchain_langgraph.StateDefinition, _langchain_langgraph.StateDefinition, unknown, unknown, unknown>;
+    build(): MultiAgentSystemWithRegistry;
 }
 /**
  * Extended multi-agent system with worker registration support
  */
-interface MultiAgentSystemWithRegistry extends CompiledStateGraph<MultiAgentStateType, Partial<MultiAgentStateType>, '__start__' | 'supervisor' | 'aggregator' | string> {
+interface MultiAgentSystemWithRegistry extends CompiledStateGraph<any, any, any> {
     _workerRegistry?: Record<string, WorkerCapabilities>;
     _originalInvoke?: typeof CompiledStateGraph.prototype.invoke;
     _originalStream?: typeof CompiledStateGraph.prototype.stream;

package/dist/index.js

@@ -5,6 +5,7 @@ var MessageSchema = z.object({
   role: MessageRoleSchema,
   content: z.string(),
   name: z.string().optional(),
+  tool_call_id: z.string().optional(),
   metadata: z.record(z.any()).optional()
 });
 var ThoughtSchema = z.object({
@@ -170,7 +171,7 @@ function formatScratchpad(scratchpad) {
 }
 
 // src/react/nodes.ts
-import { HumanMessage, AIMessage, SystemMessage } from "@langchain/core/messages";
+import { HumanMessage, AIMessage, SystemMessage, ToolMessage } from "@langchain/core/messages";
 import { toLangChainTools } from "@agentforge/core";
 
 // src/shared/deduplication.ts
@@ -240,6 +241,13 @@ function createReasoningNode(llm, tools, systemPrompt, maxIterations, verbose =
         if (msg.role === "user") return new HumanMessage(msg.content);
         if (msg.role === "assistant") return new AIMessage(msg.content);
         if (msg.role === "system") return new SystemMessage(msg.content);
+        if (msg.role === "tool") {
+          return new ToolMessage({
+            content: msg.content,
+            tool_call_id: msg.tool_call_id,
+            name: msg.name
+          });
+        }
         return new HumanMessage(msg.content);
       })
     ];
@@ -276,7 +284,7 @@ ${scratchpadText}`));
       thoughts: thought ? [{ content: thought, timestamp: Date.now() }] : [],
       actions: toolCalls,
       iteration: 1,
-      // Increment iteration
+      // Add 1 to iteration counter (uses additive reducer)
       shouldContinue,
       response: toolCalls.length === 0 ? thought : void 0
       // Final response if no tool calls
@@ -406,7 +414,7 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
     };
   };
 }
-function createObservationNode(verbose = false) {
+function createObservationNode(verbose = false, returnIntermediateSteps = false) {
   return async (state) => {
     const observations = state.observations || [];
     const thoughts = state.thoughts || [];
@@ -417,37 +425,36 @@ function createObservationNode(verbose = false) {
       iteration
     });
     const recentObservations = observations.slice(-10);
-    const currentStep = state.iteration;
-    const latestThought = thoughts[thoughts.length - 1]?.content || "";
     const latestActions = actions.slice(-10);
-    const latestObservations = recentObservations;
-    const scratchpadEntry = {
-      step: currentStep,
-      thought: latestThought,
+    const observationMessages = recentObservations.map((obs) => {
+      const content = obs.error ? `Error: ${obs.error}` : typeof obs.result === "string" ? obs.result : JSON.stringify(obs.result, null, 2);
+      return {
+        role: "tool",
+        content,
+        name: latestActions.find((a) => a.id === obs.toolCallId)?.name,
+        tool_call_id: obs.toolCallId
+        // Include tool_call_id for proper ToolMessage construction
+      };
+    });
+    const scratchpadEntries = returnIntermediateSteps ? [{
+      step: state.iteration,
+      thought: thoughts[thoughts.length - 1]?.content || "",
       action: latestActions.map((a) => `${a.name}(${JSON.stringify(a.arguments)})`).join(", "),
-      observation: latestObservations.map((obs) => {
+      observation: recentObservations.map((obs) => {
         if (obs.error) {
           return `Error: ${obs.error}`;
         }
         return typeof obs.result === "string" ? obs.result : JSON.stringify(obs.result);
       }).join("; "),
       timestamp: Date.now()
-    };
-    const observationMessages = latestObservations.map((obs) => {
-      const content = obs.error ? `Error: ${obs.error}` : typeof obs.result === "string" ? obs.result : JSON.stringify(obs.result, null, 2);
-      return {
-        role: "tool",
-        content,
-        name: latestActions.find((a) => a.id === obs.toolCallId)?.name
-      };
-    });
+    }] : [];
     observationLogger.debug("Observation node complete", {
       iteration,
-      scratchpadUpdated: true,
+      scratchpadUpdated: returnIntermediateSteps,
       messageCount: observationMessages.length
     });
     return {
-      scratchpad: [scratchpadEntry],
+      scratchpad: scratchpadEntries,
       messages: observationMessages
     };
   };
@@ -484,7 +491,7 @@ function createReActAgent(config, options) {
     verbose
   );
   const actionNode = createActionNode(toolArray, verbose, enableDeduplication);
-  const observationNode = createObservationNode(verbose);
+  const observationNode = createObservationNode(verbose, returnIntermediateSteps);
   const shouldContinue = (state) => {
     if (stopCondition && stopCondition(state)) {
       return END;
@@ -2512,7 +2519,8 @@ function createSupervisorNode(config) {
         activeAssignments: assignments,
         // Multiple assignments for parallel execution!
         messages,
-        iteration: state.iteration + 1
+        // Add 1 to iteration counter (uses additive reducer)
+        iteration: 1
       };
     } catch (error) {
       logger2.error("Supervisor node error", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentforge/patterns",
-  "version": "0.10.5",
+  "version": "0.10.7",
   "description": "Agent patterns (ReAct, Planner-Executor) for AgentForge framework",
   "type": "module",
   "main": "./dist/index.cjs",