@inkeep/agents-run-api 0.37.0 → 0.37.2

package/dist/index.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var agentsCore = require('@inkeep/agents-core');
-var z8 = require('zod');
+var zodOpenapi = require('@hono/zod-openapi');
 var s3 = require('fs');
 var o3 = require('path');
 var schema = require('@inkeep/agents-core/db/schema');
@@ -13,7 +13,6 @@ var crypto2 = require('crypto');
 var os = require('os');
 var sandbox = require('@vercel/sandbox');
 var otel = require('@hono/otel');
-var zodOpenapi = require('@hono/zod-openapi');
 var api = require('@opentelemetry/api');
 var hono = require('hono');
 var cors = require('hono/cors');
@@ -32,12 +31,6 @@ var factory = require('hono/factory');
 var swaggerUi = require('@hono/swagger-ui');
 var streaming = require('hono/streaming');
 var ai = require('ai');
-var anthropic = require('@ai-sdk/anthropic');
-var gateway = require('@ai-sdk/gateway');
-var google = require('@ai-sdk/google');
-var openai = require('@ai-sdk/openai');
-var openaiCompatible = require('@ai-sdk/openai-compatible');
-var aiSdkProvider = require('@openrouter/ai-sdk-provider');
 var jmespath = require('jmespath');
 var Ajv = require('ajv');
 var destr = require('destr');
@@ -67,7 +60,6 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var z8__default = /*#__PURE__*/_interopDefault(z8);
 var s3__namespace = /*#__PURE__*/_interopNamespace(s3);
 var o3__namespace = /*#__PURE__*/_interopNamespace(o3);
 var schema__namespace = /*#__PURE__*/_interopNamespace(schema);
