@inkeep/agents-run-api 0.0.0-dev-20260113172432 → 0.0.0-dev-20260115183047

package/dist/middleware/projectConfig.js

@@ -0,0 +1,80 @@
+import { env } from "../env.js";
+import { getLogger as getLogger$1 } from "../logger.js";
+import { InternalServices, ManageApiError, ManagementApiClient } from "@inkeep/agents-core";
+import { createMiddleware } from "hono/factory";
+
+//#region src/middleware/projectConfig.ts
+const logger = getLogger$1("projectConfigMiddleware");
+/**
+* Middleware that fetches the full project definition from the Management API
+* and adds it to the Hono context for use in route handlers.
+*
+* This middleware should be applied after authentication middleware since it
+* requires the execution context to be set.
+*/
+const projectConfigMiddleware = createMiddleware(async (c, next) => {
+	const executionContext = c.get("executionContext");
+	const { tenantId, projectId, ref } = executionContext;
+	logger.debug({
+		tenantId,
+		projectId,
+		ref
+	}, "Fetching project config from Management API");
+	try {
+		const client = new ManagementApiClient({
+			apiUrl: env.INKEEP_AGENTS_MANAGE_API_URL,
+			tenantId,
+			projectId,
+			auth: {
+				mode: "internalService",
+				internalServiceName: InternalServices.INKEEP_AGENTS_RUN_API
+			},
+			ref
+		});
+		const resolvedRef = await client.getResolvedRef();
+		if (!resolvedRef) throw new Error("Resolved ref not found");
+		if (resolvedRef.type !== "branch") throw new Error(`Runtime operations require a branch ref. Got ${resolvedRef.type} '${resolvedRef.name}'.`);
+		const projectConfig = await client.getFullProject();
+		c.set("executionContext", {
+			...executionContext,
+			project: projectConfig,
+			resolvedRef
+		});
+		logger.debug({
+			tenantId,
+			projectId,
+			agentCount: Object.keys(projectConfig.agents || {}).length,
+			toolCount: Object.keys(projectConfig.tools || {}).length
+		}, "Project config fetched successfully");
+		await next();
+	} catch (error) {
+		if (error instanceof ManageApiError) {
+			logger.error({
+				tenantId,
+				projectId,
+				statusCode: error.statusCode,
+				message: error.message
+			}, "Failed to fetch project config from Management API");
+			if (error.isNotFound) return c.json({
+				error: "Project not found",
+				message: `Project ${projectId} not found for tenant ${tenantId}`
+			}, 404);
+			if (error.isUnauthorized || error.isForbidden) return c.json({
+				error: "Access denied",
+				message: "Unable to access project configuration"
+			}, 403);
+		}
+		logger.error({
+			tenantId,
+			projectId,
+			error: error instanceof Error ? error.message : String(error)
+		}, "Unexpected error fetching project config");
+		return c.json({
+			error: "Internal server error",
+			message: "Failed to load project configuration"
+		}, 500);
+	}
+});
+
+//#endregion
+export { projectConfigMiddleware };

package/dist/routes/agents.d.ts

@@ -1,9 +1,10 @@
 import { OpenAPIHono } from "@hono/zod-openapi";
