@inkeep/agents-run-api 0.39.0 → 0.39.2

package/dist/index.cjs

@@ -32,10 +32,9 @@ var swaggerUi = require('@hono/swagger-ui');
 var streaming = require('hono/streaming');
 var ai = require('ai');
 var jmespath = require('jmespath');
+var schemaConversion = require('@inkeep/agents-core/utils/schema-conversion');
 var Ajv = require('ajv');
 var zod = require('zod');
-var destr = require('destr');
-var traverse = require('traverse');
 var mcp_js = require('@alcyone-labs/modelcontextprotocol-sdk/server/mcp.js');
 var streamableHttp_js = require('@alcyone-labs/modelcontextprotocol-sdk/server/streamableHttp.js');
 var fetchToNode = require('fetch-to-node');
@@ -67,8 +66,6 @@ var schema__namespace = /*#__PURE__*/_interopNamespace(schema);
 var crypto2__default = /*#__PURE__*/_interopDefault(crypto2);
 var jmespath__default = /*#__PURE__*/_interopDefault(jmespath);
 var Ajv__default = /*#__PURE__*/_interopDefault(Ajv);
-var destr__default = /*#__PURE__*/_interopDefault(destr);
-var traverse__default = /*#__PURE__*/_interopDefault(traverse);
 
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -13200,16 +13197,6 @@ var ArtifactCreateSchema = class {
     });
   }
 };
-function parseEmbeddedJson(data) {
-  return traverse__default.default(data).map(function(x6) {
-    if (typeof x6 === "string") {
-      const v3 = destr__default.default(x6);
-      if (v3 !== x6 && (Array.isArray(v3) || v3 && typeof v3 === "object")) {
-        this.update(v3);
-      }
-    }
-  });
-}
 
 // src/a2a/client.ts
 init_logger();
@@ -14433,6 +14420,19 @@ var Phase1Config = class _Phase1Config {
     const firstItem = tools[0];
     return "usageGuidelines" in firstItem && !("config" in firstItem);
   }
