@inkeep/agents-run-api 0.36.1 → 0.37.1

package/dist/index.js

@@ -1,10 +1,10 @@
-import { flushBatchProcessor } from './chunk-H2IQDFCM.js';
-import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-7C3GUAQD.js';
-import { dbClient_default } from './chunk-CWFQPSTI.js';
-import { env } from './chunk-UZXC6MEO.js';
+import { flushBatchProcessor } from './chunk-AZFBQY6E.js';
+import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-M46DFVYB.js';
+import { dbClient_default } from './chunk-V4RNZ6BX.js';
+import { env } from './chunk-IYG4HUQ6.js';
 import { getLogger } from './chunk-A2S7GSHL.js';
 import { SESSION_CLEANUP_INTERVAL_MS, AGENT_EXECUTION_MAX_CONSECUTIVE_ERRORS, SESSION_TOOL_RESULT_CACHE_TIMEOUT_MS, STREAM_MAX_LIFETIME_MS, STREAM_BUFFER_MAX_SIZE_BYTES, STREAM_TEXT_GAP_THRESHOLD_MS, ARTIFACT_GENERATION_MAX_RETRIES, ARTIFACT_SESSION_MAX_PENDING, STATUS_UPDATE_DEFAULT_INTERVAL_SECONDS, STATUS_UPDATE_DEFAULT_NUM_EVENTS, ARTIFACT_SESSION_MAX_PREVIOUS_SUMMARIES, AGENT_EXECUTION_MAX_GENERATION_STEPS, FUNCTION_TOOL_SANDBOX_VCPUS_DEFAULT, FUNCTION_TOOL_EXECUTION_TIMEOUT_MS_DEFAULT, LLM_GENERATION_MAX_ALLOWED_TIMEOUT_MS, ARTIFACT_GENERATION_BACKOFF_INITIAL_MS, ARTIFACT_GENERATION_BACKOFF_MAX_MS, LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_STREAMING, LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_NON_STREAMING, LLM_GENERATION_SUBSEQUENT_CALL_TIMEOUT_MS, DELEGATION_TOOL_BACKOFF_MAX_ELAPSED_TIME_MS, DELEGATION_TOOL_BACKOFF_EXPONENT, DELEGATION_TOOL_BACKOFF_MAX_INTERVAL_MS, DELEGATION_TOOL_BACKOFF_INITIAL_INTERVAL_MS, STREAM_PARSER_MAX_SNAPSHOT_SIZE, STREAM_PARSER_MAX_STREAMED_SIZE, STREAM_PARSER_MAX_COLLECTED_PARTS } from './chunk-IVALDC72.js';
-import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, generateId, commonGetErrorResponses, loggerFactory, createDefaultCredentialStores, CredentialStoreRegistry, createTask, getTask, updateTask, setSpanWithError, AGENT_EXECUTION_TRANSFER_COUNT_DEFAULT, updateConversation, handleApiError, TaskState, getAgentById, getProject, setActiveAgentForThread, getConversation, getRelatedAgentsForAgent, getExternalAgentsForSubAgent, getTeamAgentsForSubAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT, CONVERSATION_HISTORY_DEFAULT_LIMIT, validateAndGetApiKey, verifyServiceToken, validateTargetAgent, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, getContextConfigById, getFullAgentDefinition, TemplateEngine, listTaskIdsByContextId, getLedgerArtifacts, agentHasArtifactComponents, upsertLedgerArtifact, MCPTransportType, SPAN_KEYS, headers, generateServiceToken } from '@inkeep/agents-core';
+import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, generateId, commonGetErrorResponses, loggerFactory, getConversation, createDefaultCredentialStores, CredentialStoreRegistry, createTask, getTask, updateTask, setSpanWithError, AGENT_EXECUTION_TRANSFER_COUNT_DEFAULT, updateConversation, handleApiError, TaskState, getAgentById, getProject, setActiveAgentForThread, getRelatedAgentsForAgent, getExternalAgentsForSubAgent, getTeamAgentsForSubAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT, CONVERSATION_HISTORY_DEFAULT_LIMIT, ModelFactory, verifyTempToken, validateAndGetApiKey, verifyServiceToken, validateTargetAgent, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, getContextConfigById, getFullAgentDefinition, TemplateEngine, listTaskIdsByContextId, getLedgerArtifacts, agentHasArtifactComponents, upsertLedgerArtifact, MCPTransportType, SPAN_KEYS, headers, generateServiceToken } from '@inkeep/agents-core';
 import { otel } from '@hono/otel';
 import { OpenAPIHono, createRoute, z as z$1 } from '@hono/zod-openapi';
 import { trace, propagation, context, SpanStatusCode } from '@opentelemetry/api';
@@ -17,12 +17,6 @@ import { swaggerUI } from '@hono/swagger-ui';
 import z5, { z } from 'zod';
 import { streamSSE, stream } from 'hono/streaming';
 import { createUIMessageStream, JsonToSseTransformStream, parsePartialJson, generateObject, tool, streamText, generateText, streamObject } from 'ai';
-import { createAnthropic, anthropic } from '@ai-sdk/anthropic';
-import { createGateway, gateway } from '@ai-sdk/gateway';
-import { createGoogleGenerativeAI, google } from '@ai-sdk/google';
-import { createOpenAI, openai } from '@ai-sdk/openai';
-import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
-import { createOpenRouter, openrouter } from '@openrouter/ai-sdk-provider';
 import jmespath from 'jmespath';
 import Ajv from 'ajv';
 import destr from 'destr';
