@inkeep/agents-run-api 0.2.2 → 0.5.0

package/dist/index.cjs

@@ -5,6 +5,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var agentsCore = require('@inkeep/agents-core');
 var z5 = require('zod');
 var nanoid = require('nanoid');
+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');
+var httpException = require('hono/http-exception');
+var requestId = require('hono/request-id');
 var autoInstrumentationsNode = require('@opentelemetry/auto-instrumentations-node');
 var baggageSpanProcessor = require('@opentelemetry/baggage-span-processor');
 var contextAsyncHooks = require('@opentelemetry/context-async-hooks');
@@ -14,12 +21,6 @@ var resources = require('@opentelemetry/resources');
 var sdkNode = require('@opentelemetry/sdk-node');
 var sdkTraceBase = require('@opentelemetry/sdk-trace-base');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
-var zodOpenapi = require('@hono/zod-openapi');
-var api = require('@opentelemetry/api');
-var hono = require('hono');
-var cors = require('hono/cors');
-var httpException = require('hono/http-exception');
-var requestId = require('hono/request-id');
 var factory = require('hono/factory');
 var swaggerUi = require('@hono/swagger-ui');
 var streaming = require('hono/streaming');
@@ -27,14 +28,15 @@ var destr = require('destr');
 var traverse = require('traverse');
 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 aiSdkProvider = require('@openrouter/ai-sdk-provider');
 var jmespath = require('jmespath');
 var mcp_js = require('@modelcontextprotocol/sdk/server/mcp.js');
 var streamableHttp_js = require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 var v3 = require('zod/v3');
 var fetchToNode = require('fetch-to-node');