+  normalizeSchema(inputSchema) {
+    if (!inputSchema || typeof inputSchema !== "object") {
+      return inputSchema || {};
+    }
+    if (schemaConversion.isZodSchema(inputSchema)) {
+      try {
+        return schemaConversion.convertZodToJsonSchema(inputSchema);
+      } catch (error) {
+        return {};
+      }
+    }
+    return inputSchema;
+  }
   assemble(templates, config) {
     const systemPromptTemplate = templates.get("system-prompt");
     if (!systemPromptTemplate) {
@@ -14449,7 +14449,11 @@ var Phase1Config = class _Phase1Config {
     }
     const agentContextSection = this.generateAgentContextSection(config.prompt);
     systemPrompt = systemPrompt.replace("{{AGENT_CONTEXT_SECTION}}", agentContextSection);
-    const toolData = this.isToolDataArray(config.tools) ? config.tools : _Phase1Config.convertMcpToolsToToolData(config.tools);
+    const rawToolData = this.isToolDataArray(config.tools) ? config.tools : _Phase1Config.convertMcpToolsToToolData(config.tools);
+    const toolData = rawToolData.map((tool4) => ({
+      ...tool4,
+      inputSchema: this.normalizeSchema(tool4.inputSchema)
+    }));
     const hasArtifactComponents = config.artifactComponents && config.artifactComponents.length > 0;
     const artifactsSection = this.generateArtifactsSection(
       templates,
@@ -15761,9 +15765,26 @@ var Agent = class {
           description: originalTool.description,
           inputSchema: originalTool.inputSchema,
           execute: async (args2, { toolCallId }) => {
+            let processedArgs;
+            try {
+              processedArgs = agentsCore.parseEmbeddedJson(args2);
+              if (JSON.stringify(args2) !== JSON.stringify(processedArgs)) {
+                logger20.warn(
+                  { toolName, toolCallId },
+                  "Fixed stringified JSON parameters (indicates schema ambiguity)"
+                );
+              }
+            } catch (error) {
+              logger20.warn(
+                { toolName, toolCallId, error: error.message },
+                "Failed to parse embedded JSON, using original args"
+              );
+              processedArgs = args2;
+            }
+            const finalArgs = processedArgs;
             if (needsApproval) {
               logger20.info(
-                { toolName, toolCallId, args: args2 },
+                { toolName, toolCallId, args: finalArgs },
                 "Tool requires approval - waiting for user response"
               );
               const currentSpan = api.trace.getActiveSpan();
@@ -15837,7 +15858,7 @@ var Agent = class {
             }
             logger20.debug({ toolName, toolCallId }, "MCP Tool Called");
             try {
-              const rawResult = await originalTool.execute(args2, { toolCallId });
+              const rawResult = await originalTool.execute(finalArgs, { toolCallId });
               if (rawResult && typeof rawResult === "object" && rawResult.isError) {
                 const errorMessage = rawResult.content?.[0]?.text || "MCP tool returned an error";
                 logger20.error(
@@ -15847,7 +15868,7 @@ var Agent = class {
                 toolSessionManager.recordToolResult(sessionId, {
                   toolCallId,
                   toolName,
-                  args: args2,
+                  args: finalArgs,
                   result: { error: errorMessage, failed: true },
                   timestamp: Date.now()
                 });
@@ -15880,12 +15901,12 @@ var Agent = class {
                   `Tool "${toolName}" failed: ${errorMessage}. This tool is currently unavailable. Please try a different approach or inform the user of the issue.`
                 );
               }
-              const parsedResult = parseEmbeddedJson(rawResult);
+              const parsedResult = agentsCore.parseEmbeddedJson(rawResult);
               const enhancedResult = this.enhanceToolResultWithStructureHints(parsedResult);
               toolSessionManager.recordToolResult(sessionId, {
                 toolCallId,
                 toolName,
-                args: args2,
+                args: finalArgs,
                 result: enhancedResult,
                 timestamp: Date.now()
               });
@@ -16213,8 +16234,25 @@ var Agent = class {
           description: functionToolDef.description || functionToolDef.name,
           inputSchema: zodSchema,
           execute: async (args2, { toolCallId }) => {
+            let processedArgs;
+            try {
+              processedArgs = agentsCore.parseEmbeddedJson(args2);
+              if (JSON.stringify(args2) !== JSON.stringify(processedArgs)) {
+                logger20.warn(
+                  { toolName: functionToolDef.name, toolCallId },
+                  "Fixed stringified JSON parameters (indicates schema ambiguity)"
+                );
+              }
+            } catch (error) {
+              logger20.warn(
+                { toolName: functionToolDef.name, toolCallId, error: error.message },
+                "Failed to parse embedded JSON, using original args"
+              );
+              processedArgs = args2;
+            }
+            const finalArgs = processedArgs;
             logger20.debug(
-              { toolName: functionToolDef.name, toolCallId, args: args2 },
+              { toolName: functionToolDef.name, toolCallId, args: finalArgs },
               "Function Tool Called"
             );
             try {
@@ -16224,17 +16262,21 @@ var Agent = class {
                 timeout: FUNCTION_TOOL_EXECUTION_TIMEOUT_MS_DEFAULT,
                 vcpus: FUNCTION_TOOL_SANDBOX_VCPUS_DEFAULT
               };
-              const result = await sandboxExecutor.executeFunctionTool(functionToolDef.id, args2, {
-                description: functionToolDef.description || functionToolDef.name,
-                inputSchema: functionData.inputSchema || {},
-                executeCode: functionData.executeCode,
-                dependencies: functionData.dependencies || {},
-                sandboxConfig: this.config.sandboxConfig || defaultSandboxConfig
-              });
+              const result = await sandboxExecutor.executeFunctionTool(
+                functionToolDef.id,
+                finalArgs,
+                {
+                  description: functionToolDef.description || functionToolDef.name,
+                  inputSchema: functionData.inputSchema || {},
+                  executeCode: functionData.executeCode,
+                  dependencies: functionData.dependencies || {},
+                  sandboxConfig: this.config.sandboxConfig || defaultSandboxConfig
+                }
+              );
               toolSessionManager.recordToolResult(sessionId || "", {
                 toolCallId,
                 toolName: functionToolDef.name,
-                args: args2,
+                args: finalArgs,
                 result,
                 timestamp: Date.now()
               });
@@ -16668,7 +16710,7 @@ ${output}`;
     let parsedForAnalysis = result;
     if (typeof result === "string") {
       try {
-        parsedForAnalysis = parseEmbeddedJson(result);
+        parsedForAnalysis = agentsCore.parseEmbeddedJson(result);
       } catch (_error) {
         parsedForAnalysis = result;
       }
@@ -19656,6 +19698,8 @@ var ExecutionHandler = class {
               throw error;
             } finally {
               span.end();
+              await new Promise((resolve2) => setImmediate(resolve2));
+              await flushBatchProcessor();
             }
           });
         }

package/dist/index.js

@@ -4,7 +4,7 @@ import { dbClient_default } from './chunk-EVOISBFH.js';
 import { env } from './chunk-KBZIYCPJ.js';
 import { getLogger } from './chunk-A2S7GSHL.js';
 import { SESSION_CLEANUP_INTERVAL_MS, AGENT_EXECUTION_MAX_CONSECUTIVE_ERRORS, SESSION_TOOL_RESULT_CACHE_TIMEOUT_MS, STREAM_MAX_LIFETIME_MS, STREAM_BUFFER_MAX_SIZE_BYTES, STREAM_TEXT_GAP_THRESHOLD_MS, ARTIFACT_GENERATION_MAX_RETRIES, ARTIFACT_SESSION_MAX_PENDING, STATUS_UPDATE_DEFAULT_INTERVAL_SECONDS, STATUS_UPDATE_DEFAULT_NUM_EVENTS, ARTIFACT_SESSION_MAX_PREVIOUS_SUMMARIES, AGENT_EXECUTION_MAX_GENERATION_STEPS, FUNCTION_TOOL_SANDBOX_VCPUS_DEFAULT, FUNCTION_TOOL_EXECUTION_TIMEOUT_MS_DEFAULT, LLM_GENERATION_MAX_ALLOWED_TIMEOUT_MS, ARTIFACT_GENERATION_BACKOFF_INITIAL_MS, ARTIFACT_GENERATION_BACKOFF_MAX_MS, LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_STREAMING, LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_NON_STREAMING, LLM_GENERATION_SUBSEQUENT_CALL_TIMEOUT_MS, DELEGATION_TOOL_BACKOFF_MAX_ELAPSED_TIME_MS, DELEGATION_TOOL_BACKOFF_EXPONENT, DELEGATION_TOOL_BACKOFF_MAX_INTERVAL_MS, DELEGATION_TOOL_BACKOFF_INITIAL_INTERVAL_MS, STREAM_PARSER_MAX_SNAPSHOT_SIZE, STREAM_PARSER_MAX_STREAMED_SIZE, STREAM_PARSER_MAX_COLLECTED_PARTS } from './chunk-THWNUGWP.js';
-import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, generateId, commonGetErrorResponses, loggerFactory, getConversation, createDefaultCredentialStores, CredentialStoreRegistry, createTask, getTask, updateTask, setSpanWithError, AGENT_EXECUTION_TRANSFER_COUNT_DEFAULT, updateConversation, handleApiError, TaskState, getAgentById, getProject, setActiveAgentForThread, getRelatedAgentsForAgent, getExternalAgentsForSubAgent, getTeamAgentsForSubAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT, CONVERSATION_HISTORY_DEFAULT_LIMIT, ModelFactory, getLedgerArtifacts, verifyTempToken, validateAndGetApiKey, verifyServiceToken, validateTargetAgent, ContextResolver, CredentialStuffer, MCPServerType, getUserScopedCredentialReference, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, jsonSchemaToZod, getContextConfigById, getFullAgentDefinition, TemplateEngine, listTaskIdsByContextId, agentHasArtifactComponents, upsertLedgerArtifact, MCPTransportType, SPAN_KEYS, headers, generateServiceToken } from '@inkeep/agents-core';
+import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, generateId, commonGetErrorResponses, loggerFactory, getConversation, createDefaultCredentialStores, CredentialStoreRegistry, createTask, getTask, updateTask, setSpanWithError, AGENT_EXECUTION_TRANSFER_COUNT_DEFAULT, updateConversation, handleApiError, TaskState, getAgentById, getProject, setActiveAgentForThread, getRelatedAgentsForAgent, getExternalAgentsForSubAgent, getTeamAgentsForSubAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT, CONVERSATION_HISTORY_DEFAULT_LIMIT, ModelFactory, getLedgerArtifacts, verifyTempToken, validateAndGetApiKey, verifyServiceToken, validateTargetAgent, ContextResolver, CredentialStuffer, parseEmbeddedJson, MCPServerType, getUserScopedCredentialReference, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, jsonSchemaToZod, getContextConfigById, getFullAgentDefinition, TemplateEngine, listTaskIdsByContextId, agentHasArtifactComponents, upsertLedgerArtifact, MCPTransportType, SPAN_KEYS, headers, generateServiceToken } from '@inkeep/agents-core';
 import { otel } from '@hono/otel';
 import { OpenAPIHono, createRoute, z as z$1 } from '@hono/zod-openapi';
 import { trace, propagation, context, SpanStatusCode } from '@opentelemetry/api';
@@ -17,11 +17,10 @@ import { swaggerUI } from '@hono/swagger-ui';
 import { streamSSE, stream } from 'hono/streaming';
 import { createUIMessageStream, JsonToSseTransformStream, parsePartialJson, generateObject, tool, streamText, generateText, streamObject } from 'ai';
 import jmespath from 'jmespath';
+import { isZodSchema, convertZodToJsonSchema } from '@inkeep/agents-core/utils/schema-conversion';
 import Ajv from 'ajv';
 import { randomUUID } from 'crypto';
 import { z } from 'zod';
-import destr from 'destr';
-import traverse from 'traverse';
 import { McpServer } from '@alcyone-labs/modelcontextprotocol-sdk/server/mcp.js';
 import { StreamableHTTPServerTransport } from '@alcyone-labs/modelcontextprotocol-sdk/server/streamableHttp.js';
 import { toReqRes, toFetchResponse } from 'fetch-to-node';
@@ -5555,16 +5554,6 @@ var ArtifactCreateSchema = class {
     });
   }
 };
-function parseEmbeddedJson(data) {
-  return traverse(data).map(function(x) {
-    if (typeof x === "string") {
-      const v = destr(x);
-      if (v !== x && (Array.isArray(v) || v && typeof v === "object")) {
-        this.update(v);
-      }
-    }
-  });
-}
 
 // src/a2a/client.ts
 var logger13 = getLogger("a2aClient");
@@ -6781,6 +6770,19 @@ var Phase1Config = class _Phase1Config {
     const firstItem = tools[0];
     return "usageGuidelines" in firstItem && !("config" in firstItem);
   }
+  normalizeSchema(inputSchema) {
+    if (!inputSchema || typeof inputSchema !== "object") {
+      return inputSchema || {};
+    }
+    if (isZodSchema(inputSchema)) {
+      try {
+        return convertZodToJsonSchema(inputSchema);
+      } catch (error) {
+        return {};
+      }
+    }
+    return inputSchema;
+  }
   assemble(templates, config) {
     const systemPromptTemplate = templates.get("system-prompt");
     if (!systemPromptTemplate) {
@@ -6797,7 +6799,11 @@ var Phase1Config = class _Phase1Config {
     }
     const agentContextSection = this.generateAgentContextSection(config.prompt);
     systemPrompt = systemPrompt.replace("{{AGENT_CONTEXT_SECTION}}", agentContextSection);
-    const toolData = this.isToolDataArray(config.tools) ? config.tools : _Phase1Config.convertMcpToolsToToolData(config.tools);
+    const rawToolData = this.isToolDataArray(config.tools) ? config.tools : _Phase1Config.convertMcpToolsToToolData(config.tools);
+    const toolData = rawToolData.map((tool4) => ({
+      ...tool4,
+      inputSchema: this.normalizeSchema(tool4.inputSchema)
+    }));
     const hasArtifactComponents = config.artifactComponents && config.artifactComponents.length > 0;
     const artifactsSection = this.generateArtifactsSection(
       templates,
@@ -8109,9 +8115,26 @@ var Agent = class {
           description: originalTool.description,
           inputSchema: originalTool.inputSchema,
           execute: async (args, { toolCallId }) => {
+            let processedArgs;
+            try {
+              processedArgs = parseEmbeddedJson(args);
+              if (JSON.stringify(args) !== JSON.stringify(processedArgs)) {
+                logger16.warn(
+                  { toolName, toolCallId },
+                  "Fixed stringified JSON parameters (indicates schema ambiguity)"
+                );
+              }
+            } catch (error) {
+              logger16.warn(
+                { toolName, toolCallId, error: error.message },
+                "Failed to parse embedded JSON, using original args"
+              );
+              processedArgs = args;
+            }
+            const finalArgs = processedArgs;
             if (needsApproval) {
               logger16.info(
-                { toolName, toolCallId, args },
+                { toolName, toolCallId, args: finalArgs },
                 "Tool requires approval - waiting for user response"
               );
               const currentSpan = trace.getActiveSpan();
@@ -8185,7 +8208,7 @@ var Agent = class {
             }
             logger16.debug({ toolName, toolCallId }, "MCP Tool Called");
             try {
-              const rawResult = await originalTool.execute(args, { toolCallId });
+              const rawResult = await originalTool.execute(finalArgs, { toolCallId });
               if (rawResult && typeof rawResult === "object" && rawResult.isError) {
                 const errorMessage = rawResult.content?.[0]?.text || "MCP tool returned an error";
                 logger16.error(
@@ -8195,7 +8218,7 @@ var Agent = class {
                 toolSessionManager.recordToolResult(sessionId, {
                   toolCallId,
                   toolName,
-                  args,
+                  args: finalArgs,
                   result: { error: errorMessage, failed: true },
                   timestamp: Date.now()
                 });
@@ -8233,7 +8256,7 @@ var Agent = class {
               toolSessionManager.recordToolResult(sessionId, {
                 toolCallId,
                 toolName,
-                args,
+                args: finalArgs,
                 result: enhancedResult,
                 timestamp: Date.now()
               });
@@ -8561,8 +8584,25 @@ var Agent = class {
           description: functionToolDef.description || functionToolDef.name,
           inputSchema: zodSchema,
           execute: async (args, { toolCallId }) => {
+            let processedArgs;
+            try {
+              processedArgs = parseEmbeddedJson(args);
+              if (JSON.stringify(args) !== JSON.stringify(processedArgs)) {
+                logger16.warn(
+                  { toolName: functionToolDef.name, toolCallId },
+                  "Fixed stringified JSON parameters (indicates schema ambiguity)"
+                );
+              }
+            } catch (error) {
+              logger16.warn(
+                { toolName: functionToolDef.name, toolCallId, error: error.message },
+                "Failed to parse embedded JSON, using original args"
+              );
+              processedArgs = args;
+            }
+            const finalArgs = processedArgs;
             logger16.debug(
-              { toolName: functionToolDef.name, toolCallId, args },
+              { toolName: functionToolDef.name, toolCallId, args: finalArgs },
               "Function Tool Called"
             );
             try {
@@ -8572,17 +8612,21 @@ var Agent = class {
                 timeout: FUNCTION_TOOL_EXECUTION_TIMEOUT_MS_DEFAULT,
                 vcpus: FUNCTION_TOOL_SANDBOX_VCPUS_DEFAULT
               };
-              const result = await sandboxExecutor.executeFunctionTool(functionToolDef.id, args, {
-                description: functionToolDef.description || functionToolDef.name,
-                inputSchema: functionData.inputSchema || {},
-                executeCode: functionData.executeCode,
-                dependencies: functionData.dependencies || {},
-                sandboxConfig: this.config.sandboxConfig || defaultSandboxConfig
-              });
+              const result = await sandboxExecutor.executeFunctionTool(
+                functionToolDef.id,
+                finalArgs,
+                {
+                  description: functionToolDef.description || functionToolDef.name,
+                  inputSchema: functionData.inputSchema || {},
+                  executeCode: functionData.executeCode,
+                  dependencies: functionData.dependencies || {},
+                  sandboxConfig: this.config.sandboxConfig || defaultSandboxConfig
+                }
+              );
               toolSessionManager.recordToolResult(sessionId || "", {
                 toolCallId,
                 toolName: functionToolDef.name,
-                args,
+                args: finalArgs,
                 result,
                 timestamp: Date.now()
               });
@@ -11985,6 +12029,8 @@ var ExecutionHandler = class {
               throw error;
             } finally {
               span.end();
+              await new Promise((resolve) => setImmediate(resolve));
+              await flushBatchProcessor();
             }
           });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-run-api",
-  "version": "0.39.0",
+  "version": "0.39.2",
   "description": "Agents Run API for Inkeep Agent Framework - handles chat, agent execution, and streaming",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -53,7 +53,7 @@
     "pino": "^9.11.0",
     "traverse": "^0.6.11",
     "ts-pattern": "^5.7.1",
-    "@inkeep/agents-core": "^0.39.0"
+    "@inkeep/agents-core": "^0.39.2"
   },
   "peerDependencies": {
     "@hono/zod-openapi": "^1.1.5",