@@ -47,6 +41,31 @@ function createExecutionContext(params) {
 
 // src/middleware/api-key-auth.ts
 var logger = getLogger("env-key-auth");
+async function tryAuthenticateWithTempJwt(apiKey, baseUrl, subAgentId) {
+  if (!apiKey.startsWith("eyJ") || !env.INKEEP_AGENTS_TEMP_JWT_PUBLIC_KEY) {
+    return null;
+  }
+  try {
+    const publicKeyPem = Buffer.from(env.INKEEP_AGENTS_TEMP_JWT_PUBLIC_KEY, "base64").toString(
+      "utf-8"
+    );
+    const payload = await verifyTempToken(publicKeyPem, apiKey);
+    logger.info({}, "JWT temp token authenticated successfully");
+    return createExecutionContext({
+      apiKey,
+      tenantId: payload.tenantId,
+      projectId: payload.projectId,
+      agentId: payload.agentId,
+      apiKeyId: "temp-jwt",
+      baseUrl,
+      subAgentId,
+      metadata: { initiatedBy: payload.initiatedBy }
+    });
+  } catch (error) {
+    logger.debug({ error }, "JWT verification failed");
+    return null;
+  }
+}
 var apiKeyAuth = () => createMiddleware(async (c, next) => {
   if (c.req.method === "OPTIONS") {
     await next();
@@ -67,6 +86,12 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
     let executionContext;
     if (authHeader?.startsWith("Bearer ")) {
       const apiKey2 = authHeader.substring(7);
+      const jwtContext2 = await tryAuthenticateWithTempJwt(apiKey2, baseUrl, subAgentId);
+      if (jwtContext2) {
+        c.set("executionContext", jwtContext2);
+        await next();
+        return;
+      }
       try {
         executionContext = await extractContextFromApiKey(apiKey2, baseUrl);
         if (subAgentId) {
@@ -119,6 +144,12 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
     });
   }
   const apiKey = authHeader.substring(7);
+  const jwtContext = await tryAuthenticateWithTempJwt(apiKey, baseUrl, subAgentId);
+  if (jwtContext) {
+    c.set("executionContext", jwtContext);
+    await next();
+    return;
+  }
   if (env.INKEEP_AGENTS_RUN_API_BYPASS_SECRET) {
     if (apiKey === env.INKEEP_AGENTS_RUN_API_BYPASS_SECRET) {
       if (!tenantId || !projectId || !agentId) {
@@ -139,7 +170,8 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
       logger.info({}, "Bypass secret authenticated successfully");
       await next();
       return;
-    } else if (apiKey) {
+    }
+    if (apiKey) {
       try {
         const executionContext = await extractContextFromApiKey(apiKey, baseUrl);
         if (subAgentId) {
@@ -157,11 +189,10 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
       }
       await next();
       return;
-    } else {
-      throw new HTTPException(401, {
-        message: "Invalid Token"
-      });
     }
+    throw new HTTPException(401, {
+      message: "Invalid Token"
+    });
   }
   if (!apiKey || apiKey.length < 16) {
     throw new HTTPException(401, {
@@ -307,6 +338,19 @@ function setupOpenAPIRoutes(app6) {
           }
         ]
       });
+      document.components = {
+        ...document.components,
+        securitySchemes: {
+          ...document.components?.securitySchemes || {},
+          bearerAuth: {
+            type: "http",
+            scheme: "bearer",
+            bearerFormat: "API Key",
+            description: 'API key authentication. All endpoints require a valid API key in the Authorization header as "Bearer <api-key>". API keys can be created in the management UI.'
+          }
+        }
+      };
+      document.security = [{ bearerAuth: [] }];
       return c.json(document);
     } catch (error) {
       console.error("OpenAPI document generation failed:", error);
@@ -931,269 +975,7 @@ async function handleTasksResubscribe(c, agent, request) {
     });
   }
 }
-var logger3 = getLogger("ModelFactory");
-var nimDefault = 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 createAnthropic(config);
-      case "openai":
-        return createOpenAI(config);
-      case "google":
-        return createGoogleGenerativeAI(config);
-      case "openrouter":
-        return {
-          ...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 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 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
-        };
-        logger3.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 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);
-    logger3.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) {
-      logger3.info({ config: providerConfig }, `Applying custom ${provider} provider configuration`);
-      const customProvider = _ModelFactory.createProvider(provider, providerConfig);
-      return customProvider.languageModel(modelName);
-    }
-    switch (provider) {
-      case "anthropic":
-        return anthropic(modelName);
-      case "openai":
-        return openai(modelName);
-      case "google":
-        return google(modelName);
-      case "openrouter":
-        return openrouter(modelName);
-      case "gateway":
-        return 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;
-  }
-};
-var logger4 = getLogger("ToolSessionManager");
+var logger3 = getLogger("ToolSessionManager");
 var ToolSessionManager = class _ToolSessionManager {
   static instance;
   sessions = /* @__PURE__ */ new Map();
@@ -1227,7 +1009,7 @@ var ToolSessionManager = class _ToolSessionManager {
       createdAt: Date.now()
     };
     this.sessions.set(sessionId, session);
-    logger4.debug(
+    logger3.debug(
       {
         sessionId,
         tenantId,
@@ -1245,10 +1027,10 @@ var ToolSessionManager = class _ToolSessionManager {
    */
   ensureAgentSession(sessionId, tenantId, projectId, contextId, taskId) {
     if (this.sessions.has(sessionId)) {
-      logger4.debug({ sessionId }, "Agent session already exists, reusing");
+      logger3.debug({ sessionId }, "Agent session already exists, reusing");
       return sessionId;
     }
-    logger4.debug(
+    logger3.debug(
       { sessionId, tenantId, contextId, taskId },
       "Creating new agent-scoped tool session"
     );
@@ -1260,7 +1042,7 @@ var ToolSessionManager = class _ToolSessionManager {
   recordToolResult(sessionId, toolResult) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger4.warn(
+      logger3.warn(
         {
           sessionId,
           toolCallId: toolResult.toolCallId,
@@ -1272,7 +1054,7 @@ var ToolSessionManager = class _ToolSessionManager {
       return;
     }
     session.toolResults.set(toolResult.toolCallId, toolResult);
-    logger4.debug(
+    logger3.debug(
       {
         sessionId,
         toolCallId: toolResult.toolCallId,
@@ -1287,7 +1069,7 @@ var ToolSessionManager = class _ToolSessionManager {
   getToolResult(sessionId, toolCallId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger4.warn(
+      logger3.warn(
         {
           sessionId,
           toolCallId,
@@ -1300,7 +1082,7 @@ var ToolSessionManager = class _ToolSessionManager {
     }
     const result = session.toolResults.get(toolCallId);
     if (!result) {
-      logger4.warn(
+      logger3.warn(
         {
           sessionId,
           toolCallId,
@@ -1310,7 +1092,7 @@ var ToolSessionManager = class _ToolSessionManager {
         "Tool result not found"
       );
     } else {
-      logger4.debug(
+      logger3.debug(
         {
           sessionId,
           toolCallId,
@@ -1349,10 +1131,10 @@ var ToolSessionManager = class _ToolSessionManager {
     }
     for (const sessionId of expiredSessions) {
       this.sessions.delete(sessionId);
-      logger4.debug({ sessionId }, "Cleaned up expired tool session");
+      logger3.debug({ sessionId }, "Cleaned up expired tool session");
     }
     if (expiredSessions.length > 0) {
-      logger4.info({ expiredCount: expiredSessions.length }, "Cleaned up expired tool sessions");
+      logger3.info({ expiredCount: expiredSessions.length }, "Cleaned up expired tool sessions");
     }
   }
 };
@@ -1420,7 +1202,7 @@ function extractFullFields(schema) {
 }
 
 // src/services/ArtifactService.ts
-var logger6 = getLogger("ArtifactService");
+var logger5 = getLogger("ArtifactService");
 var ArtifactService = class _ArtifactService {
   constructor(context) {
     this.context = context;
@@ -1453,7 +1235,7 @@ var ArtifactService = class _ArtifactService {
           id: taskId
         });
         if (!task) {
-          logger6.warn({ taskId }, "Task not found when fetching artifacts");
+          logger5.warn({ taskId }, "Task not found when fetching artifacts");
           continue;
         }
         const taskArtifacts = await getLedgerArtifacts(dbClient_default)({
@@ -1471,7 +1253,7 @@ var ArtifactService = class _ArtifactService {
         }
       }
     } catch (error) {
-      logger6.error({ error, contextId }, "Error loading context artifacts");
+      logger5.error({ error, contextId }, "Error loading context artifacts");
     }
     return artifacts;
   }
@@ -1480,12 +1262,12 @@ var ArtifactService = class _ArtifactService {
    */
   async createArtifact(request, subAgentId) {
     if (!this.context.sessionId) {
-      logger6.warn({ request }, "No session ID available for artifact creation");
+      logger5.warn({ request }, "No session ID available for artifact creation");
       return null;
     }
     const toolResult = toolSessionManager.getToolResult(this.context.sessionId, request.toolCallId);
     if (!toolResult) {
-      logger6.warn(
+      logger5.warn(
         { request, sessionId: this.context.sessionId },
         "Tool result not found for artifact"
       );
@@ -1501,7 +1283,7 @@ var ArtifactService = class _ArtifactService {
         selectedData = selectedData.length > 0 ? selectedData[0] : {};
       }
       if (!selectedData) {
-        logger6.warn(
+        logger5.warn(
           {
             request,
             baseSelector: request.baseSelector
@@ -1572,7 +1354,7 @@ var ArtifactService = class _ArtifactService {
       );
       return artifactData;
     } catch (error) {
-      logger6.error({ error, request }, "Failed to create artifact");
+      logger5.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}`);
     }
@@ -1601,7 +1383,7 @@ var ArtifactService = class _ArtifactService {
     }
     try {
       if (!this.context.projectId || !this.context.taskId) {
-        logger6.warn(
+        logger5.warn(
           { artifactId, toolCallId },
           "No projectId or taskId available for artifact lookup"
         );
@@ -1625,7 +1407,7 @@ var ArtifactService = class _ArtifactService {
         return this.formatArtifactSummaryData(artifacts[0], artifactId, toolCallId);
       }
     } catch (error) {
-      logger6.warn(
+      logger5.warn(
         { artifactId, toolCallId, taskId: this.context.taskId, error },
         "Failed to fetch artifact"
       );
@@ -1656,7 +1438,7 @@ var ArtifactService = class _ArtifactService {
     }
     try {
       if (!this.context.projectId || !this.context.taskId) {
-        logger6.warn(
+        logger5.warn(
           { artifactId, toolCallId },
           "No projectId or taskId available for artifact lookup"
         );
@@ -1680,7 +1462,7 @@ var ArtifactService = class _ArtifactService {
         return this.formatArtifactFullData(artifacts[0], artifactId, toolCallId);
       }
     } catch (error) {
-      logger6.warn(
+      logger5.warn(
         { artifactId, toolCallId, taskId: this.context.taskId, error },
         "Failed to fetch artifact"
       );
@@ -1697,7 +1479,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)";
-        logger6.debug(
+        logger5.debug(
           { artifactId, toolCallId, dataSource },
           "Using fallback data source for artifact summary"
         );
@@ -1705,14 +1487,14 @@ var ArtifactService = class _ArtifactService {
         data = artifact.data;
         if (data && !(typeof data === "object" && Object.keys(data).length === 0)) {
           dataSource = "artifact.data (fallback)";
-          logger6.debug(
+          logger5.debug(
             { artifactId, toolCallId, dataSource },
             "Using fallback data source for artifact summary"
           );
         } else {
           data = {};
           dataSource = "empty (no data found)";
-          logger6.warn(
+          logger5.warn(
             {
               artifactId,
               toolCallId,
@@ -1749,7 +1531,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)";
-        logger6.debug(
+        logger5.debug(
           { artifactId, toolCallId, dataSource },
           "Using fallback data source for artifact full data"
         );
@@ -1757,14 +1539,14 @@ var ArtifactService = class _ArtifactService {
         data = artifact.data;
         if (data && !(typeof data === "object" && Object.keys(data).length === 0)) {
           dataSource = "artifact.data (fallback)";
-          logger6.debug(
+          logger5.debug(
             { artifactId, toolCallId, dataSource },
             "Using fallback data source for artifact full data"
           );
         } else {
           data = {};
           dataSource = "empty (no data found)";
-          logger6.warn(
+          logger5.warn(
             {
               artifactId,
               toolCallId,
@@ -1818,7 +1600,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.`
       );
-      logger6.error(
+      logger5.error(
         {
           artifactId,
           artifactType,
@@ -1831,7 +1613,7 @@ var ArtifactService = class _ArtifactService {
       throw error;
     }
     if (!summaryValidation.hasExpectedFields || summaryValidation.extraFields.length > 0) {
-      logger6.warn(
+      logger5.warn(
         {
           artifactId,
           artifactType,
@@ -1845,7 +1627,7 @@ var ArtifactService = class _ArtifactService {
       );
     }
     if (!fullValidation.hasExpectedFields || fullValidation.extraFields.length > 0) {
-      logger6.warn(
+      logger5.warn(
         {
           artifactId,
           artifactType,
@@ -1917,7 +1699,7 @@ var ArtifactService = class _ArtifactService {
         }
       );
     } else {
-      logger6.warn(
+      logger5.warn(
         {
           artifactId: request.artifactId,
           hasStreamRequestId: !!this.context.streamRequestId,
@@ -1992,7 +1774,7 @@ var ArtifactService = class _ArtifactService {
           summaryData = this.filterBySchema(artifact.data, previewSchema);
           fullData = this.filterBySchema(artifact.data, fullSchema);
         } catch (error) {
-          logger6.warn(
+          logger5.warn(
             {
               artifactType: artifact.type,
               error: error instanceof Error ? error.message : "Unknown error"
@@ -2030,7 +1812,7 @@ var ArtifactService = class _ArtifactService {
       artifact: artifactToSave
     });
     if (!result.created && result.existing) {
-      logger6.debug(
+      logger5.debug(
         {
           artifactId: artifact.artifactId,
           taskId: this.context.taskId
@@ -2090,7 +1872,7 @@ var ArtifactService = class _ArtifactService {
             extracted[fieldName] = this.cleanEscapedContent(rawValue);
           }
         } catch (error) {
-          logger6.warn(
+          logger5.warn(
             { fieldName, error: error instanceof Error ? error.message : "Unknown error" },
             "Failed to extract schema field"
           );
@@ -2119,7 +1901,7 @@ var ArtifactService = class _ArtifactService {
 };
 
 // src/services/ArtifactParser.ts
-var logger7 = getLogger("ArtifactParser");
+var logger6 = getLogger("ArtifactParser");
 var ArtifactParser = class _ArtifactParser {
   static ARTIFACT_CHECK_REGEX = /<artifact:ref\s+(?=.*id=['"][^'"]+['"])(?=.*tool=['"][^'"]+['"])[^>]*\/>/;
   static ATTR_REGEX = /(\w+)="([^"]*)"|(\w+)='([^']*)'|(\w+)=({[^}]+})/g;
@@ -2230,7 +2012,7 @@ var ArtifactParser = class _ArtifactParser {
       attrs[key] = value;
     }
     if (!attrs.id || !attrs.tool || !attrs.type || !attrs.base) {
-      logger7.warn({ attrs, attrString }, "Missing required attributes in artifact annotation");
+      logger6.warn({ attrs, attrString }, "Missing required attributes in artifact annotation");
       return null;
     }
     return {
@@ -2291,7 +2073,7 @@ var ArtifactParser = class _ArtifactParser {
             `Failed to create artifact "${annotation.artifactId}": Missing or invalid data`
           );
           processedText = processedText.replace(annotation.raw, "");
-          logger7.warn(
+          logger6.warn(
             { annotation, artifactData },
             "Removed failed artifact:create annotation from output"
           );
@@ -2302,11 +2084,11 @@ var ArtifactParser = class _ArtifactParser {
         if (annotation.raw) {
           processedText = processedText.replace(annotation.raw, "");
         }
-        logger7.error({ annotation, error }, "Failed to extract artifact from create annotation");
+        logger6.error({ annotation, error }, "Failed to extract artifact from create annotation");
       }
     }
     if (failedAnnotations.length > 0) {
-      logger7.warn(
+      logger6.warn(
         {
           failedCount: failedAnnotations.length,
           failures: failedAnnotations
@@ -2490,7 +2272,7 @@ var ArtifactParser = class _ArtifactParser {
 };
 
 // src/services/AgentSession.ts
-var logger8 = getLogger("AgentSession");
+var logger7 = getLogger("AgentSession");
 var AgentSession = class {
   // Whether to send data operations
   constructor(sessionId, messageId, agentId, tenantId, projectId, contextId) {
@@ -2500,7 +2282,7 @@ var AgentSession = class {
     this.tenantId = tenantId;
     this.projectId = projectId;
     this.contextId = contextId;
-    logger8.debug({ sessionId, messageId, agentId }, "AgentSession created");
+    logger7.debug({ sessionId, messageId, agentId }, "AgentSession created");
     if (tenantId && projectId) {
       toolSessionManager.createSessionWithId(
         sessionId,
@@ -2557,7 +2339,7 @@ var AgentSession = class {
    */
   enableEmitOperations() {
     this.isEmitOperations = true;
-    logger8.info(
+    logger7.info(
       { sessionId: this.sessionId },
       "\u{1F50D} DEBUG: Emit operations enabled for AgentSession"
     );
@@ -2566,6 +2348,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) {
@@ -2581,7 +2364,7 @@ var AgentSession = class {
         await streamHelper.writeOperation(formattedOperation);
       }
     } catch (error) {
-      logger8.error(
+      logger7.error(
         {
           sessionId: this.sessionId,
           eventType: event.eventType,
@@ -2640,7 +2423,7 @@ var AgentSession = class {
     if (this.statusUpdateState.config.timeInSeconds) {
       this.statusUpdateTimer = setInterval(async () => {
         if (!this.statusUpdateState || this.isEnded) {
-          logger8.debug(
+          logger7.debug(
             { sessionId: this.sessionId },
             "Timer triggered but session already cleaned up or ended"
           );
@@ -2652,7 +2435,7 @@ var AgentSession = class {
         }
         await this.checkAndSendTimeBasedUpdate();
       }, this.statusUpdateState.config.timeInSeconds * 1e3);
-      logger8.info(
+      logger7.info(
         {
           sessionId: this.sessionId,
           intervalMs: this.statusUpdateState.config.timeInSeconds * 1e3
@@ -2676,7 +2459,7 @@ var AgentSession = class {
       this.sendDataOperation(dataOpEvent);
     }
     if (this.isEnded) {
-      logger8.debug(
+      logger7.debug(
         {
           sessionId: this.sessionId,
           eventType,
@@ -2698,7 +2481,7 @@ var AgentSession = class {
       if (artifactData.pendingGeneration) {
         const artifactId = artifactData.artifactId;
         if (this.pendingArtifacts.size >= this.MAX_PENDING_ARTIFACTS) {
-          logger8.warn(
+          logger7.warn(
             {
               sessionId: this.sessionId,
               artifactId,
@@ -2720,7 +2503,7 @@ var AgentSession = class {
             this.artifactProcessingErrors.set(artifactId, errorCount);
             if (errorCount >= this.MAX_ARTIFACT_RETRIES) {
               this.pendingArtifacts.delete(artifactId);
-              logger8.error(
+              logger7.error(
                 {
                   sessionId: this.sessionId,
                   artifactId,
@@ -2732,7 +2515,7 @@ var AgentSession = class {
                 "Artifact processing failed after max retries, giving up"
               );
             } else {
-              logger8.warn(
+              logger7.warn(
                 {
                   sessionId: this.sessionId,
                   artifactId,
@@ -2755,14 +2538,14 @@ var AgentSession = class {
    */
   checkStatusUpdates() {
     if (this.isEnded) {
-      logger8.debug(
+      logger7.debug(
         { sessionId: this.sessionId },
         "Session has ended - skipping status update check"
       );
       return;
     }
     if (!this.statusUpdateState) {
-      logger8.debug({ sessionId: this.sessionId }, "No status update state - skipping check");
+      logger7.debug({ sessionId: this.sessionId }, "No status update state - skipping check");
       return;
     }
     const statusUpdateState = this.statusUpdateState;
@@ -2773,11 +2556,11 @@ var AgentSession = class {
    */
   async checkAndSendTimeBasedUpdate() {
     if (this.isEnded) {
-      logger8.debug({ sessionId: this.sessionId }, "Session has ended - skipping time-based update");
+      logger7.debug({ sessionId: this.sessionId }, "Session has ended - skipping time-based update");
       return;
     }
     if (!this.statusUpdateState) {
-      logger8.debug(
+      logger7.debug(
         { sessionId: this.sessionId },
         "No status updates configured for time-based check"
       );
@@ -2790,7 +2573,7 @@ var AgentSession = class {
     try {
       await this.generateAndSendUpdate();
     } catch (error) {
-      logger8.error(
+      logger7.error(
         {
           sessionId: this.sessionId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -2893,29 +2676,29 @@ var AgentSession = class {
    */
   async generateAndSendUpdate() {
     if (this.isEnded) {
-      logger8.debug({ sessionId: this.sessionId }, "Session has ended - not generating update");
+      logger7.debug({ sessionId: this.sessionId }, "Session has ended - not generating update");
       return;
     }
     if (this.isTextStreaming) {
-      logger8.debug(
+      logger7.debug(
         { sessionId: this.sessionId },
         "Text is currently streaming - skipping status update"
       );
       return;
     }
     if (this.isGeneratingUpdate) {
-      logger8.debug(
+      logger7.debug(
         { sessionId: this.sessionId },
         "Update already in progress - skipping duplicate generation"
       );
       return;
     }
     if (!this.statusUpdateState) {
-      logger8.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
+      logger7.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
       return;
     }
     if (!this.agentId) {
-      logger8.warn({ sessionId: this.sessionId }, "No agent ID - cannot generate update");
+      logger7.warn({ sessionId: this.sessionId }, "No agent ID - cannot generate update");
       return;
     }
     const newEventCount = this.events.length - this.statusUpdateState.lastEventCount;
@@ -2927,7 +2710,7 @@ var AgentSession = class {
     try {
       const streamHelper = getStreamHelper(this.sessionId);
       if (!streamHelper) {
-        logger8.warn(
+        logger7.warn(
           { sessionId: this.sessionId },
           "No stream helper found - cannot send status update"
         );
@@ -2947,7 +2730,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) {
-            logger8.warn(
+            logger7.warn(
               {
                 sessionId: this.sessionId,
                 summary
@@ -2984,7 +2767,7 @@ var AgentSession = class {
         this.statusUpdateState.lastEventCount = this.events.length;
       }
     } catch (error) {
-      logger8.error(
+      logger7.error(
         {
           sessionId: this.sessionId,
           error: error instanceof Error ? error.message : "Unknown error",
@@ -3022,7 +2805,7 @@ var AgentSession = class {
           this.releaseUpdateLock();
         }
       } catch (error) {
-        logger8.error(
+        logger7.error(
           {
             sessionId: this.sessionId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -3101,7 +2884,7 @@ User's Question/Context:
 ${conversationHistory}
 ` : "";
             } catch (error) {
-              logger8.warn(
+              logger7.warn(
                 { sessionId: this.sessionId, error },
                 "Failed to fetch conversation history for structured status update"
               );
@@ -3212,10 +2995,10 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             }
           });
           const result = object;
-          logger8.info({ result: JSON.stringify(result) }, "DEBUG: Result");
+          logger7.info({ result: JSON.stringify(result) }, "DEBUG: Result");
           const summaries = [];
           for (const [componentId, data] of Object.entries(result)) {
-            logger8.info({ componentId, data: JSON.stringify(data) }, "DEBUG: Component data");
+            logger7.info({ componentId, data: JSON.stringify(data) }, "DEBUG: Component data");
             if (componentId === "no_relevant_updates") {
               continue;
             }
@@ -3235,7 +3018,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           return { summaries };
         } catch (error) {
           setSpanWithError(span, error instanceof Error ? error : new Error(String(error)));
-          logger8.error({ error }, "Failed to generate structured update, using fallback");
+          logger7.error({ error }, "Failed to generate structured update, using fallback");
           return { summaries: [] };
         } finally {
           span.end();
@@ -3507,7 +3290,7 @@ Make it specific and relevant.`;
                   });
                   if (agentData && "models" in agentData && agentData.models?.base?.model) {
                     modelToUse = agentData.models.base;
-                    logger8.info(
+                    logger7.info(
                       {
                         sessionId: this.sessionId,
                         artifactId: artifactData.artifactId,
@@ -3518,7 +3301,7 @@ Make it specific and relevant.`;
                     );
                   }
                 } catch (error) {
-                  logger8.warn(
+                  logger7.warn(
                     {
                       sessionId: this.sessionId,
                       artifactId: artifactData.artifactId,
@@ -3530,7 +3313,7 @@ Make it specific and relevant.`;
                 }
               }
               if (!modelToUse?.model?.trim()) {
-                logger8.warn(
+                logger7.warn(
                   {
                     sessionId: this.sessionId,
                     artifactId: artifactData.artifactId
@@ -3612,7 +3395,7 @@ Make it specific and relevant.`;
                     return result2;
                   } catch (error) {
                     lastError = error instanceof Error ? error : new Error(String(error));
-                    logger8.warn(
+                    logger7.warn(
                       {
                         sessionId: this.sessionId,
                         artifactId: artifactData.artifactId,
@@ -3660,7 +3443,7 @@ Make it specific and relevant.`;
             });
             span.setStatus({ code: SpanStatusCode.OK });
           } catch (saveError) {
-            logger8.error(
+            logger7.error(
               {
                 sessionId: this.sessionId,
                 artifactId: artifactData.artifactId,
@@ -3688,7 +3471,7 @@ Make it specific and relevant.`;
                   metadata: artifactData.metadata || {},
                   toolCallId: artifactData.toolCallId
                 });
-                logger8.info(
+                logger7.info(
                   {
                     sessionId: this.sessionId,
                     artifactId: artifactData.artifactId
@@ -3699,7 +3482,7 @@ Make it specific and relevant.`;
             } catch (fallbackError) {
               const isDuplicateError = fallbackError instanceof Error && (fallbackError.message?.includes("UNIQUE") || fallbackError.message?.includes("duplicate"));
               if (isDuplicateError) ; else {
-                logger8.error(
+                logger7.error(
                   {
                     sessionId: this.sessionId,
                     artifactId: artifactData.artifactId,
@@ -3712,7 +3495,7 @@ Make it specific and relevant.`;
           }
         } catch (error) {
           setSpanWithError(span, error instanceof Error ? error : new Error(String(error)));
-          logger8.error(
+          logger7.error(
             {
               sessionId: this.sessionId,
               artifactId: artifactData.artifactId,
@@ -3731,7 +3514,7 @@ Make it specific and relevant.`;
    */
   setArtifactCache(key, artifact) {
     this.artifactCache.set(key, artifact);
-    logger8.debug({ sessionId: this.sessionId, key }, "Artifact cached in session");
+    logger7.debug({ sessionId: this.sessionId, key }, "Artifact cached in session");
   }
   /**
    * Get session-scoped ArtifactService instance
@@ -3750,7 +3533,7 @@ Make it specific and relevant.`;
    */
   getArtifactCache(key) {
     const artifact = this.artifactCache.get(key);
-    logger8.debug({ sessionId: this.sessionId, key, found: !!artifact }, "Artifact cache lookup");
+    logger7.debug({ sessionId: this.sessionId, key, found: !!artifact }, "Artifact cache lookup");
     return artifact || null;
   }
   /**
@@ -3771,7 +3554,7 @@ var AgentSessionManager = class {
     const sessionId = messageId;
     const session = new AgentSession(sessionId, messageId, agentId, tenantId, projectId, contextId);
     this.sessions.set(sessionId, session);
-    logger8.info(
+    logger7.info(
       { sessionId, messageId, agentId, tenantId, projectId, contextId },
       "AgentSession created"
     );
@@ -3785,7 +3568,7 @@ var AgentSessionManager = class {
     if (session) {
       session.initializeStatusUpdates(config, summarizerModel, baseModel);
     } else {
-      logger8.error(
+      logger7.error(
         {
           sessionId,
           availableSessions: Array.from(this.sessions.keys())
@@ -3802,7 +3585,7 @@ var AgentSessionManager = class {
     if (session) {
       session.enableEmitOperations();
     } else {
-      logger8.error(
+      logger7.error(
         {
           sessionId,
           availableSessions: Array.from(this.sessions.keys())
@@ -3824,7 +3607,7 @@ var AgentSessionManager = class {
   recordEvent(sessionId, eventType, subAgentId, data) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger8.warn({ sessionId }, "Attempted to record event in non-existent session");
+      logger7.warn({ sessionId }, "Attempted to record event in non-existent session");
       return;
     }
     session.recordEvent(eventType, subAgentId, data);
@@ -3835,12 +3618,12 @@ var AgentSessionManager = class {
   endSession(sessionId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger8.warn({ sessionId }, "Attempted to end non-existent session");
+      logger7.warn({ sessionId }, "Attempted to end non-existent session");
       return [];
     }
     const events = session.getEvents();
     const summary = session.getSummary();
-    logger8.info({ sessionId, summary }, "AgentSession ended");
+    logger7.info({ sessionId, summary }, "AgentSession ended");
     session.cleanup();
     this.sessions.delete(sessionId);
     return events;
@@ -3939,7 +3722,7 @@ async function resolveModelConfig(agentId, subAgent) {
 }
 
 // src/services/IncrementalStreamParser.ts
-var logger9 = getLogger("IncrementalStreamParser");
+var logger8 = getLogger("IncrementalStreamParser");
 var IncrementalStreamParser = class _IncrementalStreamParser {
   buffer = "";
   pendingTextBuffer = "";
@@ -3997,7 +3780,7 @@ var IncrementalStreamParser = class _IncrementalStreamParser {
   async initializeArtifactMap() {
     try {
       this.artifactMap = await this.artifactParser.getContextArtifacts(this.contextId);
-      logger9.debug(
+      logger8.debug(
         {
           contextId: this.contextId,
           artifactMapSize: this.artifactMap.size
@@ -4005,7 +3788,7 @@ var IncrementalStreamParser = class _IncrementalStreamParser {
         "Initialized artifact map for streaming"
       );
     } catch (error) {
-      logger9.warn({ error, contextId: this.contextId }, "Failed to initialize artifact map");
+      logger8.warn({ error, contextId: this.contextId }, "Failed to initialize artifact map");
       this.artifactMap = /* @__PURE__ */ new Map();
     }
   }
@@ -4338,6 +4121,142 @@ ${chunk}`;
   }
 };
 
+// src/services/PendingToolApprovalManager.ts
+var logger9 = 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, args, conversationId, subAgentId) {
+    return new Promise((resolve, reject) => {
+      const timeoutId = setTimeout(() => {
+        this.pendingApprovals.delete(toolCallId);
+        resolve({
+          approved: false,
+          reason: `Tool approval timeout for ${toolName} (${toolCallId})`
+        });
+      }, APPROVAL_TIMEOUT_MS);
+      const approval = {
+        toolCallId,
+        toolName,
+        args,
+        conversationId,
+        subAgentId,
+        createdAt: Date.now(),
+        resolve,
+        reject,
+        timeoutId
+      };
+      this.pendingApprovals.set(toolCallId, approval);
+      logger9.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) {
+      logger9.warn({ toolCallId }, "Tool approval not found or already processed");
+      return false;
+    }
+    logger9.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) {
+      logger9.warn({ toolCallId }, "Tool approval not found or already processed");
+      return false;
+    }
+    logger9.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) {
+      logger9.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
 var logger10 = getLogger("ResponseFormatter");
 var ResponseFormatter = class {
@@ -7142,7 +7061,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;
     }
@@ -7164,13 +7083,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: args,
             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(args, context);
@@ -7215,7 +7145,8 @@ var Agent = class {
               output: result,
               toolCallId,
               duration,
-              relationshipId
+              relationshipId,
+              needsApproval
             });
           }
           return result;
@@ -7229,7 +7160,8 @@ var Agent = class {
               toolCallId,
               duration,
               error: errorMessage,
-              relationshipId
+              relationshipId,
+              needsApproval
             });
           }
           throw error;
@@ -7298,30 +7230,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)) {
           logger15.error({ toolName }, "Invalid MCP tool structure - missing required properties");
           continue;
         }
+        const needsApproval = toolResult.toolPolicies?.[toolName]?.needsApproval || false;
+        logger15.debug(
+          {
+            toolName,
+            toolPolicies: toolResult.toolPolicies,
+            needsApproval,
+            policyForThisTool: toolResult.toolPolicies?.[toolName]
+          },
+          "Tool approval check"
+        );
         const sessionWrappedTool = tool({
           description: originalTool.description,
           inputSchema: originalTool.inputSchema,
           execute: async (args, { toolCallId }) => {
+            if (needsApproval) {
+              logger15.info(
+                { toolName, toolCallId, args },
+                "Tool requires approval - waiting for user response"
+              );
+              const currentSpan = 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: SpanStatusCode.OK });
+                  requestSpan.end();
+                }
+              );
+              const approvalResult = await pendingToolApprovalManager.waitForApproval(
+                toolCallId,
+                toolName,
+                args,
+                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) => {
+                    logger15.info(
+                      { toolName, toolCallId, reason: approvalResult.reason },
+                      "Tool execution denied by user"
+                    );
+                    denialSpan.setStatus({ code: 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) => {
+                  logger15.info({ toolName, toolCallId }, "Tool approved, continuing with execution");
+                  approvedSpan.setStatus({ code: SpanStatusCode.OK });
+                  approvedSpan.end();
+                }
+              );
+            }
             logger15.debug({ toolName, toolCallId }, "MCP Tool Called");
             try {
               const rawResult = await originalTool.execute(args, { toolCallId });
@@ -7387,7 +7409,8 @@ var Agent = class {
           sessionWrappedTool,
           streamRequestId,
           "mcp",
-          relationshipId
+          relationshipId,
+          { needsApproval }
         );
       }
     }
@@ -7426,8 +7449,10 @@ var Agent = class {
         subAgentId: this.config.id
       }
     });
-    const agentToolRelationHeaders = toolsForAgent.data.find((t) => t.toolId === tool3.id)?.headers || void 0;
-    const selectedTools = toolsForAgent.data.find((t) => t.toolId === tool3.id)?.selectedTools || void 0;
+    const toolRelation = toolsForAgent.data.find((t) => t.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 getCredentialReference(dbClient_default)({
@@ -7558,7 +7583,7 @@ var Agent = class {
         );
       }
     }
-    return tools;
+    return { tools, toolPolicies };
   }
   async createMcpConnection(tool3, serverConfig) {
     const client = new McpClient({
@@ -7581,12 +7606,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;
     }
@@ -7606,7 +7631,7 @@ var Agent = class {
       if (functionToolsData.length === 0) {
         return functionTools;
       }
-      const { SandboxExecutorFactory } = await import('./SandboxExecutorFactory-NUNGK35F.js');
+      const { SandboxExecutorFactory } = await import('./SandboxExecutorFactory-FVKDJKKZ.js');
       const sandboxExecutor = SandboxExecutorFactory.getInstance();
       for (const functionToolDef of functionToolsData) {
         const functionId = functionToolDef.functionId;
@@ -7900,7 +7925,7 @@ var Agent = class {
       inputSchema: tool3.inputSchema || tool3.parameters || {},
       usageGuidelines: name.startsWith("transfer_to_") || name.startsWith("delegate_to_") ? `Use this tool to ${name.startsWith("transfer_to_") ? "transfer" : "delegate"} to another agent when appropriate.` : "Use this tool when appropriate for the task at hand."
     }));
-    const { getConversationScopedArtifacts } = await import('./conversations-ZCZG5434.js');
+    const { getConversationScopedArtifacts } = await import('./conversations-NZLQK64L.js');
     const historyConfig = this.config.conversationHistoryConfig ?? createDefaultConversationHistoryConfig();
     const referenceArtifacts = await getConversationScopedArtifacts({
       tenantId: this.config.tenantId,
@@ -8484,13 +8509,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();
@@ -9385,17 +9410,16 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                   }
                 ]
               };
-            } else {
-              logger16.warn(
-                {
-                  hasToolResult: !!toolResult,
-                  hasOutput: !!toolResult?.output,
-                  validationPassed: false,
-                  output: toolResult?.output
-                },
-                "[DEBUG] Transfer validation FAILED"
-              );
             }
+            logger16.warn(
+              {
+                hasToolResult: !!toolResult,
+                hasOutput: !!toolResult?.output,
+                validationPassed: false,
+                output: toolResult?.output
+              },
+              "[DEBUG] Transfer validation FAILED"
+            );
           }
         }
       }
@@ -10295,7 +10319,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;
     }
@@ -11459,13 +11483,152 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       );
     });
   } catch (error) {
-    logger22.error({ error }, "chatDataStream error");
+    logger22.error(
+      {
+        error,
+        errorMessage: error instanceof Error ? error.message : String(error),
+        errorStack: error instanceof Error ? error.stack : void 0,
+        errorType: error?.constructor?.name
+      },
+      "chatDataStream error - DETAILED"
+    );
     throw createApiError({
       code: "internal_server_error",
       message: "Failed to process chat completion"
     });
   }
 });
+var toolApprovalRoute = 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: z$1.object({
+            conversationId: z$1.string().describe("The conversation ID"),
+            toolCallId: z$1.string().describe("The tool call ID to respond to"),
+            approved: z$1.boolean().describe("Whether the tool execution is approved"),
+            reason: z$1.string().optional().describe("Optional reason for the decision")
+          })
+        }
+      }
+    }
+  },
+  responses: {
+    200: {
+      description: "Tool approval response processed successfully",
+      content: {
+        "application/json": {
+          schema: z$1.object({
+            success: z$1.boolean(),
+            message: z$1.string().optional()
+          })
+        }
+      }
+    },
+    400: {
+      description: "Bad request - invalid tool call ID or conversation ID",
+      content: {
+        "application/json": {
+          schema: z$1.object({
+            error: z$1.string()
+          })
+        }
+      }
+    },
+    404: {
+      description: "Tool call not found or already processed",
+      content: {
+        "application/json": {
+          schema: z$1.object({
+            error: z$1.string()
+          })
+        }
+      }
+    },
+    500: {
+      description: "Internal server error",
+      content: {
+        "application/json": {
+          schema: z$1.object({
+            error: z$1.string(),
+            message: z$1.string()
+          })
+        }
+      }
+    }
+  }
+});
+app3.openapi(toolApprovalRoute, async (c) => {
+  const tracer2 = trace.getTracer("tool-approval-handler");
+  return tracer2.startActiveSpan("tool_approval_request", async (span) => {
+    try {
+      const executionContext = getRequestExecutionContext(c);
+      const { tenantId, projectId } = executionContext;
+      const requestBody = await c.req.json();
+      const { conversationId, toolCallId, approved, reason } = requestBody;
+      logger22.info(
+        {
+          conversationId,
+          toolCallId,
+          approved,
+          reason,
+          tenantId,
+          projectId
+        },
+        "Processing tool approval request"
+      );
+      const conversation = await getConversation(dbClient_default)({
+        scopes: { tenantId, projectId },
+        conversationId
+      });
+      if (!conversation) {
+        span.setStatus({ code: 1, message: "Conversation not found" });
+        return c.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 c.json({ error: "Tool call not found or already processed" }, 404);
+      }
+      logger22.info({ conversationId, toolCallId, approved }, "Tool approval processed successfully");
+      span.setStatus({ code: 1, message: "Success" });
+      return c.json({
+        success: true,
+        message: approved ? "Tool execution approved" : "Tool execution denied"
+      });
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      logger22.error(
+        {
+          error: errorMessage,
+          stack: error instanceof Error ? error.stack : void 0
+        },
+        "Failed to process tool approval"
+      );
+      span.setStatus({ code: 2, message: errorMessage });
+      return c.json(
+        {
+          error: "Internal server error",
+          message: errorMessage
+        },
+        500
+      );
+    } finally {
+      span.end();
+    }
+  });
+});
 var chatDataStream_default = app3;
 var logger23 = getLogger("mcp");
 var MockResponseSingleton = class _MockResponseSingleton {
@@ -11544,7 +11707,8 @@ var validateSession = async (req, res, body, tenantId, projectId, agentId) => {
       })
     );
     return false;
-  } else if (Array.isArray(sessionId)) {
+  }
+  if (Array.isArray(sessionId)) {
     res.writeHead(400).end(
       JSON.stringify({
         jsonrpc: "2.0",
@@ -11967,16 +12131,15 @@ app4.openapi(
           c,
           credentialStores
         );
-      } else {
-        return await handleExistingSessionRequest(
-          body,
-          executionContext,
-          validatedContext,
-          req,
-          res,
-          credentialStores
-        );
       }
+      return await handleExistingSessionRequest(
+        body,
+        executionContext,
+        validatedContext,
+        req,
+        res,
+        credentialStores
+      );
     } catch (e) {
       logger23.error(
         {