-var otel = require('@hono/otel');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -67,8 +69,7 @@ var init_env = __esm({
       NANGO_SECRET_KEY: z5.z.string().optional(),
       OPENAI_API_KEY: z5.z.string().optional(),
       ANTHROPIC_API_KEY: z5.z.string(),
-      INKEEP_AGENTS_RUN_API_BYPASS_SECRET: z5.z.string().optional(),
-      OTEL_MAX_EXPORT_BATCH_SIZE: z5.z.coerce.number().optional()
+      INKEEP_AGENTS_RUN_API_BYPASS_SECRET: z5.z.string().optional()
     });
     parseEnv = () => {
       try {
@@ -282,48 +283,48 @@ var init_conversations = __esm({
     init_dbClient();
   }
 });
-
-// src/instrumentation.ts
-init_env();
-var maxExportBatchSize = env.OTEL_MAX_EXPORT_BATCH_SIZE ?? (env.ENVIRONMENT === "development" ? 1 : 512);
 var otlpExporter = new exporterTraceOtlpHttp.OTLPTraceExporter();
-var batchProcessor = new sdkTraceBase.BatchSpanProcessor(otlpExporter, {
-  maxExportBatchSize
-});
-var resource = resources.resourceFromAttributes({
+var defaultBatchProcessor = new sdkTraceBase.BatchSpanProcessor(otlpExporter);
+var defaultResource = resources.resourceFromAttributes({
   [semanticConventions.ATTR_SERVICE_NAME]: "inkeep-agents-run-api"
 });
-var sdk = new sdkNode.NodeSDK({
-  resource,
-  contextManager: new contextAsyncHooks.AsyncLocalStorageContextManager(),
-  textMapPropagator: new core.CompositePropagator({
-    propagators: [new core.W3CTraceContextPropagator(), new core.W3CBaggagePropagator()]
-  }),
-  spanProcessors: [new baggageSpanProcessor.BaggageSpanProcessor(baggageSpanProcessor.ALLOW_ALL_BAGGAGE_KEYS), batchProcessor],
-  instrumentations: [
-    autoInstrumentationsNode.getNodeAutoInstrumentations({
-      "@opentelemetry/instrumentation-http": {
-        enabled: true,
-        requestHook: (span, request) => {
-          const url = request?.url ?? request?.path;
-          if (!url) return;
-          const u = new URL(url, "http://localhost");
-          span.updateName(`${request?.method || "UNKNOWN"} ${u.pathname}`);
-        }
-      },
-      "@opentelemetry/instrumentation-undici": {
-        requestHook: (span) => {
-          const method = span.attributes?.["http.request.method"];
-          const host = span.attributes?.["server.address"];
-          const path = span.attributes?.["url.path"];
-          if (method && path)
-            span.updateName(host ? `${method} ${host}${path}` : `${method} ${path}`);
-        }
+var defaultInstrumentations = [
+  autoInstrumentationsNode.getNodeAutoInstrumentations({
+    "@opentelemetry/instrumentation-http": {
+      enabled: true,
+      requestHook: (span, request) => {
+        const url = request?.url ?? request?.path;
+        if (!url) return;
+        const u = new URL(url, "http://localhost");
+        span.updateName(`${request?.method || "UNKNOWN"} ${u.pathname}`);
       }
-    })
-  ]
+    },
+    "@opentelemetry/instrumentation-undici": {
+      requestHook: (span) => {
+        const method = span.attributes?.["http.request.method"];
+        const host = span.attributes?.["server.address"];
+        const path = span.attributes?.["url.path"];
+        if (method && path)
+          span.updateName(host ? `${method} ${host}${path}` : `${method} ${path}`);
+      }
+    }
+  })
+];
+var defaultSpanProcessors = [
+  new baggageSpanProcessor.BaggageSpanProcessor(baggageSpanProcessor.ALLOW_ALL_BAGGAGE_KEYS),
+  defaultBatchProcessor
+];
+var defaultContextManager = new contextAsyncHooks.AsyncLocalStorageContextManager();
+var defaultTextMapPropagator = new core.CompositePropagator({
+  propagators: [new core.W3CTraceContextPropagator(), new core.W3CBaggagePropagator()]
+});
+new sdkNode.NodeSDK({
+  resource: defaultResource,
+  contextManager: defaultContextManager,
+  textMapPropagator: defaultTextMapPropagator,
+  spanProcessors: defaultSpanProcessors,
+  instrumentations: defaultInstrumentations
 });
-sdk.start();
 init_dbClient();
 init_env();
 
@@ -1226,7 +1227,7 @@ async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
     throw new Error("Agent ID is required");
   }
   const dbAgent = await agentsCore.getAgentById(dbClient_default)({
-    scopes: { tenantId, projectId },
+    scopes: { tenantId, projectId, graphId },
     agentId
   });
   if (!dbAgent) {
@@ -1245,6 +1246,41 @@ async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
 // src/agents/generateTaskHandler.ts
 init_dbClient();
 
+// src/utils/model-resolver.ts
+init_dbClient();
+async function resolveModelConfig(graphId, agent) {
+  if (agent.models?.base?.model) {
+    return {
+      base: agent.models.base,
+      structuredOutput: agent.models.structuredOutput || agent.models.base,
+      summarizer: agent.models.summarizer || agent.models.base
+    };
+  }
+  const graph = await agentsCore.getAgentGraphById(dbClient_default)({
+    scopes: { tenantId: agent.tenantId, projectId: agent.projectId, graphId }
+  });
+  if (graph?.models?.base?.model) {
+    return {
+      base: graph.models.base,
+      structuredOutput: agent.models?.structuredOutput || graph.models.structuredOutput || graph.models.base,
+      summarizer: agent.models?.summarizer || graph.models.summarizer || graph.models.base
+    };
+  }
+  const project = await agentsCore.getProject(dbClient_default)({
+    scopes: { tenantId: agent.tenantId, projectId: agent.projectId }
+  });
+  if (project?.models?.base?.model) {
+    return {
+      base: project.models.base,
+      structuredOutput: agent.models?.structuredOutput || project.models.structuredOutput || project.models.base,
+      summarizer: agent.models?.summarizer || project.models.summarizer || project.models.base
+    };
+  }
+  throw new Error(
+    "Base model configuration is required. Please configure models at the project level."
+  );
+}
+
 // src/agents/Agent.ts
 init_conversations();
 init_dbClient();
@@ -1266,24 +1302,19 @@ function completionOp(agentId, iterations) {
     }
   };
 }
-function errorOp(error, agentId) {
+function errorOp(message, agentId, severity = "error", code) {
   return {
     type: "error",
-    ctx: {
-      error,
-      agent: agentId
-    }
+    message,
+    agent: agentId,
+    severity,
+    code,
+    timestamp: Date.now()
   };
 }
 function generateToolId() {
   return `tool_${nanoid.nanoid(8)}`;
 }
-function statusUpdateOp(ctx) {
-  return {
-    type: "status_update",
-    ctx
-  };
-}
 var logger4 = agentsCore.getLogger("DataComponentSchema");
 function jsonSchemaToZod(jsonSchema) {
   if (!jsonSchema || typeof jsonSchema !== "object") {
@@ -1368,6 +1399,17 @@ __publicField(_ArtifactReferenceSchema, "ARTIFACT_PROPS_SCHEMA", {
   required: ["artifact_id", "task_id"]
 });
 var ArtifactReferenceSchema = _ArtifactReferenceSchema;
+
+// src/utils/default-status-schemas.ts
+var retrieveStatusSchema = {
+  type: "retrieve",
+  description: 'Use this when the system found or retrieved specific information from searches, queries, or lookups. ONLY report ACTUAL findings that appear explicitly in the tool results - never make up data, names, numbers, or details. The label must state the SPECIFIC discovery (e.g., "Found 3 authentication methods", "Database contains 500 records", "API supports JSON format") not the act of searching. Every detail must be traceable to actual tool output. NEVER invent placeholder names, fictional data, or information not present in the activities.'
+};
+var actionStatusSchema = {
+  type: "action",
+  description: 'Use this when the system executed a tool or performed an operation that modified state or had side effects. ONLY report ACTUAL tool executions and their results as they appear in the tool outputs - never make up tool names, parameters, or outcomes. The label must describe what specific action was performed and its concrete result based on actual tool execution data. DO NOT make up examples like "Ran test suite with X passes" unless a test suite was ACTUALLY run and reported X passes. DO NOT say "Executed database query" unless a database query was ACTUALLY executed. Only report what literally happened. NEVER invent tool names, execution results, or details not explicitly present in the tool execution activities. If a tool failed, report the actual failure, not imagined success.'
+};
+var defaultStatusSchemas = [retrieveStatusSchema, actionStatusSchema];
 var logger5 = agentsCore.getLogger("ModelFactory");
 var _ModelFactory = class _ModelFactory {
   /**
@@ -1381,6 +1423,18 @@ var _ModelFactory = class _ModelFactory {
         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);
       default:
         throw new Error(`Unsupported provider: ${provider}`);
     }
@@ -1413,6 +1467,9 @@ var _ModelFactory = class _ModelFactory {
       );
     }
     const modelSettings = config;
+    if (!modelSettings.model) {
+      throw new Error("Model configuration is required");
+    }
     const modelString = modelSettings.model.trim();
     const { provider, modelName } = _ModelFactory.parseModelString(modelString);
     logger5.debug(
@@ -1437,26 +1494,29 @@ var _ModelFactory = class _ModelFactory {
         return openai.openai(modelName);
       case "google":
         return google.google(modelName);
+      case "openrouter":
+        return aiSdkProvider.openrouter(modelName);
+      case "gateway":
+        return gateway.gateway(modelName);
       default:
-        throw new Error(`Unsupported provider: ${provider}`);
+        throw new Error(
+          `Unsupported provider: ${provider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id) or Vercel AI Gateway (gateway/model-id).`
+        );
     }
   }
   /**
    * 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.SUPPORTED_PROVIDERS.includes(normalizedProvider)) {
-        logger5.error(
-          { provider: normalizedProvider, modelName: modelParts.join("/") },
-          "Unsupported provider detected, falling back to anthropic"
-        );
+      if (!_ModelFactory.BUILT_IN_PROVIDERS.includes(normalizedProvider)) {
         throw new Error(
-          `Unsupported provider: ${normalizedProvider}. Please provide a model in the format of provider/model-name.`
+          `Unsupported provider: ${normalizedProvider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id) or Vercel AI Gateway (gateway/model-id).`
         );
       }
       return {
@@ -1465,9 +1525,7 @@ var _ModelFactory = class _ModelFactory {
         // In case model name has slashes
       };
     }
-    throw new Error(
-      `Invalid model provided: ${modelString}. Please provide a model in the format of provider/model-name.`
-    );
+    throw new Error(`No provider specified in model string: ${modelString}`);
   }
   /**
    * Get generation parameters from provider options
@@ -1531,15 +1589,20 @@ var _ModelFactory = class _ModelFactory {
   }
 };
 /**
- * Supported providers for security validation
+ * Built-in providers that have special handling
  */
-__publicField(_ModelFactory, "SUPPORTED_PROVIDERS", ["anthropic", "openai", "google"]);
+__publicField(_ModelFactory, "BUILT_IN_PROVIDERS", [
+  "anthropic",
+  "openai",
+  "google",
+  "openrouter",
+  "gateway"
+]);
 var ModelFactory = _ModelFactory;
 
 // src/utils/graph-session.ts
 init_conversations();
 init_dbClient();
-var tracer = agentsCore.getTracer("agents-run-api");
 
 // src/utils/stream-registry.ts
 var streamHelperRegistry = /* @__PURE__ */ new Map();
@@ -1555,6 +1618,7 @@ function getStreamHelper(requestId2) {
 function unregisterStreamHelper(requestId2) {
   streamHelperRegistry.delete(requestId2);
 }
+var tracer = agentsCore.getTracer("agents-run-api");
 
 // src/utils/graph-session.ts
 var logger6 = agentsCore.getLogger("GraphSession");
@@ -1863,7 +1927,6 @@ var GraphSession = class {
     }
     this.isGeneratingUpdate = true;
     const statusUpdateState = this.statusUpdateState;
-    const graphId = this.graphId;
     try {
       const streamHelper = getStreamHelper(this.sessionId);
       if (!streamHelper) {
@@ -1876,81 +1939,49 @@ var GraphSession = class {
       }
       const now = Date.now();
       const elapsedTime = now - statusUpdateState.startTime;
-      let operation;
-      if (statusUpdateState.config.statusComponents && statusUpdateState.config.statusComponents.length > 0) {
-        const result = await this.generateStructuredStatusUpdate(
-          this.events.slice(statusUpdateState.lastEventCount),
-          elapsedTime,
-          statusUpdateState.config.statusComponents,
-          statusUpdateState.summarizerModel,
-          this.previousSummaries
-        );
-        if (result.operations && result.operations.length > 0) {
-          for (const op of result.operations) {
-            if (!op || !op.type || !op.data || Object.keys(op.data).length === 0) {
-              logger6.warn(
-                {
-                  sessionId: this.sessionId,
-                  operation: op
-                },
-                "Skipping empty or invalid structured operation"
-              );
-              continue;
-            }
-            const operationToSend = {
-              type: "status_update",
-              ctx: {
-                operationType: op.type,
-                label: op.data.label,
-                data: Object.fromEntries(
-                  Object.entries(op.data).filter(([key]) => !["label", "type"].includes(key))
-                )
-              }
-            };
-            await streamHelper.writeOperation(operationToSend);
-          }
-          const summaryTexts = result.operations.map(
-            (op) => JSON.stringify({ type: op.type, data: op.data })
-          );
-          this.previousSummaries.push(...summaryTexts);
-          if (this.statusUpdateState) {
-            this.statusUpdateState.lastUpdateTime = now;
-            this.statusUpdateState.lastEventCount = this.events.length;
+      const statusComponents = statusUpdateState.config.statusComponents && statusUpdateState.config.statusComponents.length > 0 ? statusUpdateState.config.statusComponents : defaultStatusSchemas;
+      const result = await this.generateStructuredStatusUpdate(
+        this.events.slice(statusUpdateState.lastEventCount),
+        elapsedTime,
+        statusComponents,
+        statusUpdateState.summarizerModel,
+        this.previousSummaries
+      );
+      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) {
+            logger6.warn(
+              {
+                sessionId: this.sessionId,
+                summary
+              },
+              "Skipping empty or invalid structured operation"
+            );
+            continue;
           }
-          return;
+          const summaryToSend = {
+            type: summary.data.type || summary.type,
+            // Preserve the actual custom type from LLM
+            label: summary.data.label,
+            details: Object.fromEntries(
+              Object.entries(summary.data).filter(([key]) => !["label", "type"].includes(key))
+            )
+          };
+          await streamHelper.writeSummary(summaryToSend);
         }
-      } else {
-        const summary = await this.generateProgressSummary(
-          this.events.slice(statusUpdateState.lastEventCount),
-          elapsedTime,
-          statusUpdateState.summarizerModel,
-          this.previousSummaries
+        const summaryTexts = result.summaries.map(
+          (summary) => JSON.stringify({ type: summary.type, data: summary.data })
         );
-        this.previousSummaries.push(summary);
-        operation = statusUpdateOp({
-          summary,
-          eventCount: this.events.length,
-          elapsedTime,
-          currentPhase: "processing",
-          activeAgent: "system",
-          graphId,
-          sessionId: this.sessionId
-        });
+        this.previousSummaries.push(...summaryTexts);
+        if (this.statusUpdateState) {
+          this.statusUpdateState.lastUpdateTime = now;
+          this.statusUpdateState.lastEventCount = this.events.length;
+        }
+        return;
       }
       if (this.previousSummaries.length > 3) {
         this.previousSummaries.shift();
       }
-      if (!operation || !operation.type || !operation.ctx) {
-        logger6.warn(
-          {
-            sessionId: this.sessionId,
-            operation
-          },
-          "Skipping empty or invalid status update operation"
-        );
-        return;
-      }
-      await streamHelper.writeOperation(operation);
       if (this.statusUpdateState) {
         this.statusUpdateState.lastUpdateTime = now;
         this.statusUpdateState.lastEventCount = this.events.length;
@@ -2034,103 +2065,6 @@ var GraphSession = class {
       this.statusUpdateState.updateLock = false;
     }
   }
-  /**
-   * Generate user-focused progress summary hiding internal operations
-   */
-  async generateProgressSummary(newEvents, elapsedTime, summarizerModel, previousSummaries = []) {
-    return tracer.startActiveSpan(
-      "graph_session.generate_progress_summary",
-      {
-        attributes: {
-          "graph_session.id": this.sessionId,
-          "events.count": newEvents.length,
-          "elapsed_time.seconds": Math.round(elapsedTime / 1e3),
-          "llm.model": summarizerModel?.model,
-          "previous_summaries.count": previousSummaries.length
-        }
-      },
-      async (span) => {
-        try {
-          const userVisibleActivities = this.extractUserVisibleActivities(newEvents);
-          let conversationContext = "";
-          if (this.tenantId && this.projectId) {
-            try {
-              const conversationHistory = await getFormattedConversationHistory({
-                tenantId: this.tenantId,
-                projectId: this.projectId,
-                conversationId: this.sessionId,
-                options: {
-                  limit: 10,
-                  // Get recent conversation context
-                  maxOutputTokens: 2e3
-                },
-                filters: {}
-              });
-              conversationContext = conversationHistory.trim() ? `
-User's Question/Context:
-${conversationHistory}
-` : "";
-            } catch (error) {
-              logger6.warn(
-                { sessionId: this.sessionId, error },
-                "Failed to fetch conversation history for status update"
-              );
-            }
-          }
-          const previousSummaryContext = previousSummaries.length > 0 ? `
-Previous updates provided to user:
-${previousSummaries.map((s, i) => `${i + 1}. ${s}`).join("\n")}
-` : "";
-          const basePrompt = `Generate a meaningful status update that tells the user what specific information or result was just found/achieved.${conversationContext}${previousSummaries.length > 0 ? `
-${previousSummaryContext}` : ""}
-
-Activities:
-${userVisibleActivities.join("\n") || "No New Activities"}
-
-Describe the ACTUAL finding, result, or specific information discovered (e.g., "Found Slack bot requires admin permissions", "Identified 3 channel types for ingestion", "Configuration requires OAuth token").
-
-${this.statusUpdateState?.config.prompt?.trim() || ""}`;
-          const prompt = basePrompt;
-          let modelToUse = summarizerModel;
-          if (!summarizerModel?.model?.trim()) {
-            if (!this.statusUpdateState?.baseModel?.model?.trim()) {
-              throw new Error(
-                "Either summarizer or base model is required for progress summary generation. Please configure models at the project level."
-              );
-            }
-            modelToUse = this.statusUpdateState.baseModel;
-          }
-          const model = ModelFactory.createModel(modelToUse);
-          const { text } = await ai.generateText({
-            model,
-            prompt,
-            experimental_telemetry: {
-              isEnabled: true,
-              functionId: `status_update_${this.sessionId}`,
-              recordInputs: true,
-              recordOutputs: true,
-              metadata: {
-                operation: "progress_summary_generation",
-                sessionId: this.sessionId
-              }
-            }
-          });
-          span.setAttributes({
-            "summary.length": text.trim().length,
-            "user_activities.count": userVisibleActivities.length
-          });
-          span.setStatus({ code: api.SpanStatusCode.OK });
-          return text.trim();
-        } catch (error) {
-          agentsCore.setSpanWithError(span, error);
-          logger6.error({ error }, "Failed to generate summary, using fallback");
-          return this.generateFallbackSummary(newEvents, elapsedTime);
-        } finally {
-          span.end();
-        }
-      }
-    );
-  }
   /**
    * Generate structured status update using configured data components
    */
@@ -2209,15 +2143,45 @@ Rules:
 - Fill in data for relevant components only
 - Use 'no_relevant_updates' if nothing substantially new to report. DO NOT WRITE LABELS OR USE OTHER COMPONENTS IF YOU USE THIS COMPONENT.
 - Never repeat previous values, make every update EXTREMELY unique. If you cannot do that the update is not worth mentioning.
-- Labels MUST contain the ACTUAL information discovered ("Found X", "Learned Y", "Discovered Z requires A")
+- Labels MUST be short 3-7 word phrases with ACTUAL information discovered. NEVER MAKE UP SOMETHING WITHOUT BACKING IT UP WITH ACTUAL INFORMATION.
+- Use sentence case: only capitalize the first word and proper nouns (e.g., "Admin permissions required", not "Admin Permissions Required"). ALWAYS capitalize the first word of the label.
 - DO NOT use action words like "Searching", "Processing", "Analyzing" - state what was FOUND
 - Include specific details, numbers, requirements, or insights discovered
-- You are ONE unified AI system - NEVER mention agents, transfers, delegations, or routing
-- CRITICAL: NEVER use the words "transfer", "delegation", "agent", "routing", or any internal system terminology in labels
-- Present all operations as seamless actions by a single system
-- Anonymize all internal operations so that the information appears descriptive and USER FRIENDLY. HIDE ALL INTERNAL OPERATIONS!
-- Bad examples: "Transferring to search agent", "Delegating task", "Routing request", "Processing request", or not using the no_relevant_updates
-- Good examples: "Slack bot needs admin privileges", "Found 3-step OAuth flow required", "Channel limit is 500 per workspace", or use the no_relevant_updates component if nothing new to report.
+- Examples: "Admin permissions required", "Three OAuth steps found", "Token expires daily"
+
+CRITICAL - HIDE ALL INTERNAL SYSTEM OPERATIONS:
+- You are ONE unified AI system presenting results to the user
+- ABSOLUTELY FORBIDDEN WORDS/PHRASES: "transfer", "transferring", "delegation", "delegating", "delegate", "agent", "routing", "route", "artifact", "saving artifact", "stored artifact", "artifact saved", "continuing", "passing to", "handing off", "switching to"
+- NEVER reveal internal architecture: No mentions of different agents, components, systems, or modules working together
+- NEVER mention artifact operations: Users don't need to know about data being saved, stored, or organized internally
+- NEVER describe handoffs or transitions: Present everything as one seamless operation
+- If you see "transfer", "delegation_sent", "delegation_returned", or "artifact_saved" events - IGNORE THEM or translate to user-facing information only
+- Focus ONLY on actual discoveries, findings, and results that matter to the user
+
+- Bad examples: 
+  * "Transferring to search agent"
+  * "Delegating research task" 
+  * "Routing to QA specialist"
+  * "Artifact saved successfully"
+  * "Storing results for later"
+  * "Passing request to tool handler"
+  * "Continuing with analysis"
+  * "Handing off to processor"
+- Good examples:
+  * "Slack bot needs admin privileges"
+  * "Found 3-step OAuth flow required"  
+  * "Channel limit is 500 per workspace"
+  * Use no_relevant_updates if nothing new to report
+
+CRITICAL ANTI-HALLUCINATION RULES:
+- NEVER MAKE UP SOMETHING WITHOUT BACKING IT UP WITH ACTUAL INFORMATION. EVERY SINGLE UPDATE MUST BE BACKED UP WITH ACTUAL INFORMATION.
+- DO NOT MAKE UP PEOPLE, NAMES, PLACES, THINGS, ORGANIZATIONS, OR INFORMATION. IT IS OBVIOUS WHEN A PERSON/ENTITY DOES NOT EXIST.
+- Only report facts that are EXPLICITLY mentioned in the activities or tool results
+- If you don't have concrete information about something, DO NOT mention it
+- Never invent names like "John Doe", "Alice", "Bob", or any other placeholder names
+- Never create fictional companies, products, or services
+- If a tool returned no results or an error, DO NOT pretend it found something
+- Every detail in your status update must be traceable back to the actual activities provided
 
 REMEMBER YOU CAN ONLY USE 'no_relevant_updates' ALONE! IT CANNOT BE CONCATENATED WITH OTHER STATUS UPDATES!
 
@@ -2232,6 +2196,9 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             }
             modelToUse = this.statusUpdateState.baseModel;
           }
+          if (!modelToUse) {
+            throw new Error("No model configuration available");
+          }
           const model = ModelFactory.createModel(modelToUse);
           const { object } = await ai.generateObject({
             model,
@@ -2249,29 +2216,29 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             }
           });
           const result = object;
-          const operations = [];
+          const summaries = [];
           for (const [componentId, data] of Object.entries(result)) {
             if (componentId === "no_relevant_updates") {
               continue;
             }
             if (data && typeof data === "object" && Object.keys(data).length > 0) {
-              operations.push({
+              summaries.push({
                 type: componentId,
                 data
               });
             }
           }
           span.setAttributes({
-            "operations.count": operations.length,
+            "summaries.count": summaries.length,
             "user_activities.count": userVisibleActivities.length,
             "result_keys.count": Object.keys(result).length
           });
           span.setStatus({ code: api.SpanStatusCode.OK });
-          return { operations };
+          return { summaries };
         } catch (error) {
           agentsCore.setSpanWithError(span, error);
           logger6.error({ error }, "Failed to generate structured update, using fallback");
-          return { operations: [] };
+          return { summaries: [] };
         } finally {
           span.end();
         }
@@ -2287,7 +2254,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
     }
     return z5.z.object({
       label: z5.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.'
+        '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.'
       )
     });
   }
@@ -2297,7 +2264,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
   buildZodSchemaFromJson(jsonSchema) {
     const properties = {};
     properties["label"] = z5.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?'
+      '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;
@@ -2374,41 +2341,12 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           );
           break;
         }
-        case "transfer": {
-          const data = event.data;
-          activities.push(
-            `\u{1F504} **Continuing**: ${data.reason || "Processing request"}
-   ${data.context ? `Context: ${JSON.stringify(data.context, null, 2)}` : ""}`
-          );
-          break;
-        }
-        case "delegation_sent": {
-          const data = event.data;
-          activities.push(
-            `\u{1F4E4} **Processing**: ${data.taskDescription}
-   ${data.context ? `Context: ${JSON.stringify(data.context, null, 2)}` : ""}`
-          );
-          break;
-        }
-        case "delegation_returned": {
-          const data = event.data;
-          activities.push(
-            `\u{1F4E5} **Completed subtask**
-   Result: ${JSON.stringify(data.result, null, 2)}`
-          );
-          break;
-        }
-        case "artifact_saved": {
-          const data = event.data;
-          activities.push(
-            `\u{1F4BE} **Artifact Saved**: ${data.artifactType}
-   ID: ${data.artifactId}
-   Task: ${data.taskId}
-   ${data.summaryData ? `Summary: ${data.summaryData}` : ""}
-   ${data.fullData ? `Full Data: ${data.fullData}` : ""}`
-          );
+        // INTERNAL OPERATIONS - DO NOT EXPOSE TO STATUS UPDATES
+        case "transfer":
+        case "delegation_sent":
+        case "delegation_returned":
+        case "artifact_saved":
           break;
-        }
         case "agent_reasoning": {
           const data = event.data;
           activities.push(
@@ -2433,21 +2371,6 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
     }
     return activities;
   }
-  /**
-   * Generate fallback summary when LLM fails
-   */
-  generateFallbackSummary(events, elapsedTime) {
-    const timeStr = Math.round(elapsedTime / 1e3);
-    const toolCalls = events.filter((e) => e.eventType === "tool_execution").length;
-    const artifacts = events.filter((e) => e.eventType === "artifact_saved").length;
-    if (artifacts > 0) {
-      return `Generated ${artifacts} result${artifacts > 1 ? "s" : ""} so far (${timeStr}s elapsed)`;
-    } else if (toolCalls > 0) {
-      return `Used ${toolCalls} tool${toolCalls > 1 ? "s" : ""} to gather information (${timeStr}s elapsed)`;
-    } else {
-      return `Processing your request... (${timeStr}s elapsed)`;
-    }
-  }
   /**
    * Process a single artifact to generate name and description using conversation context
    */
@@ -2522,6 +2445,9 @@ Make it specific and relevant.`;
             }
             modelToUse = this.statusUpdateState.baseModel;
           }
+          if (!modelToUse) {
+            throw new Error("No model configuration available");
+          }
           const model = ModelFactory.createModel(modelToUse);
           const schema = z5.z.object({
             name: z5.z.string().max(50).describe("Concise, descriptive name for the artifact"),
@@ -2803,6 +2729,7 @@ var _ArtifactParser = class _ArtifactParser {
     }
     for (let i = matches.length - 1; i >= 0; i--) {
       const match = matches[i];
+      if (match.index === void 0) continue;
       const startIdx = match.index;
       const textAfterMatch = text.slice(startIdx);
       if (!textAfterMatch.includes("/>")) {
@@ -2852,7 +2779,8 @@ var _ArtifactParser = class _ArtifactParser {
       taskId,
       name: artifact.name || "Processing...",
       description: artifact.description || "Name and description being generated...",
-      artifactType: artifact.metadata?.artifactType,
+      type: artifact.metadata?.artifactType || artifact.artifactType,
+      // Map artifactType to type for consistency
       artifactSummary: artifact.parts?.[0]?.data?.summary || {}
     };
   }
@@ -2869,10 +2797,11 @@ var _ArtifactParser = class _ArtifactParser {
     let lastIndex = 0;
     for (const match of matches) {
       const [fullMatch, artifactId, taskId] = match;
+      if (match.index === void 0) continue;
       const matchStart = match.index;
       if (matchStart > lastIndex) {
         const textBefore = text.slice(lastIndex, matchStart);
-        if (textBefore.trim()) {
+        if (textBefore) {
           parts.push({ kind: "text", text: textBefore });
         }
       }
@@ -2884,7 +2813,7 @@ var _ArtifactParser = class _ArtifactParser {
     }
     if (lastIndex < text.length) {
       const remainingText = text.slice(lastIndex);
-      if (remainingText.trim()) {
+      if (remainingText) {
         parts.push({ kind: "text", text: remainingText });
       }
     }
@@ -2994,8 +2923,9 @@ __publicField(_ArtifactParser, "INCOMPLETE_ARTIFACT_REGEX", /<(a(r(t(i(f(a(c(t(:
 var ArtifactParser = _ArtifactParser;
 
 // src/utils/incremental-stream-parser.ts
-var logger8 = agentsCore.getLogger("IncrementalStreamParser");
-var IncrementalStreamParser = class {
+agentsCore.getLogger("IncrementalStreamParser");
+var _IncrementalStreamParser = class _IncrementalStreamParser {
+  // Max number of streamed component IDs to track
   constructor(streamHelper, tenantId, contextId) {
     __publicField(this, "buffer", "");
     __publicField(this, "pendingTextBuffer", "");
@@ -3005,6 +2935,9 @@ var IncrementalStreamParser = class {
     __publicField(this, "collectedParts", []);
     __publicField(this, "contextId");
     __publicField(this, "lastChunkWasToolResult", false);
+    __publicField(this, "componentAccumulator", {});
+    __publicField(this, "lastStreamedComponents", /* @__PURE__ */ new Map());
+    __publicField(this, "componentSnapshots", /* @__PURE__ */ new Map());
     this.streamHelper = streamHelper;
     this.contextId = contextId;
     this.artifactParser = new ArtifactParser(tenantId);
@@ -3019,7 +2952,7 @@ var IncrementalStreamParser = class {
    * Process a new text chunk for text streaming (handles artifact markers)
    */
   async processTextChunk(chunk) {
-    if (this.lastChunkWasToolResult && this.buffer === "" && chunk.trim()) {
+    if (this.lastChunkWasToolResult && this.buffer === "" && chunk) {
       chunk = "\n\n" + chunk;
       this.lastChunkWasToolResult = false;
     }
@@ -3031,120 +2964,167 @@ var IncrementalStreamParser = class {
     this.buffer = parseResult.remainingBuffer;
   }
   /**
-   * Process a new object chunk for object streaming (handles JSON objects with artifact references)
+   * Process object deltas directly from Vercel AI SDK's fullStream
+   * Accumulates components and streams them when they're stable (unchanged between deltas)
    */
-  async processObjectChunk(chunk) {
-    this.buffer += chunk;
-    const parseResult = await this.parseObjectBuffer();
-    for (const part of parseResult.completeParts) {
-      await this.streamPart(part);
+  async processObjectDelta(delta) {
+    if (!delta || typeof delta !== "object") {
+      return;
     }
-    this.buffer = parseResult.remainingBuffer;
-  }
-  /**
-   * Process tool call stream for structured output, streaming components as they complete
-   */
-  async processToolCallStream(stream2, targetToolName) {
-    let jsonBuffer = "";
-    let componentBuffer = "";
-    let depth = 0;
-    let componentsStreamed = 0;
-    const MAX_BUFFER_SIZE = 5 * 1024 * 1024;
-    for await (const part of stream2) {
-      if (part.type === "tool-call-delta" && part.toolName === targetToolName) {
-        const delta = part.argsTextDelta || "";
-        if (jsonBuffer.length + delta.length > MAX_BUFFER_SIZE) {
-          logger8.warn(
-            { bufferSize: jsonBuffer.length + delta.length, maxSize: MAX_BUFFER_SIZE },
-            "JSON buffer exceeded maximum size, truncating"
-          );
-          jsonBuffer = jsonBuffer.slice(-MAX_BUFFER_SIZE / 2);
+    this.componentAccumulator = this.deepMerge(this.componentAccumulator, delta);
+    if (this.componentAccumulator.dataComponents && Array.isArray(this.componentAccumulator.dataComponents)) {
+      const components = this.componentAccumulator.dataComponents;
+      const currentComponentIds = new Set(components.filter((c) => c?.id).map((c) => c.id));
+      for (const [componentId, snapshot] of this.componentSnapshots.entries()) {
+        if (!currentComponentIds.has(componentId) && !this.lastStreamedComponents.has(componentId)) {
+          try {
+            const component = JSON.parse(snapshot);
+            if (this.isComponentComplete(component)) {
+              await this.streamComponent(component);
+            }
+          } catch (e) {
+          }
         }
-        jsonBuffer += delta;
-        for (const char of delta) {
-          if (componentBuffer.length > MAX_BUFFER_SIZE) {
-            logger8.warn(
-              { bufferSize: componentBuffer.length, maxSize: MAX_BUFFER_SIZE },
-              "Component buffer exceeded maximum size, resetting"
-            );
-            componentBuffer = "";
-            depth = 0;
-            continue;
+      }
+      for (let i = 0; i < components.length; i++) {
+        const component = components[i];
+        if (!component?.id) continue;
+        const componentKey = component.id;
+        const hasBeenStreamed = this.lastStreamedComponents.has(componentKey);
+        if (hasBeenStreamed) continue;
+        const currentSnapshot = JSON.stringify(component);
+        const previousSnapshot = this.componentSnapshots.get(componentKey);
+        this.componentSnapshots.set(componentKey, currentSnapshot);
+        if (this.componentSnapshots.size > _IncrementalStreamParser.MAX_SNAPSHOT_SIZE) {
+          const firstKey = this.componentSnapshots.keys().next().value;
+          if (firstKey) {
+            this.componentSnapshots.delete(firstKey);
           }
-          componentBuffer += char;
-          if (char === "{") {
-            depth++;
-          } else if (char === "}") {
-            depth--;
-            if (depth === 2 && componentBuffer.includes('"id"')) {
-              const componentMatch = componentBuffer.match(/\{[^{}]*(?:\{[^{}]*\}[^{}]*)*\}/);
-              if (componentMatch) {
-                const MAX_COMPONENT_SIZE = 1024 * 1024;
-                if (componentMatch[0].length > MAX_COMPONENT_SIZE) {
-                  logger8.warn(
-                    {
-                      size: componentMatch[0].length,
-                      maxSize: MAX_COMPONENT_SIZE
-                    },
-                    "Component exceeds size limit, skipping"
-                  );
-                  componentBuffer = "";
-                  continue;
-                }
-                try {
-                  const component = JSON.parse(componentMatch[0]);
-                  if (typeof component !== "object" || !component.id) {
-                    logger8.warn({ component }, "Invalid component structure, skipping");
-                    componentBuffer = "";
-                    continue;
-                  }
-                  const parts = await this.artifactParser.parseObject({
-                    dataComponents: [component]
-                  });
-                  for (const part2 of parts) {
-                    await this.streamPart(part2);
-                  }
-                  componentsStreamed++;
-                  componentBuffer = "";
-                } catch (e) {
-                  logger8.debug({ error: e }, "Failed to parse component, continuing to accumulate");
-                }
-              }
+        }
+        if (component.name === "Text" && component.props?.text) {
+          const previousTextContent = previousSnapshot ? JSON.parse(previousSnapshot).props?.text || "" : "";
+          const currentTextContent = component.props.text || "";
+          if (currentTextContent.length > previousTextContent.length) {
+            const newText = currentTextContent.slice(previousTextContent.length);
+            if (!this.hasStartedRole) {
+              await this.streamHelper.writeRole("assistant");
+              this.hasStartedRole = true;
             }
+            await this.streamHelper.streamText(newText, 50);
+            this.collectedParts.push({
+              kind: "text",
+              text: newText
+            });
           }
-          if (componentBuffer.includes('"dataComponents"') && componentBuffer.includes("[")) ;
+          continue;
         }
-      } else if (part.type === "tool-call" && part.toolName === targetToolName) {
-        if (part.args?.dataComponents) {
-          const parts = await this.artifactParser.parseObject(part.args);
-          for (const part2 of parts) {
-            await this.streamPart(part2);
+        if (this.isComponentComplete(component)) {
+          const currentPropsSnapshot = JSON.stringify(component.props);
+          const previousPropsSnapshot = previousSnapshot ? JSON.stringify(JSON.parse(previousSnapshot).props) : null;
+          if (previousPropsSnapshot === currentPropsSnapshot) {
+            await this.streamComponent(component);
           }
         }
-        break;
       }
     }
-    logger8.debug({ componentsStreamed }, "Finished streaming components");
   }
   /**
-   * Legacy method for backward compatibility - defaults to text processing
+   * Stream a component and mark it as streamed
+   * Note: Text components are handled separately with incremental streaming
    */
-  async processChunk(chunk) {
-    await this.processTextChunk(chunk);
+  async streamComponent(component) {
+    const parts = await this.artifactParser.parseObject({
+      dataComponents: [component]
+    });
+    for (const part of parts) {
+      await this.streamPart(part);
+    }
+    this.lastStreamedComponents.set(component.id, true);
+    if (this.lastStreamedComponents.size > _IncrementalStreamParser.MAX_STREAMED_SIZE) {
+      const firstKey = this.lastStreamedComponents.keys().next().value;
+      if (firstKey) {
+        this.lastStreamedComponents.delete(firstKey);
+      }
+    }
+    this.componentSnapshots.delete(component.id);
+  }
+  /**
+   * Check if a component has the basic structure required for streaming
+   * Requires id, name, and props object with content
+   */
+  isComponentComplete(component) {
+    if (!component || !component.id || !component.name) {
+      return false;
+    }
+    if (!component.props || typeof component.props !== "object") {
+      return false;
+    }
+    const isArtifact = component.name === "Artifact" || component.props.artifact_id && component.props.task_id;
+    if (isArtifact) {
+      return Boolean(component.props.artifact_id && component.props.task_id);
+    }
+    return true;
+  }
+  /**
+   * Deep merge helper for object deltas
+   */
+  deepMerge(target, source) {
+    if (!source) return target;
+    if (!target) return source;
+    const result = { ...target };
+    for (const key in source) {
+      if (source[key] && typeof source[key] === "object" && !Array.isArray(source[key])) {
+        result[key] = this.deepMerge(target[key], source[key]);
+      } else {
+        result[key] = source[key];
+      }
+    }
+    return result;
+  }
+  /**
+   * Legacy method for backward compatibility - defaults to text processing
+   */
+  async processChunk(chunk) {
+    await this.processTextChunk(chunk);
   }
   /**
    * Process any remaining buffer content at the end of stream
    */
   async finalize() {
-    if (this.buffer.trim()) {
+    if (this.componentAccumulator.dataComponents && Array.isArray(this.componentAccumulator.dataComponents)) {
+      const components = this.componentAccumulator.dataComponents;
+      for (let i = 0; i < components.length; i++) {
+        const component = components[i];
+        if (!component?.id) continue;
+        const componentKey = component.id;
+        const hasBeenStreamed = this.lastStreamedComponents.has(componentKey);
+        if (!hasBeenStreamed && this.isComponentComplete(component) && component.name !== "Text") {
+          const parts = await this.artifactParser.parseObject({
+            dataComponents: [component]
+          });
+          for (const part of parts) {
+            await this.streamPart(part);
+          }
+          this.lastStreamedComponents.set(componentKey, true);
+          if (this.lastStreamedComponents.size > _IncrementalStreamParser.MAX_STREAMED_SIZE) {
+            const firstKey = this.lastStreamedComponents.keys().next().value;
+            if (firstKey) {
+              this.lastStreamedComponents.delete(firstKey);
+            }
+          }
+          this.componentSnapshots.delete(componentKey);
+        }
+      }
+    }
+    if (this.buffer) {
       const part = {
         kind: "text",
-        text: this.buffer.trim()
+        text: this.buffer
       };
       await this.streamPart(part);
     }
-    if (this.pendingTextBuffer.trim()) {
-      const cleanedText = this.pendingTextBuffer.replace(/<\/?artifact:ref(?:\s[^>]*)?>\/?>/g, "").replace(/<\/?artifact(?:\s[^>]*)?>\/?>/g, "").replace(/<\/(?:\w+:)?artifact>/g, "").trim();
+    if (this.pendingTextBuffer) {
+      const cleanedText = this.pendingTextBuffer.replace(/<\/?artifact:ref(?:\s[^>]*)?>\/?>/g, "").replace(/<\/?artifact(?:\s[^>]*)?>\/?>/g, "").replace(/<\/artifact:ref>/g, "").replace(/<\/(?:\w+:)?artifact>/g, "");
       if (cleanedText) {
         this.collectedParts.push({
           kind: "text",
@@ -3154,6 +3134,9 @@ var IncrementalStreamParser = class {
       }
       this.pendingTextBuffer = "";
     }
+    this.componentSnapshots.clear();
+    this.lastStreamedComponents.clear();
+    this.componentAccumulator = {};
   }
   /**
    * Get all collected parts for building the final response
@@ -3200,30 +3183,6 @@ var IncrementalStreamParser = class {
       remainingBuffer: ""
     };
   }
-  /**
-   * Parse buffer for complete JSON objects with artifact references (for object streaming)
-   */
-  async parseObjectBuffer() {
-    const completeParts = [];
-    try {
-      const parsed = JSON.parse(this.buffer);
-      const parts = await this.artifactParser.parseObject(parsed);
-      return {
-        completeParts: parts,
-        remainingBuffer: ""
-      };
-    } catch {
-      const { complete, remaining } = this.artifactParser.parsePartialJSON(this.buffer);
-      for (const obj of complete) {
-        const parts = await this.artifactParser.parseObject(obj);
-        completeParts.push(...parts);
-      }
-      return {
-        completeParts,
-        remainingBuffer: remaining
-      };
-    }
-  }
   /**
    * Check if text might be the start of an artifact marker
    */
@@ -3243,16 +3202,16 @@ var IncrementalStreamParser = class {
     if (part.kind === "text" && part.text) {
       this.pendingTextBuffer += part.text;
       if (!this.artifactParser.hasIncompleteArtifact(this.pendingTextBuffer)) {
-        const cleanedText = this.pendingTextBuffer.replace(/<\/?artifact:ref(?:\s[^>]*)?>\/?>/g, "").replace(/<\/?artifact(?:\s[^>]*)?>\/?>/g, "").replace(/<\/(?:\w+:)?artifact>/g, "");
-        if (cleanedText.trim()) {
+        const cleanedText = this.pendingTextBuffer.replace(/<\/?artifact:ref(?:\s[^>]*)?>\/?>/g, "").replace(/<\/?artifact(?:\s[^>]*)?>\/?>/g, "").replace(/<\/artifact:ref>/g, "").replace(/<\/(?:\w+:)?artifact>/g, "");
+        if (cleanedText) {
           await this.streamHelper.streamText(cleanedText, 50);
         }
         this.pendingTextBuffer = "";
       }
     } else if (part.kind === "data" && part.data) {
       if (this.pendingTextBuffer) {
-        const cleanedText = this.pendingTextBuffer.replace(/<\/?artifact:ref(?:\s[^>]*)?>\/?>/g, "").replace(/<\/?artifact(?:\s[^>]*)?>\/?>/g, "").replace(/<\/(?:\w+:)?artifact>/g, "");
-        if (cleanedText.trim()) {
+        const cleanedText = this.pendingTextBuffer.replace(/<\/?artifact:ref(?:\s[^>]*)?>\/?>/g, "").replace(/<\/?artifact(?:\s[^>]*)?>\/?>/g, "").replace(/<\/artifact:ref>/g, "").replace(/<\/(?:\w+:)?artifact>/g, "");
+        if (cleanedText) {
           await this.streamHelper.streamText(cleanedText, 50);
         }
         this.pendingTextBuffer = "";
@@ -3266,6 +3225,11 @@ var IncrementalStreamParser = class {
     }
   }
 };
+// Memory management constants
+__publicField(_IncrementalStreamParser, "MAX_SNAPSHOT_SIZE", 100);
+// Max number of snapshots to keep
+__publicField(_IncrementalStreamParser, "MAX_STREAMED_SIZE", 1e3);
+var IncrementalStreamParser = _IncrementalStreamParser;
 
 // src/utils/response-formatter.ts
 var logger9 = agentsCore.getLogger("ResponseFormatter");
@@ -4654,7 +4618,8 @@ function createDelegateToAgentTool({
         const externalAgent = await agentsCore.getExternalAgent(dbClient_default)({
           scopes: {
             tenantId,
-            projectId
+            projectId,
+            graphId
           },
           agentId: delegateConfig.config.id
         });
@@ -5256,6 +5221,23 @@ var Agent = class {
     __publicField(this, "credentialStoreRegistry");
     this.artifactComponents = config.artifactComponents || [];
     let processedDataComponents = config.dataComponents || [];
+    if (processedDataComponents.length > 0) {
+      processedDataComponents.push({
+        id: "text-content",
+        name: "Text",
+        description: "Natural conversational text for the user - write naturally without mentioning technical details. Avoid redundancy and repetition with data components.",
+        props: {
+          type: "object",
+          properties: {
+            text: {
+              type: "string",
+              description: "Natural conversational text - respond as if having a normal conversation, never mention JSON, components, schemas, or technical implementation. Avoid redundancy and repetition with data components."
+            }
+          },
+          required: ["text"]
+        }
+      });
+    }
     if (this.artifactComponents.length > 0 && config.dataComponents && config.dataComponents.length > 0) {
       processedDataComponents = [
         ArtifactReferenceSchema.getDataComponent(config.tenantId, config.projectId),
@@ -5526,8 +5508,12 @@ var Agent = class {
   async getMcpTool(tool4) {
     const credentialReferenceId = tool4.credentialReferenceId;
     const toolsForAgent = await agentsCore.getToolsForAgent(dbClient_default)({
-      scopes: { tenantId: this.config.tenantId, projectId: this.config.projectId },
-      agentId: this.config.id
+      scopes: {
+        tenantId: this.config.tenantId,
+        projectId: this.config.projectId,
+        graphId: this.config.graphId,
+        agentId: this.config.id
+      }
     });
     const selectedTools = toolsForAgent.data.find((t) => t.toolId === tool4.id)?.selectedTools || void 0;
     let serverConfig;
@@ -5674,9 +5660,9 @@ var Agent = class {
       const graphDefinition = await agentsCore.getFullGraphDefinition(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
-          projectId: this.config.projectId
-        },
-        graphId: this.config.graphId
+          projectId: this.config.projectId,
+          graphId: this.config.graphId
+        }
       });
       return graphDefinition?.graphPrompt || void 0;
     } catch (error) {
@@ -5698,14 +5684,16 @@ var Agent = class {
       const graphDefinition = await agentsCore.getFullGraphDefinition(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
-          projectId: this.config.projectId
-        },
-        graphId: this.config.graphId
+          projectId: this.config.projectId,
+          graphId: this.config.graphId
+        }
       });
       if (!graphDefinition) {
         return false;
       }
-      return !!(graphDefinition.artifactComponents && Object.keys(graphDefinition.artifactComponents).length > 0);
+      return Object.values(graphDefinition.agents).some(
+        (agent) => "artifactComponents" in agent && agent.artifactComponents && agent.artifactComponents.length > 0
+      );
     } catch (error) {
       logger15.warn(
         {
@@ -5733,7 +5721,8 @@ Key requirements:
 - Mix artifact references throughout your dataComponents array
 - Each artifact reference must use EXACT IDs from tool outputs
 - Reference artifacts that directly support the adjacent information
-- Follow the pattern: Data \u2192 Supporting Artifact \u2192 Next Data \u2192 Next Artifact`;
+- Follow the pattern: Data \u2192 Supporting Artifact \u2192 Next Data \u2192 Next Artifact
+- IMPORTANT: In Text components, write naturally as if having a conversation - do NOT mention components, schemas, JSON, structured data, or any technical implementation details`;
     }
     if (hasDataComponents && !hasArtifactComponents) {
       return `Generate the final structured JSON response using the configured data components. Organize the information from the research above into the appropriate structured format based on the available component schemas.
@@ -5741,7 +5730,8 @@ Key requirements:
 Key requirements:
 - Use the exact component structure and property names
 - Fill in all relevant data from the research
-- Ensure data is organized logically and completely`;
+- Ensure data is organized logically and completely
+- IMPORTANT: In Text components, write naturally as if having a conversation - do NOT mention components, schemas, JSON, structured data, or any technical implementation details`;
     }
     if (!hasDataComponents && hasArtifactComponents) {
       return `Generate the final structured response with artifact references based on the research above. Use the artifact reference component to cite relevant information with exact artifact_id and task_id values from the tool outputs.
@@ -5751,7 +5741,7 @@ Key requirements:
 - Reference artifacts that support your response
 - Never make up or modify artifact IDs`;
     }
-    return `Generate the final response based on the research above.`;
+    return `Generate the final response based on the research above. Write naturally as if having a conversation.`;
   }
   async buildSystemPrompt(runtimeContext, excludeDataComponents = false) {
     const conversationId = runtimeContext?.metadata?.conversationId || runtimeContext?.contextId;
@@ -5902,9 +5892,9 @@ Key requirements:
       return await agentsCore.graphHasArtifactComponents(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
-          projectId: this.config.projectId
-        },
-        graphId: this.config.graphId
+          projectId: this.config.projectId,
+          graphId: this.config.graphId
+        }
       });
     } catch (error) {
       logger15.error(
@@ -6250,35 +6240,94 @@ ${output}`;
               this.getStructuredOutputModel()
             );
             const phase2TimeoutMs = structuredModelSettings.maxDuration ? structuredModelSettings.maxDuration * 1e3 : CONSTANTS.PHASE_2_TIMEOUT_MS;
-            const structuredResponse = await ai.generateObject({
-              ...structuredModelSettings,
-              messages: [
-                { role: "user", content: userMessage },
-                ...reasoningFlow,
-                {
-                  role: "user",
-                  content: await this.buildPhase2SystemPrompt()
-                }
-              ],
-              schema: z5.z.object({
-                dataComponents: z5.z.array(dataComponentsSchema)
-              }),
-              experimental_telemetry: {
-                isEnabled: true,
-                functionId: this.config.id,
-                recordInputs: true,
-                recordOutputs: true,
-                metadata: {
-                  phase: "structured_generation"
+            const shouldStreamPhase2 = this.getStreamingHelper();
+            if (shouldStreamPhase2) {
+              const streamResult = ai.streamObject({
+                ...structuredModelSettings,
+                messages: [
+                  { role: "user", content: userMessage },
+                  ...reasoningFlow,
+                  {
+                    role: "user",
+                    content: await this.buildPhase2SystemPrompt()
+                  }
+                ],
+                schema: z5.z.object({
+                  dataComponents: z5.z.array(dataComponentsSchema)
+                }),
+                experimental_telemetry: {
+                  isEnabled: true,
+                  functionId: this.config.id,
+                  recordInputs: true,
+                  recordOutputs: true,
+                  metadata: {
+                    phase: "structured_generation"
+                  }
+                },
+                abortSignal: AbortSignal.timeout(phase2TimeoutMs)
+              });
+              const streamHelper = this.getStreamingHelper();
+              if (!streamHelper) {
+                throw new Error("Stream helper is unexpectedly undefined in streaming context");
+              }
+              const parser = new IncrementalStreamParser(
+                streamHelper,
+                this.config.tenantId,
+                contextId
+              );
+              for await (const delta of streamResult.partialObjectStream) {
+                if (delta) {
+                  await parser.processObjectDelta(delta);
                 }
-              },
-              abortSignal: AbortSignal.timeout(phase2TimeoutMs)
-            });
-            response = {
-              ...response,
-              object: structuredResponse.object
-            };
-            textResponse = JSON.stringify(structuredResponse.object, null, 2);
+              }
+              await parser.finalize();
+              const structuredResponse = await streamResult;
+              const collectedParts = parser.getCollectedParts();
+              if (collectedParts.length > 0) {
+                response.formattedContent = {
+                  parts: collectedParts.map((part) => ({
+                    kind: part.kind,
+                    ...part.kind === "text" && { text: part.text },
+                    ...part.kind === "data" && { data: part.data }
+                  }))
+                };
+              }
+              response = {
+                ...response,
+                object: structuredResponse.object
+              };
+              textResponse = JSON.stringify(structuredResponse.object, null, 2);
+            } else {
+              const structuredResponse = await ai.generateObject({
+                ...structuredModelSettings,
+                messages: [
+                  { role: "user", content: userMessage },
+                  ...reasoningFlow,
+                  {
+                    role: "user",
+                    content: await this.buildPhase2SystemPrompt()
+                  }
+                ],
+                schema: z5.z.object({
+                  dataComponents: z5.z.array(dataComponentsSchema)
+                }),
+                experimental_telemetry: {
+                  isEnabled: true,
+                  functionId: this.config.id,
+                  recordInputs: true,
+                  recordOutputs: true,
+                  metadata: {
+                    phase: "structured_generation"
+                  }
+                },
+                abortSignal: AbortSignal.timeout(phase2TimeoutMs)
+              });
+              response = {
+                ...response,
+                object: structuredResponse.object
+              };
+              textResponse = JSON.stringify(structuredResponse.object, null, 2);
+            }
           } else {
             textResponse = response.text || "";
           }
@@ -6324,42 +6373,6 @@ ${output}`;
   }
 };
 
-// src/utils/model-resolver.ts
-init_dbClient();
-async function resolveModelConfig(graphId, agent) {
-  if (agent.models?.base?.model) {
-    return {
-      base: agent.models.base,
-      structuredOutput: agent.models.structuredOutput || agent.models.base,
-      summarizer: agent.models.summarizer || agent.models.base
-    };
-  }
-  const graph = await agentsCore.getAgentGraph(dbClient_default)({
-    scopes: { tenantId: agent.tenantId, projectId: agent.projectId },
-    graphId
-  });
-  if (graph?.models?.base?.model) {
-    return {
-      base: graph.models.base,
-      structuredOutput: agent.models?.structuredOutput || graph.models.structuredOutput || graph.models.base,
-      summarizer: agent.models?.summarizer || graph.models.summarizer || graph.models.base
-    };
-  }
-  const project = await agentsCore.getProject(dbClient_default)({
-    scopes: { tenantId: agent.tenantId, projectId: agent.projectId }
-  });
-  if (project?.models?.base?.model) {
-    return {
-      base: project.models.base,
-      structuredOutput: agent.models?.structuredOutput || project.models.structuredOutput || project.models.base,
-      summarizer: agent.models?.summarizer || project.models.summarizer || project.models.base
-    };
-  }
-  throw new Error(
-    "Base model configuration is required. Please configure models at the project level."
-  );
-}
-
 // src/agents/generateTaskHandler.ts
 function parseEmbeddedJson(data) {
   return traverse__default.default(data).map(function(x) {
@@ -6394,31 +6407,34 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         agentsCore.getRelatedAgentsForGraph(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
+            projectId: config.projectId,
+            graphId: config.graphId
           },
-          graphId: config.graphId,
           agentId: config.agentId
         }),
         agentsCore.getToolsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
-          },
-          agentId: config.agentId
+            projectId: config.projectId,
+            graphId: config.graphId,
+            agentId: config.agentId
+          }
         }),
         agentsCore.getDataComponentsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
