agents 0.21.0 → 0.23.0

package/dist/mcp/{server.d.ts → server/index.d.ts}

@@ -5,7 +5,7 @@ import {
   o as getMcpAuthContext,
   r as StatelessMcpServerInput,
   t as CreateStatelessMcpHandlerOptions
-} from "../handler-stateless-C_bo-Ytq.js";
+} from "../../handler-stateless-DxYpJ_XF.js";
 export {
   type CreateStatelessMcpHandlerOptions as CreateMcpHandlerOptions,
   type CreateStatelessMcpHandlerOptions,

package/dist/mcp/{server.js → server/index.js}

@@ -1,2 +1,2 @@
-import { n as getMcpAuthContext, t as createStatelessMcpHandler } from "../handler-stateless-CIkKPETH.js";
+import { n as getMcpAuthContext, t as createStatelessMcpHandler } from "../../handler-stateless-VvrWSAVA.js";
 export { createStatelessMcpHandler as createMcpHandler, getMcpAuthContext };

package/dist/observability/ai/index.js

@@ -1,5 +1,6 @@
-import { __DO_NOT_USE_WILL_BREAK__agentContext } from "../../internal_context.js";
-import { r as writeSpanAttributes, t as tracer } from "../../cloudflare-BduZwmYK.js";
+import { t as __DO_NOT_USE_WILL_BREAK__agentContext } from "../../current-agent-DhoDkSnH.js";
+import "../../internal_context.js";
+import { r as writeSpanAttributes, t as tracer } from "../../cloudflare-Dzvc7V2N.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/observability/ai/read.ts
 /** Narrows an unknown value to a string. */
@@ -189,6 +190,14 @@ function metadataAttributes(metadata, passthroughPrefix = TraceAttribute.Cloudfl
 function operationSpanName(agentName) {
 	return spanName(TraceAttribute.GenAI.OperationNameValueInvokeAgent, agentName);
 }
+function semanticContextAttributes(context) {
+	return {
+		[TraceAttribute.GenAI.AgentID]: context?.agentId,
+		[TraceAttribute.GenAI.AgentName]: context?.agentName,
+		[TraceAttribute.GenAI.AgentVersion]: context?.agentVersion,
+		[TraceAttribute.GenAI.ConversationID]: context?.conversationId
+	};
+}
 /** Builds the root span for an SDK operation such as generateText or streamText. */
 function operationSpan(input) {
 	return {
@@ -196,10 +205,7 @@ function operationSpan(input) {
 			...input.attributes,
 			[TraceAttribute.Cloudflare.IntegrationName]: "ai-sdk",
 			[TraceAttribute.Cloudflare.OperationName]: input.operation,
-			[TraceAttribute.GenAI.AgentID]: input.context?.agentId,
-			[TraceAttribute.GenAI.AgentName]: input.context?.agentName,
-			[TraceAttribute.GenAI.AgentVersion]: input.context?.agentVersion,
-			[TraceAttribute.GenAI.ConversationID]: input.context?.conversationId,
+			...semanticContextAttributes(input.context),
 			[TraceAttribute.GenAI.OperationName]: TraceAttribute.GenAI.OperationNameValueInvokeAgent,
 			[TraceAttribute.GenAI.ProviderName]: normalizeProviderName(input.provider),
 			...requestAttributes(input.request, input.model)
@@ -214,6 +220,7 @@ function modelCallSpan(input) {
 			...input.attributes,
 			[TraceAttribute.Cloudflare.IntegrationName]: "ai-sdk",
 			[TraceAttribute.Cloudflare.OperationName]: input.operation,
+			...semanticContextAttributes(input.context),
 			[TraceAttribute.GenAI.OperationName]: TraceAttribute.GenAI.OperationNameValueChat,
 			[TraceAttribute.GenAI.ProviderName]: normalizeProviderName(input.provider),
 			...requestAttributes(input.request, input.model)
@@ -241,6 +248,7 @@ function toolCallSpan(input) {
 		attributes: {
 			[TraceAttribute.Cloudflare.IntegrationName]: "ai-sdk",
 			[TraceAttribute.Cloudflare.OperationName]: input.operation,
+			...semanticContextAttributes(input.context),
 			[TraceAttribute.GenAI.OperationName]: TraceAttribute.GenAI.OperationNameValueExecuteTool,
 			[TraceAttribute.GenAI.ToolCallID]: input.toolCallId,
 			[TraceAttribute.GenAI.ToolName]: input.toolName,
@@ -256,6 +264,7 @@ function toolApprovalSpan(input) {
 			[TraceAttribute.Cloudflare.IntegrationName]: "ai-sdk",
 			[TraceAttribute.Cloudflare.OperationName]: "tool.approval",
 			[TraceAttribute.Cloudflare.ToolApprovalState]: input.state,
+			...semanticContextAttributes(input.context),
 			[TraceAttribute.GenAI.OperationName]: TraceAttribute.GenAI.OperationNameValueExecuteTool,
 			[TraceAttribute.GenAI.ToolCallID]: input.toolCallId,
 			[TraceAttribute.GenAI.ToolName]: input.toolName,
@@ -1085,7 +1094,7 @@ function isAsyncIterable$1(value) {
 }
 //#endregion
 //#region src/observability/ai/wrapper/model.ts
-function wrapModel(tracer, wrapLanguageModel, model, parentOperation, storeMessages, boundToInvocation = false) {
+function wrapModel(tracer, wrapLanguageModel, model, parentOperation, storeMessages, context, boundToInvocation = false) {
 	if (!wrapLanguageModel) return model;
 	if (typeof model !== "object" || model === null) return model;
 	const modelInfo = extractModelInfo(model);
@@ -1094,7 +1103,7 @@ function wrapModel(tracer, wrapLanguageModel, model, parentOperation, storeMessa
 		model: aiGatewayLog.model,
 		middleware: {
 			wrapGenerate: async ({ doGenerate, params }) => {
-				const span = modelCallSpanForModel("doGenerate", modelInfo, params, parentOperation, storeMessages);
+				const span = modelCallSpanForModel("doGenerate", modelInfo, params, parentOperation, storeMessages, context);
 				return tracer.withSpan(span.name, span.attributes, async (modelCall) => {
 					aiGatewayLog.reset();
 					try {
@@ -1114,7 +1123,7 @@ function wrapModel(tracer, wrapLanguageModel, model, parentOperation, storeMessa
 				}, boundToInvocation ? { boundToInvocation: true } : void 0);
 			},
 			wrapStream: async ({ doStream, params }) => {
-				const span = modelCallSpanForModel("doStream", modelInfo, params, parentOperation, storeMessages);
+				const span = modelCallSpanForModel("doStream", modelInfo, params, parentOperation, storeMessages, context);
 				return tracer.openSpan(span.name, span.attributes, async (modelCall) => {
 					aiGatewayLog.reset();
 					try {
@@ -1140,9 +1149,10 @@ function wrapModel(tracer, wrapLanguageModel, model, parentOperation, storeMessa
 function recordAIGatewayLogOnError(span, cause, capturedLogId) {
 	writeSpanAttributes(span, aiGatewayLogAttributes(extractAIGatewayLogId(cause) ?? capturedLogId));
 }
-function modelCallSpanForModel(operation, model, params, parentOperation, storeMessages) {
+function modelCallSpanForModel(operation, model, params, parentOperation, storeMessages, context) {
 	const record = typeof params === "object" && params !== null ? params : {};
 	const span = modelCallSpan({
+		context,
 		model: model?.modelId,
 		operation,
 		provider: model?.provider,
@@ -1158,27 +1168,28 @@ function modelCallSpanForModel(operation, model, params, parentOperation, storeM
 }
 //#endregion
 //#region src/observability/ai/wrapper/tools.ts
-function wrapTools(tracer, tools, storeTools, boundToInvocation = false, approvedToolCalls) {
+function wrapTools(tracer, tools, storeTools, context, boundToInvocation = false, approvedToolCalls) {
 	if (typeof tools !== "object" || tools === null) return tools;
 	const toolRecord = tools;
 	const wrappedTools = {};
-	for (const [toolName, tool] of Object.entries(toolRecord)) wrappedTools[toolName] = wrapTool(tracer, toolName, tool, storeTools, boundToInvocation, approvedToolCalls);
+	for (const [toolName, tool] of Object.entries(toolRecord)) wrappedTools[toolName] = wrapTool(tracer, toolName, tool, storeTools, context, boundToInvocation, approvedToolCalls);
 	return wrappedTools;
 }
-function wrapTool(tracer, toolName, tool, storeTools, boundToInvocation, approvedToolCalls) {
+function wrapTool(tracer, toolName, tool, storeTools, context, boundToInvocation, approvedToolCalls) {
 	if (typeof tool !== "object" || tool === null) return tool;
 	const toolRecord = tool;
 	const hasExecute = typeof toolRecord.execute === "function";
 	const hasApproval = typeof toolRecord.needsApproval === "boolean" || typeof toolRecord.needsApproval === "function";
 	if (!hasExecute && !hasApproval) return tool;
 	const wrappedTool = Object.assign(Object.create(Object.getPrototypeOf(tool)), tool);
-	if (hasApproval) wrapApprovalCheck(tracer, wrappedTool, toolRecord, tool, toolName, boundToInvocation);
+	if (hasApproval) wrapApprovalCheck(tracer, wrappedTool, toolRecord, tool, toolName, context, boundToInvocation);
 	if (!hasExecute) return wrappedTool;
 	const execute = toolRecord.execute;
 	if (typeof execute !== "function") return wrappedTool;
 	const originalExecute = execute.bind(tool);
 	wrappedTool.execute = (...args) => {
 		const span = toolCallSpan({
+			context,
 			operation: "tool.execute",
 			toolCallId: extractToolCallId(args[1]),
 			toolName
@@ -1191,7 +1202,7 @@ function wrapTool(tracer, toolName, tool, storeTools, boundToInvocation, approve
 			const inSpanContext = AsyncLocalStorage.snapshot();
 			const toolCallId = extractToolCallId(args[1]);
 			if (approvalResponseForOptions(args[1], toolCallId)?.approved === true || toolCallId !== void 0 && approvedToolCalls?.get(toolCallId) === toolName) {
-				recordApprovalChild(tracer, toolName, toolCallId, "approved", boundToInvocation);
+				recordApprovalChild(tracer, toolName, toolCallId, "approved", context, boundToInvocation);
 				if (toolCallId !== void 0) approvedToolCalls?.delete(toolCallId);
 			}
 			const result = originalExecute(...args);
@@ -1204,54 +1215,56 @@ function wrapTool(tracer, toolName, tool, storeTools, boundToInvocation, approve
 	};
 	return wrappedTool;
 }
-function wrapApprovalCheck(tracer, wrappedTool, toolRecord, tool, toolName, boundToInvocation) {
+function wrapApprovalCheck(tracer, wrappedTool, toolRecord, tool, toolName, context, boundToInvocation) {
 	const approval = toolRecord.needsApproval;
 	const original = typeof approval === "function" ? approval.bind(tool) : void 0;
 	wrappedTool.needsApproval = (...args) => {
 		const result = original ? original(...args) : approval;
 		const recordRequested = (needed) => {
 			const toolCallId = extractToolCallId(args[1]);
-			if (needed === true && !hasApprovalResponse(args[1], toolCallId)) recordApprovalSegment(tracer, toolName, toolCallId, "requested", boundToInvocation);
+			if (needed === true && !hasApprovalResponse(args[1], toolCallId)) recordApprovalSegment(tracer, toolName, toolCallId, "requested", context, boundToInvocation);
 			return needed;
 		};
 		return isPromiseLike(result) ? Promise.resolve(result).then(recordRequested) : recordRequested(result);
 	};
 }
 /** Instruments AI SDK v7's top-level tool approval policy. */
-function wrapToolApprovalPolicy(tracer, policy, approvedToolCalls, boundToInvocation = false) {
+function wrapToolApprovalPolicy(tracer, policy, approvedToolCalls, context, boundToInvocation = false) {
 	if (typeof policy === "function") return (...args) => {
 		const toolCall = recordValue(recordValue(args[0])?.toolCall);
-		return observePolicyResult(policy(...args), readString(toolCall?.toolName) ?? "tool", readString(toolCall?.toolCallId), tracer, approvedToolCalls, boundToInvocation);
+		return observePolicyResult(policy(...args), readString(toolCall?.toolName) ?? "tool", readString(toolCall?.toolCallId), tracer, approvedToolCalls, context, boundToInvocation);
 	};
 	if (typeof policy !== "object" || policy === null) return policy;
-	return Object.fromEntries(Object.entries(policy).map(([toolName, setting]) => [toolName, (...args) => observePolicyResult(typeof setting === "function" ? setting(...args) : setting, toolName, extractToolCallId(args[1]), tracer, approvedToolCalls, boundToInvocation)]));
+	return Object.fromEntries(Object.entries(policy).map(([toolName, setting]) => [toolName, (...args) => observePolicyResult(typeof setting === "function" ? setting(...args) : setting, toolName, extractToolCallId(args[1]), tracer, approvedToolCalls, context, boundToInvocation)]));
 }
-function observePolicyResult(result, toolName, toolCallId, tracer, approvedToolCalls, boundToInvocation = false) {
+function observePolicyResult(result, toolName, toolCallId, tracer, approvedToolCalls, context, boundToInvocation = false) {
 	const observe = (status) => {
 		if (toolCallId === void 0) return status;
 		const type = typeof status === "string" ? status : readString(recordValue(status)?.type);
 		if (type === "approved") approvedToolCalls.set(toolCallId, toolName);
-		else if (type === "user-approval" || type === "denied") recordApprovalSegment(tracer, toolName, toolCallId, type === "denied" ? "denied" : "requested", boundToInvocation);
+		else if (type === "user-approval" || type === "denied") recordApprovalSegment(tracer, toolName, toolCallId, type === "denied" ? "denied" : "requested", context, boundToInvocation);
 		return status;
 	};
 	return isPromiseLike(result) ? Promise.resolve(result).then(observe) : observe(result);
 }
 /** Records denied responses, whose tool never reaches execute(). */
-function recordDeniedApprovalResponses(tracer, messages) {
-	for (const response of approvalResponses(messages)) if (!response.approved) recordApprovalSegment(tracer, response.toolName, response.toolCallId, "denied");
+function recordDeniedApprovalResponses(tracer, messages, context) {
+	for (const response of approvalResponses(messages)) if (!response.approved) recordApprovalSegment(tracer, response.toolName, response.toolCallId, "denied", context);
 }
-function recordApprovalSegment(tracer, toolName, toolCallId, state, boundToInvocation = false) {
+function recordApprovalSegment(tracer, toolName, toolCallId, state, context, boundToInvocation = false) {
 	const tool = toolCallSpan({
+		context,
 		operation: "tool.approval",
 		toolCallId,
 		toolName
 	});
 	tracer.withSpan(tool.name, tool.attributes, () => {
-		recordApprovalChild(tracer, toolName, toolCallId, state, boundToInvocation);
+		recordApprovalChild(tracer, toolName, toolCallId, state, context, boundToInvocation);
 	}, boundToInvocation ? { boundToInvocation: true } : void 0);
 }
-function recordApprovalChild(tracer, toolName, toolCallId, state, boundToInvocation = false) {
+function recordApprovalChild(tracer, toolName, toolCallId, state, context, boundToInvocation = false) {
 	const approval = toolApprovalSpan({
+		context,
 		state,
 		toolCallId,
 		toolName
@@ -1415,10 +1428,11 @@ function createOperationWrapper(operationName, operation, wrapLanguageModel, ins
 				operationSpan.finish();
 				return operation(params, ...args);
 			}
+			const context = semanticContext(params);
 			writeSpanAttributes(operationSpan, operationSpanForCall(operationName, extractModelInfo(params.model), params, instrumentation.options).attributes);
-			recordDeniedApprovalResponses(instrumentation.tracer, params.messages);
+			recordDeniedApprovalResponses(instrumentation.tracer, params.messages, context);
 			const startedAtMs = Date.now();
-			const result = operation(operationParamsForCall(params, operationName, wrapLanguageModel, instrumentation.tracer, storage, boundToInvocation), ...args);
+			const result = operation(operationParamsForCall(params, operationName, wrapLanguageModel, instrumentation.tracer, storage, context, boundToInvocation), ...args);
 			const hasModelSpan = canWrapModel(wrapLanguageModel, params.model);
 			return finishWhenStreamCompletes(result, operationSpan, {
 				includeResponse: !hasModelSpan,
@@ -1430,9 +1444,10 @@ function createOperationWrapper(operationName, operation, wrapLanguageModel, ins
 		const boundToInvocation = isAISDKInvocationBounded(params);
 		return instrumentation.tracer.withSpan(operationSpanName(agentNameForCall(params)), {}, async (operationSpan) => {
 			if (!operationSpan.isTraced) return operation(params, ...args);
+			const context = semanticContext(params);
 			writeSpanAttributes(operationSpan, operationSpanForCall(operationName, extractModelInfo(params.model), params, instrumentation.options).attributes);
-			recordDeniedApprovalResponses(instrumentation.tracer, params.messages);
-			const result = await operation(operationParamsForCall(params, operationName, wrapLanguageModel, instrumentation.tracer, storage, boundToInvocation), ...args);
+			recordDeniedApprovalResponses(instrumentation.tracer, params.messages, context);
+			const result = await operation(operationParamsForCall(params, operationName, wrapLanguageModel, instrumentation.tracer, storage, context, boundToInvocation), ...args);
 			operationSpan.finish(finishAttributesFromResult(result, { includeResponse: !canWrapModel(wrapLanguageModel, params.model) }));
 			return result;
 		}, boundToInvocation ? { boundToInvocation: true } : void 0);
@@ -1450,13 +1465,13 @@ function agentNameForCall(params) {
 	const runtimeContext = runtimeContextRecord(params);
 	return metadataValue(metadata, "agentName", "gen_ai.agent.name") ?? metadataValue(runtimeContext, "agentName", "gen_ai.agent.name") ?? readString(telemetry?.functionId);
 }
-function operationParamsForCall(params, operationName, wrapLanguageModel, tracer, storage, boundToInvocation = false) {
+function operationParamsForCall(params, operationName, wrapLanguageModel, tracer, storage, context, boundToInvocation = false) {
 	const approvedToolCalls = /* @__PURE__ */ new Map();
 	return {
 		...params,
-		...shouldWrapTools(operationName) && params.tools !== void 0 ? { tools: wrapTools(tracer, params.tools, storage.storeTools, boundToInvocation, approvedToolCalls) } : {},
-		...params.toolApproval !== void 0 ? { toolApproval: wrapToolApprovalPolicy(tracer, params.toolApproval, approvedToolCalls, boundToInvocation) } : {},
-		...params.model !== void 0 ? { model: wrapModel(tracer, wrapLanguageModel, params.model, operationName, storage.storeMessages, boundToInvocation) } : {}
+		...shouldWrapTools(operationName) && params.tools !== void 0 ? { tools: wrapTools(tracer, params.tools, storage.storeTools, context, boundToInvocation, approvedToolCalls) } : {},
+		...params.toolApproval !== void 0 ? { toolApproval: wrapToolApprovalPolicy(tracer, params.toolApproval, approvedToolCalls, context, boundToInvocation) } : {},
+		...params.model !== void 0 ? { model: wrapModel(tracer, wrapLanguageModel, params.model, operationName, storage.storeMessages, context, boundToInvocation) } : {}
 	};
 }
 function canWrapModel(wrapLanguageModel, model) {