agents 0.20.1 → 0.22.0

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. */
@@ -38,7 +39,6 @@ function readNestedTokenField(value, key) {
 const TraceAttribute = {
 	Cloudflare: {
 		AIGatewayLogID: "cloudflare.ai_gateway.log.id",
-		CallID: "cloudflare.agents.call.id",
 		IntegrationName: "cloudflare.agents.integration.name",
 		MetadataPrefix: "cloudflare.agents.metadata.",
 		OperationName: "cloudflare.agents.operation.name",
@@ -190,17 +190,22 @@ 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 {
 		attributes: {
 			...input.attributes,
-			[TraceAttribute.Cloudflare.IntegrationName]: input.integration,
+			[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)
@@ -213,8 +218,9 @@ function modelCallSpan(input) {
 	return {
 		attributes: {
 			...input.attributes,
-			[TraceAttribute.Cloudflare.IntegrationName]: input.integration,
+			[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)
@@ -240,8 +246,9 @@ function requestAttributes(request, model) {
 function toolCallSpan(input) {
 	return {
 		attributes: {
-			[TraceAttribute.Cloudflare.IntegrationName]: input.integration,
+			[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,
@@ -257,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,
@@ -291,14 +299,14 @@ function totalTokens(usage) {
 	return usage?.inputTokens !== void 0 && usage.outputTokens !== void 0 ? usage.inputTokens + usage.outputTokens : void 0;
 }
 //#endregion
-//#region src/observability/ai/v6/extract.ts
+//#region src/observability/ai/wrapper/extract.ts
 function finishAttributesFromResult(result, options = {}) {
 	return finishAttributes({
 		aiGatewayLogId: options.aiGatewayLogId,
-		finishReason: extractFinishReason$1(result),
+		finishReason: extractFinishReason(result),
 		response: options.includeResponse ? extractResponseInfo(result) : void 0,
 		toolCallCount: extractToolCallCount(result),
-		usage: extractAISDKv6TokenUsage(result)
+		usage: extractAISDKTokenUsage(result)
 	});
 }
 function extractRequestSummary(params, operation) {
@@ -314,7 +322,7 @@ function extractRequestSummary(params, operation) {
 		topP: readNumber(params.topP)
 	};
 }
-/** Extracts model identity from an AI SDK v6 model object. */
+/** Extracts model identity from an AI SDK model object. */
 function extractModelInfo(value) {
 	if (typeof value === "string") return value.length > 0 ? {
 		modelId: value,
@@ -331,13 +339,11 @@ function extractModelInfo(value) {
 	};
 }
 /**
-* Extracts token usage from an AI SDK v6 result or stream chunk.
-*
-* AI SDK v6 exposes usage as `{ inputTokens, outputTokens, totalTokens }`
-* where `inputTokens`/`outputTokens` may be plain numbers or nested objects
-* like `{ total, cacheRead, cacheWrite }` / `{ total, reasoning }`.
+* Extracts token usage from an AI SDK result or stream chunk across supported
+* majors. Token counts may be plain numbers or nested objects such as
+* `{ total, cacheRead, cacheWrite }` / `{ total, reasoning }`.
 */
-function extractAISDKv6TokenUsage(value) {
+function extractAISDKTokenUsage(value) {
 	if (typeof value !== "object" || value === null) return;
 	const record = value;
 	const raw = record.totalUsage ?? record.usage;
@@ -365,9 +371,9 @@ function extractToolCallCount(value) {
 	return Array.isArray(toolCalls) && toolCalls.length > 0 ? toolCalls.length : void 0;
 }
 /**
-* Reads a finish reason from an AI SDK v6 result or `finish`-type stream chunk.
+* Reads a finish reason from an AI SDK result or `finish`-type stream chunk.
 */
-function extractFinishReason$1(value) {
+function extractFinishReason(value) {
 	if (typeof value !== "object" || value === null) return;
 	const finishReason = value.finishReason;
 	if (typeof finishReason === "string") return finishReason;
@@ -805,7 +811,7 @@ function byteLength(value) {
 	return new TextEncoder().encode(value).length;
 }
 //#endregion
-//#region src/observability/ai/v6/streams.ts
+//#region src/observability/ai/wrapper/streams.ts
 function finishWhenStreamCompletes(result, span, options = {}) {
 	return patchStreamFields(result, {
 		onComplete: (summary) => {
@@ -1043,8 +1049,8 @@ function createStreamState(hooks, startedAtMs, initialAIGatewayLogId, storeMessa
 			if (isErrorChunk(chunk)) observedError = { cause: chunk.error };
 			if (isAbortChunk(chunk)) observedAbort = true;
 			if (isToolCallChunk(chunk)) toolCallCount += 1;
-			finishReason = extractFinishReason$1(chunk) ?? finishReason;
-			usage = extractAISDKv6TokenUsage(chunk) ?? usage;
+			finishReason = extractFinishReason(chunk) ?? finishReason;
+			usage = extractAISDKTokenUsage(chunk) ?? usage;
 			response = extractResponseInfo(chunk) ?? response;
 		}
 	};
@@ -1087,8 +1093,8 @@ function isAsyncIterable$1(value) {
 	return typeof value === "object" && value !== null && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
 //#endregion
-//#region src/observability/ai/v6/model.ts
-function wrapModel(tracer, wrapLanguageModel, model, parentOperation, storeMessages, boundToInvocation = false) {
+//#region src/observability/ai/wrapper/model.ts
+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);
@@ -1097,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 {
@@ -1117,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 {
@@ -1143,10 +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({
-		integration: "ai-sdk",
+		context,
 		model: model?.modelId,
 		operation,
 		provider: model?.provider,
@@ -1161,29 +1167,29 @@ function modelCallSpanForModel(operation, model, params, parentOperation, storeM
 	};
 }
 //#endregion
-//#region src/observability/ai/v6/tools.ts
-function wrapTools(tracer, tools, storeTools, boundToInvocation = false, approvedToolCalls) {
+//#region src/observability/ai/wrapper/tools.ts
+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({
-			integration: "ai-sdk",
+			context,
 			operation: "tool.execute",
 			toolCallId: extractToolCallId(args[1]),
 			toolName
@@ -1196,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);
@@ -1209,55 +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$1(recordValue$1(args[0])?.toolCall);
-		return observePolicyResult(policy(...args), readString(toolCall?.toolName) ?? "tool", readString(toolCall?.toolCallId), tracer, approvedToolCalls, boundToInvocation);
+		const toolCall = recordValue(recordValue(args[0])?.toolCall);
+		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$1(status)?.type);
+		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({
-		integration: "ai-sdk",
+		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
@@ -1361,19 +1368,19 @@ function extractToolCallId(options) {
 function isAsyncIterable(value) {
 	return typeof value === "object" && value !== null && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
-function recordValue$1(value) {
+function recordValue(value) {
 	return typeof value === "object" && value !== null ? value : void 0;
 }
 function isPromiseLike(value) {
 	return value !== null && value !== void 0 && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function";
 }
 //#endregion
-//#region src/observability/ai/v6/wrap.ts
+//#region src/observability/ai/wrapper/wrap.ts
 /**
-* Wraps an AI SDK namespace object with v6 tracing while preserving its public
-* shape and overloaded call signatures.
+* Wraps an AI SDK namespace object with tracing while preserving its public
+* shape and overloaded call signatures across supported majors.
 */
-function createAISDKV6Wrapper(ai, instrumentation) {
+function createAISDKWrapper(ai, instrumentation) {
 	const target = isModuleNamespace(ai) ? Object.setPrototypeOf({}, ai) : ai;
 	const wrapperCache = /* @__PURE__ */ new Map();
 	return new Proxy(target, { get(proxyTarget, property, receiver) {
@@ -1381,7 +1388,7 @@ function createAISDKV6Wrapper(ai, instrumentation) {
 		if (isWrappedOperationName(property) && typeof original === "function") {
 			let wrapper = wrapperCache.get(property);
 			if (!wrapper) {
-				wrapper = createOperationWrapper(property, toAISDKV6Operation(original), readWrapLanguageModel(ai), instrumentation);
+				wrapper = createOperationWrapper(property, toAISDKOperation(original), readWrapLanguageModel(ai), instrumentation);
 				wrapperCache.set(property, wrapper);
 			}
 			return wrapper;
@@ -1394,7 +1401,7 @@ function readWrapLanguageModel(ai) {
 	if (typeof value !== "function") return;
 	return value;
 }
-function toAISDKV6Operation(value) {
+function toAISDKOperation(value) {
 	return value;
 }
 function isModuleNamespace(value) {
@@ -1414,17 +1421,18 @@ function createOperationWrapper(operationName, operation, wrapLanguageModel, ins
 		storeMessages: instrumentation.options?.storeMessages === true,
 		storeTools: instrumentation.options?.storeTools === true
 	};
-	if (isStreamOperation$1(operationName)) return (params, ...args) => {
+	if (isStreamOperation(operationName)) return (params, ...args) => {
 		const boundToInvocation = isAISDKInvocationBounded(params);
 		return instrumentation.tracer.openSpan(operationSpanName(agentNameForCall(params)), {}, (operationSpan) => {
 			if (!operationSpan.isTraced) {
 				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,
@@ -1436,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);
@@ -1454,21 +1463,21 @@ function agentNameForCall(params) {
 	const telemetry = telemetryOptions(params);
 	const metadata = telemetryMetadata(params);
 	const runtimeContext = runtimeContextRecord(params);
-	return metadataValue$1(metadata, "agentName", "gen_ai.agent.name") ?? metadataValue$1(runtimeContext, "agentName", "gen_ai.agent.name") ?? readString(telemetry?.functionId);
+	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) } : {},
-		...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) {
 	return wrapLanguageModel !== void 0 && typeof model === "object" && model !== null;
 }
-function isStreamOperation$1(operationName) {
+function isStreamOperation(operationName) {
 	return operationName === "streamObject" || operationName === "streamText";
 }
 function shouldWrapTools(operationName) {
@@ -1485,7 +1494,6 @@ function operationSpanForCall(operation, model, params, options) {
 			...contextAttributes(params, options)
 		},
 		context: semanticContext(params),
-		integration: "ai-sdk",
 		model: model?.modelId,
 		operation,
 		provider: model?.provider,
@@ -1573,15 +1581,15 @@ function semanticContext(params) {
 	const telemetry = telemetryOptions(params);
 	const metadata = telemetryMetadata(params);
 	const runtimeContext = runtimeContextRecord(params);
-	const fromContext = (key, semanticKey) => isExcludedFromContext(params, key) ? void 0 : metadataValue$1(runtimeContext, key, semanticKey);
+	const fromContext = (key, semanticKey) => isExcludedFromContext(params, key) ? void 0 : metadataValue(runtimeContext, key, semanticKey);
 	return {
-		agentId: metadataValue$1(metadata, "agentId", "gen_ai.agent.id") ?? fromContext("agentId", "gen_ai.agent.id"),
-		agentName: metadataValue$1(metadata, "agentName", "gen_ai.agent.name") ?? fromContext("agentName", "gen_ai.agent.name") ?? readString(telemetry?.functionId),
-		agentVersion: metadataValue$1(metadata, "agentVersion", "gen_ai.agent.version") ?? fromContext("agentVersion", "gen_ai.agent.version"),
-		conversationId: metadataValue$1(metadata, "conversationId", "gen_ai.conversation.id") ?? fromContext("conversationId", "gen_ai.conversation.id")
+		agentId: metadataValue(metadata, "agentId", "gen_ai.agent.id") ?? fromContext("agentId", "gen_ai.agent.id"),
+		agentName: metadataValue(metadata, "agentName", "gen_ai.agent.name") ?? fromContext("agentName", "gen_ai.agent.name") ?? readString(telemetry?.functionId),
+		agentVersion: metadataValue(metadata, "agentVersion", "gen_ai.agent.version") ?? fromContext("agentVersion", "gen_ai.agent.version"),
+		conversationId: metadataValue(metadata, "conversationId", "gen_ai.conversation.id") ?? fromContext("conversationId", "gen_ai.conversation.id")
 	};
 }
-function metadataValue$1(metadata, key, semanticKey) {
+function metadataValue(metadata, key, semanticKey) {
 	return readString(metadata?.[key] ?? metadata?.[semanticKey]);
 }
 /**
@@ -1604,370 +1612,17 @@ function isAISDKInvocationBounded(params) {
 	return params[invocationBounded] === true || __DO_NOT_USE_WILL_BREAK__agentContext.getStore()?.connection !== void 0;
 }
 //#endregion
-//#region src/observability/ai/v7/extract.ts
-/** Extracts the safe operation name from an AI SDK v7 operation id. */
-function operationNameFromId(operationId) {
-	const value = readString(operationId);
-	if (value === void 0) return "ai-sdk";
-	return value.startsWith("ai.") ? value.slice(3) : value;
-}
-/**
-* Extracts safe GenAI semantic context from an AI SDK v7 event. The AI SDK's
-* canonical OpenTelemetry projection maps `functionId` to agent name. v7 has
-* no telemetry metadata bag, so other identity fields come from the SDK-
-* filtered runtime context only when the caller explicitly includes them.
-*/
-function semanticContextFromEvent(event) {
-	const record = eventRecord(event);
-	const runtimeContext = typeof record.runtimeContext === "object" && record.runtimeContext !== null ? record.runtimeContext : void 0;
-	return {
-		agentId: metadataValue(runtimeContext, "agentId", "gen_ai.agent.id"),
-		agentName: metadataValue(runtimeContext, "agentName", "gen_ai.agent.name") ?? readString(record.functionId),
-		agentVersion: metadataValue(runtimeContext, "agentVersion", "gen_ai.agent.version"),
-		conversationId: metadataValue(runtimeContext, "conversationId", "gen_ai.conversation.id")
-	};
-}
-/** Extracts safe request settings from an AI SDK v7 event. */
-function requestSummaryFromEvent(event, operationName) {
-	const record = eventRecord(event);
-	return {
-		frequencyPenalty: readNumber(record.frequencyPenalty),
-		maxTokens: readNumber(record.maxOutputTokens ?? record.maxTokens),
-		outputType: operationName === "generateObject" || operationName === "streamObject" ? "json" : "text",
-		presencePenalty: readNumber(record.presencePenalty),
-		seed: readNumber(record.seed),
-		stream: operationName === "streamText" || operationName === "streamObject",
-		temperature: readNumber(record.temperature),
-		topK: readNumber(record.topK),
-		topP: readNumber(record.topP)
-	};
-}
-/** Extracts safe finish attributes from an AI SDK v7 result-like event. */
-function finishAttributesFromEvent(event, options = {}) {
-	const record = eventRecord(event);
-	return finishAttributes({
-		aiGatewayLogId: options.includeAIGatewayLog ? extractAIGatewayLogId(record) : void 0,
-		finishReason: extractFinishReason(record),
-		response: options.includeResponse ? responseSummaryFromEvent(record) : void 0,
-		timeToFirstChunkSeconds: options.includePerformance ? timeToFirstChunkSeconds(record) : void 0,
-		usage: tokenUsageFromEvent(record)
-	});
-}
-/** Builds correlation attributes for AI SDK v7 callback ids. */
-function correlationAttributes(input) {
-	return {
-		[TraceAttribute.Cloudflare.CallID]: input.callId,
-		[TraceAttribute.GenAI.ToolCallID]: input.toolCallId
-	};
-}
-function metadataValue(metadata, key, semanticKey) {
-	return readString(metadata?.[key] ?? metadata?.[semanticKey]);
-}
-function eventRecord(event) {
-	return event;
-}
-function extractFinishReason(event) {
-	const finishReason = event.finishReason;
-	if (typeof finishReason === "string") return finishReason;
-	if (typeof finishReason === "object" && finishReason !== null) return readString(finishReason.unified);
-}
-function responseSummaryFromEvent(event) {
-	const response = typeof event.response === "object" && event.response !== null ? event.response : void 0;
-	const id = readString(event.responseId ?? response?.id);
-	const model = readString(event.responseModel ?? response?.modelId ?? response?.model);
-	if (id === void 0 && model === void 0) return;
-	return {
-		...id !== void 0 ? { id } : {},
-		...model !== void 0 ? { model } : {}
-	};
-}
-function tokenUsageFromEvent(event) {
-	const raw = event.totalUsage ?? event.usage;
-	if (typeof raw !== "object" || raw === null) return;
-	const usage = raw;
-	const inputTokens = readTokenCount(usage.inputTokens);
-	const outputTokens = readTokenCount(usage.outputTokens);
-	const cacheReadInputTokens = readNestedTokenField(usage.inputTokenDetails, "cacheReadTokens") ?? readNestedTokenField(usage.inputTokens, "cacheRead") ?? readNumber(usage.cachedInputTokens);
-	const cacheCreationInputTokens = readNestedTokenField(usage.inputTokenDetails, "cacheWriteTokens") ?? readNestedTokenField(usage.inputTokens, "cacheWrite");
-	const reasoningTokens = readNestedTokenField(usage.outputTokenDetails, "reasoningTokens") ?? readNestedTokenField(usage.outputTokens, "reasoning") ?? readNumber(usage.reasoningTokens);
-	if (inputTokens === void 0 && outputTokens === void 0 && cacheReadInputTokens === void 0 && cacheCreationInputTokens === void 0 && reasoningTokens === void 0) return;
-	return {
-		...cacheCreationInputTokens !== void 0 ? { cacheCreationInputTokens } : {},
-		...cacheReadInputTokens !== void 0 ? { cacheReadInputTokens } : {},
-		...inputTokens !== void 0 ? { inputTokens } : {},
-		...outputTokens !== void 0 ? { outputTokens } : {},
-		...reasoningTokens !== void 0 ? { reasoningTokens } : {}
-	};
-}
-function timeToFirstChunkSeconds(event) {
-	const milliseconds = readNumber((typeof event.performance === "object" && event.performance !== null ? event.performance : void 0)?.timeToFirstOutputMs);
-	return milliseconds === void 0 ? void 0 : milliseconds / 1e3;
-}
-//#endregion
-//#region src/observability/ai/v7/telemetry.ts
-/**
-* Creates an AI SDK v7 `Telemetry` object that projects callback events into
-* Cloudflare-compatible GenAI spans without recording raw prompts or outputs.
-*/
-function createAISDKV7Telemetry(instrumentation) {
-	const storeMessages = instrumentation.options?.storeMessages === true;
-	const storeTools = instrumentation.options?.storeTools === true;
-	const operations = /* @__PURE__ */ new Map();
-	const modelSpans = /* @__PURE__ */ new Map();
-	const toolSpans = /* @__PURE__ */ new Map();
-	const toolSpanKey = (callId, toolCallId) => `${callId}:${toolCallId}`;
-	const finishOperation = (event) => {
-		const state = operations.get(event.callId);
-		if (!state) return;
-		finishOpenModelSpans(event.callId, void 0, modelSpans, instrumentation.tracer);
-		finishOpenToolSpans(event.callId, void 0, toolSpans, instrumentation.tracer);
-		state.span.finish(finishAttributesFromEvent(event));
-		operations.delete(event.callId);
-	};
-	return {
-		onStart(event) {
-			const operationName = supportedOperationName(operationNameFromId(event.operationId));
-			if (!operationName) return;
-			const span = operationSpan({
-				attributes: {
-					...correlationAttributes({ callId: event.callId }),
-					...runtimeContextAttributes(event.runtimeContext)
-				},
-				context: semanticContextFromEvent(event),
-				integration: "ai-sdk",
-				model: readString(event.modelId),
-				operation: operationName,
-				provider: readString(event.provider),
-				request: requestSummaryFromEvent(event, operationName)
-			});
-			const operation = instrumentation.tracer.openSpan(span.name, span.attributes, (activeSpan) => activeSpan);
-			operations.set(event.callId, {
-				callId: event.callId,
-				operationName,
-				span: operation
-			});
-		},
-		onLanguageModelCallStart(event) {
-			const state = operations.get(event.callId);
-			if (!state) return;
-			const span = modelCallSpan({
-				attributes: {
-					...correlationAttributes({ callId: event.callId }),
-					...inputMessageAttributes(event, storeMessages)
-				},
-				integration: "ai-sdk",
-				model: readString(event.modelId),
-				operation: isStreamOperation(state.operationName) ? "doStream" : "doGenerate",
-				provider: readString(event.provider),
-				request: requestSummaryFromEvent(event, state.operationName)
-			});
-			const spans = modelSpans.get(event.callId) ?? [];
-			spans.push({ spanSpec: span });
-			modelSpans.set(event.callId, spans);
-		},
-		onLanguageModelCallEnd(event) {
-			const state = shiftModelSpan(modelSpans, event.callId);
-			if (!state) return;
-			(state.span ?? instrumentation.tracer.openSpan(state.spanSpec.name, state.spanSpec.attributes, (activeSpan) => activeSpan)).finish({
-				...finishAttributesFromEvent(event, {
-					includeAIGatewayLog: true,
-					includePerformance: true,
-					includeResponse: true
-				}),
-				...outputMessageAttributes(event, storeMessages)
-			});
-		},
-		onToolExecutionStart(event) {
-			const toolCallId = readString(event.toolCall.toolCallId);
-			if (toolCallId === void 0 || !operations.has(event.callId)) return;
-			const toolName = readString(event.toolCall.toolName) ?? "tool";
-			const span = toolCallSpan({
-				integration: "ai-sdk",
-				operation: "tool.execute",
-				toolName
-			});
-			toolSpans.set(toolSpanKey(event.callId, toolCallId), {
-				callId: event.callId,
-				spanSpec: {
-					name: span.name,
-					attributes: {
-						...span.attributes,
-						...correlationAttributes({
-							callId: event.callId,
-							toolCallId
-						}),
-						...toolInputAttributes(event.toolCall.input, storeTools),
-						...toolContextAttributes(toolName, event.toolContext)
-					}
-				}
-			});
-		},
-		onToolExecutionEnd(event) {
-			const toolCallId = readString(event.toolCall.toolCallId);
-			if (toolCallId === void 0) return;
-			const state = toolSpans.get(toolSpanKey(event.callId, toolCallId));
-			if (!state) return;
-			const span = state.span ?? instrumentation.tracer.openSpan(state.spanSpec.name, state.spanSpec.attributes, (activeSpan) => activeSpan);
-			if (event.toolOutput?.type === "tool-error") span.fail(event.toolOutput.error);
-			else span.finish(toolOutputAttributes(event.toolOutput?.output, storeTools));
-			toolSpans.delete(toolSpanKey(event.callId, toolCallId));
-		},
-		onAbort(event) {
-			const cause = { name: "AbortError" };
-			finishOpenModelSpans(event.callId, cause, modelSpans, instrumentation.tracer);
-			finishOpenToolSpans(event.callId, cause, toolSpans, instrumentation.tracer);
-			const state = operations.get(event.callId);
-			if (!state) return;
-			state.span.fail(cause);
-			operations.delete(event.callId);
-		},
-		onEnd: finishOperation,
-		onError(event) {
-			const errorEvent = eventObject(event);
-			const callId = readString(errorEvent.callId);
-			if (callId === void 0) return;
-			const cause = errorEvent.error ?? event;
-			finishOpenModelSpans(callId, cause, modelSpans, instrumentation.tracer);
-			finishOpenToolSpans(callId, cause, toolSpans, instrumentation.tracer);
-			const state = operations.get(callId);
-			if (!state) return;
-			state.span.fail(cause);
-			operations.delete(callId);
-		},
-		executeLanguageModelCall(options) {
-			const state = modelSpans.get(options.callId)?.find((candidate) => candidate.span === void 0);
-			if (!state) return options.execute();
-			return instrumentation.tracer.openSpan(state.spanSpec.name, state.spanSpec.attributes, (span) => {
-				state.span = span;
-				try {
-					return Promise.resolve(options.execute()).catch((cause) => {
-						writeSpanAttributes(span, aiGatewayLogAttributes(extractAIGatewayLogId(cause)));
-						span.fail(cause);
-						removeModelState(modelSpans, options.callId, state);
-						throw cause;
-					});
-				} catch (cause) {
-					writeSpanAttributes(span, aiGatewayLogAttributes(extractAIGatewayLogId(cause)));
-					span.fail(cause);
-					removeModelState(modelSpans, options.callId, state);
-					throw cause;
-				}
-			});
-		},
-		executeTool(options) {
-			const state = toolSpans.get(toolSpanKey(options.callId, options.toolCallId));
-			if (!state) return options.execute();
-			return instrumentation.tracer.openSpan(state.spanSpec.name, state.spanSpec.attributes, (span) => {
-				state.span = span;
-				try {
-					return Promise.resolve(options.execute()).catch((cause) => {
-						span.fail(cause);
-						toolSpans.delete(toolSpanKey(options.callId, options.toolCallId));
-						throw cause;
-					});
-				} catch (cause) {
-					span.fail(cause);
-					toolSpans.delete(toolSpanKey(options.callId, options.toolCallId));
-					throw cause;
-				}
-			});
-		}
-	};
-}
-function supportedOperationName(operationName) {
-	if (operationName === "generateObject" || operationName === "generateText" || operationName === "streamObject" || operationName === "streamText") return operationName;
-}
-function isStreamOperation(operationName) {
-	return operationName === "streamObject" || operationName === "streamText";
-}
-function shiftModelSpan(spansByCallId, callId) {
-	const spans = spansByCallId.get(callId);
-	const span = spans?.shift();
-	if (spans && spans.length === 0) spansByCallId.delete(callId);
-	return span;
-}
-function removeModelState(statesByCallId, callId, state) {
-	const states = statesByCallId.get(callId);
-	if (!states) return;
-	const index = states.indexOf(state);
-	if (index !== -1) states.splice(index, 1);
-	if (states.length === 0) statesByCallId.delete(callId);
-}
-function finishOpenModelSpans(callId, cause, spansByCallId, tracer) {
-	const states = spansByCallId.get(callId);
-	if (!states) return;
-	for (const state of states) {
-		const span = state.span ?? tracer.openSpan(state.spanSpec.name, state.spanSpec.attributes, (activeSpan) => activeSpan);
-		if (cause === void 0) span.finish();
-		else span.fail(cause);
-	}
-	spansByCallId.delete(callId);
-}
-function finishOpenToolSpans(callId, cause, spansByToolCallId, tracer) {
-	for (const [toolCallId, state] of spansByToolCallId) {
-		if (state.callId !== callId) continue;
-		const span = state.span ?? tracer.openSpan(state.spanSpec.name, state.spanSpec.attributes, (activeSpan) => activeSpan);
-		if (cause === void 0) span.finish();
-		else span.fail(cause);
-		spansByToolCallId.delete(toolCallId);
-	}
-}
-function eventObject(event) {
-	return typeof event === "object" && event !== null ? event : {};
-}
-const SEMANTIC_CONTEXT_KEYS = /* @__PURE__ */ new Set([
-	"agentId",
-	"agentName",
-	"agentVersion",
-	"conversationId",
-	"gen_ai.agent.id",
-	"gen_ai.agent.name",
-	"gen_ai.agent.version",
-	"gen_ai.conversation.id"
-]);
-function runtimeContextAttributes(runtimeContextValue) {
-	const attributes = {};
-	const runtimeContext = recordValue(runtimeContextValue);
-	for (const [key, value] of Object.entries(runtimeContext ?? {})) if (!SEMANTIC_CONTEXT_KEYS.has(key) && isScalarAttributeValue(value)) attributes[key.startsWith("cloudflare.agents.") ? key : `cloudflare.agents.runtime_context.${key}`] = value;
-	return attributes;
-}
-function toolContextAttributes(toolName, toolContextValue) {
-	const attributes = {};
-	const toolContext = recordValue(toolContextValue);
-	for (const [key, value] of Object.entries(toolContext ?? {})) if (isScalarAttributeValue(value)) attributes[`cloudflare.agents.tool_context.${toolName}.${key}`] = value;
-	return attributes;
-}
-function recordValue(value) {
-	return typeof value === "object" && value !== null ? value : void 0;
-}
-function isScalarAttributeValue(value) {
-	return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
-}
-//#endregion
 //#region src/observability/ai/index.ts
-const agentsAISDKTelemetryBrand = Symbol.for("cloudflare.agents.ai-sdk-telemetry");
 /**
 * Wraps an AI SDK namespace with tracing.
 */
 function wrapAISDK(ai, options = {}) {
-	return createAISDKV6Wrapper(ai, {
-		options,
-		tracer
-	});
-}
-/**
-* Creates an AI SDK v7 telemetry adapter for use with `registerTelemetry` or
-* per-call telemetry configuration.
-*/
-function createAISDKTelemetry(options = {}) {
-	const telemetry = createAISDKV7Telemetry({
+	return createAISDKWrapper(ai, {
 		options,
 		tracer
 	});
-	Object.defineProperty(telemetry, agentsAISDKTelemetryBrand, { value: true });
-	return telemetry;
 }
 //#endregion
-export { createAISDKTelemetry, wrapAISDK };
+export { wrapAISDK };
 
 //# sourceMappingURL=index.js.map