@@ -90,28 +82,29 @@ var envSchema, parseEnv, env;
 var init_env = __esm({
   "src/env.ts"() {
     agentsCore.loadEnvironmentFiles();
-    envSchema = z8.z.object({
-      NODE_ENV: z8.z.enum(["development", "production", "test"]).optional(),
-      ENVIRONMENT: z8.z.enum(["development", "production", "pentest", "test"]).optional().default("development"),
-      DATABASE_URL: z8.z.string().optional(),
-      INKEEP_AGENTS_RUN_API_URL: z8.z.string().optional().default("http://localhost:3003"),
-      LOG_LEVEL: z8.z.enum(["trace", "debug", "info", "warn", "error"]).optional().default("debug"),
-      NANGO_SERVER_URL: z8.z.string().optional().default("https://api.nango.dev"),
-      NANGO_SECRET_KEY: z8.z.string().optional(),
-      ANTHROPIC_API_KEY: z8.z.string(),
-      OPENAI_API_KEY: z8.z.string().optional(),
-      GOOGLE_GENERATIVE_AI_API_KEY: z8.z.string().optional(),
-      INKEEP_AGENTS_RUN_API_BYPASS_SECRET: z8.z.string().optional(),
-      INKEEP_AGENTS_JWT_SIGNING_SECRET: z8.z.string().optional(),
-      INKEEP_AGENTS_TEMP_JWT_PUBLIC_KEY: z8.z.string().optional(),
-      OTEL_BSP_SCHEDULE_DELAY: z8.z.coerce.number().optional().default(500),
-      OTEL_BSP_MAX_EXPORT_BATCH_SIZE: z8.z.coerce.number().optional().default(64)
+    envSchema = zodOpenapi.z.object({
+      NODE_ENV: zodOpenapi.z.enum(["development", "production", "test"]).optional(),
+      ENVIRONMENT: zodOpenapi.z.enum(["development", "production", "pentest", "test"]).optional().default("development"),
+      DATABASE_URL: zodOpenapi.z.string().optional(),
+      INKEEP_AGENTS_RUN_API_URL: zodOpenapi.z.string().optional().default("http://localhost:3003"),
+      AGENTS_MANAGE_UI_URL: zodOpenapi.z.string().optional().default("http://localhost:3000"),
+      LOG_LEVEL: zodOpenapi.z.enum(["trace", "debug", "info", "warn", "error"]).optional().default("debug"),
+      NANGO_SERVER_URL: zodOpenapi.z.string().optional().default("https://api.nango.dev"),
+      NANGO_SECRET_KEY: zodOpenapi.z.string().optional(),
+      ANTHROPIC_API_KEY: zodOpenapi.z.string(),
+      OPENAI_API_KEY: zodOpenapi.z.string().optional(),
+      GOOGLE_GENERATIVE_AI_API_KEY: zodOpenapi.z.string().optional(),
+      INKEEP_AGENTS_RUN_API_BYPASS_SECRET: zodOpenapi.z.string().optional(),
+      INKEEP_AGENTS_JWT_SIGNING_SECRET: zodOpenapi.z.string().optional(),
+      INKEEP_AGENTS_TEMP_JWT_PUBLIC_KEY: zodOpenapi.z.string().optional(),
+      OTEL_BSP_SCHEDULE_DELAY: zodOpenapi.z.coerce.number().optional().default(500),
+      OTEL_BSP_MAX_EXPORT_BATCH_SIZE: zodOpenapi.z.coerce.number().optional().default(64)
     });
     parseEnv = () => {
       try {
         return envSchema.parse(process.env);
       } catch (error) {
-        if (error instanceof z8.z.ZodError) {
+        if (error instanceof zodOpenapi.z.ZodError) {
           const missingVars = error.issues.map((issue) => issue.path.join("."));
           throw new Error(
             `\u274C Invalid environment variables: ${missingVars.join(", ")}
@@ -6249,11 +6242,11 @@ var init_execution_limits = __esm({
     init_defaults();
     init_defaults();
     agentsCore.loadEnvironmentFiles();
-    constantsSchema = z8.z.object(
+    constantsSchema = zodOpenapi.z.object(
       Object.fromEntries(
         Object.keys(executionLimitsDefaults).map((key) => [
           `AGENTS_${key}`,
-          z8.z.coerce.number().optional()
+          zodOpenapi.z.coerce.number().optional()
         ])
       )
     );
@@ -6741,10 +6734,9 @@ var init_NativeSandboxExecutor = __esm({
               "Reusing cached sandbox"
             );
             return sandbox.sandboxDir;
-          } else {
-            this.cleanupSandbox(sandbox.sandboxDir);
-            delete this.sandboxPool[poolKey];
           }
+          this.cleanupSandbox(sandbox.sandboxDir);
+          delete this.sandboxPool[poolKey];
         }
         return null;
       }
@@ -8238,6 +8230,21 @@ async function handleMessageSend(c2, agent, request) {
         });
       }
     }
+    if (result.status.state === agentsCore.TaskState.Failed) {
+      const isConnectionRefused = result.status.type === "connection_refused";
+      if (isConnectionRefused) {
+        return c2.json({
+          jsonrpc: "2.0",
+          error: {
+            code: -32603,
+            message: result.status.message || "Agent execution failed",
+            data: {
+              type: "connection_refused"
+            }
+          }
+        });
+      }
+    }
     const taskStatus = {
       state: result.status.state,
       timestamp: (/* @__PURE__ */ new Date()).toISOString()
@@ -8588,275 +8595,10 @@ async function handleTasksResubscribe(c2, agent, request) {
 init_dbClient();
 init_logger();
 
-// src/agents/ModelFactory.ts
-init_logger();
-var logger4 = agentsCore.getLogger("ModelFactory");
-var nimDefault = openaiCompatible.createOpenAICompatible({
-  name: "nim",
-  baseURL: "https://integrate.api.nvidia.com/v1",
-  headers: {
-    Authorization: `Bearer ${process.env.NIM_API_KEY}`
-  }
-});
-var ModelFactory = class _ModelFactory {
-  /**
-   * Create a provider instance with custom configuration
-   */
-  static createProvider(provider, config) {
-    switch (provider) {
-      case "anthropic":
-        return anthropic.createAnthropic(config);
-      case "openai":
-        return openai.createOpenAI(config);
-      case "google":
-        return google.createGoogleGenerativeAI(config);
-      case "openrouter":
-        return {
-          ...aiSdkProvider.createOpenRouter(config),
-          textEmbeddingModel: () => {
-            throw new Error("OpenRouter does not support text embeddings");
-          },
-          imageModel: () => {
-            throw new Error("OpenRouter does not support image generation");
-          }
-        };
-      case "gateway":
-        return gateway.createGateway(config);
-      case "nim": {
-        const nimConfig = {
-          name: "nim",
-          baseURL: "https://integrate.api.nvidia.com/v1",
-          headers: {
-            Authorization: `Bearer ${process.env.NIM_API_KEY}`
-          },
-          ...config
-        };
-        return openaiCompatible.createOpenAICompatible(nimConfig);
-      }
-      case "custom": {
-        if (!config.baseURL && !config.baseUrl) {
-          throw new Error(
-            "Custom provider requires baseURL. Please provide it in providerOptions.baseURL or providerOptions.baseUrl"
-          );
-        }
-        const customConfig = {
-          name: "custom",
-          baseURL: config.baseURL || config.baseUrl,
-          headers: {
-            ...process.env.CUSTOM_LLM_API_KEY && {
-              Authorization: `Bearer ${process.env.CUSTOM_LLM_API_KEY}`
-            },
-            ...config.headers || {}
-          },
-          ...config
-        };
-        logger4.info(
-          {
-            config: {
-              baseURL: customConfig.baseURL,
-              hasApiKey: !!process.env.CUSTOM_LLM_API_KEY,
-              apiKeyPrefix: process.env.CUSTOM_LLM_API_KEY?.substring(0, 10) + "...",
-              headers: Object.keys(customConfig.headers || {})
-            }
-          },
-          "Creating custom OpenAI-compatible provider"
-        );
-        return openaiCompatible.createOpenAICompatible(customConfig);
-      }
-      default:
-        throw new Error(`Unsupported provider: ${provider}`);
-    }
-  }
-  /**
-   * Extract provider configuration from providerOptions
-   * Only includes settings that go to the provider constructor (baseURL, apiKey, etc.)
-   */
-  static extractProviderConfig(providerOptions) {
-    if (!providerOptions) {
-      return {};
-    }
-    const providerConfig = {};
-    if (providerOptions.baseUrl || providerOptions.baseURL) {
-      providerConfig.baseURL = providerOptions.baseUrl || providerOptions.baseURL;
-    }
-    if (providerOptions.headers) {
-      providerConfig.headers = providerOptions.headers;
-    }
-    if (providerOptions.gateway) {
-      Object.assign(providerConfig, providerOptions.gateway);
-    }
-    if (providerOptions.nim) {
-      Object.assign(providerConfig, providerOptions.nim);
-    }
-    if (providerOptions.custom) {
-      Object.assign(providerConfig, providerOptions.custom);
-    }
-    return providerConfig;
-  }
-  /**
-   * Create a language model instance from configuration
-   * Throws error if no config provided - models must be configured at project level
-   */
-  static createModel(config) {
-    if (!config?.model?.trim()) {
-      throw new Error(
-        "Model configuration is required. Please configure models at the project level."
-      );
-    }
-    const modelSettings = config;
-    if (!modelSettings.model) {
-      throw new Error("Model configuration is required");
-    }
-    const modelString = modelSettings.model.trim();
-    const { provider, modelName } = _ModelFactory.parseModelString(modelString);
-    logger4.debug(
-      {
-        provider,
-        model: modelName,
-        fullModelString: modelSettings.model,
-        hasProviderOptions: !!modelSettings.providerOptions
-      },
-      "Creating language model from config"
-    );
-    const providerConfig = _ModelFactory.extractProviderConfig(modelSettings.providerOptions);
-    if (Object.keys(providerConfig).length > 0) {
-      logger4.info({ config: providerConfig }, `Applying custom ${provider} provider configuration`);
-      const customProvider = _ModelFactory.createProvider(provider, providerConfig);
-      return customProvider.languageModel(modelName);
-    }
-    switch (provider) {
-      case "anthropic":
-        return anthropic.anthropic(modelName);
-      case "openai":
-        return openai.openai(modelName);
-      case "google":
-        return google.google(modelName);
-      case "openrouter":
-        return aiSdkProvider.openrouter(modelName);
-      case "gateway":
-        return gateway.gateway(modelName);
-      case "nim":
-        return nimDefault(modelName);
-      case "custom":
-        throw new Error(
-          "Custom provider requires configuration. Please provide baseURL in providerOptions.custom.baseURL or providerOptions.baseURL"
-        );
-      default:
-        throw new Error(
-          `Unsupported provider: ${provider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id), Vercel AI Gateway (gateway/model-id), NVIDIA NIM (nim/model-id), or Custom OpenAI-compatible (custom/model-id).`
-        );
-    }
-  }
-  /**
-   * Built-in providers that have special handling
-   */
-  static BUILT_IN_PROVIDERS = [
-    "anthropic",
-    "openai",
-    "google",
-    "openrouter",
-    "gateway",
-    "nim",
-    "custom"
-  ];
-  /**
-   * Parse model string to extract provider and model name
-   * Examples: "anthropic/claude-sonnet-4" -> { provider: "anthropic", modelName: "claude-sonnet-4" }
-   *          "openrouter/anthropic/claude-sonnet-4" -> { provider: "openrouter", modelName: "anthropic/claude-sonnet-4" }
-   *          "claude-sonnet-4" -> { provider: "anthropic", modelName: "claude-sonnet-4" } (default to anthropic)
-   */
-  static parseModelString(modelString) {
-    if (modelString.includes("/")) {
-      const [provider, ...modelParts] = modelString.split("/");
-      const normalizedProvider = provider.toLowerCase();
-      if (!_ModelFactory.BUILT_IN_PROVIDERS.includes(normalizedProvider)) {
-        throw new Error(
-          `Unsupported provider: ${normalizedProvider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id), Vercel AI Gateway (gateway/model-id), NVIDIA NIM (nim/model-id), or Custom OpenAI-compatible (custom/model-id).`
-        );
-      }
-      return {
-        provider: normalizedProvider,
-        modelName: modelParts.join("/")
-        // In case model name has slashes
-      };
-    }
-    throw new Error(`No provider specified in model string: ${modelString}`);
-  }
-  /**
-   * Get generation parameters from provider options
-   * These are parameters that get passed to generateText/streamText calls
-   */
-  static getGenerationParams(providerOptions) {
-    if (!providerOptions) {
-      return {};
-    }
-    const excludedKeys = [
-      "apiKey",
-      "baseURL",
-      "baseUrl",
-      "maxDuration",
-      "headers",
-      "gateway",
-      "nim",
-      "custom"
-    ];
-    const params = {};
-    for (const [key, value] of Object.entries(providerOptions)) {
-      if (!excludedKeys.includes(key) && value !== void 0) {
-        params[key] = value;
-      }
-    }
-    return params;
-  }
-  /**
-   * Prepare complete generation configuration from model settings
-   * Returns model instance and generation parameters ready to spread into generateText/streamText
-   * Includes maxDuration if specified in provider options (in seconds, following Vercel standard)
-   */
-  static prepareGenerationConfig(modelSettings) {
-    const modelString = modelSettings?.model?.trim();
-    const model = _ModelFactory.createModel({
-      model: modelString,
-      providerOptions: modelSettings?.providerOptions
-    });
-    const generationParams = _ModelFactory.getGenerationParams(modelSettings?.providerOptions);
-    const maxDuration = modelSettings?.providerOptions?.maxDuration;
-    return {
-      model,
-      ...generationParams,
-      ...maxDuration !== void 0 && { maxDuration }
-    };
-  }
-  /**
-   * Validate model settingsuration
-   * Basic validation only - let AI SDK handle parameter-specific validation
-   */
-  static validateConfig(config) {
-    const errors = [];
-    if (!config.model) {
-      errors.push("Model name is required");
-    }
-    if (config.providerOptions) {
-      if (config.providerOptions.apiKey) {
-        errors.push(
-          "API keys should not be stored in provider options. Use environment variables (ANTHROPIC_API_KEY, OPENAI_API_KEY) or credential store instead."
-        );
-      }
-      if (config.providerOptions.maxDuration !== void 0) {
-        const maxDuration = config.providerOptions.maxDuration;
-        if (typeof maxDuration !== "number" || maxDuration <= 0) {
-          errors.push("maxDuration must be a positive number (in seconds)");
-        }
-      }
-    }
-    return errors;
-  }
-};
-
 // src/agents/ToolSessionManager.ts
 init_execution_limits();
 init_logger();
-var logger5 = agentsCore.getLogger("ToolSessionManager");
+var logger4 = agentsCore.getLogger("ToolSessionManager");
 var ToolSessionManager = class _ToolSessionManager {
   static instance;
   sessions = /* @__PURE__ */ new Map();
@@ -8890,7 +8632,7 @@ var ToolSessionManager = class _ToolSessionManager {
       createdAt: Date.now()
     };
     this.sessions.set(sessionId, session);
-    logger5.debug(
+    logger4.debug(
       {
         sessionId,
         tenantId,
@@ -8908,10 +8650,10 @@ var ToolSessionManager = class _ToolSessionManager {
    */
   ensureAgentSession(sessionId, tenantId, projectId, contextId, taskId) {
     if (this.sessions.has(sessionId)) {
-      logger5.debug({ sessionId }, "Agent session already exists, reusing");
+      logger4.debug({ sessionId }, "Agent session already exists, reusing");
       return sessionId;
     }
-    logger5.debug(
+    logger4.debug(
       { sessionId, tenantId, contextId, taskId },
       "Creating new agent-scoped tool session"
     );
@@ -8923,7 +8665,7 @@ var ToolSessionManager = class _ToolSessionManager {
   recordToolResult(sessionId, toolResult) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger5.warn(
+      logger4.warn(
         {
           sessionId,
           toolCallId: toolResult.toolCallId,
@@ -8935,7 +8677,7 @@ var ToolSessionManager = class _ToolSessionManager {
       return;
     }
     session.toolResults.set(toolResult.toolCallId, toolResult);
-    logger5.debug(
+    logger4.debug(
       {
         sessionId,
         toolCallId: toolResult.toolCallId,
@@ -8950,7 +8692,7 @@ var ToolSessionManager = class _ToolSessionManager {
   getToolResult(sessionId, toolCallId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger5.warn(
+      logger4.warn(
         {
           sessionId,
           toolCallId,
@@ -8963,7 +8705,7 @@ var ToolSessionManager = class _ToolSessionManager {
     }
     const result = session.toolResults.get(toolCallId);
     if (!result) {
-      logger5.warn(
+      logger4.warn(
         {
           sessionId,
           toolCallId,
@@ -8973,7 +8715,7 @@ var ToolSessionManager = class _ToolSessionManager {
         "Tool result not found"
       );
     } else {
-      logger5.debug(
+      logger4.debug(
         {
           sessionId,
           toolCallId,
@@ -9012,10 +8754,10 @@ var ToolSessionManager = class _ToolSessionManager {
     }
     for (const sessionId of expiredSessions) {
       this.sessions.delete(sessionId);
-      logger5.debug({ sessionId }, "Cleaned up expired tool session");
+      logger4.debug({ sessionId }, "Cleaned up expired tool session");
     }
     if (expiredSessions.length > 0) {
-      logger5.info({ expiredCount: expiredSessions.length }, "Cleaned up expired tool sessions");
+      logger4.info({ expiredCount: expiredSessions.length }, "Cleaned up expired tool sessions");
     }
   }
 };
@@ -9097,7 +8839,7 @@ function extractFullFields(schema2) {
 }
 
 // src/services/ArtifactService.ts
-var logger7 = agentsCore.getLogger("ArtifactService");
+var logger6 = agentsCore.getLogger("ArtifactService");
 var ArtifactService = class _ArtifactService {
   constructor(context) {
     this.context = context;
@@ -9130,7 +8872,7 @@ var ArtifactService = class _ArtifactService {
           id: taskId
         });
         if (!task) {
-          logger7.warn({ taskId }, "Task not found when fetching artifacts");
+          logger6.warn({ taskId }, "Task not found when fetching artifacts");
           continue;
         }
         const taskArtifacts = await agentsCore.getLedgerArtifacts(dbClient_default)({
@@ -9148,7 +8890,7 @@ var ArtifactService = class _ArtifactService {
         }
       }
     } catch (error) {
-      logger7.error({ error, contextId }, "Error loading context artifacts");
+      logger6.error({ error, contextId }, "Error loading context artifacts");
     }
     return artifacts;
   }
@@ -9157,12 +8899,12 @@ var ArtifactService = class _ArtifactService {
    */
   async createArtifact(request, subAgentId) {
     if (!this.context.sessionId) {
-      logger7.warn({ request }, "No session ID available for artifact creation");
+      logger6.warn({ request }, "No session ID available for artifact creation");
       return null;
     }
     const toolResult = toolSessionManager.getToolResult(this.context.sessionId, request.toolCallId);
     if (!toolResult) {
-      logger7.warn(
+      logger6.warn(
         { request, sessionId: this.context.sessionId },
         "Tool result not found for artifact"
       );
@@ -9178,7 +8920,7 @@ var ArtifactService = class _ArtifactService {
         selectedData = selectedData.length > 0 ? selectedData[0] : {};
       }
       if (!selectedData) {
-        logger7.warn(
+        logger6.warn(
           {
             request,
             baseSelector: request.baseSelector
@@ -9249,7 +8991,7 @@ var ArtifactService = class _ArtifactService {
       );
       return artifactData;
     } catch (error) {
-      logger7.error({ error, request }, "Failed to create artifact");
+      logger6.error({ error, request }, "Failed to create artifact");
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
       throw new Error(`Artifact creation failed for ${request.artifactId}: ${errorMessage}`);
     }
@@ -9278,7 +9020,7 @@ var ArtifactService = class _ArtifactService {
     }
     try {
       if (!this.context.projectId || !this.context.taskId) {
-        logger7.warn(
+        logger6.warn(
           { artifactId, toolCallId },
           "No projectId or taskId available for artifact lookup"
         );
@@ -9302,7 +9044,7 @@ var ArtifactService = class _ArtifactService {
         return this.formatArtifactSummaryData(artifacts[0], artifactId, toolCallId);
       }
     } catch (error) {
-      logger7.warn(
+      logger6.warn(
         { artifactId, toolCallId, taskId: this.context.taskId, error },
         "Failed to fetch artifact"
       );
@@ -9333,7 +9075,7 @@ var ArtifactService = class _ArtifactService {
     }
     try {
       if (!this.context.projectId || !this.context.taskId) {
-        logger7.warn(
+        logger6.warn(
           { artifactId, toolCallId },
           "No projectId or taskId available for artifact lookup"
         );
@@ -9357,7 +9099,7 @@ var ArtifactService = class _ArtifactService {
         return this.formatArtifactFullData(artifacts[0], artifactId, toolCallId);
       }
     } catch (error) {
-      logger7.warn(
+      logger6.warn(
         { artifactId, toolCallId, taskId: this.context.taskId, error },
         "Failed to fetch artifact"
       );
@@ -9374,7 +9116,7 @@ var ArtifactService = class _ArtifactService {
       data = artifact.parts?.[0]?.data;
       if (data && !(typeof data === "object" && Object.keys(data).length === 0)) {
         dataSource = "parts[0].data (fallback)";
-        logger7.debug(
+        logger6.debug(
           { artifactId, toolCallId, dataSource },
           "Using fallback data source for artifact summary"
         );
@@ -9382,14 +9124,14 @@ var ArtifactService = class _ArtifactService {
         data = artifact.data;
         if (data && !(typeof data === "object" && Object.keys(data).length === 0)) {
           dataSource = "artifact.data (fallback)";
-          logger7.debug(
+          logger6.debug(
             { artifactId, toolCallId, dataSource },
             "Using fallback data source for artifact summary"
           );
         } else {
           data = {};
           dataSource = "empty (no data found)";
-          logger7.warn(
+          logger6.warn(
             {
               artifactId,
               toolCallId,
@@ -9426,7 +9168,7 @@ var ArtifactService = class _ArtifactService {
       data = artifact.parts?.[0]?.data;
       if (data && !(typeof data === "object" && Object.keys(data).length === 0)) {
         dataSource = "parts[0].data (fallback)";
-        logger7.debug(
+        logger6.debug(
           { artifactId, toolCallId, dataSource },
           "Using fallback data source for artifact full data"
         );
@@ -9434,14 +9176,14 @@ var ArtifactService = class _ArtifactService {
         data = artifact.data;
         if (data && !(typeof data === "object" && Object.keys(data).length === 0)) {
           dataSource = "artifact.data (fallback)";
-          logger7.debug(
+          logger6.debug(
             { artifactId, toolCallId, dataSource },
             "Using fallback data source for artifact full data"
           );
         } else {
           data = {};
           dataSource = "empty (no data found)";
-          logger7.warn(
+          logger6.warn(
             {
               artifactId,
               toolCallId,
@@ -9495,7 +9237,7 @@ var ArtifactService = class _ArtifactService {
       const error = new Error(
         `Cannot save artifact: Missing required fields [${summaryValidation.missingRequired.join(", ")}] for '${artifactType}' schema. Required: [${summaryValidation.missingRequired.join(", ")}]. Found: [${summaryValidation.actualFields.join(", ")}]. Consider using a different artifact component type that matches your data structure.`
       );
-      logger7.error(
+      logger6.error(
         {
           artifactId,
           artifactType,
@@ -9508,7 +9250,7 @@ var ArtifactService = class _ArtifactService {
       throw error;
     }
     if (!summaryValidation.hasExpectedFields || summaryValidation.extraFields.length > 0) {
-      logger7.warn(
+      logger6.warn(
         {
           artifactId,
           artifactType,
@@ -9522,7 +9264,7 @@ var ArtifactService = class _ArtifactService {
       );
     }
     if (!fullValidation.hasExpectedFields || fullValidation.extraFields.length > 0) {
-      logger7.warn(
+      logger6.warn(
         {
           artifactId,
           artifactType,
@@ -9594,7 +9336,7 @@ var ArtifactService = class _ArtifactService {
         }
       );
     } else {
-      logger7.warn(
+      logger6.warn(
         {
           artifactId: request.artifactId,
           hasStreamRequestId: !!this.context.streamRequestId,
@@ -9669,7 +9411,7 @@ var ArtifactService = class _ArtifactService {
           summaryData = this.filterBySchema(artifact.data, previewSchema);
           fullData = this.filterBySchema(artifact.data, fullSchema);
         } catch (error) {
-          logger7.warn(
+          logger6.warn(
             {
               artifactType: artifact.type,
               error: error instanceof Error ? error.message : "Unknown error"
@@ -9707,7 +9449,7 @@ var ArtifactService = class _ArtifactService {
       artifact: artifactToSave
     });
     if (!result.created && result.existing) {
-      logger7.debug(
+      logger6.debug(
         {
           artifactId: artifact.artifactId,
           taskId: this.context.taskId
@@ -9767,7 +9509,7 @@ var ArtifactService = class _ArtifactService {
             extracted[fieldName] = this.cleanEscapedContent(rawValue);
           }
         } catch (error) {
-          logger7.warn(
+          logger6.warn(
             { fieldName, error: error instanceof Error ? error.message : "Unknown error" },
             "Failed to extract schema field"
           );
@@ -9796,7 +9538,7 @@ var ArtifactService = class _ArtifactService {
 };
 
 // src/services/ArtifactParser.ts
-var logger8 = agentsCore.getLogger("ArtifactParser");
+var logger7 = agentsCore.getLogger("ArtifactParser");
 var ArtifactParser = class _ArtifactParser {
   static ARTIFACT_CHECK_REGEX = /<artifact:ref\s+(?=.*id=['"][^'"]+['"])(?=.*tool=['"][^'"]+['"])[^>]*\/>/;
   static ATTR_REGEX = /(\w+)="([^"]*)"|(\w+)='([^']*)'|(\w+)=({[^}]+})/g;
@@ -9907,7 +9649,7 @@ var ArtifactParser = class _ArtifactParser {
       attrs[key] = value;
     }
     if (!attrs.id || !attrs.tool || !attrs.type || !attrs.base) {
-      logger8.warn({ attrs, attrString }, "Missing required attributes in artifact annotation");
+      logger7.warn({ attrs, attrString }, "Missing required attributes in artifact annotation");
       return null;
     }
     return {
@@ -9968,7 +9710,7 @@ var ArtifactParser = class _ArtifactParser {
             `Failed to create artifact "${annotation.artifactId}": Missing or invalid data`
           );
           processedText = processedText.replace(annotation.raw, "");
-          logger8.warn(
+          logger7.warn(
             { annotation, artifactData },
             "Removed failed artifact:create annotation from output"
           );
@@ -9979,11 +9721,11 @@ var ArtifactParser = class _ArtifactParser {
         if (annotation.raw) {
           processedText = processedText.replace(annotation.raw, "");
         }
-        logger8.error({ annotation, error }, "Failed to extract artifact from create annotation");
+        logger7.error({ annotation, error }, "Failed to extract artifact from create annotation");
       }
     }
     if (failedAnnotations.length > 0) {
-      logger8.warn(
+      logger7.warn(
         {
           failedCount: failedAnnotations.length,
           failures: failedAnnotations
@@ -10167,7 +9909,7 @@ var ArtifactParser = class _ArtifactParser {
 };
 
 // src/services/AgentSession.ts
-var logger9 = agentsCore.getLogger("AgentSession");
+var logger8 = agentsCore.getLogger("AgentSession");
 var AgentSession = class {
   // Whether to send data operations
   constructor(sessionId, messageId, agentId, tenantId, projectId, contextId) {
@@ -10177,7 +9919,7 @@ var AgentSession = class {
     this.tenantId = tenantId;
     this.projectId = projectId;
     this.contextId = contextId;
-    logger9.debug({ sessionId, messageId, agentId }, "AgentSession created");
+    logger8.debug({ sessionId, messageId, agentId }, "AgentSession created");
     if (tenantId && projectId) {
       toolSessionManager.createSessionWithId(
         sessionId,
@@ -10234,7 +9976,7 @@ var AgentSession = class {
    */
   enableEmitOperations() {
     this.isEmitOperations = true;
-    logger9.info(
+    logger8.info(
       { sessionId: this.sessionId },
       "\u{1F50D} DEBUG: Emit operations enabled for AgentSession"
     );
@@ -10243,6 +9985,7 @@ var AgentSession = class {
    * Send data operation to stream when emit operations is enabled
    */
   async sendDataOperation(event) {
+    console.log("sendDataOperation called with event", Date.now());
     try {
       const streamHelper = getStreamHelper(this.sessionId);
       if (streamHelper) {
@@ -10258,7 +10001,7 @@ var AgentSession = class {
         await streamHelper.writeOperation(formattedOperation);
       }
     } catch (error) {
-      logger9.error(
+      logger8.error(
         {
           sessionId: this.sessionId,
           eventType: event.eventType,
@@ -10317,7 +10060,7 @@ var AgentSession = class {
     if (this.statusUpdateState.config.timeInSeconds) {
       this.statusUpdateTimer = setInterval(async () => {
         if (!this.statusUpdateState || this.isEnded) {
-          logger9.debug(
+          logger8.debug(
             { sessionId: this.sessionId },
             "Timer triggered but session already cleaned up or ended"
           );
@@ -10329,7 +10072,7 @@ var AgentSession = class {
         }
         await this.checkAndSendTimeBasedUpdate();
       }, this.statusUpdateState.config.timeInSeconds * 1e3);
-      logger9.info(
+      logger8.info(
         {
           sessionId: this.sessionId,
           intervalMs: this.statusUpdateState.config.timeInSeconds * 1e3
@@ -10353,7 +10096,7 @@ var AgentSession = class {
       this.sendDataOperation(dataOpEvent);
     }
     if (this.isEnded) {
-      logger9.debug(
+      logger8.debug(
         {
           sessionId: this.sessionId,
           eventType,
@@ -10375,7 +10118,7 @@ var AgentSession = class {
       if (artifactData.pendingGeneration) {
         const artifactId = artifactData.artifactId;
         if (this.pendingArtifacts.size >= this.MAX_PENDING_ARTIFACTS) {
-          logger9.warn(
+          logger8.warn(
             {
               sessionId: this.sessionId,
               artifactId,
@@ -10397,7 +10140,7 @@ var AgentSession = class {
             this.artifactProcessingErrors.set(artifactId, errorCount);
             if (errorCount >= this.MAX_ARTIFACT_RETRIES) {
               this.pendingArtifacts.delete(artifactId);
-              logger9.error(
+              logger8.error(
                 {
                   sessionId: this.sessionId,
                   artifactId,
@@ -10409,7 +10152,7 @@ var AgentSession = class {
                 "Artifact processing failed after max retries, giving up"
               );
             } else {
-              logger9.warn(
+              logger8.warn(
                 {
                   sessionId: this.sessionId,
                   artifactId,
@@ -10432,14 +10175,14 @@ var AgentSession = class {
    */
   checkStatusUpdates() {
     if (this.isEnded) {
-      logger9.debug(
+      logger8.debug(
         { sessionId: this.sessionId },
         "Session has ended - skipping status update check"
       );
       return;
     }
     if (!this.statusUpdateState) {
-      logger9.debug({ sessionId: this.sessionId }, "No status update state - skipping check");
+      logger8.debug({ sessionId: this.sessionId }, "No status update state - skipping check");
       return;
     }
     const statusUpdateState = this.statusUpdateState;
@@ -10450,11 +10193,11 @@ var AgentSession = class {
    */
   async checkAndSendTimeBasedUpdate() {
     if (this.isEnded) {
-      logger9.debug({ sessionId: this.sessionId }, "Session has ended - skipping time-based update");
+      logger8.debug({ sessionId: this.sessionId }, "Session has ended - skipping time-based update");
       return;
     }
     if (!this.statusUpdateState) {
-      logger9.debug(
+      logger8.debug(
         { sessionId: this.sessionId },
         "No status updates configured for time-based check"
       );
@@ -10467,7 +10210,7 @@ var AgentSession = class {
     try {
       await this.generateAndSendUpdate();
     } catch (error) {
-      logger9.error(
+      logger8.error(
         {
           sessionId: this.sessionId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -10570,29 +10313,29 @@ var AgentSession = class {
    */
   async generateAndSendUpdate() {
     if (this.isEnded) {
-      logger9.debug({ sessionId: this.sessionId }, "Session has ended - not generating update");
+      logger8.debug({ sessionId: this.sessionId }, "Session has ended - not generating update");
       return;
     }
     if (this.isTextStreaming) {
-      logger9.debug(
+      logger8.debug(
         { sessionId: this.sessionId },
         "Text is currently streaming - skipping status update"
       );
       return;
     }
     if (this.isGeneratingUpdate) {
-      logger9.debug(
+      logger8.debug(
         { sessionId: this.sessionId },
         "Update already in progress - skipping duplicate generation"
       );
       return;
     }
     if (!this.statusUpdateState) {
-      logger9.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
+      logger8.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
       return;
     }
     if (!this.agentId) {
-      logger9.warn({ sessionId: this.sessionId }, "No agent ID - cannot generate update");
+      logger8.warn({ sessionId: this.sessionId }, "No agent ID - cannot generate update");
       return;
     }
     const newEventCount = this.events.length - this.statusUpdateState.lastEventCount;
@@ -10604,7 +10347,7 @@ var AgentSession = class {
     try {
       const streamHelper = getStreamHelper(this.sessionId);
       if (!streamHelper) {
-        logger9.warn(
+        logger8.warn(
           { sessionId: this.sessionId },
           "No stream helper found - cannot send status update"
         );
@@ -10624,7 +10367,7 @@ var AgentSession = class {
       if (result.summaries && result.summaries.length > 0) {
         for (const summary of result.summaries) {
           if (!summary || !summary.type || !summary.data || !summary.data.label || Object.keys(summary.data).length === 0) {
-            logger9.warn(
+            logger8.warn(
               {
                 sessionId: this.sessionId,
                 summary
@@ -10661,7 +10404,7 @@ var AgentSession = class {
         this.statusUpdateState.lastEventCount = this.events.length;
       }
     } catch (error) {
-      logger9.error(
+      logger8.error(
         {
           sessionId: this.sessionId,
           error: error instanceof Error ? error.message : "Unknown error",
@@ -10699,7 +10442,7 @@ var AgentSession = class {
           this.releaseUpdateLock();
         }
       } catch (error) {
-        logger9.error(
+        logger8.error(
           {
             sessionId: this.sessionId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -10778,7 +10521,7 @@ User's Question/Context:
 ${conversationHistory}
 ` : "";
             } catch (error) {
-              logger9.warn(
+              logger8.warn(
                 { sessionId: this.sessionId, error },
                 "Failed to fetch conversation history for structured status update"
               );
@@ -10788,12 +10531,12 @@ ${conversationHistory}
 Previous updates sent to user:
 ${previousSummaries.map((s4, i3) => `${i3 + 1}. ${s4}`).join("\n")}
 ` : "";
-          const selectionSchema = z8.z.object(
+          const selectionSchema = zodOpenapi.z.object(
             Object.fromEntries([
               [
                 "no_relevant_updates",
-                z8.z.object({
-                  no_updates: z8.z.boolean().default(true)
+                zodOpenapi.z.object({
+                  no_updates: zodOpenapi.z.boolean().default(true)
                 }).optional().describe(
                   "Use when nothing substantially new to report. Should only use on its own."
                 )
@@ -10872,7 +10615,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           if (!modelToUse) {
             throw new Error("No model configuration available");
           }
-          const model = ModelFactory.createModel(modelToUse);
+          const model = agentsCore.ModelFactory.createModel(modelToUse);
           const { object } = await ai.generateObject({
             model,
             prompt,
@@ -10889,10 +10632,10 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             }
           });
           const result = object;
-          logger9.info({ result: JSON.stringify(result) }, "DEBUG: Result");
+          logger8.info({ result: JSON.stringify(result) }, "DEBUG: Result");
           const summaries = [];
           for (const [componentId, data] of Object.entries(result)) {
-            logger9.info({ componentId, data: JSON.stringify(data) }, "DEBUG: Component data");
+            logger8.info({ componentId, data: JSON.stringify(data) }, "DEBUG: Component data");
             if (componentId === "no_relevant_updates") {
               continue;
             }
@@ -10912,7 +10655,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           return { summaries };
         } catch (error) {
           agentsCore.setSpanWithError(span, error instanceof Error ? error : new Error(String(error)));
-          logger9.error({ error }, "Failed to generate structured update, using fallback");
+          logger8.error({ error }, "Failed to generate structured update, using fallback");
           return { summaries: [] };
         } finally {
           span.end();
@@ -10927,8 +10670,8 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
     if (component.detailsSchema && "properties" in component.detailsSchema) {
       return this.buildZodSchemaFromJson(component.detailsSchema);
     }
-    return z8.z.object({
-      label: z8.z.string().describe(
+    return zodOpenapi.z.object({
+      label: zodOpenapi.z.string().describe(
         'A short 3-5 word phrase, that is a descriptive label for the update component. This Label must be EXTREMELY unique to represent the UNIQUE update we are providing. The ACTUAL finding or result, not the action. What specific information was discovered? (e.g., "Slack requires OAuth 2.0 setup", "Found 5 integration methods", "API rate limit is 100/minute"). Include the actual detail or insight, not just that you searched or processed. CRITICAL: Only use facts explicitly found in the activities - NEVER invent names, people, organizations, or details that are not present in the actual tool results.'
       )
     });
@@ -10938,56 +10681,56 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
    */
   buildZodSchemaFromJson(jsonSchema) {
     const properties = {};
-    properties.label = z8.z.string().describe(
+    properties.label = zodOpenapi.z.string().describe(
       'A short 3-5 word phrase, that is a descriptive label for the update component. This Label must be EXTREMELY unique to represent the UNIQUE update we are providing. The SPECIFIC finding, result, or insight discovered (e.g., "Slack bot needs workspace admin role", "Found ingestion requires 3 steps", "Channel history limited to 10k messages"). State the ACTUAL information found, not that you searched. What did you LEARN or DISCOVER? What specific detail is now known? CRITICAL: Only use facts explicitly found in the activities - NEVER invent names, people, organizations, or details that are not present in the actual tool results.'
     );
     for (const [key, value] of Object.entries(jsonSchema.properties)) {
       let zodType;
       if (value.enum && Array.isArray(value.enum)) {
         if (value.enum.length === 1) {
-          zodType = z8.z.literal(value.enum[0]);
+          zodType = zodOpenapi.z.literal(value.enum[0]);
         } else {
           const [first, ...rest] = value.enum;
-          zodType = z8.z.enum([first, ...rest]);
+          zodType = zodOpenapi.z.enum([first, ...rest]);
         }
       } else if (value.type === "string") {
-        zodType = z8.z.string();
+        zodType = zodOpenapi.z.string();
         if (value.minLength) zodType = zodType.min(value.minLength);
         if (value.maxLength) zodType = zodType.max(value.maxLength);
         if (value.format === "email") zodType = zodType.email();
         if (value.format === "url" || value.format === "uri")
           zodType = zodType.url();
       } else if (value.type === "number" || value.type === "integer") {
-        zodType = value.type === "integer" ? z8.z.number().int() : z8.z.number();
+        zodType = value.type === "integer" ? zodOpenapi.z.number().int() : zodOpenapi.z.number();
         if (value.minimum !== void 0) zodType = zodType.min(value.minimum);
         if (value.maximum !== void 0) zodType = zodType.max(value.maximum);
       } else if (value.type === "boolean") {
-        zodType = z8.z.boolean();
+        zodType = zodOpenapi.z.boolean();
       } else if (value.type === "array") {
         if (value.items) {
           if (value.items.enum && Array.isArray(value.items.enum)) {
             const [first, ...rest] = value.items.enum;
-            zodType = z8.z.array(z8.z.enum([first, ...rest]));
+            zodType = zodOpenapi.z.array(zodOpenapi.z.enum([first, ...rest]));
           } else if (value.items.type === "string") {
-            zodType = z8.z.array(z8.z.string());
+            zodType = zodOpenapi.z.array(zodOpenapi.z.string());
           } else if (value.items.type === "number") {
-            zodType = z8.z.array(z8.z.number());
+            zodType = zodOpenapi.z.array(zodOpenapi.z.number());
           } else if (value.items.type === "boolean") {
-            zodType = z8.z.array(z8.z.boolean());
+            zodType = zodOpenapi.z.array(zodOpenapi.z.boolean());
           } else if (value.items.type === "object") {
-            zodType = z8.z.array(z8.z.record(z8.z.string(), z8.z.any()));
+            zodType = zodOpenapi.z.array(zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.any()));
           } else {
-            zodType = z8.z.array(z8.z.any());
+            zodType = zodOpenapi.z.array(zodOpenapi.z.any());
           }
         } else {
-          zodType = z8.z.array(z8.z.any());
+          zodType = zodOpenapi.z.array(zodOpenapi.z.any());
         }
         if (value.minItems) zodType = zodType.min(value.minItems);
         if (value.maxItems) zodType = zodType.max(value.maxItems);
       } else if (value.type === "object") {
-        zodType = z8.z.record(z8.z.string(), z8.z.any());
+        zodType = zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.any());
       } else {
-        zodType = z8.z.any();
+        zodType = zodOpenapi.z.any();
       }
       if (value.description) {
         zodType = zodType.describe(value.description);
@@ -10997,7 +10740,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
       }
       properties[key] = zodType;
     }
-    return z8.z.object(properties);
+    return zodOpenapi.z.object(properties);
   }
   /**
    * Extract user-visible activities with rich formatting and complete information
@@ -11184,7 +10927,7 @@ Make it specific and relevant.`;
                   });
                   if (agentData && "models" in agentData && agentData.models?.base?.model) {
                     modelToUse = agentData.models.base;
-                    logger9.info(
+                    logger8.info(
                       {
                         sessionId: this.sessionId,
                         artifactId: artifactData.artifactId,
@@ -11195,7 +10938,7 @@ Make it specific and relevant.`;
                     );
                   }
                 } catch (error) {
-                  logger9.warn(
+                  logger8.warn(
                     {
                       sessionId: this.sessionId,
                       artifactId: artifactData.artifactId,
@@ -11207,7 +10950,7 @@ Make it specific and relevant.`;
                 }
               }
               if (!modelToUse?.model?.trim()) {
-                logger9.warn(
+                logger8.warn(
                   {
                     sessionId: this.sessionId,
                     artifactId: artifactData.artifactId
@@ -11227,10 +10970,10 @@ Make it specific and relevant.`;
               description: `${artifactData.artifactType || "Data"} from ${artifactData.metadata?.toolCallId || "tool results"}`
             };
           } else {
-            const model = ModelFactory.createModel(modelToUse);
-            const schema2 = z8.z.object({
-              name: z8.z.string().describe("Concise, descriptive name for the artifact"),
-              description: z8.z.string().describe("Brief description of the artifact's relevance to the user's question")
+            const model = agentsCore.ModelFactory.createModel(modelToUse);
+            const schema2 = zodOpenapi.z.object({
+              name: zodOpenapi.z.string().describe("Concise, descriptive name for the artifact"),
+              description: zodOpenapi.z.string().describe("Brief description of the artifact's relevance to the user's question")
             });
             const { object } = await tracer.startActiveSpan(
               "agent_session.generate_artifact_metadata",
@@ -11289,7 +11032,7 @@ Make it specific and relevant.`;
                     return result2;
                   } catch (error) {
                     lastError = error instanceof Error ? error : new Error(String(error));
-                    logger9.warn(
+                    logger8.warn(
                       {
                         sessionId: this.sessionId,
                         artifactId: artifactData.artifactId,
@@ -11337,7 +11080,7 @@ Make it specific and relevant.`;
             });
             span.setStatus({ code: api.SpanStatusCode.OK });
           } catch (saveError) {
-            logger9.error(
+            logger8.error(
               {
                 sessionId: this.sessionId,
                 artifactId: artifactData.artifactId,
@@ -11365,7 +11108,7 @@ Make it specific and relevant.`;
                   metadata: artifactData.metadata || {},
                   toolCallId: artifactData.toolCallId
                 });
-                logger9.info(
+                logger8.info(
                   {
                     sessionId: this.sessionId,
                     artifactId: artifactData.artifactId
@@ -11376,7 +11119,7 @@ Make it specific and relevant.`;
             } catch (fallbackError) {
               const isDuplicateError = fallbackError instanceof Error && (fallbackError.message?.includes("UNIQUE") || fallbackError.message?.includes("duplicate"));
               if (isDuplicateError) ; else {
-                logger9.error(
+                logger8.error(
                   {
                     sessionId: this.sessionId,
                     artifactId: artifactData.artifactId,
@@ -11389,7 +11132,7 @@ Make it specific and relevant.`;
           }
         } catch (error) {
           agentsCore.setSpanWithError(span, error instanceof Error ? error : new Error(String(error)));
-          logger9.error(
+          logger8.error(
             {
               sessionId: this.sessionId,
               artifactId: artifactData.artifactId,
@@ -11408,7 +11151,7 @@ Make it specific and relevant.`;
    */
   setArtifactCache(key, artifact) {
     this.artifactCache.set(key, artifact);
-    logger9.debug({ sessionId: this.sessionId, key }, "Artifact cached in session");
+    logger8.debug({ sessionId: this.sessionId, key }, "Artifact cached in session");
   }
   /**
    * Get session-scoped ArtifactService instance
@@ -11427,7 +11170,7 @@ Make it specific and relevant.`;
    */
   getArtifactCache(key) {
     const artifact = this.artifactCache.get(key);
-    logger9.debug({ sessionId: this.sessionId, key, found: !!artifact }, "Artifact cache lookup");
+    logger8.debug({ sessionId: this.sessionId, key, found: !!artifact }, "Artifact cache lookup");
     return artifact || null;
   }
   /**
@@ -11448,7 +11191,7 @@ var AgentSessionManager = class {
     const sessionId = messageId;
     const session = new AgentSession(sessionId, messageId, agentId, tenantId, projectId, contextId);
     this.sessions.set(sessionId, session);
-    logger9.info(
+    logger8.info(
       { sessionId, messageId, agentId, tenantId, projectId, contextId },
       "AgentSession created"
     );
@@ -11462,7 +11205,7 @@ var AgentSessionManager = class {
     if (session) {
       session.initializeStatusUpdates(config, summarizerModel, baseModel);
     } else {
-      logger9.error(
+      logger8.error(
         {
           sessionId,
           availableSessions: Array.from(this.sessions.keys())
@@ -11479,7 +11222,7 @@ var AgentSessionManager = class {
     if (session) {
       session.enableEmitOperations();
     } else {
-      logger9.error(
+      logger8.error(
         {
           sessionId,
           availableSessions: Array.from(this.sessions.keys())
@@ -11501,7 +11244,7 @@ var AgentSessionManager = class {
   recordEvent(sessionId, eventType, subAgentId, data) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger9.warn({ sessionId }, "Attempted to record event in non-existent session");
+      logger8.warn({ sessionId }, "Attempted to record event in non-existent session");
       return;
     }
     session.recordEvent(eventType, subAgentId, data);
@@ -11512,12 +11255,12 @@ var AgentSessionManager = class {
   endSession(sessionId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger9.warn({ sessionId }, "Attempted to end non-existent session");
+      logger8.warn({ sessionId }, "Attempted to end non-existent session");
       return [];
     }
     const events = session.getEvents();
     const summary = session.getSummary();
-    logger9.info({ sessionId, summary }, "AgentSession ended");
+    logger8.info({ sessionId, summary }, "AgentSession ended");
     session.cleanup();
     this.sessions.delete(sessionId);
     return events;
@@ -11627,7 +11370,7 @@ init_logger();
 // src/services/IncrementalStreamParser.ts
 init_execution_limits();
 init_logger();
-var logger10 = agentsCore.getLogger("IncrementalStreamParser");
+var logger9 = agentsCore.getLogger("IncrementalStreamParser");
 var IncrementalStreamParser = class _IncrementalStreamParser {
   buffer = "";
   pendingTextBuffer = "";
@@ -11685,7 +11428,7 @@ var IncrementalStreamParser = class _IncrementalStreamParser {
   async initializeArtifactMap() {
     try {
       this.artifactMap = await this.artifactParser.getContextArtifacts(this.contextId);
-      logger10.debug(
+      logger9.debug(
         {
           contextId: this.contextId,
           artifactMapSize: this.artifactMap.size
@@ -11693,7 +11436,7 @@ var IncrementalStreamParser = class _IncrementalStreamParser {
         "Initialized artifact map for streaming"
       );
     } catch (error) {
-      logger10.warn({ error, contextId: this.contextId }, "Failed to initialize artifact map");
+      logger9.warn({ error, contextId: this.contextId }, "Failed to initialize artifact map");
       this.artifactMap = /* @__PURE__ */ new Map();
     }
   }
@@ -12026,6 +11769,143 @@ ${chunk}`;
   }
 };
 
+// src/services/PendingToolApprovalManager.ts
+init_logger();
+var logger10 = agentsCore.getLogger("PendingToolApprovalManager");
+var APPROVAL_CLEANUP_INTERVAL_MS = 2 * 60 * 1e3;
+var APPROVAL_TIMEOUT_MS = 10 * 60 * 1e3;
+var PendingToolApprovalManager = class _PendingToolApprovalManager {
+  static instance;
+  pendingApprovals = /* @__PURE__ */ new Map();
+  constructor() {
+    setInterval(() => this.cleanupExpiredApprovals(), APPROVAL_CLEANUP_INTERVAL_MS);
+  }
+  static getInstance() {
+    if (!_PendingToolApprovalManager.instance) {
+      _PendingToolApprovalManager.instance = new _PendingToolApprovalManager();
+    }
+    return _PendingToolApprovalManager.instance;
+  }
+  /**
+   * Create a new pending approval and return a promise that resolves with approval status
+   */
+  async waitForApproval(toolCallId, toolName, args2, conversationId, subAgentId) {
+    return new Promise((resolve2, reject) => {
+      const timeoutId = setTimeout(() => {
+        this.pendingApprovals.delete(toolCallId);
+        resolve2({
+          approved: false,
+          reason: `Tool approval timeout for ${toolName} (${toolCallId})`
+        });
+      }, APPROVAL_TIMEOUT_MS);
+      const approval = {
+        toolCallId,
+        toolName,
+        args: args2,
+        conversationId,
+        subAgentId,
+        createdAt: Date.now(),
+        resolve: resolve2,
+        reject,
+        timeoutId
+      };
+      this.pendingApprovals.set(toolCallId, approval);
+      logger10.info(
+        {
+          toolCallId,
+          toolName,
+          conversationId,
+          subAgentId
+        },
+        "Tool approval request created, waiting for user response"
+      );
+    });
+  }
+  /**
+   * Approve a pending tool call
+   */
+  approveToolCall(toolCallId) {
+    const approval = this.pendingApprovals.get(toolCallId);
+    if (!approval) {
+      logger10.warn({ toolCallId }, "Tool approval not found or already processed");
+      return false;
+    }
+    logger10.info(
+      {
+        toolCallId,
+        toolName: approval.toolName,
+        conversationId: approval.conversationId
+      },
+      "Tool approved by user, resuming execution"
+    );
+    clearTimeout(approval.timeoutId);
+    this.pendingApprovals.delete(toolCallId);
+    approval.resolve({ approved: true });
+    return true;
+  }
+  /**
+   * Deny a pending tool call
+   */
+  denyToolCall(toolCallId, reason) {
+    const approval = this.pendingApprovals.get(toolCallId);
+    if (!approval) {
+      logger10.warn({ toolCallId }, "Tool approval not found or already processed");
+      return false;
+    }
+    logger10.info(
+      {
+        toolCallId,
+        toolName: approval.toolName,
+        conversationId: approval.conversationId,
+        reason
+      },
+      "Tool execution denied by user"
+    );
+    clearTimeout(approval.timeoutId);
+    this.pendingApprovals.delete(toolCallId);
+    approval.resolve({
+      approved: false,
+      reason: reason || "User denied approval"
+    });
+    return true;
+  }
+  /**
+   * Clean up expired approvals (called by interval timer)
+   */
+  cleanupExpiredApprovals() {
+    const now = Date.now();
+    let cleanedUp = 0;
+    for (const [toolCallId, approval] of this.pendingApprovals) {
+      if (now - approval.createdAt > APPROVAL_TIMEOUT_MS) {
+        clearTimeout(approval.timeoutId);
+        this.pendingApprovals.delete(toolCallId);
+        approval.resolve({ approved: false, reason: "Tool approval expired" });
+        cleanedUp++;
+      }
+    }
+    if (cleanedUp > 0) {
+      logger10.info({ cleanedUp }, "Cleaned up expired tool approvals");
+    }
+  }
+  /**
+   * Get current status for monitoring
+   */
+  getStatus() {
+    return {
+      pendingApprovals: this.pendingApprovals.size,
+      approvals: Array.from(this.pendingApprovals.values()).map((approval) => ({
+        toolCallId: approval.toolCallId,
+        toolName: approval.toolName,
+        conversationId: approval.conversationId,
+        subAgentId: approval.subAgentId,
+        createdAt: approval.createdAt,
+        age: Date.now() - approval.createdAt
+      }))
+    };
+  }
+};
+var pendingToolApprovalManager = PendingToolApprovalManager.getInstance();
+
 // src/services/ResponseFormatter.ts
 init_logger();
 var logger11 = agentsCore.getLogger("ResponseFormatter");
@@ -12229,7 +12109,7 @@ var logger12 = agentsCore.getLogger("DataComponentSchema");
 function jsonSchemaToZod(jsonSchema) {
   if (!jsonSchema || typeof jsonSchema !== "object") {
     logger12.warn({ jsonSchema }, "Invalid JSON schema provided, using string fallback");
-    return z8.z.string();
+    return zodOpenapi.z.string();
   }
   switch (jsonSchema.type) {
     case "object":
@@ -12238,22 +12118,22 @@ function jsonSchemaToZod(jsonSchema) {
         for (const [key, prop] of Object.entries(jsonSchema.properties)) {
           shape[key] = jsonSchemaToZod(prop);
         }
-        return z8.z.object(shape);
+        return zodOpenapi.z.object(shape);
       }
-      return z8.z.record(z8.z.string(), z8.z.unknown());
+      return zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.unknown());
     case "array": {
-      const itemSchema = jsonSchema.items ? jsonSchemaToZod(jsonSchema.items) : z8.z.unknown();
-      return z8.z.array(itemSchema);
+      const itemSchema = jsonSchema.items ? jsonSchemaToZod(jsonSchema.items) : zodOpenapi.z.unknown();
+      return zodOpenapi.z.array(itemSchema);
     }
     case "string":
-      return z8.z.string();
+      return zodOpenapi.z.string();
     case "number":
     case "integer":
-      return z8.z.number();
+      return zodOpenapi.z.number();
     case "boolean":
-      return z8.z.boolean();
+      return zodOpenapi.z.boolean();
     case "null":
-      return z8.z.null();
+      return zodOpenapi.z.null();
     default:
       logger12.warn(
         {
@@ -12262,7 +12142,7 @@ function jsonSchemaToZod(jsonSchema) {
         },
         "Unsupported JSON schema type, using unknown validation"
       );
-      return z8.z.unknown();
+      return zodOpenapi.z.unknown();
   }
 }
 
@@ -12509,9 +12389,9 @@ var ArtifactReferenceSchema = class _ArtifactReferenceSchema {
    * Get the standard Zod schema for artifact reference components
    */
   static getSchema() {
-    return z8.z.object({
-      id: z8.z.string(),
-      name: z8.z.literal("Artifact"),
+    return zodOpenapi.z.object({
+      id: zodOpenapi.z.string(),
+      name: zodOpenapi.z.literal("Artifact"),
       props: jsonSchemaToZod(_ArtifactReferenceSchema.ARTIFACT_PROPS_SCHEMA)
     });
   }
@@ -12562,9 +12442,9 @@ var ArtifactCreateSchema = class {
         },
         required: ["id", "tool_call_id", "type", "base_selector"]
       };
-      return z8.z.object({
-        id: z8.z.string(),
-        name: z8.z.literal(`ArtifactCreate_${component.name}`),
+      return zodOpenapi.z.object({
+        id: zodOpenapi.z.string(),
+        name: zodOpenapi.z.literal(`ArtifactCreate_${component.name}`),
         props: jsonSchemaToZod(propsSchema)
       });
     });
@@ -12636,13 +12516,14 @@ var DEFAULT_BACKOFF = {
 var DEFAULT_RETRY_STATUS_CODES = ["429", "500", "502", "503", "504"];
 var PermanentError = class _PermanentError extends Error {
   cause;
+  type;
   constructor(message, options) {
     let msg = message;
     if (options?.cause) {
       msg += `: ${options.cause}`;
     }
     super(msg, options);
-    this.name = "PermanentError";
+    this.name = options?.type || "PermanentError";
     if (typeof this.cause === "undefined") {
       this.cause = options?.cause;
     }
@@ -12951,6 +12832,12 @@ var A2AClient = class {
       }
     }
     const rpcResponse = await httpResponse.json();
+    if (rpcResponse.error?.data?.type === "connection_refused") {
+      throw new PermanentError(rpcResponse.error.message, {
+        cause: new Error(rpcResponse.error.message),
+        type: "connection_refused"
+      });
+    }
     if (rpcResponse.id !== requestId2) {
       logger13.warn(
         {
@@ -13342,7 +13229,7 @@ var createTransferToAgentTool = ({
   const toolDescription = generateTransferToolDescription(transferConfig);
   return ai.tool({
     description: toolDescription,
-    inputSchema: z8__default.default.object({}),
+    inputSchema: zodOpenapi.z.object({}),
     execute: async () => {
       const activeSpan = api.trace.getActiveSpan();
       if (activeSpan) {
@@ -13397,7 +13284,7 @@ function createDelegateToAgentTool({
 }) {
   return ai.tool({
     description: generateDelegateToolDescription(delegateConfig),
-    inputSchema: z8__default.default.object({ message: z8__default.default.string() }),
+    inputSchema: zodOpenapi.z.object({ message: zodOpenapi.z.string() }),
     execute: async (input, context) => {
       const delegationId = `del_${agentsCore.generateId()}`;
       const activeSpan = api.trace.getActiveSpan();
@@ -14847,7 +14734,7 @@ var Agent = class {
   /**
    * Wraps a tool with streaming lifecycle tracking (start, complete, error) and AgentSession recording
    */
-  wrapToolWithStreaming(toolName, toolDefinition, streamRequestId, toolType, relationshipId) {
+  wrapToolWithStreaming(toolName, toolDefinition, streamRequestId, toolType, relationshipId, options) {
     if (!toolDefinition || typeof toolDefinition !== "object" || !("execute" in toolDefinition)) {
       return toolDefinition;
     }
@@ -14869,13 +14756,24 @@ var Agent = class {
           });
         }
         const isInternalTool = toolName.includes("save_tool_result") || toolName.includes("thinking_complete") || toolName.startsWith("transfer_to_");
+        const needsApproval = options?.needsApproval || false;
         if (streamRequestId && !isInternalTool) {
-          agentSessionManager.recordEvent(streamRequestId, "tool_call", this.config.id, {
+          const toolCallData = {
             toolName,
             input: args2,
             toolCallId,
             relationshipId
-          });
+          };
+          if (needsApproval) {
+            toolCallData.needsApproval = true;
+            toolCallData.conversationId = this.conversationId;
+          }
+          await agentSessionManager.recordEvent(
+            streamRequestId,
+            "tool_call",
+            this.config.id,
+            toolCallData
+          );
         }
         try {
           const result = await originalExecute(args2, context);
@@ -14920,7 +14818,8 @@ var Agent = class {
               output: result,
               toolCallId,
               duration,
-              relationshipId
+              relationshipId,
+              needsApproval
             });
           }
           return result;
@@ -14934,7 +14833,8 @@ var Agent = class {
               toolCallId,
               duration,
               error: errorMessage,
-              relationshipId
+              relationshipId,
+              needsApproval
             });
           }
           throw error;
@@ -15003,30 +14903,120 @@ var Agent = class {
       const wrappedTools2 = {};
       for (const [index, toolSet] of tools.entries()) {
         const relationshipId = mcpTools[index]?.relationshipId;
-        for (const [toolName, toolDef] of Object.entries(toolSet)) {
+        for (const [toolName, toolDef] of Object.entries(toolSet.tools)) {
+          const needsApproval = toolSet.toolPolicies?.[toolName]?.needsApproval || false;
+          const enhancedTool = {
+            ...toolDef,
+            needsApproval
+          };
           wrappedTools2[toolName] = this.wrapToolWithStreaming(
             toolName,
-            toolDef,
+            enhancedTool,
             streamRequestId,
             "mcp",
-            relationshipId
+            relationshipId,
+            { needsApproval }
           );
         }
       }
       return wrappedTools2;
     }
     const wrappedTools = {};
-    for (const [index, toolSet] of tools.entries()) {
+    for (const [index, toolResult] of tools.entries()) {
       const relationshipId = mcpTools[index]?.relationshipId;
-      for (const [toolName, originalTool] of Object.entries(toolSet)) {
+      for (const [toolName, originalTool] of Object.entries(toolResult.tools)) {
         if (!isValidTool(originalTool)) {
           logger19.error({ toolName }, "Invalid MCP tool structure - missing required properties");
           continue;
         }
+        const needsApproval = toolResult.toolPolicies?.[toolName]?.needsApproval || false;
+        logger19.debug(
+          {
+            toolName,
+            toolPolicies: toolResult.toolPolicies,
+            needsApproval,
+            policyForThisTool: toolResult.toolPolicies?.[toolName]
+          },
+          "Tool approval check"
+        );
         const sessionWrappedTool = ai.tool({
           description: originalTool.description,
           inputSchema: originalTool.inputSchema,
           execute: async (args2, { toolCallId }) => {
+            if (needsApproval) {
+              logger19.info(
+                { toolName, toolCallId, args: args2 },
+                "Tool requires approval - waiting for user response"
+              );
+              const currentSpan = api.trace.getActiveSpan();
+              if (currentSpan) {
+                currentSpan.addEvent("tool.approval.requested", {
+                  "tool.name": toolName,
+                  "tool.callId": toolCallId,
+                  "subAgent.id": this.config.id
+                });
+              }
+              tracer.startActiveSpan(
+                "tool.approval_requested",
+                {
+                  attributes: {
+                    "tool.name": toolName,
+                    "tool.callId": toolCallId,
+                    "subAgent.id": this.config.id,
+                    "subAgent.name": this.config.name
+                  }
+                },
+                (requestSpan) => {
+                  requestSpan.setStatus({ code: api.SpanStatusCode.OK });
+                  requestSpan.end();
+                }
+              );
+              const approvalResult = await pendingToolApprovalManager.waitForApproval(
+                toolCallId,
+                toolName,
+                args2,
+                this.conversationId || "unknown",
+                this.config.id
+              );
+              if (!approvalResult.approved) {
+                return tracer.startActiveSpan(
+                  "tool.approval_denied",
+                  {
+                    attributes: {
+                      "tool.name": toolName,
+                      "tool.callId": toolCallId,
+                      "subAgent.id": this.config.id,
+                      "subAgent.name": this.config.name
+                    }
+                  },
+                  (denialSpan) => {
+                    logger19.info(
+                      { toolName, toolCallId, reason: approvalResult.reason },
+                      "Tool execution denied by user"
+                    );
+                    denialSpan.setStatus({ code: api.SpanStatusCode.OK });
+                    denialSpan.end();
+                    return `User denied approval to run this tool: ${approvalResult.reason}`;
+                  }
+                );
+              }
+              tracer.startActiveSpan(
+                "tool.approval_approved",
+                {
+                  attributes: {
+                    "tool.name": toolName,
+                    "tool.callId": toolCallId,
+                    "subAgent.id": this.config.id,
+                    "subAgent.name": this.config.name
+                  }
+                },
+                (approvedSpan) => {
+                  logger19.info({ toolName, toolCallId }, "Tool approved, continuing with execution");
+                  approvedSpan.setStatus({ code: api.SpanStatusCode.OK });
+                  approvedSpan.end();
+                }
+              );
+            }
             logger19.debug({ toolName, toolCallId }, "MCP Tool Called");
             try {
               const rawResult = await originalTool.execute(args2, { toolCallId });
@@ -15092,7 +15082,8 @@ var Agent = class {
           sessionWrappedTool,
           streamRequestId,
           "mcp",
-          relationshipId
+          relationshipId,
+          { needsApproval }
         );
       }
     }
@@ -15131,8 +15122,10 @@ var Agent = class {
         subAgentId: this.config.id
       }
     });
-    const agentToolRelationHeaders = toolsForAgent.data.find((t2) => t2.toolId === tool3.id)?.headers || void 0;
-    const selectedTools = toolsForAgent.data.find((t2) => t2.toolId === tool3.id)?.selectedTools || void 0;
+    const toolRelation = toolsForAgent.data.find((t2) => t2.toolId === tool3.id);
+    const agentToolRelationHeaders = toolRelation?.headers || void 0;
+    const selectedTools = toolRelation?.selectedTools || void 0;
+    const toolPolicies = toolRelation?.toolPolicies || {};
     let serverConfig;
     if (credentialReferenceId && this.credentialStuffer) {
       const credentialReference = await agentsCore.getCredentialReference(dbClient_default)({
@@ -15263,7 +15256,7 @@ var Agent = class {
         );
       }
     }
-    return tools;
+    return { tools, toolPolicies };
   }
   async createMcpConnection(tool3, serverConfig) {
     const client = new agentsCore.McpClient({
@@ -15286,12 +15279,12 @@ var Agent = class {
         if (error?.cause && JSON.stringify(error.cause).includes("ECONNREFUSED")) {
           const errorMessage = "Connection refused. Please check if the MCP server is running.";
           throw new Error(errorMessage);
-        } else if (error.message.includes("404")) {
+        }
+        if (error.message.includes("404")) {
           const errorMessage = "Error accessing endpoint (HTTP 404)";
           throw new Error(errorMessage);
-        } else {
-          throw new Error(`MCP server connection failed: ${error.message}`);
         }
+        throw new Error(`MCP server connection failed: ${error.message}`);
       }
       throw error;
     }
@@ -15651,9 +15644,9 @@ var Agent = class {
   getArtifactTools() {
     return ai.tool({
       description: "Call this tool to get the complete artifact data with the given artifactId. This retrieves the full artifact content (not just the summary). Only use this when you need the complete artifact data and the summary shown in your context is insufficient.",
-      inputSchema: z8.z.object({
-        artifactId: z8.z.string().describe("The unique identifier of the artifact to get."),
-        toolCallId: z8.z.string().describe("The tool call ID associated with this artifact.")
+      inputSchema: zodOpenapi.z.object({
+        artifactId: zodOpenapi.z.string().describe("The unique identifier of the artifact to get."),
+        toolCallId: zodOpenapi.z.string().describe("The tool call ID associated with this artifact.")
       }),
       execute: async ({ artifactId, toolCallId }) => {
         logger19.info({ artifactId, toolCallId }, "get_artifact_full executed");
@@ -15680,9 +15673,9 @@ var Agent = class {
   createThinkingCompleteTool() {
     return ai.tool({
       description: "\u{1F6A8} CRITICAL: Call this tool IMMEDIATELY when you have gathered enough information to answer the user. This is MANDATORY - you CANNOT provide text responses in thinking mode, only tool calls. Call thinking_complete as soon as you have sufficient data to generate a structured response.",
-      inputSchema: z8.z.object({
-        complete: z8.z.boolean().describe("ALWAYS set to true - marks end of research phase"),
-        summary: z8.z.string().describe(
+      inputSchema: zodOpenapi.z.object({
+        complete: zodOpenapi.z.boolean().describe("ALWAYS set to true - marks end of research phase"),
+        summary: zodOpenapi.z.string().describe(
           "Brief summary of what information was gathered and why it is sufficient to answer the user"
         )
       }),
@@ -16076,7 +16069,7 @@ ${output}`;
             }
           }
           const primaryModelSettings = this.getPrimaryModel();
-          const modelSettings = ModelFactory.prepareGenerationConfig(primaryModelSettings);
+          const modelSettings = agentsCore.ModelFactory.prepareGenerationConfig(primaryModelSettings);
           let response;
           let textResponse;
           const hasStructuredOutput = this.config.dataComponents && this.config.dataComponents.length > 0;
@@ -16129,6 +16122,15 @@ ${output}`;
                     logger19.debug({ error }, "Failed to track agent reasoning");
                   }
                 }
+                if (last && last["content"] && last["content"].length > 0) {
+                  const lastContent = last["content"][last["content"].length - 1];
+                  if (lastContent["type"] === "tool-error") {
+                    const error = lastContent["error"];
+                    if (error && typeof error === "object" && "name" in error && error.name === "connection_refused") {
+                      return true;
+                    }
+                  }
+                }
                 if (steps.length >= 2) {
                   const previousStep = steps[steps.length - 2];
                   if (previousStep && "toolCalls" in previousStep && previousStep.toolCalls) {
@@ -16189,13 +16191,13 @@ ${output}`;
                     parser.markToolResult();
                   }
                   break;
-                case "error":
+                case "error": {
                   if (event.error instanceof Error) {
                     throw event.error;
-                  } else {
-                    const errorMessage = event.error?.error?.message;
-                    throw new Error(errorMessage);
                   }
+                  const errorMessage = event.error?.error?.message;
+                  throw new Error(errorMessage);
+                }
               }
             }
             await parser.finalize();
@@ -16364,9 +16366,9 @@ ${output}${structureHintsFormatted}`;
                 this.config.dataComponents.forEach((dc) => {
                   const propsSchema = jsonSchemaToZod(dc.props);
                   componentSchemas.push(
-                    z8.z.object({
-                      id: z8.z.string(),
-                      name: z8.z.literal(dc.name),
+                    zodOpenapi.z.object({
+                      id: zodOpenapi.z.string(),
+                      name: zodOpenapi.z.literal(dc.name),
                       props: propsSchema
                     })
                   );
@@ -16383,11 +16385,11 @@ ${output}${structureHintsFormatted}`;
               if (componentSchemas.length === 1) {
                 dataComponentsSchema = componentSchemas[0];
               } else {
-                dataComponentsSchema = z8.z.union(
+                dataComponentsSchema = zodOpenapi.z.union(
                   componentSchemas
                 );
               }
-              const structuredModelSettings = ModelFactory.prepareGenerationConfig(
+              const structuredModelSettings = agentsCore.ModelFactory.prepareGenerationConfig(
                 this.getStructuredOutputModel()
               );
               const configuredPhase2Timeout = structuredModelSettings.maxDuration ? Math.min(
@@ -16425,8 +16427,8 @@ ${output}${structureHintsFormatted}`;
                 const streamResult = ai.streamObject({
                   ...structuredModelSettings,
                   messages: phase2Messages,
-                  schema: z8.z.object({
-                    dataComponents: z8.z.array(dataComponentsSchema)
+                  schema: zodOpenapi.z.object({
+                    dataComponents: zodOpenapi.z.array(dataComponentsSchema)
                   }),
                   experimental_telemetry: {
                     isEnabled: true,
@@ -16496,8 +16498,8 @@ ${output}${structureHintsFormatted}`;
                   withJsonPostProcessing2({
                     ...structuredModelSettings,
                     messages: phase2Messages,
-                    schema: z8.z.object({
-                      dataComponents: z8.z.array(dataComponentsSchema)
+                    schema: zodOpenapi.z.object({
+                      dataComponents: zodOpenapi.z.array(dataComponentsSchema)
                     }),
                     experimental_telemetry: {
                       isEnabled: true,
@@ -17090,17 +17092,16 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                   }
                 ]
               };
-            } else {
-              logger20.warn(
-                {
-                  hasToolResult: !!toolResult,
-                  hasOutput: !!toolResult?.output,
-                  validationPassed: false,
-                  output: toolResult?.output
-                },
-                "[DEBUG] Transfer validation FAILED"
-              );
             }
+            logger20.warn(
+              {
+                hasToolResult: !!toolResult,
+                hasOutput: !!toolResult?.output,
+                validationPassed: false,
+                output: toolResult?.output
+              },
+              "[DEBUG] Transfer validation FAILED"
+            );
           }
         }
       }
@@ -17120,10 +17121,13 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       };
     } catch (error) {
       console.error("Task handler error:", error);
+      const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+      const isConnectionRefused = errorMessage.includes("Connection refused. Please check if the MCP server is running.");
       return {
         status: {
           state: agentsCore.TaskState.Failed,
-          message: error instanceof Error ? error.message : "Unknown error occurred"
+          message: errorMessage,
+          type: isConnectionRefused ? "connection_refused" : "unknown"
         },
         artifacts: []
       };
@@ -17336,14 +17340,14 @@ app.openapi(
         description: "Agent Card for A2A discovery",
         content: {
           "application/json": {
-            schema: z8.z.object({
-              name: z8.z.string(),
-              description: z8.z.string().optional(),
-              url: z8.z.string(),
-              version: z8.z.string(),
-              defaultInputModes: z8.z.array(z8.z.string()),
-              defaultOutputModes: z8.z.array(z8.z.string()),
-              skills: z8.z.array(z8.z.any())
+            schema: zodOpenapi.z.object({
+              name: zodOpenapi.z.string(),
+              description: zodOpenapi.z.string().optional(),
+              url: zodOpenapi.z.string(),
+              version: zodOpenapi.z.string(),
+              defaultInputModes: zodOpenapi.z.array(zodOpenapi.z.string()),
+              defaultOutputModes: zodOpenapi.z.array(zodOpenapi.z.string()),
+              skills: zodOpenapi.z.array(zodOpenapi.z.any())
             })
           }
         }
@@ -18019,7 +18023,7 @@ var VercelDataStreamHelper = class _VercelDataStreamHelper {
     }
     const now = Date.now();
     const gapFromLastTextEnd = this.lastTextEndTimestamp > 0 ? now - this.lastTextEndTimestamp : Number.MAX_SAFE_INTEGER;
-    if (this.isTextStreaming || gapFromLastTextEnd < STREAM_TEXT_GAP_THRESHOLD_MS) {
+    if (operation.type !== "tool_call" && operation.type !== "tool_result" && (this.isTextStreaming || gapFromLastTextEnd < STREAM_TEXT_GAP_THRESHOLD_MS)) {
       this.queuedEvents.push({ type: "data-operation", event: operation });
       return;
     }
@@ -18615,36 +18619,36 @@ var chatCompletionsRoute = zodOpenapi.createRoute({
     body: {
       content: {
         "application/json": {
-          schema: z8.z.object({
-            model: z8.z.string().describe("The model to use for the completion"),
-            messages: z8.z.array(
-              z8.z.object({
-                role: z8.z.enum(["system", "user", "assistant", "function", "tool"]).describe("The role of the message"),
-                content: z8.z.union([
-                  z8.z.string(),
-                  z8.z.array(
-                    z8.z.strictObject({
-                      type: z8.z.string(),
-                      text: z8.z.string().optional()
+          schema: zodOpenapi.z.object({
+            model: zodOpenapi.z.string().describe("The model to use for the completion"),
+            messages: zodOpenapi.z.array(
+              zodOpenapi.z.object({
+                role: zodOpenapi.z.enum(["system", "user", "assistant", "function", "tool"]).describe("The role of the message"),
+                content: zodOpenapi.z.union([
+                  zodOpenapi.z.string(),
+                  zodOpenapi.z.array(
+                    zodOpenapi.z.strictObject({
+                      type: zodOpenapi.z.string(),
+                      text: zodOpenapi.z.string().optional()
                     })
                   )
                 ]).describe("The message content"),
-                name: z8.z.string().optional().describe("The name of the message sender")
+                name: zodOpenapi.z.string().optional().describe("The name of the message sender")
               })
             ).describe("The conversation messages"),
-            temperature: z8.z.number().optional().describe("Controls randomness (0-1)"),
-            top_p: z8.z.number().optional().describe("Controls nucleus sampling"),
-            n: z8.z.number().optional().describe("Number of completions to generate"),
-            stream: z8.z.boolean().optional().describe("Whether to stream the response"),
-            max_tokens: z8.z.number().optional().describe("Maximum tokens to generate"),
-            presence_penalty: z8.z.number().optional().describe("Presence penalty (-2 to 2)"),
-            frequency_penalty: z8.z.number().optional().describe("Frequency penalty (-2 to 2)"),
-            logit_bias: z8.z.record(z8.z.string(), z8.z.number()).optional().describe("Token logit bias"),
-            user: z8.z.string().optional().describe("User identifier"),
-            conversationId: z8.z.string().optional().describe("Conversation ID for multi-turn chat"),
-            tools: z8.z.array(z8.z.string()).optional().describe("Available tools"),
-            runConfig: z8.z.record(z8.z.string(), z8.z.unknown()).optional().describe("Run configuration"),
-            headers: z8.z.record(z8.z.string(), z8.z.unknown()).optional().describe(
+            temperature: zodOpenapi.z.number().optional().describe("Controls randomness (0-1)"),
+            top_p: zodOpenapi.z.number().optional().describe("Controls nucleus sampling"),
+            n: zodOpenapi.z.number().optional().describe("Number of completions to generate"),
+            stream: zodOpenapi.z.boolean().optional().describe("Whether to stream the response"),
+            max_tokens: zodOpenapi.z.number().optional().describe("Maximum tokens to generate"),
+            presence_penalty: zodOpenapi.z.number().optional().describe("Presence penalty (-2 to 2)"),
+            frequency_penalty: zodOpenapi.z.number().optional().describe("Frequency penalty (-2 to 2)"),
+            logit_bias: zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.number()).optional().describe("Token logit bias"),
+            user: zodOpenapi.z.string().optional().describe("User identifier"),
+            conversationId: zodOpenapi.z.string().optional().describe("Conversation ID for multi-turn chat"),
+            tools: zodOpenapi.z.array(zodOpenapi.z.string()).optional().describe("Available tools"),
+            runConfig: zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.unknown()).optional().describe("Run configuration"),
+            headers: zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.unknown()).optional().describe(
               "Headers data for template processing (validated against context config schema)"
             )
           })
@@ -18655,14 +18659,14 @@ var chatCompletionsRoute = zodOpenapi.createRoute({
   responses: {
     200: {
       description: "Streaming chat completion response in Server-Sent Events format",
-      headers: z8.z.object({
-        "Content-Type": z8.z.string().default("text/event-stream"),
-        "Cache-Control": z8.z.string().default("no-cache"),
-        Connection: z8.z.string().default("keep-alive")
+      headers: zodOpenapi.z.object({
+        "Content-Type": zodOpenapi.z.string().default("text/event-stream"),
+        "Cache-Control": zodOpenapi.z.string().default("no-cache"),
+        Connection: zodOpenapi.z.string().default("keep-alive")
       }),
       content: {
         "text/event-stream": {
-          schema: z8.z.string().describe("Server-Sent Events stream with chat completion chunks")
+          schema: zodOpenapi.z.string().describe("Server-Sent Events stream with chat completion chunks")
         }
       }
     },
@@ -18670,13 +18674,13 @@ var chatCompletionsRoute = zodOpenapi.createRoute({
       description: "Invalid request context or parameters",
       content: {
         "application/json": {
-          schema: z8.z.object({
-            error: z8.z.string(),
-            details: z8.z.array(
-              z8.z.object({
-                field: z8.z.string(),
-                message: z8.z.string(),
-                value: z8.z.unknown().optional()
+          schema: zodOpenapi.z.object({
+            error: zodOpenapi.z.string(),
+            details: zodOpenapi.z.array(
+              zodOpenapi.z.object({
+                field: zodOpenapi.z.string(),
+                message: zodOpenapi.z.string(),
+                value: zodOpenapi.z.unknown().optional()
               })
             ).optional()
           })
@@ -18687,8 +18691,8 @@ var chatCompletionsRoute = zodOpenapi.createRoute({
       description: "Agent or agent not found",
       content: {
         "application/json": {
-          schema: z8.z.object({
-            error: z8.z.string()
+          schema: zodOpenapi.z.object({
+            error: zodOpenapi.z.string()
           })
         }
       }
@@ -18697,9 +18701,9 @@ var chatCompletionsRoute = zodOpenapi.createRoute({
       description: "Internal server error",
       content: {
         "application/json": {
-          schema: z8.z.object({
-            error: z8.z.string(),
-            message: z8.z.string()
+          schema: zodOpenapi.z.object({
+            error: zodOpenapi.z.string(),
+            message: zodOpenapi.z.string()
           })
         }
       }
@@ -19203,6 +19207,137 @@ app3.openapi(chatDataStreamRoute, async (c2) => {
     });
   }
 });
+var toolApprovalRoute = zodOpenapi.createRoute({
+  method: "post",
+  path: "/tool-approvals",
+  tags: ["chat"],
+  summary: "Approve or deny tool execution",
+  description: "Handle user approval/denial of tool execution requests during conversations",
+  security: [{ bearerAuth: [] }],
+  request: {
+    body: {
+      content: {
+        "application/json": {
+          schema: zodOpenapi.z.object({
+            conversationId: zodOpenapi.z.string().describe("The conversation ID"),
+            toolCallId: zodOpenapi.z.string().describe("The tool call ID to respond to"),
+            approved: zodOpenapi.z.boolean().describe("Whether the tool execution is approved"),
+            reason: zodOpenapi.z.string().optional().describe("Optional reason for the decision")
+          })
+        }
+      }
+    }
+  },
+  responses: {
+    200: {
+      description: "Tool approval response processed successfully",
+      content: {
+        "application/json": {
+          schema: zodOpenapi.z.object({
+            success: zodOpenapi.z.boolean(),
+            message: zodOpenapi.z.string().optional()
+          })
+        }
+      }
+    },
+    400: {
+      description: "Bad request - invalid tool call ID or conversation ID",
+      content: {
+        "application/json": {
+          schema: zodOpenapi.z.object({
+            error: zodOpenapi.z.string()
+          })
+        }
+      }
+    },
+    404: {
+      description: "Tool call not found or already processed",
+      content: {
+        "application/json": {
+          schema: zodOpenapi.z.object({
+            error: zodOpenapi.z.string()
+          })
+        }
+      }
+    },
+    500: {
+      description: "Internal server error",
+      content: {
+        "application/json": {
+          schema: zodOpenapi.z.object({
+            error: zodOpenapi.z.string(),
+            message: zodOpenapi.z.string()
+          })
+        }
+      }
+    }
+  }
+});
+app3.openapi(toolApprovalRoute, async (c2) => {
+  const tracer2 = api.trace.getTracer("tool-approval-handler");
+  return tracer2.startActiveSpan("tool_approval_request", async (span) => {
+    try {
+      const executionContext = agentsCore.getRequestExecutionContext(c2);
+      const { tenantId, projectId } = executionContext;
+      const requestBody = await c2.req.json();
+      const { conversationId, toolCallId, approved, reason } = requestBody;
+      logger26.info(
+        {
+          conversationId,
+          toolCallId,
+          approved,
+          reason,
+          tenantId,
+          projectId
+        },
+        "Processing tool approval request"
+      );
+      const conversation = await agentsCore.getConversation(dbClient_default)({
+        scopes: { tenantId, projectId },
+        conversationId
+      });
+      if (!conversation) {
+        span.setStatus({ code: 1, message: "Conversation not found" });
+        return c2.json({ error: "Conversation not found" }, 404);
+      }
+      let success = false;
+      if (approved) {
+        success = pendingToolApprovalManager.approveToolCall(toolCallId);
+      } else {
+        success = pendingToolApprovalManager.denyToolCall(toolCallId, reason);
+      }
+      if (!success) {
+        span.setStatus({ code: 1, message: "Tool call not found" });
+        return c2.json({ error: "Tool call not found or already processed" }, 404);
+      }
+      logger26.info({ conversationId, toolCallId, approved }, "Tool approval processed successfully");
+      span.setStatus({ code: 1, message: "Success" });
+      return c2.json({
+        success: true,
+        message: approved ? "Tool execution approved" : "Tool execution denied"
+      });
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      logger26.error(
+        {
+          error: errorMessage,
+          stack: error instanceof Error ? error.stack : void 0
+        },
+        "Failed to process tool approval"
+      );
+      span.setStatus({ code: 2, message: errorMessage });
+      return c2.json(
+        {
+          error: "Internal server error",
+          message: errorMessage
+        },
+        500
+      );
+    } finally {
+      span.end();
+    }
+  });
+});
 var chatDataStream_default = app3;
 
 // src/routes/mcp.ts
@@ -19285,7 +19420,8 @@ var validateSession = async (req, res, body2, tenantId, projectId, agentId) => {
       })
     );
     return false;
-  } else if (Array.isArray(sessionId)) {
+  }
+  if (Array.isArray(sessionId)) {
     res.writeHead(400).end(
       JSON.stringify({
         jsonrpc: "2.0",
@@ -19418,7 +19554,7 @@ var getServer = async (headers2, executionContext, conversationId, credentialSto
     "send-query-to-agent",
     `Send a query to the ${agent.name} agent. The agent has the following description: ${agent.description}`,
     {
-      query: z8.z.string().describe("The query to send to the agent")
+      query: zodOpenapi.z.string().describe("The query to send to the agent")
     },
     async ({ query }) => {
       try {
@@ -19708,16 +19844,15 @@ app4.openapi(
           c2,
           credentialStores
         );
-      } else {
-        return await handleExistingSessionRequest(
-          body2,
-          executionContext,
-          validatedContext,
-          req,
-          res,
-          credentialStores
-        );
       }
+      return await handleExistingSessionRequest(
+        body2,
+        executionContext,
+        validatedContext,
+        req,
+        res,
+        credentialStores
+      );
     } catch (e) {
       logger27.error(
         {