-          },
-          agentId: config.agentId
+            projectId: config.projectId,
+            graphId: config.graphId,
+            agentId: config.agentId
+          }
         }),
         agentsCore.getArtifactComponentsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
-          },
-          agentId: config.agentId
+            projectId: config.projectId,
+            graphId: config.graphId,
+            agentId: config.agentId
+          }
         })
       ]);
       logger16.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
@@ -6426,13 +6442,16 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         internalRelations.map(async (relation) => {
           try {
             const relatedAgent = await agentsCore.getAgentById(dbClient_default)({
-              scopes: { tenantId: config.tenantId, projectId: config.projectId },
+              scopes: {
+                tenantId: config.tenantId,
+                projectId: config.projectId,
+                graphId: config.graphId
+              },
               agentId: relation.id
             });
             if (relatedAgent) {
               const relatedAgentRelations = await agentsCore.getRelatedAgentsForGraph(dbClient_default)({
-                scopes: { tenantId: config.tenantId, projectId: config.projectId },
-                graphId: config.graphId,
+                scopes: { tenantId: config.tenantId, projectId: config.projectId, graphId: config.graphId },
                 agentId: relation.id
               });
               const enhancedDescription = generateDescriptionWithTransfers(
@@ -6655,16 +6674,17 @@ var createTaskHandlerConfig = async (params) => {
   const agent = await agentsCore.getAgentById(dbClient_default)({
     scopes: {
       tenantId: params.tenantId,
-      projectId: params.projectId
+      projectId: params.projectId,
+      graphId: params.graphId
     },
     agentId: params.agentId
   });
-  const agentGraph = await agentsCore.getAgentGraph(dbClient_default)({
+  const agentGraph = await agentsCore.getAgentGraphById(dbClient_default)({
     scopes: {
       tenantId: params.tenantId,
-      projectId: params.projectId
-    },
-    graphId: params.graphId
+      projectId: params.projectId,
+      graphId: params.graphId
+    }
   });
   if (!agent) {
     throw new Error(`Agent not found: ${params.agentId}`);
@@ -6704,10 +6724,14 @@ async function hydrateGraph({
   apiKey
 }) {
   try {
+    if (!dbGraph.defaultAgentId) {
+      throw new Error(`Graph ${dbGraph.id} does not have a default agent configured`);
+    }
     const defaultAgent = await agentsCore.getAgentById(dbClient_default)({
       scopes: {
         tenantId: dbGraph.tenantId,
-        projectId: dbGraph.projectId
+        projectId: dbGraph.projectId,
+        graphId: dbGraph.id
       },
       agentId: dbGraph.defaultAgentId
     });
@@ -6762,7 +6786,7 @@ async function hydrateGraph({
 }
 async function getRegisteredGraph(executionContext) {
   const { tenantId, projectId, graphId, baseUrl, apiKey } = executionContext;
-  const dbGraph = await agentsCore.getAgentGraph(dbClient_default)({ scopes: { tenantId, projectId }, graphId });
+  const dbGraph = await agentsCore.getAgentGraphById(dbClient_default)({ scopes: { tenantId, projectId, graphId } });
   if (!dbGraph) {
     return null;
   }
@@ -6821,6 +6845,7 @@ app.openapi(
     );
     const executionContext = agentsCore.getRequestExecutionContext(c);
     const { tenantId, projectId, graphId, agentId } = executionContext;
+    console.dir("executionContext", executionContext);
     if (agentId) {
       logger17.info(
         {
@@ -6836,7 +6861,10 @@ app.openapi(
       const agent = await getRegisteredAgent(executionContext, credentialStores);
       logger17.info({ agent }, "agent registered: well-known agent.json");
       if (!agent) {
-        return c.json({ error: "Agent not found" }, 404);
+        throw agentsCore.createApiError({
+          code: "not_found",
+          message: "Agent not found"
+        });
       }
       return c.json(agent.agentCard);
     } else {
@@ -6851,7 +6879,10 @@ app.openapi(
       );
       const graph = await getRegisteredGraph(executionContext);
       if (!graph) {
-        return c.json({ error: "Graph not found" }, 404);
+        throw agentsCore.createApiError({
+          code: "not_found",
+          message: "Graph not found"
+        });
       }
       return c.json(graph.agentCard);
     }
@@ -6908,8 +6939,7 @@ app.post("/a2a", async (c) => {
       "graph-level a2a endpoint"
     );
     const graph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
-      scopes: { tenantId, projectId },
-      graphId
+      scopes: { tenantId, projectId, graphId }
     });
     if (!graph) {
       return c.json(
@@ -6921,6 +6951,16 @@ app.post("/a2a", async (c) => {
         404
       );
     }
+    if (!graph.defaultAgentId) {
+      return c.json(
+        {
+          jsonrpc: "2.0",
+          error: { code: -32004, message: "Graph does not have a default agent configured" },
+          id: null
+        },
+        400
+      );
+    }
     executionContext.agentId = graph.defaultAgentId;
     const credentialStores = c.get("credentialStores");
     const defaultAgent = await getRegisteredAgent(executionContext, credentialStores);
@@ -6964,6 +7004,9 @@ function isTransferResponse(result) {
     (artifact) => artifact.parts.some((part) => part.kind === "data" && part.data?.type === "transfer")
   );
 }
+
+// src/handlers/executionHandler.ts
+init_dbClient();
 var SSEStreamHelper = class {
   constructor(stream2, requestId2, timestamp) {
     this.stream = stream2;
@@ -6971,7 +7014,7 @@ var SSEStreamHelper = class {
     this.timestamp = timestamp;
     // Stream queuing for proper event ordering
     __publicField(this, "isTextStreaming", false);
-    __publicField(this, "queuedOperations", []);
+    __publicField(this, "queuedEvents", []);
   }
   /**
    * Write the initial role message
@@ -7036,9 +7079,10 @@ var SSEStreamHelper = class {
     await this.writeContent(JSON.stringify(data));
   }
   /**
-   * Write error message
+   * Write error message or error event
    */
-  async writeError(errorMessage) {
+  async writeError(error) {
+    const errorMessage = typeof error === "string" ? error : error.message;
     await this.writeContent(`
 
 ${errorMessage}`);
@@ -7062,22 +7106,6 @@ ${errorMessage}`);
       })
     });
   }
-  /**
-   * Write the final [DONE] message
-   */
-  async writeDone() {
-    await this.stream.writeSSE({
-      data: "[DONE]"
-    });
-  }
-  /**
-   * Complete the stream with finish reason and done message
-   */
-  async complete(finishReason = "stop") {
-    await this.flushQueuedOperations();
-    await this.writeCompletion(finishReason);
-    await this.writeDone();
-  }
   async writeData(type, data) {
     await this.stream.writeSSE({
       data: JSON.stringify({
@@ -7096,16 +7124,23 @@ ${errorMessage}`);
       })
     });
   }
-  async writeOperation(operation) {
-    if (operation.type === "status_update" && operation.ctx.label) {
-      operation = {
-        type: operation.type,
-        label: operation.ctx.label,
-        ctx: operation.ctx.data
-      };
+  async writeSummary(summary) {
+    if (this.isTextStreaming) {
+      this.queuedEvents.push({
+        type: "data-summary",
+        event: summary
+      });
+      return;
     }
+    await this.flushQueuedOperations();
+    await this.writeData("data-summary", summary);
+  }
+  async writeOperation(operation) {
     if (this.isTextStreaming) {
-      this.queuedOperations.push(operation);
+      this.queuedEvents.push({
+        type: "data-operation",
+        event: operation
+      });
       return;
     }
     await this.flushQueuedOperations();
@@ -7115,15 +7150,31 @@ ${errorMessage}`);
    * Flush all queued operations in order after text streaming completes
    */
   async flushQueuedOperations() {
-    if (this.queuedOperations.length === 0) {
+    if (this.queuedEvents.length === 0) {
       return;
     }
-    const operationsToFlush = [...this.queuedOperations];
-    this.queuedOperations = [];
-    for (const operation of operationsToFlush) {
-      await this.writeData("data-operation", operation);
+    const eventsToFlush = [...this.queuedEvents];
+    this.queuedEvents = [];
+    for (const event of eventsToFlush) {
+      await this.writeData(event.type, event.event);
     }
   }
+  /**
+   * Write the final [DONE] message
+   */
+  async writeDone() {
+    await this.stream.writeSSE({
+      data: "[DONE]"
+    });
+  }
+  /**
+   * Complete the stream with finish reason and done message
+   */
+  async complete(finishReason = "stop") {
+    await this.flushQueuedOperations();
+    await this.writeCompletion(finishReason);
+    await this.writeDone();
+  }
 };
 function createSSEStreamHelper(stream2, requestId2, timestamp) {
   return new SSEStreamHelper(stream2, requestId2, timestamp);
@@ -7143,10 +7194,10 @@ var _VercelDataStreamHelper = class _VercelDataStreamHelper {
     __publicField(this, "isCompleted", false);
     // Stream queuing for proper event ordering
     __publicField(this, "isTextStreaming", false);
-    __publicField(this, "queuedOperations", []);
+    __publicField(this, "queuedEvents", []);
     // Timing tracking for text sequences (text-end to text-start gap)
     __publicField(this, "lastTextEndTimestamp", 0);
-    __publicField(this, "TEXT_GAP_THRESHOLD", 50);
+    __publicField(this, "TEXT_GAP_THRESHOLD", 2e3);
     // milliseconds - if gap between text sequences is less than this, queue operations
     // Connection management and forced cleanup
     __publicField(this, "connectionDropTimer");
@@ -7255,15 +7306,24 @@ var _VercelDataStreamHelper = class _VercelDataStreamHelper {
       data
     });
   }
-  async writeError(errorMessage) {
+  async writeError(error) {
     if (this.isCompleted) {
       console.warn("Attempted to write error to completed stream");
       return;
     }
-    this.writer.write({
-      type: "error",
-      errorText: errorMessage
-    });
+    if (typeof error === "string") {
+      this.writer.write({
+        type: "error",
+        message: error,
+        severity: "error",
+        timestamp: Date.now()
+      });
+    } else {
+      this.writer.write({
+        ...error,
+        type: "error"
+      });
+    }
   }
   async streamData(data) {
     await this.writeContent(JSON.stringify(data));
@@ -7275,20 +7335,6 @@ var _VercelDataStreamHelper = class _VercelDataStreamHelper {
     }
     this.writer.merge(stream2);
   }
-  async writeCompletion(_finishReason = "stop") {
-  }
-  async writeDone() {
-  }
-  /**
-   * Complete the stream and clean up all memory
-   * This is the primary cleanup point to prevent memory leaks between requests
-   */
-  async complete() {
-    if (this.isCompleted) return;
-    await this.flushQueuedOperations();
-    this.isCompleted = true;
-    this.cleanup();
-  }
   /**
    * Clean up all memory allocations
    * Should be called when the stream helper is no longer needed
@@ -7302,7 +7348,7 @@ var _VercelDataStreamHelper = class _VercelDataStreamHelper {
     this.sentItems.clear();
     this.completedItems.clear();
     this.textId = null;
-    this.queuedOperations = [];
+    this.queuedEvents = [];
     this.isTextStreaming = false;
   }
   /**
@@ -7368,7 +7414,9 @@ var _VercelDataStreamHelper = class _VercelDataStreamHelper {
       if (this.writer && !this.isCompleted) {
         this.writer.write({
           type: "error",
-          errorText: `Stream terminated: ${reason}`
+          message: `Stream terminated: ${reason}`,
+          severity: "error",
+          timestamp: Date.now()
         });
       }
     } catch (e) {
@@ -7391,23 +7439,33 @@ var _VercelDataStreamHelper = class _VercelDataStreamHelper {
       isCompleted: this.isCompleted
     };
   }
+  async writeSummary(summary) {
+    if (this.isCompleted) {
+      console.warn("Attempted to write summary to completed stream");
+      return;
+    }
+    const now = Date.now();
+    const gapFromLastTextEnd = this.lastTextEndTimestamp > 0 ? now - this.lastTextEndTimestamp : Number.MAX_SAFE_INTEGER;
+    if (this.isTextStreaming || gapFromLastTextEnd < this.TEXT_GAP_THRESHOLD) {
+      this.queuedEvents.push({ type: "data-summary", event: summary });
+      return;
+    }
+    await this.flushQueuedOperations();
+    await this.writer.write({
+      id: "id" in summary ? summary.id : void 0,
+      type: "data-summary",
+      data: summary
+    });
+  }
   async writeOperation(operation) {
     if (this.isCompleted) {
       console.warn("Attempted to write operation to completed stream");
       return;
     }
-    if (operation.type === "status_update" && operation.ctx.label) {
-      operation = {
-        type: operation.type,
-        label: operation.ctx.label,
-        // Preserve the label for the UI
-        ctx: operation.ctx.data
-      };
-    }
     const now = Date.now();
     const gapFromLastTextEnd = this.lastTextEndTimestamp > 0 ? now - this.lastTextEndTimestamp : Number.MAX_SAFE_INTEGER;
     if (this.isTextStreaming || gapFromLastTextEnd < this.TEXT_GAP_THRESHOLD) {
-      this.queuedOperations.push(operation);
+      this.queuedEvents.push({ type: "data-operation", event: operation });
       return;
     }
     await this.flushQueuedOperations();
@@ -7421,19 +7479,33 @@ var _VercelDataStreamHelper = class _VercelDataStreamHelper {
    * Flush all queued operations in order after text streaming completes
    */
   async flushQueuedOperations() {
-    if (this.queuedOperations.length === 0) {
+    if (this.queuedEvents.length === 0) {
       return;
     }
-    const operationsToFlush = [...this.queuedOperations];
-    this.queuedOperations = [];
-    for (const operation of operationsToFlush) {
+    const eventsToFlush = [...this.queuedEvents];
+    this.queuedEvents = [];
+    for (const event of eventsToFlush) {
       this.writer.write({
-        id: "id" in operation ? operation.id : void 0,
-        type: "data-operation",
-        data: operation
+        id: "id" in event.event ? event.event.id : void 0,
+        type: event.type,
+        data: event.event
       });
     }
   }
+  async writeCompletion(_finishReason = "stop") {
+  }
+  async writeDone() {
+  }
+  /**
+   * Complete the stream and clean up all memory
+   * This is the primary cleanup point to prevent memory leaks between requests
+   */
+  async complete() {
+    if (this.isCompleted) return;
+    await this.flushQueuedOperations();
+    this.isCompleted = true;
+    this.cleanup();
+  }
 };
 // Memory management - focused on connection completion cleanup
 __publicField(_VercelDataStreamHelper, "MAX_BUFFER_SIZE", 5 * 1024 * 1024);
@@ -7446,6 +7518,7 @@ var MCPStreamHelper = class {
     __publicField(this, "capturedText", "");
     __publicField(this, "capturedData", []);
     __publicField(this, "capturedOperations", []);
+    __publicField(this, "capturedSummaries", []);
     __publicField(this, "hasError", false);
     __publicField(this, "errorMessage", "");
     __publicField(this, "sessionId");
@@ -7464,18 +7537,27 @@ var MCPStreamHelper = class {
   async streamData(data) {
     this.capturedData.push(data);
   }
+  async streamSummary(summary) {
+    this.capturedSummaries.push(summary);
+  }
+  async streamOperation(operation) {
+    this.capturedOperations.push(operation);
+  }
   async writeData(_type, data) {
     this.capturedData.push(data);
   }
-  async writeError(errorMessage) {
-    this.hasError = true;
-    this.errorMessage = errorMessage;
-  }
-  async complete() {
+  async writeSummary(summary) {
+    this.capturedSummaries.push(summary);
   }
   async writeOperation(operation) {
     this.capturedOperations.push(operation);
   }
+  async writeError(error) {
+    this.hasError = true;
+    this.errorMessage = typeof error === "string" ? error : error.message;
+  }
+  async complete() {
+  }
   /**
    * Get the captured response for MCP tool result
    */
@@ -7494,7 +7576,6 @@ function createMCPStreamHelper() {
 }
 
 // src/handlers/executionHandler.ts
-init_dbClient();
 var logger19 = agentsCore.getLogger("ExecutionHandler");
 var ExecutionHandler = class {
   constructor() {
@@ -7523,7 +7604,7 @@ var ExecutionHandler = class {
     logger19.info({ sessionId: requestId2, graphId }, "Created GraphSession for message execution");
     let graphConfig = null;
     try {
-      graphConfig = await agentsCore.getFullGraph(dbClient_default)({ scopes: { tenantId, projectId }, graphId });
+      graphConfig = await agentsCore.getFullGraph(dbClient_default)({ scopes: { tenantId, projectId, graphId } });
       if (graphConfig?.statusUpdates && graphConfig.statusUpdates.enabled !== false) {
         graphSessionManager.initializeStatusUpdates(
           requestId2,
@@ -7677,7 +7758,6 @@ var ExecutionHandler = class {
           if (errorCount >= this.MAX_ERRORS) {
             const errorMessage2 = `Maximum error limit (${this.MAX_ERRORS}) reached`;
             logger19.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
-            await sseHelper.writeError(errorMessage2);
             await sseHelper.writeOperation(errorOp(errorMessage2, currentAgentId || "system"));
             if (task) {
               await agentsCore.updateTask(dbClient_default)({
@@ -7818,7 +7898,6 @@ var ExecutionHandler = class {
         if (errorCount >= this.MAX_ERRORS) {
           const errorMessage2 = `Maximum error limit (${this.MAX_ERRORS}) reached`;
           logger19.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
-          await sseHelper.writeError(errorMessage2);
           await sseHelper.writeOperation(errorOp(errorMessage2, currentAgentId || "system"));
           if (task) {
             await agentsCore.updateTask(dbClient_default)({
@@ -7840,7 +7919,6 @@ var ExecutionHandler = class {
       }
       const errorMessage = `Maximum transfer limit (${maxTransfers}) reached without completion`;
       logger19.error({ maxTransfers, iterations }, errorMessage);
-      await sseHelper.writeError(errorMessage);
       await sseHelper.writeOperation(errorOp(errorMessage, currentAgentId || "system"));
       if (task) {
         await agentsCore.updateTask(dbClient_default)({
@@ -7861,8 +7939,7 @@ var ExecutionHandler = class {
     } catch (error) {
       logger19.error({ error }, "Error in execution handler");
       const errorMessage = error instanceof Error ? error.message : "Unknown execution error";
-      await sseHelper.writeError(`Execution error: ${errorMessage}`);
-      await sseHelper.writeOperation(errorOp(errorMessage, currentAgentId || "system"));
+      await sseHelper.writeOperation(errorOp(`Execution error: ${errorMessage}`, currentAgentId || "system"));
       if (task) {
         await agentsCore.updateTask(dbClient_default)({
           taskId: task.id,
@@ -8024,8 +8101,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     const body = c.get("requestBody") || {};
     const conversationId = body.conversationId || nanoid.nanoid();
     const fullGraph = await agentsCore.getFullGraph(dbClient_default)({
-      scopes: { tenantId, projectId },
-      graphId
+      scopes: { tenantId, projectId, graphId }
     });
     let agentGraph;
     let defaultAgentId;
@@ -8042,16 +8118,21 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       defaultAgentId = fullGraph.defaultAgentId || firstAgentId;
     } else {
       agentGraph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
-        scopes: { tenantId, projectId },
-        graphId
+        scopes: { tenantId, projectId, graphId }
       });
       if (!agentGraph) {
-        return c.json({ error: "Agent graph not found" }, 404);
+        throw agentsCore.createApiError({
+          code: "not_found",
+          message: "Agent graph not found"
+        });
       }
       defaultAgentId = agentGraph.defaultAgentId || "";
     }
     if (!defaultAgentId) {
-      return c.json({ error: "No default agent found in graph" }, 404);
+      throw agentsCore.createApiError({
+        code: "not_found",
+        message: "No default agent found in graph"
+      });
     }
     await agentsCore.createOrGetConversation(dbClient_default)({
       tenantId,
@@ -8072,26 +8153,30 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     }
     const agentId = activeAgent?.activeAgentId || defaultAgentId;
     const agentInfo = await agentsCore.getAgentById(dbClient_default)({
-      scopes: { tenantId, projectId },
+      scopes: { tenantId, projectId, graphId },
       agentId
     });
     if (!agentInfo) {
-      return c.json({ error: "Agent not found" }, 404);
+      throw agentsCore.createApiError({
+        code: "not_found",
+        message: "Agent not found"
+      });
     }
     const validatedContext = c.get("validatedContext") || body.requestContext || {};
     const credentialStores = c.get("credentialStores");
-    await agentsCore.handleContextResolution(
+    await agentsCore.handleContextResolution({
       tenantId,
       projectId,
-      conversationId,
       graphId,
-      validatedContext,
-      dbClient_default,
+      conversationId,
+      requestContext: validatedContext,
+      dbClient: dbClient_default,
       credentialStores
-    );
+    });
     logger20.info(
       {
         tenantId,
+        projectId,
         graphId,
         conversationId,
         defaultAgentId,
@@ -8133,41 +8218,69 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       });
     }
     return streaming.streamSSE(c, async (stream2) => {
-      const sseHelper = createSSEStreamHelper(stream2, requestId2, timestamp);
-      await sseHelper.writeRole();
-      logger20.info({ agentId }, "Starting execution");
-      const executionHandler = new ExecutionHandler();
-      const result = await executionHandler.execute({
-        executionContext,
-        conversationId,
-        userMessage,
-        initialAgentId: agentId,
-        requestId: requestId2,
-        sseHelper
-      });
-      logger20.info(
-        { result },
-        `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
-      );
-      if (!result.success) {
-        await sseHelper.writeError(
-          "Sorry, I was unable to process your request at this time. Please try again."
+      try {
+        const sseHelper = createSSEStreamHelper(stream2, requestId2, timestamp);
+        await sseHelper.writeRole();
+        logger20.info({ agentId }, "Starting execution");
+        const executionHandler = new ExecutionHandler();
+        const result = await executionHandler.execute({
+          executionContext,
+          conversationId,
+          userMessage,
+          initialAgentId: agentId,
+          requestId: requestId2,
+          sseHelper
+        });
+        logger20.info(
+          { result },
+          `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
         );
+        if (!result.success) {
+          await sseHelper.writeOperation(
+            errorOp(
+              "Sorry, I was unable to process your request at this time. Please try again.",
+              "system"
+            )
+          );
+        }
+        await sseHelper.complete();
+      } catch (error) {
+        logger20.error(
+          {
+            error: error instanceof Error ? error.message : error,
+            stack: error instanceof Error ? error.stack : void 0
+          },
+          "Error during streaming execution"
+        );
+        try {
+          const sseHelper = createSSEStreamHelper(stream2, requestId2, timestamp);
+          await sseHelper.writeOperation(
+            errorOp(
+              "Sorry, I was unable to process your request at this time. Please try again.",
+              "system"
+            )
+          );
+          await sseHelper.complete();
+        } catch (streamError) {
+          logger20.error({ streamError }, "Failed to write error to stream");
+        }
       }
-      await sseHelper.complete();
     });
   } catch (error) {
-    console.error("\u274C Error in chat completions endpoint:", {
-      error: error instanceof Error ? error.message : error,
-      stack: error instanceof Error ? error.stack : void 0
-    });
-    return c.json(
+    logger20.error(
       {
-        error: "Failed to process chat completion",
-        message: error instanceof Error ? error.message : "Unknown error"
+        error: error instanceof Error ? error.message : error,
+        stack: error instanceof Error ? error.stack : void 0
       },
-      500
+      "Error in chat completions endpoint before streaming"
     );
+    if (error && typeof error === "object" && "status" in error) {
+      throw error;
+    }
+    throw agentsCore.createApiError({
+      code: "internal_server_error",
+      message: error instanceof Error ? error.message : "Failed to process chat completion"
+    });
   }
 });
 var getMessageText = (content) => {
@@ -8234,6 +8347,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
   try {
     const executionContext = agentsCore.getRequestExecutionContext(c);
     const { tenantId, projectId, graphId } = executionContext;
+    agentsCore.loggerFactory.getLogger("chatDataStream").debug({ tenantId, projectId, graphId }, "Extracted chatDataStream parameters");
     const body = c.get("requestBody") || {};
     const conversationId = body.conversationId || nanoid.nanoid();
     const activeSpan = api.trace.getActiveSpan();
@@ -8246,14 +8360,22 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       });
     }
     const agentGraph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
-      scopes: { tenantId, projectId },
-      graphId
+      scopes: { tenantId, projectId, graphId }
     });
     if (!agentGraph) {
-      return c.json({ error: "Agent graph not found" }, 404);
+      throw agentsCore.createApiError({
+        code: "not_found",
+        message: "Agent graph not found"
+      });
     }
     const defaultAgentId = agentGraph.defaultAgentId;
     const graphName = agentGraph.name;
+    if (!defaultAgentId) {
+      throw agentsCore.createApiError({
+        code: "bad_request",
+        message: "Graph does not have a default agent configured"
+      });
+    }
     const activeAgent = await agentsCore.getActiveAgentForConversation(dbClient_default)({
       scopes: { tenantId, projectId },
       conversationId
@@ -8267,23 +8389,26 @@ app3.openapi(chatDataStreamRoute, async (c) => {
     }
     const agentId = activeAgent?.activeAgentId || defaultAgentId;
     const agentInfo = await agentsCore.getAgentById(dbClient_default)({
-      scopes: { tenantId, projectId },
+      scopes: { tenantId, projectId, graphId },
       agentId
     });
     if (!agentInfo) {
-      return c.json({ error: "Agent not found" }, 404);
+      throw agentsCore.createApiError({
+        code: "not_found",
+        message: "Agent not found"
+      });
     }
     const validatedContext = c.get("validatedContext") || body.requestContext || {};
     const credentialStores = c.get("credentialStores");
-    await agentsCore.handleContextResolution(
+    await agentsCore.handleContextResolution({
       tenantId,
       projectId,
-      conversationId,
       graphId,
-      validatedContext,
-      dbClient_default,
+      conversationId,
+      requestContext: validatedContext,
+      dbClient: dbClient_default,
       credentialStores
-    );
+    });
     const lastUserMessage = body.messages.filter((m) => m.role === "user").slice(-1)[0];
     const userText = typeof lastUserMessage?.content === "string" ? lastUserMessage.content : lastUserMessage?.parts?.map((p) => p.text).join("") || "";
     logger21.info({ userText, lastUserMessage }, "userText");
@@ -8325,11 +8450,11 @@ app3.openapi(chatDataStreamRoute, async (c) => {
             sseHelper: streamHelper
           });
           if (!result.success) {
-            await streamHelper.writeError("Unable to process request");
+            await streamHelper.writeOperation(errorOp("Unable to process request", "system"));
           }
         } catch (err) {
           logger21.error({ err }, "Streaming error");
-          await streamHelper.writeError("Internal server error");
+          await streamHelper.writeOperation(errorOp("Internal server error", "system"));
         } finally {
           if ("cleanup" in streamHelper && typeof streamHelper.cleanup === "function") {
             streamHelper.cleanup();
@@ -8350,7 +8475,10 @@ app3.openapi(chatDataStreamRoute, async (c) => {
     );
   } catch (error) {
     logger21.error({ error }, "chatDataStream error");
-    return c.json({ error: "Failed to process chat completion" }, 500);
+    throw agentsCore.createApiError({
+      code: "internal_server_error",
+      message: "Failed to process chat completion"
+    });
   }
 });
 var chatDataStream_default = app3;
@@ -8555,8 +8683,7 @@ var getServer = async (requestContext, executionContext, conversationId, credent
   const { tenantId, projectId, graphId } = executionContext;
   setupTracing(conversationId, tenantId, graphId);
   const agentGraph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
-    scopes: { tenantId, projectId },
-    graphId
+    scopes: { tenantId, projectId, graphId }
   });
   if (!agentGraph) {
     throw new Error("Agent graph not found");
@@ -8576,9 +8703,20 @@ var getServer = async (requestContext, executionContext, conversationId, credent
     },
     async ({ query }) => {
       try {
+        if (!agentGraph.defaultAgentId) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Graph does not have a default agent configured`
+              }
+            ],
+            isError: true
+          };
+        }
         const defaultAgentId = agentGraph.defaultAgentId;
         const agentInfo = await agentsCore.getAgentById(dbClient_default)({
-          scopes: { tenantId, projectId },
+          scopes: { tenantId, projectId, graphId },
           agentId: defaultAgentId
         });
         if (!agentInfo) {
@@ -8592,18 +8730,19 @@ var getServer = async (requestContext, executionContext, conversationId, credent
             isError: true
           };
         }
-        const resolvedContext = await agentsCore.handleContextResolution(
+        const resolvedContext = await agentsCore.handleContextResolution({
           tenantId,
           projectId,
-          conversationId,
           graphId,
+          conversationId,
           requestContext,
-          dbClient_default,
+          dbClient: dbClient_default,
           credentialStores
-        );
+        });
         logger22.info(
           {
             tenantId,
+            projectId,
             graphId,
             conversationId,
             hasContextConfig: !!agentGraph.contextConfigId,
@@ -8665,8 +8804,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
   logger22.info({ body }, "Received initialization request");
   const sessionId = nanoid.nanoid();
   const agentGraph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
-    scopes: { tenantId, projectId },
-    graphId
+    scopes: { tenantId, projectId, graphId }
   });
   if (!agentGraph) {
     return c.json(
@@ -8678,6 +8816,16 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
       { status: 404 }
     );
   }
+  if (!agentGraph.defaultAgentId) {
+    return c.json(
+      {
+        jsonrpc: "2.0",
+        error: { code: -32001, message: "Graph does not have a default agent configured" },
+        id: body.id || null
+      },
+      { status: 400 }
+    );
+  }
   const conversation = await agentsCore.createOrGetConversation(dbClient_default)({
     id: sessionId,
     tenantId,
@@ -8874,6 +9022,8 @@ app4.delete("/", async (c) => {
   );
 });
 var mcp_default = app4;
+
+// src/app.ts
 var logger23 = agentsCore.getLogger("agents-run-api");
 function createExecutionHono(serverConfig, credentialStores) {
   const app6 = new zodOpenapi.OpenAPIHono();
@@ -9063,21 +9213,21 @@ function createExecutionHono(serverConfig, credentialStores) {
   app6.route("/v1/mcp", mcp_default);
   app6.route("/agents", agents_default);
   setupOpenAPIRoutes(app6);
-  app6.use("/tenants/*", async (c, next) => {
+  app6.use("/tenants/*", async (_c, next) => {
     await next();
-    await batchProcessor.forceFlush();
+    await defaultBatchProcessor.forceFlush();
   });
-  app6.use("/agents/*", async (c, next) => {
+  app6.use("/agents/*", async (_c, next) => {
     await next();
-    await batchProcessor.forceFlush();
+    await defaultBatchProcessor.forceFlush();
   });
-  app6.use("/v1/*", async (c, next) => {
+  app6.use("/v1/*", async (_c, next) => {
     await next();
-    await batchProcessor.forceFlush();
+    await defaultBatchProcessor.forceFlush();
   });
-  app6.use("/api/*", async (c, next) => {
+  app6.use("/api/*", async (_c, next) => {
     await next();
-    await batchProcessor.forceFlush();
+    await defaultBatchProcessor.forceFlush();
   });
   const baseApp = new hono.Hono();
   baseApp.route("/", app6);