-import { CredentialStoreRegistry } from "@inkeep/agents-core";
+import { CredentialStoreRegistry, ResolvedRef } from "@inkeep/agents-core";
 
 //#region src/routes/agents.d.ts
 type AppVariables = {
   credentialStores: CredentialStoreRegistry;
+  ref: ResolvedRef;
 };
 declare const app: OpenAPIHono<{
   Variables: AppVariables;

package/dist/routes/agents.js

@@ -1,13 +1,12 @@
-import { getLogger } from "../logger.js";
-import dbClient_default from "../data/db/dbClient.js";
+import { getLogger as getLogger$1 } from "../logger.js";
 import { a2aHandler } from "../a2a/handlers.js";
 import { getRegisteredAgent } from "../data/agents.js";
 import { OpenAPIHono, createRoute, z } from "@hono/zod-openapi";
-import { HeadersScopeSchema, createApiError, getAgentWithDefaultSubAgent, getRequestExecutionContext } from "@inkeep/agents-core";
+import { HeadersScopeSchema, createApiError } from "@inkeep/agents-core";
 
 //#region src/routes/agents.ts
 const app = new OpenAPIHono();
-const logger = getLogger("agents");
+const logger = getLogger$1("agents");
 app.openapi(createRoute({
 	method: "get",
 	path: "/.well-known/agent.json",
@@ -40,9 +39,8 @@ app.openapi(createRoute({
 		path: c.req.path,
 		method: c.req.method
 	}, "OpenTelemetry headers: well-known agent.json");
-	const executionContext = getRequestExecutionContext(c);
+	const executionContext = c.get("executionContext");
 	const { tenantId, projectId, agentId, subAgentId } = executionContext;
-	logger.info({ executionContext }, "executionContext");
 	logger.info({
 		message: "getRegisteredAgent (agent-level)",
 		tenantId,
@@ -73,8 +71,8 @@ app.post("/a2a", async (c) => {
 		path: c.req.path,
 		method: c.req.method
 	}, "OpenTelemetry headers: a2a");
-	const executionContext = getRequestExecutionContext(c);
-	const { tenantId, projectId, agentId, subAgentId } = executionContext;
+	const executionContext = c.get("executionContext");
+	const { tenantId, projectId, agentId, subAgentId, project } = executionContext;
 	if (subAgentId) {
 		logger.info({
 			message: "a2a (agent-level)",
@@ -104,11 +102,7 @@ app.post("/a2a", async (c) => {
 		projectId,
 		agentId
 	}, "agent-level a2a endpoint");
-	const agent = await getAgentWithDefaultSubAgent(dbClient_default)({ scopes: {
-		tenantId,
-		projectId,
-		agentId
-	} });
+	const agent = project.agents[agentId];
 	if (!agent) return c.json({
 		jsonrpc: "2.0",
 		error: {

package/dist/routes/chat.d.ts

@@ -1,9 +1,10 @@
 import { OpenAPIHono } from "@hono/zod-openapi";
-import { CredentialStoreRegistry } from "@inkeep/agents-core";
+import { CredentialStoreRegistry, FullExecutionContext } from "@inkeep/agents-core";
 
 //#region src/routes/chat.d.ts
 type AppVariables = {
   credentialStores: CredentialStoreRegistry;
+  executionContext: FullExecutionContext;
   requestBody?: any;
 };
 declare const app: OpenAPIHono<{

package/dist/routes/chat.js

@@ -1,16 +1,19 @@
-import { getLogger } from "../logger.js";
+import { getLogger as getLogger$1 } from "../logger.js";
 import dbClient_default from "../data/db/dbClient.js";
+import { contextValidationMiddleware } from "../context/validation.js";
+import { handleContextResolution } from "../context/context.js";
+import "../context/index.js";
 import { errorOp } from "../utils/agent-operations.js";
 import { createSSEStreamHelper } from "../utils/stream-helpers.js";
 import { ExecutionHandler } from "../handlers/executionHandler.js";
 import { OpenAPIHono, createRoute, z } from "@hono/zod-openapi";
-import { contextValidationMiddleware, createApiError, createMessage, createOrGetConversation, generateId, getActiveAgentForConversation, getAgentWithDefaultSubAgent, getConversationId, getFullAgent, getRequestExecutionContext, getSubAgentById, handleContextResolution, setActiveAgentForConversation } from "@inkeep/agents-core";
+import { createApiError, createMessage, createOrGetConversation, generateId, getActiveAgentForConversation, getConversationId, setActiveAgentForConversation } from "@inkeep/agents-core";
 import { context, propagation, trace } from "@opentelemetry/api";
 import { streamSSE } from "hono/streaming";
 
 //#region src/routes/chat.ts
 const app = new OpenAPIHono();
-const logger = getLogger("completionsHandler");
+const logger = getLogger$1("completionsHandler");
 const chatCompletionsRoute = createRoute({
 	method: "post",
 	path: "/completions",
@@ -82,9 +85,9 @@ const chatCompletionsRoute = createRoute({
 		}
 	}
 });
-app.use("/completions", contextValidationMiddleware(dbClient_default));
+app.use("/completions", contextValidationMiddleware);
 app.openapi(chatCompletionsRoute, async (c) => {
-	getLogger("chat").info({
+	getLogger$1("chat").info({
 		path: c.req.path,
 		method: c.req.method,
 		params: c.req.param()
@@ -100,9 +103,9 @@ app.openapi(chatCompletionsRoute, async (c) => {
 		method: c.req.method
 	}, "OpenTelemetry headers: chat");
 	try {
-		const executionContext = getRequestExecutionContext(c);
-		const { tenantId, projectId, agentId } = executionContext;
-		getLogger("chat").debug({
+		const executionContext = c.get("executionContext");
+		const { tenantId, projectId, agentId, ref } = executionContext;
+		getLogger$1("chat").debug({
 			tenantId,
 			agentId
 		}, "Extracted chat parameters from API key context");
@@ -126,36 +129,16 @@ app.openapi(chatCompletionsRoute, async (c) => {
 		currentBag = currentBag.setEntry("conversation.id", { value: conversationId });
 		const ctxWithBaggage = propagation.setBaggage(context.active(), currentBag);
 		return await context.with(ctxWithBaggage, async () => {
-			const fullAgent = await getFullAgent(dbClient_default)({ scopes: {
-				tenantId,
-				projectId,
-				agentId
-			} });
-			let agent;
+			const fullAgent = executionContext.project.agents[agentId];
+			if (!fullAgent) throw createApiError({
+				code: "not_found",
+				message: "Agent not found"
+			});
+			const agent = fullAgent;
 			let defaultSubAgentId;
-			if (fullAgent) {
-				agent = {
-					id: fullAgent.id,
-					name: fullAgent.name,
-					tenantId,
-					projectId,
-					defaultSubAgentId: fullAgent.defaultSubAgentId
-				};
-				const agentKeys = Object.keys(fullAgent.subAgents || {});
-				const firstAgentId = agentKeys.length > 0 ? agentKeys[0] : "";
-				defaultSubAgentId = fullAgent.defaultSubAgentId || firstAgentId;
-			} else {
-				agent = await getAgentWithDefaultSubAgent(dbClient_default)({ scopes: {
-					tenantId,
-					projectId,
-					agentId
-				} });
-				if (!agent) throw createApiError({
-					code: "not_found",
-					message: "Agent not found"
-				});
-				defaultSubAgentId = agent.defaultSubAgentId || "";
-			}
+			const agentKeys = Object.keys(fullAgent.subAgents || {});
+			const firstAgentId = agentKeys.length > 0 ? agentKeys[0] : "";
+			defaultSubAgentId = fullAgent.defaultSubAgentId || firstAgentId;
 			if (!defaultSubAgentId) throw createApiError({
 				code: "not_found",
 				message: "No default agent found in agent"
@@ -164,7 +147,9 @@ app.openapi(chatCompletionsRoute, async (c) => {
 				tenantId,
 				projectId,
 				id: conversationId,
-				activeSubAgentId: defaultSubAgentId
+				agentId,
+				activeSubAgentId: defaultSubAgentId,
+				ref: executionContext.resolvedRef
 			});
 			const activeAgent = await getActiveAgentForConversation(dbClient_default)({
 				scopes: {
@@ -173,34 +158,26 @@ app.openapi(chatCompletionsRoute, async (c) => {
 				},
 				conversationId
 			});
-			if (!activeAgent) setActiveAgentForConversation(dbClient_default)({
+			if (!activeAgent) await setActiveAgentForConversation(dbClient_default)({
 				scopes: {
 					tenantId,
 					projectId
 				},
 				conversationId,
-				subAgentId: defaultSubAgentId
+				agentId,
+				subAgentId: defaultSubAgentId,
+				ref: executionContext.resolvedRef
 			});
 			const subAgentId = activeAgent?.activeSubAgentId || defaultSubAgentId;
-			if (!await getSubAgentById(dbClient_default)({
-				scopes: {
-					tenantId,
-					projectId,
-					agentId
-				},
-				subAgentId
-			})) throw createApiError({
+			if (!executionContext.project.agents[agentId]?.subAgents[subAgentId]) throw createApiError({
 				code: "not_found",
 				message: "Agent not found"
 			});
 			const validatedContext = c.get("validatedContext") || body.headers || {};
 			await handleContextResolution({
-				tenantId,
-				projectId,
-				agentId,
+				executionContext,
 				conversationId,
 				headers: validatedContext,
-				dbClient: dbClient_default,
 				credentialStores: c.get("credentialStores")
 			});
 			logger.info({

package/dist/routes/chatDataStream.d.ts

@@ -1,10 +1,11 @@
 import { OpenAPIHono } from "@hono/zod-openapi";
-import { CredentialStoreRegistry } from "@inkeep/agents-core";
+import { CredentialStoreRegistry, FullExecutionContext } from "@inkeep/agents-core";
 
 //#region src/routes/chatDataStream.d.ts
 type AppVariables = {
   credentialStores: CredentialStoreRegistry;
   requestBody?: any;
+  executionContext: FullExecutionContext;
 };
 declare const app: OpenAPIHono<{
   Variables: AppVariables;

package/dist/routes/chatDataStream.js

@@ -1,18 +1,21 @@
-import { getLogger } from "../logger.js";
+import { getLogger as getLogger$1 } from "../logger.js";
 import dbClient_default from "../data/db/dbClient.js";
+import { contextValidationMiddleware } from "../context/validation.js";
+import { handleContextResolution } from "../context/context.js";
+import "../context/index.js";
 import { pendingToolApprovalManager } from "../services/PendingToolApprovalManager.js";
 import { errorOp } from "../utils/agent-operations.js";
 import { createBufferingStreamHelper, createVercelStreamHelper } from "../utils/stream-helpers.js";
 import { ExecutionHandler } from "../handlers/executionHandler.js";
 import { OpenAPIHono, createRoute, z } from "@hono/zod-openapi";
-import { commonGetErrorResponses, contextValidationMiddleware, createApiError, createMessage, generateId, getActiveAgentForConversation, getAgentWithDefaultSubAgent, getConversation, getConversationId, getRequestExecutionContext, getSubAgentById, handleContextResolution, loggerFactory, setActiveAgentForConversation } from "@inkeep/agents-core";
+import { commonGetErrorResponses, createApiError, createMessage, generateId, getActiveAgentForConversation, getConversation, getConversationId, loggerFactory, setActiveAgentForConversation } from "@inkeep/agents-core";
 import { context, propagation, trace } from "@opentelemetry/api";
 import { stream } from "hono/streaming";
 import { JsonToSseTransformStream, createUIMessageStream } from "ai";
 
 //#region src/routes/chatDataStream.ts
 const app = new OpenAPIHono();
-const logger = getLogger("chatDataStream");
+const logger = getLogger$1("chatDataStream");
 const chatDataStreamRoute = createRoute({
 	method: "post",
 	path: "/chat",
@@ -60,11 +63,11 @@ const chatDataStreamRoute = createRoute({
 		...commonGetErrorResponses
 	}
 });
-app.use("/chat", contextValidationMiddleware(dbClient_default));
+app.use("/chat", contextValidationMiddleware);
 app.openapi(chatDataStreamRoute, async (c) => {
 	try {
-		const executionContext = getRequestExecutionContext(c);
-		const { tenantId, projectId, agentId } = executionContext;
+		const executionContext = c.get("executionContext");
+		const { tenantId, projectId, agentId, resolvedRef } = executionContext;
 		loggerFactory.getLogger("chatDataStream").debug({
 			tenantId,
 			projectId,
@@ -95,11 +98,7 @@ app.openapi(chatDataStreamRoute, async (c) => {
 		currentBag = currentBag.setEntry("conversation.id", { value: conversationId });
 		const ctxWithBaggage = propagation.setBaggage(context.active(), currentBag);
 		return await context.with(ctxWithBaggage, async () => {
-			const agent = await getAgentWithDefaultSubAgent(dbClient_default)({ scopes: {
-				tenantId,
-				projectId,
-				agentId
-			} });
+			const agent = executionContext.project.agents[agentId];
 			if (!agent) throw createApiError({
 				code: "not_found",
 				message: "Agent not found"
@@ -117,33 +116,29 @@ app.openapi(chatDataStreamRoute, async (c) => {
 				},
 				conversationId
 			});
-			if (!activeAgent) setActiveAgentForConversation(dbClient_default)({
+			if (!activeAgent) await setActiveAgentForConversation(dbClient_default)({
 				scopes: {
 					tenantId,
 					projectId
 				},
 				conversationId,
-				subAgentId: defaultSubAgentId
+				subAgentId: defaultSubAgentId,
+				ref: executionContext.resolvedRef,
+				agentId
 			});
 			const subAgentId = activeAgent?.activeSubAgentId || defaultSubAgentId;
-			if (!await getSubAgentById(dbClient_default)({
-				scopes: {
-					tenantId,
-					projectId,
-					agentId
-				},
-				subAgentId
-			})) throw createApiError({
-				code: "not_found",
-				message: "Agent not found"
-			});
+			logger.info({ subAgentId }, "subAgentId");
+			if (!executionContext.project.agents[agentId]?.subAgents[subAgentId]) {
+				logger.error({ subAgentId }, "subAgentId not found");
+				throw createApiError({
+					code: "not_found",
+					message: "Agent not found"
+				});
+			}
 			await handleContextResolution({
-				tenantId,
-				projectId,
-				agentId,
+				executionContext,
 				conversationId,
 				headers: c.get("validatedContext") || body.headers || {},
-				dbClient: dbClient_default,
 				credentialStores: c.get("credentialStores")
 			});
 			const lastUserMessage = body.messages.filter((m) => m.role === "user").slice(-1)[0];
@@ -216,7 +211,9 @@ app.openapi(chatDataStreamRoute, async (c) => {
 				const streamHelper = createVercelStreamHelper(writer);
 				try {
 					const emitOperations = c.req.header("x-emit-operations") === "true";
-					if (!(await new ExecutionHandler().execute({
+					const executionHandler = new ExecutionHandler();
+					const datasetRunId = c.req.header("x-inkeep-dataset-run-id");
+					if (!(await executionHandler.execute({
 						executionContext,
 						conversationId,
 						userMessage: userText,
@@ -224,6 +221,7 @@ app.openapi(chatDataStreamRoute, async (c) => {
 						requestId: `chatds-${Date.now()}`,
 						sseHelper: streamHelper,
 						emitOperations,
+						datasetRunId: datasetRunId || void 0,
 						forwardedHeaders
 					})).success) await streamHelper.writeOperation(errorOp("Unable to process request", "system"));
 				} catch (err) {
@@ -294,7 +292,7 @@ const toolApprovalRoute = createRoute({
 app.openapi(toolApprovalRoute, async (c) => {
 	return trace.getTracer("tool-approval-handler").startActiveSpan("tool_approval_request", async (span) => {
 		try {
-			const { tenantId, projectId } = getRequestExecutionContext(c);
+			const { tenantId, projectId } = c.get("executionContext");
 			const { conversationId, toolCallId, approved, reason } = await c.req.json();
 			logger.info({
 				conversationId,

package/dist/routes/mcp.d.ts

@@ -1,10 +1,11 @@
 import { OpenAPIHono } from "@hono/zod-openapi";
-import { CredentialStoreRegistry } from "@inkeep/agents-core";
+import { CredentialStoreRegistry, FullExecutionContext } from "@inkeep/agents-core";
 
 //#region src/routes/mcp.d.ts
 type AppVariables = {
   credentialStores: CredentialStoreRegistry;
   requestBody?: any;
+  executionContext: FullExecutionContext;
 };
 declare const app: OpenAPIHono<{
   Variables: AppVariables;

package/dist/routes/mcp.js

@@ -1,16 +1,19 @@
-import { getLogger } from "../logger.js";
+import { getLogger as getLogger$1 } from "../logger.js";
 import dbClient_default from "../data/db/dbClient.js";
+import { contextValidationMiddleware } from "../context/validation.js";
+import { handleContextResolution } from "../context/context.js";
+import "../context/index.js";
 import { createMCPStreamHelper } from "../utils/stream-helpers.js";
 import { ExecutionHandler } from "../handlers/executionHandler.js";
 import { OpenAPIHono, createRoute, z } from "@hono/zod-openapi";
-import { HeadersScopeSchema, contextValidationMiddleware, createMessage, createOrGetConversation, generateId, getAgentWithDefaultSubAgent, getConversation, getConversationId, getRequestExecutionContext, getSubAgentById, handleContextResolution, updateConversation } from "@inkeep/agents-core";
+import { HeadersScopeSchema, createMessage, createOrGetConversation, generateId, getConversation, getConversationId, updateConversation } from "@inkeep/agents-core";
 import { context, propagation, trace } from "@opentelemetry/api";
 import { McpServer } from "@alcyone-labs/modelcontextprotocol-sdk/server/mcp.js";
 import { StreamableHTTPServerTransport } from "@alcyone-labs/modelcontextprotocol-sdk/server/streamableHttp.js";
 import { toFetchResponse, toReqRes } from "fetch-to-node";
 
 //#region src/routes/mcp.ts
-const logger = getLogger("mcp");
+const logger = getLogger$1("mcp");
 /**
 * Singleton mock response object for spoof initialization
 */
@@ -83,7 +86,7 @@ const spoofTransportInitialization = async (transport, req, sessionId, mcpProtoc
 		}, "Spoof initialization failed, continuing anyway");
 	}
 };
-const validateSession = async (req, res, body, tenantId, projectId, agentId) => {
+const validateSession = async (req, res, body, tenantId, projectId, agentId, ref) => {
 	const sessionId = req.headers["mcp-session-id"];
 	logger.info({ sessionId }, "Received MCP session ID");
 	if (!sessionId) {
@@ -154,7 +157,7 @@ const setupTracing = (conversationId, tenantId, agentId) => {
 /**
 * Processes and stores the user message
 */
-const processUserMessage = async (tenantId, projectId, conversationId, query) => {
+const processUserMessage = async (tenantId, projectId, conversationId, query, ref) => {
 	const messageSpan = trace.getActiveSpan();
 	if (messageSpan) messageSpan.setAttributes({
 		"message.content": query,
@@ -202,13 +205,9 @@ const executeAgentQuery = async (executionContext, conversationId, query, defaul
 * Creates and configures an MCP server for the given context
 */
 const getServer = async (headers$1, executionContext, conversationId, credentialStores) => {
-	const { tenantId, projectId, agentId } = executionContext;
+	const { tenantId, projectId, agentId, resolvedRef } = executionContext;
 	setupTracing(conversationId, tenantId, agentId);
-	const agent = await getAgentWithDefaultSubAgent(dbClient_default)({ scopes: {
-		tenantId,
-		projectId,
-		agentId
-	} });
+	const agent = executionContext.project.agents[agentId];
 	if (!agent) throw new Error("Agent not found");
 	const server = new McpServer({
 		name: "inkeep-chat-api-server",
@@ -224,14 +223,7 @@ const getServer = async (headers$1, executionContext, conversationId, credential
 				isError: true
 			};
 			const defaultSubAgentId = agent.defaultSubAgentId;
-			if (!await getSubAgentById(dbClient_default)({
-				scopes: {
-					tenantId,
-					projectId,
-					agentId
-				},
-				subAgentId: defaultSubAgentId
-			})) return {
+			if (!executionContext.project.agents[agentId]?.subAgents[defaultSubAgentId]) return {
 				content: [{
 					type: "text",
 					text: `Agent not found`
@@ -239,12 +231,9 @@ const getServer = async (headers$1, executionContext, conversationId, credential
 				isError: true
 			};
 			const resolvedContext = await handleContextResolution({
-				tenantId,
-				projectId,
-				agentId,
+				executionContext,
 				conversationId,
 				headers: headers$1,
-				dbClient: dbClient_default,
 				credentialStores
 			});
 			logger.info({
@@ -256,7 +245,7 @@ const getServer = async (headers$1, executionContext, conversationId, credential
 				hasHeaders: !!headers$1,
 				hasValidatedContext: !!resolvedContext
 			}, "parameters");
-			await processUserMessage(tenantId, projectId, conversationId, query);
+			await processUserMessage(tenantId, projectId, conversationId, query, resolvedRef);
 			return executeAgentQuery(executionContext, conversationId, query, defaultSubAgentId);
 		} catch (error) {
 			return {
@@ -272,7 +261,7 @@ const getServer = async (headers$1, executionContext, conversationId, credential
 };
 const app = new OpenAPIHono();
 app.use("/", async (c, next) => {
-	if (c.req.method === "POST") return contextValidationMiddleware(dbClient_default)(c, next);
+	if (c.req.method === "POST") return contextValidationMiddleware(c, next);
 	return next();
 });
 /**
@@ -280,9 +269,9 @@ app.use("/", async (c, next) => {
 */
 const validateRequestParameters = (c) => {
 	try {
-		const executionContext = getRequestExecutionContext(c);
+		const executionContext = c.get("executionContext");
 		const { tenantId, projectId, agentId } = executionContext;
-		getLogger("mcp").debug({
+		getLogger$1("mcp").debug({
 			tenantId,
 			projectId,
 			agentId
@@ -292,7 +281,7 @@ const validateRequestParameters = (c) => {
 			executionContext
 		};
 	} catch (error) {
-		getLogger("chat").warn({ error: error instanceof Error ? error.message : "Unknown error" }, "Failed to get execution context");
+		getLogger$1("chat").warn({ error: error instanceof Error ? error.message : "Unknown error" }, "Failed to get execution context");
 		return {
 			valid: false,
 			response: c.json({
@@ -310,7 +299,7 @@ const validateRequestParameters = (c) => {
 * Creates a new MCP session and handles initialization
 */
 const handleInitializationRequest = async (body, executionContext, validatedContext, req, res, c, credentialStores) => {
-	const { tenantId, projectId, agentId } = executionContext;
+	const { tenantId, projectId, agentId, resolvedRef, project } = executionContext;
 	logger.info({ body }, "Received initialization request");
 	const sessionId = getConversationId();
 	const activeSpan = trace.getActiveSpan();
@@ -325,11 +314,7 @@ const handleInitializationRequest = async (body, executionContext, validatedCont
 	currentBag = currentBag.setEntry("conversation.id", { value: sessionId });
 	const ctxWithBaggage = propagation.setBaggage(context.active(), currentBag);
 	return await context.with(ctxWithBaggage, async () => {
-		const agent = await getAgentWithDefaultSubAgent(dbClient_default)({ scopes: {
-			tenantId,
-			projectId,
-			agentId
-		} });
+		const agent = project.agents[agentId];
 		if (!agent) return c.json({
 			jsonrpc: "2.0",
 			error: {
@@ -346,11 +331,14 @@ const handleInitializationRequest = async (body, executionContext, validatedCont
 			},
 			id: body.id || null
 		}, { status: 400 });
+		const activeSubAgentId = agent.defaultSubAgentId;
 		const conversation = await createOrGetConversation(dbClient_default)({
 			id: sessionId,
 			tenantId,
 			projectId,
-			activeSubAgentId: agent.defaultSubAgentId,
+			activeSubAgentId,
+			agentId,
+			ref: resolvedRef,
 			metadata: { sessionData: {
 				agentId,
 				sessionType: "mcp",
@@ -380,8 +368,8 @@ const handleInitializationRequest = async (body, executionContext, validatedCont
 * Handles requests for existing MCP sessions
 */
 const handleExistingSessionRequest = async (body, executionContext, validatedContext, req, res, credentialStores) => {
-	const { tenantId, projectId, agentId } = executionContext;
-	const conversation = await validateSession(req, res, body, tenantId, projectId, agentId);
+	const { tenantId, projectId, agentId, resolvedRef } = executionContext;
+	const conversation = await validateSession(req, res, body, tenantId, projectId, agentId, resolvedRef);
 	if (!conversation) return toFetchResponse(res);
 	const sessionId = conversation.id;
 	await updateConversation(dbClient_default)({

package/dist/services/AgentSession.d.ts

@@ -1,4 +1,4 @@
-import { DelegationReturnedData, DelegationSentData, ModelSettings, StatusUpdateSettings, TransferData } from "@inkeep/agents-core";
+import { DelegationReturnedData, DelegationSentData, FullExecutionContext, ModelSettings, StatusUpdateSettings, TransferData } from "@inkeep/agents-core";
 
 //#region src/services/AgentSession.d.ts
 type AgentSessionEventType = 'agent_generate' | 'agent_reasoning' | 'transfer' | 'delegation_sent' | 'delegation_returned' | 'artifact_saved' | 'tool_call' | 'tool_result' | 'compression' | 'error';
@@ -143,9 +143,7 @@ interface ErrorEventData {
 declare class AgentSession {
   readonly sessionId: string;
   readonly messageId: string;
-  readonly agentId?: string | undefined;
-  readonly tenantId?: string | undefined;
-  readonly projectId?: string | undefined;
+  readonly executionContext: FullExecutionContext;
   readonly contextId?: string | undefined;
   private events;
   private statusUpdateState?;
@@ -163,7 +161,7 @@ declare class AgentSession {
   private artifactService?;
   private artifactParser?;
   private isEmitOperations;
-  constructor(sessionId: string, messageId: string, agentId?: string | undefined, tenantId?: string | undefined, projectId?: string | undefined, contextId?: string | undefined);
+  constructor(sessionId: string, messageId: string, executionContext: FullExecutionContext, contextId?: string | undefined);
   /**
    * Enable emit operations to send data operations
    */
@@ -211,7 +209,7 @@ declare class AgentSession {
   getSummary(): {
     sessionId: string;
     messageId: string;
-    agentId: string | undefined;
+    agentId: string;
     totalEvents: number;
     eventCounts: Record<AgentSessionEventType, number>;
     agentCounts: Record<string, number>;
@@ -296,7 +294,7 @@ declare class AgentSessionManager {
   /**
    * Create a new session for a message
    */
-  createSession(messageId: string, agentId?: string, tenantId?: string, projectId?: string, contextId?: string): string;
+  createSession(messageId: string, executionContext: FullExecutionContext, contextId?: string): string;
   /**
    * Initialize status updates for a session
    */