@minded-ai/mindedjs 3.1.43 → 3.1.44

package/dist/utils/schemaUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemaUtils.js","sourceRoot":"","sources":["../../src/utils/schemaUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schemaUtils.js","sourceRoot":"","sources":["../../src/utils/schemaUtils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minded-ai/mindedjs",
-  "version": "3.1.43",
+  "version": "3.1.44",
   "description": "MindedJS is a TypeScript library for building agents.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli/cliUtils.ts

@@ -4,12 +4,19 @@ import * as path from 'path';
 import { Agent } from '../agent';
 
 /**
- * Registers TypeScript loader (tsx or ts-node) to enable requiring .ts files
+ * Registers TypeScript loader (tsx or ts-node) to enable requiring .ts files.
+ * Resolves loaders from the agent's project directory so that devDependencies
+ * installed there (not in mindedjs itself) are found correctly.
  */
-export function registerTypeScriptLoader(): void {
-  // Try tsx first (faster), then fall back to ts-node
+export function registerTypeScriptLoader(projectDir: string): void {
   const loaders = [
-    { name: 'tsx', register: () => require('tsx/cjs') },
+    {
+      name: 'tsx',
+      register: () => {
+        const tsxPath = require.resolve('tsx/cjs', { paths: [projectDir] });
+        require(tsxPath);
+      },
+    },
   ];
 
   for (const loader of loaders) {
@@ -44,7 +51,7 @@ export function loadAgentFromConfig(projectDir: string, agentFilePath: string):
   }
 
   // Register TypeScript loader before requiring .ts files
-  registerTypeScriptLoader();
+  registerTypeScriptLoader(projectDir);
 
   // Clear require cache to ensure fresh load
   const resolvedPath = require.resolve(modulePath);

package/src/nodes/addAppToolNode.ts

@@ -1,7 +1,7 @@
 import { AppToolNode, AppToolNodeMindedMetadata, NodeType } from '../types/Flows.types';
 import { tool as langchainTool } from '@langchain/core/tools';
 import { PreCompiledGraph, stateAnnotation } from '../types/LangGraph.types';
-import { SystemMessage } from '@langchain/core/messages';
+import { AIMessage, SystemMessage } from '@langchain/core/messages';
 import { RunnableLike } from '@langchain/core/runnables';
 import { z } from 'zod';
 import { LLMProviders } from '../types/LLM.types';
@@ -15,6 +15,8 @@ import { compileParameter, compilePrompt } from './compilePrompt';
 import { ToolMessage } from '@langchain/core/messages';
 import { AnalyticsEventName } from '../types/Analytics.types';
 import { trackAnalyticsEvent } from '../internalTools/analytics';
+import { inferToolCallWithRetry } from './utils/inferToolCallWithRetry';
+import { getSchemaForToolInference } from './utils/getSchemaForToolInference';
 
 export const addAppToolNode = async ({
   graph,
@@ -82,6 +84,12 @@ export const addAppToolNode = async ({
         }
       }
     }
+    const overriddenKeys = Object.keys(compiledParameters);
+    const { schemaForLLM, skipLLMCall } = getSchemaForToolInference({
+      inputSchema: appRunnerTool.input,
+      overriddenKeys,
+      toolName: appRunnerTool.name,
+    });
 
     const executeWrapper = async (input: z.infer<typeof appRunnerTool.input>) => {
       try {
@@ -92,10 +100,15 @@ export const addAppToolNode = async ({
         throw err;
       }
     };
-    const tool = langchainTool(executeWrapper, {
+    const inferenceTool = langchainTool(() => ({}), {
+      name: appRunnerTool.name,
+      description: appRunnerTool.description,
+      schema: schemaForLLM as any,
+    });
+    const executionTool = langchainTool(executeWrapper, {
       name: appRunnerTool.name,
       description: appRunnerTool.description,
-      schema: appRunnerTool.input,
+      schema: appRunnerTool.input as any,
     });
 
     const combinedPlaybooks = combinePlaybooks(agent.playbooks) || '';
@@ -143,19 +156,52 @@ export const addAppToolNode = async ({
         ${compiledNodePrompt ? compiledNodePrompt : 'no instructions set by the user'}`;
 
     // const compiledPrompt = compilePrompt(message, { state: state, memory: state.memory, env: process.env });
-    const systemMessage = new SystemMessage(message);
-    if (state.messages.length === 0 || state.messages[0].getType() === 'system') {
-      state.messages[0] = systemMessage;
+    let AIToolCallMessage: AIMessage;
+    if (skipLLMCall) {
+      AIToolCallMessage = new AIMessage({
+        content: '',
+        tool_calls: [
+          {
+            name: appRunnerTool.name,
+            args: compiledParameters,
+            id: `call_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
+            type: 'tool_call',
+          },
+        ],
+      });
     } else {
-      state.messages.unshift(systemMessage);
+      const systemMessage = new SystemMessage(message);
+      if (state.messages.length === 0 || state.messages[0].getType() === 'system') {
+        state.messages[0] = systemMessage;
+      } else {
+        state.messages.unshift(systemMessage);
+      }
+
+      AIToolCallMessage = await inferToolCallWithRetry({
+        llm,
+        tool: inferenceTool,
+        inputSchema: appRunnerTool.input,
+        messages: state.messages,
+        sessionId: state.sessionId,
+        mergeArgs: (args) => ({
+          ...args,
+          ...compiledParameters, // user-set parameters have priority over AI-generated parameters
+        }),
+        onAfterAttempt: async () => {
+          await agent.interruptSessionManager.checkQueueAndInterrupt(state.sessionId);
+        },
+        toolNameForLogs: appRunnerTool.name,
+      });
+      if (!AIToolCallMessage.tool_calls || AIToolCallMessage.tool_calls.length === 0) {
+        throw new Error('No tool calls generated by LLM');
+      }
     }
 
-    const AIToolCallMessage = await llm.bindTools([tool], { tool_choice: tool.name }).invoke(state.messages);
-    AIToolCallMessage.tool_calls[0].args = {
-      ...AIToolCallMessage.tool_calls[0].args,
-      ...compiledParameters, //user set parameters have priority over ai generated parameters
-    };
-    const toolCallMessage = await tool.invoke(AIToolCallMessage.tool_calls[0]);
+    if (!AIToolCallMessage.tool_calls || AIToolCallMessage.tool_calls.length === 0) {
+      throw new Error('No tool calls generated by LLM');
+    }
+    const firstToolCall = AIToolCallMessage.tool_calls[0];
+    const toolCallMessage = await executionTool.invoke(firstToolCall);
     AIToolCallMessage.additional_kwargs = {
       mindedMetadata: {
         nodeType: NodeType.APP_TOOL,
@@ -190,11 +236,11 @@ export const addAppToolNode = async ({
         nodeId: node.name,
         nodeDisplayName: node.displayName!,
         raw: {
-          ...AIToolCallMessage.tool_calls[0],
+          ...firstToolCall,
           result: parsedContent,
         },
         appName: node.appName,
-        messageIds: [AIToolCallMessage.tool_calls[0].id],
+        messageIds: [firstToolCall.id!],
       }),
     );
     return state;

package/src/nodes/addBrowserTaskNode.ts

@@ -17,6 +17,7 @@ import { getConfig } from '../platform/config';
 import { createZodSchemaFromFields } from '../utils/schemaUtils';
 import { AnalyticsEventName } from '../types/Analytics.types';
 import { trackAnalyticsEvent } from '../internalTools/analytics';
+import { inferToolCallWithRetry } from './utils/inferToolCallWithRetry';
 
 type AddBrowserTaskNodeParams = {
   graph: PreCompiledGraph;
@@ -61,9 +62,18 @@ export const addBrowserTaskNode = async ({ graph, node, agent, llm }: AddBrowser
     }
 
     try {
-      // Use LLM to generate tool call
-      const AIToolCallMessage: AIMessage = await llm.bindTools([tool], { tool_choice: tool.name }).invoke(state.messages);
-      await agent.interruptSessionManager.checkQueueAndInterrupt(state.sessionId);
+      // Use LLM to generate tool call, with retry when inferred args are schema-invalid
+      const AIToolCallMessage: AIMessage = await inferToolCallWithRetry({
+        llm,
+        tool,
+        inputSchema: zodSchema as any,
+        messages: state.messages,
+        sessionId: state.sessionId,
+        onAfterAttempt: async () => {
+          await agent.interruptSessionManager.checkQueueAndInterrupt(state.sessionId);
+        },
+        toolNameForLogs: 'browser-task',
+      });
       if (!AIToolCallMessage.tool_calls || AIToolCallMessage.tool_calls.length === 0) {
         throw new Error('No tool calls generated by LLM');
       }

package/src/nodes/addToolNode.ts

@@ -13,7 +13,8 @@ import { combinePlaybooks } from '../playbooks/playbooks';
 import { compileParameter, compilePrompt } from './compilePrompt';
 import { AnalyticsEventName } from '../types/Analytics.types';
 import { trackAnalyticsEvent } from '../internalTools/analytics';
-import { z } from 'zod';
+import { inferToolCallWithRetry } from './utils/inferToolCallWithRetry';
+import { getSchemaForToolInference } from './utils/getSchemaForToolInference';
 
 export const addToolNode = async ({
   graph,
@@ -65,38 +66,14 @@ export const addToolNode = async ({
       }
     }
 
-    // Create a filtered schema for the LLM (exclude overridden parameters)
-    let schemaForLLM = matchedTool.input;
     const overriddenKeys = Object.keys(compiledParameters);
-    let skipLLMCall = false;
-
-    if (overriddenKeys.length > 0) {
-      try {
-        // Only filter if it's a ZodObject
-        if (matchedTool.input instanceof z.ZodObject) {
-          // Create omit map: { key1: true, key2: true, ... }
-          const omitMap = overriddenKeys.reduce((acc, key) => {
-            acc[key] = true;
-            return acc;
-          }, {} as Record<string, true>);
-
-          schemaForLLM = matchedTool.input.omit(omitMap);
-
-          // Check if all parameters are overridden
-          const remainingKeys = Object.keys(schemaForLLM.shape);
-          skipLLMCall = remainingKeys.length === 0;
-        }
-      } catch (err) {
-        logger.warn({
-          msg: '[Tool] Failed to filter schema, using original',
-          tool: matchedTool.name,
-          err,
-        });
-        // Fall back to original schema on error
-      }
-    }
+    const { schemaForLLM, skipLLMCall } = getSchemaForToolInference({
+      inputSchema: matchedTool.input,
+      overriddenKeys,
+      toolName: matchedTool.name,
+    });
 
-    let AIToolCallMessage: AIMessage;
+    let AIToolCallMessage: AIMessage = new AIMessage({ content: '', tool_calls: [] });
 
     if (skipLLMCall) {
       // All parameters are overridden - create synthetic tool call without LLM
@@ -112,10 +89,10 @@ export const addToolNode = async ({
       });
     } else {
       // Need LLM to infer remaining parameters
-      const tool = langchainTool(() => {}, {
+      const tool = langchainTool(() => { }, {
         name: matchedTool.name,
         description: matchedTool.description,
-        schema: schemaForLLM, // Use filtered schema
+        schema: schemaForLLM as any, // Use filtered schema
       });
 
       const combinedPlaybooks = combinePlaybooks(agent.playbooks) || '';
@@ -172,20 +149,21 @@ export const addToolNode = async ({
           state.messages.unshift(systemMessage);
         }
       }
-
-      const startTime = Date.now();
-      AIToolCallMessage = await llm.bindTools([tool], { tool_choice: tool.name }).invoke(state.messages);
-      const endTime = Date.now();
-      logger.debug({ msg: '[Tool] Model execution time', tool: matchedTool.name, executionTimeMs: endTime - startTime });
-      await agent.interruptSessionManager.checkQueueAndInterrupt(state.sessionId);
-
-      // Merge AI-generated parameters with user-set parameters
-      if (AIToolCallMessage.tool_calls && AIToolCallMessage.tool_calls.length > 0) {
-        AIToolCallMessage.tool_calls[0].args = {
-          ...AIToolCallMessage.tool_calls[0].args,
+      AIToolCallMessage = await inferToolCallWithRetry({
+        llm,
+        tool,
+        inputSchema: matchedTool.input,
+        messages: state.messages,
+        sessionId: state.sessionId,
+        mergeArgs: (args) => ({
+          ...args,
           ...compiledParameters, // User-set parameters have priority over AI-generated parameters
-        };
-      }
+        }),
+        onAfterAttempt: async () => {
+          await agent.interruptSessionManager.checkQueueAndInterrupt(state.sessionId);
+        },
+        toolNameForLogs: matchedTool.name,
+      });
     }
 
     state.goto = null;

package/src/nodes/addToolRunNode.ts

@@ -35,55 +35,50 @@ export const addToolRunNode = async ({ graph, tools, toolNode, attachedToNodeNam
     const { env, browserTaskMode } = getConfig();
 
     const executeWrapper = async (input: z.infer<typeof matchedTool.input>) => {
-      try {
-        const startTime = Date.now();
-
-        // Check if this is an RPA tool
-        if (matchedTool.type === 'rpa') {
-          // Wrap with browser session and screenshot capture
-          const { result, breakpointHit, breakpointInfo } = await withBrowserSession(
-            {
-              sessionId: state.sessionId,
-              browserTaskMode: matchedTool.browserTaskMode ?? browserTaskMode,
-              toolCallId: toolCallObj.tool_calls[0].id,
-              proxyConfig: matchedTool.proxyConfig,
-              toolName: matchedTool.name,
-              persistSession: matchedTool.persistSession,
-              checkBreakpoints: env === Environment.DEVELOPMENT,
-            },
-            async (page) => {
-              // Pass page directly to RPA tool execution
-              const toolResult = await matchedTool.execute({
-                input,
-                state,
-                agent,
-                page,
-              });
-
-              return toolResult;
-            },
-          );
-
-          const endTime = Date.now();
-          logger.debug({ msg: '[Tool] RPA tool execution time', tool: matchedTool.name, executionTimeMs: endTime - startTime });
-
-          // Check if breakpoint was hit - return special result
-          if (breakpointHit && breakpointInfo) {
-            return { breakpointHit: true, breakpointInfo } as unknown as ToolMessage;
-          }
-
-          return result as ToolMessage;
-        } else {
-          // Non-RPA tool - execute normally
-          const response = await matchedTool.execute({ input, state, agent });
-          const endTime = Date.now();
-          logger.debug({ msg: '[Tool] Tool execution time', tool: matchedTool.name, executionTimeMs: endTime - startTime });
-          return response as ToolMessage;
+      const startTime = Date.now();
+
+      // Check if this is an RPA tool
+      if (matchedTool.type === 'rpa') {
+        // Wrap with browser session and screenshot capture
+        const { result, breakpointHit, breakpointInfo } = await withBrowserSession(
+          {
+            sessionId: state.sessionId,
+            browserTaskMode: matchedTool.browserTaskMode ?? browserTaskMode,
+            toolCallId: toolCallObj.tool_calls[0].id,
+            proxyConfig: matchedTool.proxyConfig,
+            toolName: matchedTool.name,
+            persistSession: matchedTool.persistSession,
+            checkBreakpoints: env === Environment.DEVELOPMENT,
+          },
+          async (page) => {
+            // Pass page directly to RPA tool execution
+            const toolResult = await matchedTool.execute({
+              input,
+              state,
+              agent,
+              page,
+            });
+
+            return toolResult;
+          },
+        );
+
+        const endTime = Date.now();
+        logger.debug({ msg: '[Tool] RPA tool execution time', tool: matchedTool.name, executionTimeMs: endTime - startTime });
+
+        // Check if breakpoint was hit - return special result
+        if (breakpointHit && breakpointInfo) {
+          return { breakpointHit: true, breakpointInfo } as unknown as ToolMessage;
         }
-      } catch (err) {
-        logger.error({ message: '[Tool] Error executing tool', err, node: toolNode.displayName });
-        throw err;
+
+        return result as ToolMessage;
       }
+
+      // Non-RPA tool - execute normally
+      const response = await matchedTool.execute({ input, state, agent });
+      const endTime = Date.now();
+      logger.debug({ msg: '[Tool] Tool execution time', tool: matchedTool.name, executionTimeMs: endTime - startTime });
+      return response as ToolMessage;
     };
 
     const toolCallObj = state.messages[state.messages.length - 1] as any;
@@ -95,72 +90,94 @@ export const addToolRunNode = async ({ graph, tools, toolNode, attachedToNodeNam
     const toolCall = toolCallObj.tool_calls[0];
     const parsedArgs = matchedTool.input.parse(toolCall.args);
 
-    // Execute the tool with validated args
-    const result = await executeWrapper(parsedArgs);
-
-    // Check if breakpoint was hit - handle gracefully by ending the flow
-    const resultObj = result as unknown as { breakpointHit?: boolean; breakpointInfo?: BreakpointHitResult };
-    if (resultObj?.breakpointHit && resultObj?.breakpointInfo) {
-      logger.info({
-        msg: '[Tool] RPA breakpoint hit - ending flow gracefully',
-        toolName: matchedTool.name,
-        stepNumber: resultObj.breakpointInfo.stepNumber,
-      });
+    try {
+      // Execute the tool with validated args
+      const result = await executeWrapper(parsedArgs);
 
-      // Create a ToolMessage indicating breakpoint was hit
-      const breakpointMessage = new ToolMessage({
-        content: JSON.stringify({
-          breakpointHit: true,
-          message: `RPA breakpoint reached at step ${resultObj.breakpointInfo.stepNumber + 1}`,
-          toolName: resultObj.breakpointInfo.toolName,
+      // Check if breakpoint was hit - handle gracefully by ending the flow
+      const resultObj = result as unknown as { breakpointHit?: boolean; breakpointInfo?: BreakpointHitResult };
+      if (resultObj?.breakpointHit && resultObj?.breakpointInfo) {
+        logger.info({
+          msg: '[Tool] RPA breakpoint hit - ending flow gracefully',
+          toolName: matchedTool.name,
           stepNumber: resultObj.breakpointInfo.stepNumber,
-        }),
+        });
+
+        // Create a ToolMessage indicating breakpoint was hit
+        const breakpointMessage = new ToolMessage({
+          content: JSON.stringify({
+            breakpointHit: true,
+            message: `RPA breakpoint reached at step ${resultObj.breakpointInfo.stepNumber + 1}`,
+            toolName: resultObj.breakpointInfo.toolName,
+            stepNumber: resultObj.breakpointInfo.stepNumber,
+          }),
+          tool_call_id: toolCall.id,
+          name: matchedTool.name,
+        });
+
+        state.messages.push(breakpointMessage);
+        state.history.push(
+          createHistoryStep<HistoryStep>(state.history, {
+            type: NodeType.TOOL,
+            nodeId: toolNode.name,
+            nodeDisplayName: toolNode.displayName,
+            raw: breakpointMessage,
+            messageIds: [toolCall.id],
+          }),
+        );
+
+        // Set goto to __end__ to stop the flow gracefully
+        state.goto = '__end__';
+        return state;
+      }
+
+      // Create a ToolMessage with the result
+      const toolCallMessage = new ToolMessage({
+        content: typeof result === 'string' ? result : JSON.stringify(result),
         tool_call_id: toolCall.id,
         name: matchedTool.name,
       });
 
-      state.messages.push(breakpointMessage);
+      // Add the tool message to the state
+      state.messages.push(toolCallMessage);
+
+      // Add history step
       state.history.push(
         createHistoryStep<HistoryStep>(state.history, {
           type: NodeType.TOOL,
           nodeId: toolNode.name,
           nodeDisplayName: toolNode.displayName,
-          raw: breakpointMessage,
-          messageIds: [toolCallObj.tool_calls[0].id],
+          raw: toolCallMessage,
+          messageIds: [toolCall.id],
         }),
       );
 
-      // Set goto to __end__ to stop the flow gracefully
-      state.goto = '__end__';
+      // Clear goto if it was set
+      state.goto = null;
+
+      // Return the entire modified state
       return state;
-    }
+    } catch (err) {
+      logger.error({ message: '[Tool] Error executing tool', err, node: toolNode.displayName });
+
+      const errorMessage = err instanceof Error ? err.message : JSON.stringify(err);
+      const toolErrorMessage = new ToolMessage({
+        content: JSON.stringify({ error: errorMessage }),
+        tool_call_id: toolCall.id,
+        name: matchedTool.name,
+      });
 
-    // Create a ToolMessage with the result
-    const toolCallMessage = new ToolMessage({
-      content: typeof result === 'string' ? result : JSON.stringify(result),
-      tool_call_id: toolCall.id,
-      name: matchedTool.name,
-    });
-
-    // Add the tool message to the state
-    state.messages.push(toolCallMessage);
-
-    // Add history step
-    state.history.push(
-      createHistoryStep<HistoryStep>(state.history, {
-        type: NodeType.TOOL,
-        nodeId: toolNode.name,
-        nodeDisplayName: toolNode.displayName,
-        raw: toolCallMessage,
-        messageIds: [toolCallObj.tool_calls[0].id],
-      }),
-    );
-
-    // Clear goto if it was set
-    state.goto = null;
-
-    // Return the entire modified state
-    return state;
+      state.messages.push(toolErrorMessage);
+      state.history.push(
+        createHistoryStep<HistoryStep>(state.history, {
+          type: NodeType.TOOL,
+          nodeId: toolNode.name,
+          nodeDisplayName: toolNode.displayName,
+          raw: toolErrorMessage,
+          messageIds: [toolCall.id],
+        }),
+      );
+    }
   };
 
   graph.addNode(buildToolRunNodeName(attachedToNodeName), callback);

package/src/nodes/utils/getSchemaForToolInference.ts

@@ -0,0 +1,48 @@
+import { z } from 'zod';
+import { logger } from '../../utils/logger';
+
+interface GetSchemaForToolInferenceParams {
+  inputSchema: z.ZodTypeAny;
+  overriddenKeys: string[];
+  toolName: string;
+}
+
+interface GetSchemaForToolInferenceResult {
+  schemaForLLM: z.ZodTypeAny;
+  skipLLMCall: boolean;
+}
+
+export const getSchemaForToolInference = ({
+  inputSchema,
+  overriddenKeys,
+  toolName,
+}: GetSchemaForToolInferenceParams): GetSchemaForToolInferenceResult => {
+  let schemaForLLM = inputSchema;
+  let skipLLMCall = false;
+
+  if (overriddenKeys.length === 0) {
+    return { schemaForLLM, skipLLMCall };
+  }
+
+  try {
+    if (inputSchema instanceof z.ZodObject) {
+      const omitMap = overriddenKeys.reduce((acc, key) => {
+        acc[key] = true;
+        return acc;
+      }, {} as Record<string, true>);
+
+      const filteredSchema = inputSchema.omit(omitMap);
+      schemaForLLM = filteredSchema;
+      const remainingKeys = Object.keys(filteredSchema.shape);
+      skipLLMCall = remainingKeys.length === 0;
+    }
+  } catch (err) {
+    logger.warn({
+      msg: '[Tool] Failed to filter schema, using original',
+      tool: toolName,
+      err,
+    });
+  }
+
+  return { schemaForLLM, skipLLMCall };
+};