@agentforge/patterns 0.15.9 → 0.15.10

package/dist/index.cjs

@@ -343,54 +343,101 @@ function handleNodeError(error, context, verbose = false) {
 var reasoningLogger = createPatternLogger("agentforge:patterns:react:reasoning");
 var actionLogger = createPatternLogger("agentforge:patterns:react:action");
 var observationLogger = createPatternLogger("agentforge:patterns:react:observation");
+function normalizeConversationMessage(message) {
+  switch (message.role) {
+    case "user":
+      return new import_messages.HumanMessage(message.content);
+    case "assistant":
+      return new import_messages.AIMessage(message.content);
+    case "system":
+      return new import_messages.SystemMessage(message.content);
+    case "tool":
+      if (!message.tool_call_id) {
+        reasoningLogger.warn(
+          "Tool message missing tool_call_id; falling back to human message",
+          message.name ? { name: message.name } : void 0
+        );
+        return new import_messages.HumanMessage(message.content);
+      }
+      return new import_messages.ToolMessage({
+        content: message.content,
+        tool_call_id: message.tool_call_id,
+        name: message.name
+      });
+    default:
+      return new import_messages.HumanMessage(message.content);
+  }
+}
+function buildReasoningMessages(systemPrompt, stateMessages, scratchpad) {
+  const messages = [
+    new import_messages.SystemMessage(systemPrompt),
+    ...stateMessages.map(normalizeConversationMessage)
+  ];
+  if (scratchpad.length > 0) {
+    messages.push(new import_messages.SystemMessage(`Previous steps:
+${formatScratchpad(scratchpad)}`));
+  }
+  return messages;
+}
+function extractToolCalls(response) {
+  if (!response.tool_calls || response.tool_calls.length === 0) {
+    return [];
+  }
+  return response.tool_calls.map((toolCall) => ({
+    id: toolCall.id || `call_${Date.now()}_${Math.random()}`,
+    name: toolCall.name,
+    arguments: toolCall.args ?? {},
+    timestamp: Date.now()
+  }));
+}
+function formatObservationContent(observation) {
+  if (observation.error) {
+    return `Error: ${observation.error}`;
+  }
+  return stringifyObservationResult(observation.result, 2);
+}
+function formatActionSummary(actions) {
+  return actions.map((action) => `${action.name}(${JSON.stringify(action.arguments)})`).join(", ");
+}
+function formatObservationSummary(observations) {
+  return observations.map((observation) => {
+    if (observation.error) {
+      return `Error: ${observation.error}`;
+    }
+    return stringifyObservationResult(observation.result);
+  }).join("; ");
+}
+function stringifyObservationResult(result, space) {
+  if (typeof result === "string") {
+    return result;
+  }
+  const stringified = JSON.stringify(result, null, space);
+  return stringified ?? String(result);
+}
+function getLatestThought(thoughts) {
+  return thoughts[thoughts.length - 1]?.content ?? "";
+}
+function debugIfVerbose(logger4, verbose, message, data) {
+  if (verbose) {
+    logger4.debug(message, data);
+  }
+}
 function createReasoningNode(llm, tools, systemPrompt, maxIterations, verbose = false) {
   const langchainTools = (0, import_core3.toLangChainTools)(tools);
   const llmWithTools = llm.bindTools ? llm.bindTools(langchainTools) : llm;
   return async (state) => {
     const currentIteration = state.iteration || 0;
     const startTime = Date.now();
-    reasoningLogger.debug("Reasoning iteration started", {
+    debugIfVerbose(reasoningLogger, verbose, "Reasoning iteration started", {
       iteration: currentIteration + 1,
       maxIterations,
-      observationCount: state.observations?.length || 0,
-      hasActions: !!state.actions?.length
+      observationCount: state.observations.length,
+      hasActions: state.actions.length > 0
     });
-    const stateMessages = state.messages || [];
-    const messages = [
-      new import_messages.SystemMessage(systemPrompt),
-      ...stateMessages.map((msg) => {
-        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);
-      })
-    ];
-    const scratchpad = state.scratchpad || [];
-    if (scratchpad.length > 0) {
-      const scratchpadText = formatScratchpad(scratchpad);
-      messages.push(new import_messages.SystemMessage(`Previous steps:
-${scratchpadText}`));
-    }
+    const messages = buildReasoningMessages(systemPrompt, state.messages, state.scratchpad);
     const response = await llmWithTools.invoke(messages);
     const thought = typeof response.content === "string" ? response.content : "";
-    const toolCalls = [];
-    if (response.tool_calls && response.tool_calls.length > 0) {
-      for (const toolCall of response.tool_calls) {
-        toolCalls.push({
-          id: toolCall.id || `call_${Date.now()}_${Math.random()}`,
-          name: toolCall.name,
-          arguments: toolCall.args || {},
-          timestamp: Date.now()
-        });
-      }
-    }
+    const toolCalls = extractToolCalls(response);
     const shouldContinue = toolCalls.length > 0 && currentIteration + 1 < maxIterations;
     reasoningLogger.info("Reasoning complete", {
       iteration: currentIteration + 1,
@@ -415,11 +462,11 @@ ${scratchpadText}`));
 function createActionNode(tools, verbose = false, enableDeduplication = true) {
   const toolMap = new Map(tools.map((tool) => [tool.metadata.name, tool]));
   return async (state) => {
-    const actions = state.actions || [];
-    const allObservations = state.observations || [];
+    const actions = state.actions;
+    const allObservations = state.observations;
     const iteration = state.iteration || 0;
     const startTime = Date.now();
-    actionLogger.debug("Action node started", {
+    debugIfVerbose(actionLogger, verbose, "Action node started", {
       actionCount: actions.length,
       iteration,
       cacheEnabled: enableDeduplication
@@ -438,7 +485,7 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
         }
       }
       if (cacheSize > 0) {
-        actionLogger.debug("Deduplication cache built", {
+        debugIfVerbose(actionLogger, verbose, "Deduplication cache built", {
           cacheSize,
           totalObservations: allObservations.length
         });
@@ -449,7 +496,7 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
     for (const action of recentActions) {
       const existingObservation = allObservations.find((obs) => obs.toolCallId === action.id);
       if (existingObservation) {
-        actionLogger.debug("Skipping already-processed action", {
+        debugIfVerbose(actionLogger, verbose, "Skipping already-processed action", {
           toolName: action.name,
           toolCallId: action.id,
           iteration
@@ -492,7 +539,7 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
         const result = await tool.invoke(action.arguments);
         const executionTime = Date.now() - startTime2;
         toolsExecuted++;
-        actionLogger.debug("Tool executed successfully", {
+        debugIfVerbose(actionLogger, verbose, "Tool executed successfully", {
           toolName: action.name,
           executionTime,
           iteration
@@ -508,7 +555,7 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
           executionCache.set(cacheKey, observation);
         }
       } catch (error) {
-        const errorMessage = handleNodeError(error, `action:${action.name}`, false);
+        const errorMessage = handleNodeError(error, `action:${action.name}`, verbose);
         actionLogger.error("Tool execution failed", {
           toolName: action.name,
           error: errorMessage,
@@ -537,39 +584,31 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
 }
 function createObservationNode(verbose = false, returnIntermediateSteps = false) {
   return async (state) => {
-    const observations = state.observations || [];
-    const thoughts = state.thoughts || [];
-    const actions = state.actions || [];
+    const observations = state.observations;
+    const thoughts = state.thoughts;
+    const actions = state.actions;
     const iteration = state.iteration || 0;
-    observationLogger.debug("Processing observations", {
+    debugIfVerbose(observationLogger, verbose, "Processing observations", {
       observationCount: observations.length,
       iteration
     });
     const recentObservations = observations.slice(-10);
     const latestActions = actions.slice(-10);
-    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 actionNamesById = new Map(latestActions.map((action) => [action.id, action.name]));
+    const observationMessages = recentObservations.map((observation) => ({
+      role: "tool",
+      content: formatObservationContent(observation),
+      name: actionNamesById.get(observation.toolCallId),
+      tool_call_id: observation.toolCallId
+    }));
     const scratchpadEntries = returnIntermediateSteps ? [{
       step: state.iteration,
-      thought: thoughts[thoughts.length - 1]?.content || "",
-      action: latestActions.map((a) => `${a.name}(${JSON.stringify(a.arguments)})`).join(", "),
-      observation: recentObservations.map((obs) => {
-        if (obs.error) {
-          return `Error: ${obs.error}`;
-        }
-        return typeof obs.result === "string" ? obs.result : JSON.stringify(obs.result);
-      }).join("; "),
+      thought: getLatestThought(thoughts),
+      action: formatActionSummary(latestActions),
+      observation: formatObservationSummary(recentObservations),
       timestamp: Date.now()
     }] : [];
-    observationLogger.debug("Observation node complete", {
+    debugIfVerbose(observationLogger, verbose, "Observation node complete", {
       iteration,
       scratchpadUpdated: returnIntermediateSteps,
       messageCount: observationMessages.length

package/dist/index.js

@@ -171,7 +171,12 @@ function formatScratchpad(scratchpad) {
 }
 
 // src/react/nodes.ts
-import { HumanMessage, AIMessage, SystemMessage, ToolMessage } from "@langchain/core/messages";
+import {
+  HumanMessage,
+  AIMessage,
+  SystemMessage,
+  ToolMessage
+} from "@langchain/core/messages";
 import { toLangChainTools } from "@agentforge/core";
 
 // src/shared/deduplication.ts
@@ -240,54 +245,101 @@ function handleNodeError(error, context, verbose = false) {
 var reasoningLogger = createPatternLogger("agentforge:patterns:react:reasoning");
 var actionLogger = createPatternLogger("agentforge:patterns:react:action");
 var observationLogger = createPatternLogger("agentforge:patterns:react:observation");
+function normalizeConversationMessage(message) {
+  switch (message.role) {
+    case "user":
+      return new HumanMessage(message.content);
+    case "assistant":
+      return new AIMessage(message.content);
+    case "system":
+      return new SystemMessage(message.content);
+    case "tool":
+      if (!message.tool_call_id) {
+        reasoningLogger.warn(
+          "Tool message missing tool_call_id; falling back to human message",
+          message.name ? { name: message.name } : void 0
+        );
+        return new HumanMessage(message.content);
+      }
+      return new ToolMessage({
+        content: message.content,
+        tool_call_id: message.tool_call_id,
+        name: message.name
+      });
+    default:
+      return new HumanMessage(message.content);
+  }
+}
+function buildReasoningMessages(systemPrompt, stateMessages, scratchpad) {
+  const messages = [
+    new SystemMessage(systemPrompt),
+    ...stateMessages.map(normalizeConversationMessage)
+  ];
+  if (scratchpad.length > 0) {
+    messages.push(new SystemMessage(`Previous steps:
+${formatScratchpad(scratchpad)}`));
+  }
+  return messages;
+}
+function extractToolCalls(response) {
+  if (!response.tool_calls || response.tool_calls.length === 0) {
+    return [];
+  }
+  return response.tool_calls.map((toolCall) => ({
+    id: toolCall.id || `call_${Date.now()}_${Math.random()}`,
+    name: toolCall.name,
+    arguments: toolCall.args ?? {},
+    timestamp: Date.now()
+  }));
+}
+function formatObservationContent(observation) {
+  if (observation.error) {
+    return `Error: ${observation.error}`;
+  }
+  return stringifyObservationResult(observation.result, 2);
+}
+function formatActionSummary(actions) {
+  return actions.map((action) => `${action.name}(${JSON.stringify(action.arguments)})`).join(", ");
+}
+function formatObservationSummary(observations) {
+  return observations.map((observation) => {
+    if (observation.error) {
+      return `Error: ${observation.error}`;
+    }
+    return stringifyObservationResult(observation.result);
+  }).join("; ");
+}
+function stringifyObservationResult(result, space) {
+  if (typeof result === "string") {
+    return result;
+  }
+  const stringified = JSON.stringify(result, null, space);
+  return stringified ?? String(result);
+}
+function getLatestThought(thoughts) {
+  return thoughts[thoughts.length - 1]?.content ?? "";
+}
+function debugIfVerbose(logger4, verbose, message, data) {
+  if (verbose) {
+    logger4.debug(message, data);
+  }
+}
 function createReasoningNode(llm, tools, systemPrompt, maxIterations, verbose = false) {
   const langchainTools = toLangChainTools(tools);
   const llmWithTools = llm.bindTools ? llm.bindTools(langchainTools) : llm;
   return async (state) => {
     const currentIteration = state.iteration || 0;
     const startTime = Date.now();
-    reasoningLogger.debug("Reasoning iteration started", {
+    debugIfVerbose(reasoningLogger, verbose, "Reasoning iteration started", {
       iteration: currentIteration + 1,
       maxIterations,
-      observationCount: state.observations?.length || 0,
-      hasActions: !!state.actions?.length
+      observationCount: state.observations.length,
+      hasActions: state.actions.length > 0
     });
-    const stateMessages = state.messages || [];
-    const messages = [
-      new SystemMessage(systemPrompt),
-      ...stateMessages.map((msg) => {
-        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);
-      })
-    ];
-    const scratchpad = state.scratchpad || [];
-    if (scratchpad.length > 0) {
-      const scratchpadText = formatScratchpad(scratchpad);
-      messages.push(new SystemMessage(`Previous steps:
-${scratchpadText}`));
-    }
+    const messages = buildReasoningMessages(systemPrompt, state.messages, state.scratchpad);
     const response = await llmWithTools.invoke(messages);
     const thought = typeof response.content === "string" ? response.content : "";
-    const toolCalls = [];
-    if (response.tool_calls && response.tool_calls.length > 0) {
-      for (const toolCall of response.tool_calls) {
-        toolCalls.push({
-          id: toolCall.id || `call_${Date.now()}_${Math.random()}`,
-          name: toolCall.name,
-          arguments: toolCall.args || {},
-          timestamp: Date.now()
-        });
-      }
-    }
+    const toolCalls = extractToolCalls(response);
     const shouldContinue = toolCalls.length > 0 && currentIteration + 1 < maxIterations;
     reasoningLogger.info("Reasoning complete", {
       iteration: currentIteration + 1,
@@ -312,11 +364,11 @@ ${scratchpadText}`));
 function createActionNode(tools, verbose = false, enableDeduplication = true) {
   const toolMap = new Map(tools.map((tool) => [tool.metadata.name, tool]));
   return async (state) => {
-    const actions = state.actions || [];
-    const allObservations = state.observations || [];
+    const actions = state.actions;
+    const allObservations = state.observations;
     const iteration = state.iteration || 0;
     const startTime = Date.now();
-    actionLogger.debug("Action node started", {
+    debugIfVerbose(actionLogger, verbose, "Action node started", {
       actionCount: actions.length,
       iteration,
       cacheEnabled: enableDeduplication
@@ -335,7 +387,7 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
         }
       }
       if (cacheSize > 0) {
-        actionLogger.debug("Deduplication cache built", {
+        debugIfVerbose(actionLogger, verbose, "Deduplication cache built", {
           cacheSize,
           totalObservations: allObservations.length
         });
@@ -346,7 +398,7 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
     for (const action of recentActions) {
       const existingObservation = allObservations.find((obs) => obs.toolCallId === action.id);
       if (existingObservation) {
-        actionLogger.debug("Skipping already-processed action", {
+        debugIfVerbose(actionLogger, verbose, "Skipping already-processed action", {
           toolName: action.name,
           toolCallId: action.id,
           iteration
@@ -389,7 +441,7 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
         const result = await tool.invoke(action.arguments);
         const executionTime = Date.now() - startTime2;
         toolsExecuted++;
-        actionLogger.debug("Tool executed successfully", {
+        debugIfVerbose(actionLogger, verbose, "Tool executed successfully", {
           toolName: action.name,
           executionTime,
           iteration
@@ -405,7 +457,7 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
           executionCache.set(cacheKey, observation);
         }
       } catch (error) {
-        const errorMessage = handleNodeError(error, `action:${action.name}`, false);
+        const errorMessage = handleNodeError(error, `action:${action.name}`, verbose);
         actionLogger.error("Tool execution failed", {
           toolName: action.name,
           error: errorMessage,
@@ -434,39 +486,31 @@ function createActionNode(tools, verbose = false, enableDeduplication = true) {
 }
 function createObservationNode(verbose = false, returnIntermediateSteps = false) {
   return async (state) => {
-    const observations = state.observations || [];
-    const thoughts = state.thoughts || [];
-    const actions = state.actions || [];
+    const observations = state.observations;
+    const thoughts = state.thoughts;
+    const actions = state.actions;
     const iteration = state.iteration || 0;
-    observationLogger.debug("Processing observations", {
+    debugIfVerbose(observationLogger, verbose, "Processing observations", {
       observationCount: observations.length,
       iteration
     });
     const recentObservations = observations.slice(-10);
     const latestActions = actions.slice(-10);
-    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 actionNamesById = new Map(latestActions.map((action) => [action.id, action.name]));
+    const observationMessages = recentObservations.map((observation) => ({
+      role: "tool",
+      content: formatObservationContent(observation),
+      name: actionNamesById.get(observation.toolCallId),
+      tool_call_id: observation.toolCallId
+    }));
     const scratchpadEntries = returnIntermediateSteps ? [{
       step: state.iteration,
-      thought: thoughts[thoughts.length - 1]?.content || "",
-      action: latestActions.map((a) => `${a.name}(${JSON.stringify(a.arguments)})`).join(", "),
-      observation: recentObservations.map((obs) => {
-        if (obs.error) {
-          return `Error: ${obs.error}`;
-        }
-        return typeof obs.result === "string" ? obs.result : JSON.stringify(obs.result);
-      }).join("; "),
+      thought: getLatestThought(thoughts),
+      action: formatActionSummary(latestActions),
+      observation: formatObservationSummary(recentObservations),
       timestamp: Date.now()
     }] : [];
-    observationLogger.debug("Observation node complete", {
+    debugIfVerbose(observationLogger, verbose, "Observation node complete", {
       iteration,
       scratchpadUpdated: returnIntermediateSteps,
       messageCount: observationMessages.length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentforge/patterns",
-  "version": "0.15.9",
+  "version": "0.15.10",
   "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.15.9",
+    "@agentforge/core": "0.15.10",
     "@langchain/core": "^1.1.17",
     "@langchain/langgraph": "^1.1.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@agentforge/testing": "0.15.9",
+    "@agentforge/testing": "0.15.10",
     "@eslint/js": "^9.17.0",
     "@types/node": "^22.10.2",
     "eslint": "^9.17.0",