@lmnr-ai/lmnr 0.8.37 → 0.8.38

package/dist/index.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
-const require_dist = require("./dist-muQLQb9o.cjs");
+const require_dist = require("./dist-DGDsKbQ8.cjs");
 const require_consts = require("./consts-DV6_Ea-8.cjs");
 let _opentelemetry_api = require("@opentelemetry/api");
 let _opentelemetry_context_async_hooks = require("@opentelemetry/context-async-hooks");
@@ -19,7 +19,6 @@ let _traceloop_instrumentation_openai = require("@traceloop/instrumentation-open
 let _traceloop_instrumentation_pinecone = require("@traceloop/instrumentation-pinecone");
 let _traceloop_instrumentation_qdrant = require("@traceloop/instrumentation-qdrant");
 let _traceloop_instrumentation_together = require("@traceloop/instrumentation-together");
-let _traceloop_instrumentation_vertexai = require("@traceloop/instrumentation-vertexai");
 let node_child_process = require("node:child_process");
 let node_crypto = require("node:crypto");
 let node_fs = require("node:fs");
@@ -95,7 +94,7 @@ var LaminarDataset = class extends EvaluationDataset {
 	*/
 	async push(paths, recursive = false) {
 		if (!this.client) throw new Error("Client not set");
-		const { loadFromPaths } = await Promise.resolve().then(() => require("./file-utils-C0oHtdus.cjs")).then((n) => n.file_utils_exports);
+		const { loadFromPaths } = await Promise.resolve().then(() => require("./file-utils-wA-Z77kv.cjs")).then((n) => n.file_utils_exports);
 		const data = await loadFromPaths(Array.isArray(paths) ? paths : [paths], recursive);
 		if (data.length === 0) {
 			console.warn("No data to push. Skipping");
@@ -167,7 +166,10 @@ const stringifyPromptForTelemetry = (prompt) => JSON.stringify(prompt.map((messa
 	...message,
 	content: typeof message.content === "string" ? message.content : message.content.map((part) => part.type === "file" ? {
 		...part,
-		data: part.data instanceof Uint8Array ? convertDataContentToBase64String(part.data) : part.data
+		data: part.data instanceof Uint8Array ? convertDataContentToBase64String(part.data) : part.data && typeof part.data === "object" && part.data.type === "data" && part.data.data instanceof Uint8Array ? {
+			...part.data,
+			data: convertDataContentToBase64String(part.data.data)
+		} : part.data
 	} : part)
 })));
 /**
@@ -6238,8 +6240,6 @@ const initInstrumentations = (client, suppressContentTracing, sessionRecordingOp
 	}));
 	instrumentations.push(new _traceloop_instrumentation_anthropic.AnthropicInstrumentation({ traceContent: !suppressContentTracing }));
 	instrumentations.push(new _traceloop_instrumentation_cohere.CohereInstrumentation({ traceContent: !suppressContentTracing }));
-	instrumentations.push(new _traceloop_instrumentation_vertexai.VertexAIInstrumentation({ traceContent: !suppressContentTracing }));
-	instrumentations.push(new _traceloop_instrumentation_vertexai.AIPlatformInstrumentation({ traceContent: !suppressContentTracing }));
 	instrumentations.push(new _traceloop_instrumentation_bedrock.BedrockInstrumentation({ traceContent: !suppressContentTracing }));
 	instrumentations.push(new _traceloop_instrumentation_pinecone.PineconeInstrumentation());
 	instrumentations.push(new _traceloop_instrumentation_langchain.LangChainInstrumentation({ traceContent: !suppressContentTracing }));
@@ -6291,16 +6291,6 @@ const manuallyInitInstrumentations = (client, instrumentModules, suppressContent
 		instrumentations.push(cohereInstrumentation);
 		cohereInstrumentation.manuallyInstrument(instrumentModules.cohere);
 	}
-	if (instrumentModules?.google_vertexai) {
-		const vertexaiInstrumentation = new _traceloop_instrumentation_vertexai.VertexAIInstrumentation({ traceContent: !suppressContentTracing });
-		instrumentations.push(vertexaiInstrumentation);
-		vertexaiInstrumentation.manuallyInstrument(instrumentModules.google_vertexai);
-	}
-	if (instrumentModules?.google_aiplatform) {
-		const aiplatformInstrumentation = new _traceloop_instrumentation_vertexai.AIPlatformInstrumentation({ traceContent: !suppressContentTracing });
-		instrumentations.push(aiplatformInstrumentation);
-		aiplatformInstrumentation.manuallyInstrument(instrumentModules.google_aiplatform);
-	}
 	if (instrumentModules?.bedrock) {
 		const bedrockInstrumentation = new _traceloop_instrumentation_bedrock.BedrockInstrumentation({ traceContent: !suppressContentTracing });
 		instrumentations.push(bedrockInstrumentation);
@@ -7325,260 +7315,6 @@ async function evaluate({ data, executor, evaluators, groupName, name, metadata,
 	else return await evaluation.run();
 }
 //#endregion
-//#region src/debug/aisdk-normalize.ts
-const isRecord = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
-/** Mirror Rust `is_url`. */
-const isUrl = (data) => data.startsWith("http://") || data.startsWith("https://") || data.startsWith("data:");
-/** Mirror Rust `infer_image_type`. */
-const inferImageType = (base64) => {
-	if (base64.startsWith("/9j/")) return "image/jpeg";
-	if (base64.startsWith("iVBORw0KGgo")) return "image/png";
-	if (base64.startsWith("R0lGODlh")) return "image/gif";
-	if (base64.startsWith("UklGR")) return "image/webp";
-	if (base64.startsWith("PHN2Zz")) return "image/svg+xml";
-	return "image/png";
-};
-const base64FromBytes = (bytes) => {
-	let latin1 = "";
-	for (const b of bytes) latin1 += String.fromCharCode(b & 255);
-	return btoa(latin1);
-};
-/**
-* Mirror Rust `json_value_to_string`: a JSON string stays itself; anything else
-* is compact-serialized. With serde `preserve_order` on, `JSON.stringify` matches
-* `serde_json::Value::to_string()` byte-for-byte for object key order.
-*/
-const jsonValueToString = (value) => typeof value === "string" ? value : JSON.stringify(value);
-/** First string among the candidates (ports serde field aliases). */
-const firstString = (...candidates) => {
-	for (const c of candidates) if (typeof c === "string") return c;
-};
-/**
-* Port of `InstrumentationChatMessageImage` (untagged) →
-* `from_instrumentation_content_part`'s `Image` arm. Returns the output
-* `ChatMessageContentPart` object, or `null` if no untagged variant matches.
-*/
-const parseImage = (e) => {
-	if (isRecord(e.source)) {
-		const src = e.source;
-		if (typeof src.media_type === "string" && typeof src.data === "string") return {
-			type: "image",
-			mediaType: src.media_type,
-			data: src.data
-		};
-		if (typeof src.url === "string") return {
-			type: "image_url",
-			url: src.url,
-			detail: typeof src.detail === "string" ? src.detail : null
-		};
-	}
-	if (Array.isArray(e.image) && e.image.every((n) => typeof n === "number")) {
-		const b64 = base64FromBytes(e.image);
-		return {
-			type: "image_url",
-			url: `data:${typeof e.mime_type === "string" ? e.mime_type : inferImageType(b64)};base64,${b64}`,
-			detail: null
-		};
-	}
-	if (typeof e.image === "string") {
-		if (isUrl(e.image)) return {
-			type: "image_url",
-			url: e.image,
-			detail: null
-		};
-		return {
-			type: "image",
-			data: e.image,
-			mediaType: typeof e.mime_type === "string" ? e.mime_type : "image/png"
-		};
-	}
-	return null;
-};
-/** Port of the `Document` arm (only the Base64 source shape exists). */
-const parseDocument = (e) => {
-	if (!isRecord(e.source) || e.source.type !== "base64") return null;
-	const data = e.source.data;
-	if (typeof data !== "string") return null;
-	return {
-		type: "document",
-		source: {
-			type: "base64",
-			media_type: firstString(e.source.media_type, e.source.mediaType) ?? "application/octet-stream",
-			data
-		}
-	};
-};
-const DATA_URL_RE = /^data:((?:application|image)\/[a-zA-Z-]+);base64,/;
-/**
-* Port of the `File` arm (OpenAI file-id / base64, AI SDK v1/v2).
-*
-* Known parity gap (v7 + image-by-URL only): on AI SDK v7 the recording path
-* stores `ai.prompt.messages` from the user-facing `ModelMessage[]` (an image
-* passed by URL is a `{type:"image", image:"https://…"}` part), which the
-* server reshapes via `parseImage` into an `image_url`. Replay instead hashes
-* the LanguageModel-level prompt, where that same image is already a
-* `{type:"file", data:"https://…", mediaType:"image/*"}` part — this arm maps
-* it to `image`, not `image_url`, so the two hashes diverge and the lookup
-* MISSes (degrading safely to a live call). This can't be reconciled here: the
-* arm is a faithful port of the server's Rust `parseFile`, so on v6 (where the
-* server itself reshapes a file part) emitting `image_url` would instead BREAK
-* parity, and the replay wrapper has no signal for which SDK version recorded
-* the span. Plain text, multi-part text, tool calls, and base64 images all hash
-* identically across both paths; only URL-referenced images on v7 are affected.
-*/
-const parseFile = (e) => {
-	if (isRecord(e.file)) {
-		const file = e.file;
-		if (typeof file.file_id === "string") return {
-			type: "text",
-			text: JSON.stringify({ file_id: file.file_id })
-		};
-		if (typeof file.file_data === "string") {
-			const m = DATA_URL_RE.exec(file.file_data.slice(0, 50));
-			return {
-				type: "document",
-				source: {
-					type: "base64",
-					media_type: m ? m[1] : "application/octet-stream",
-					data: m ? file.file_data.slice(file.file_data.indexOf(",") + 1) : file.file_data
-				}
-			};
-		}
-		return null;
-	}
-	if (typeof e.data === "string") {
-		const mediaType = firstString(e.media_type, e.mediaType, e.mime_type);
-		if (mediaType === void 0) return null;
-		if (mediaType.startsWith("image/")) return {
-			type: "image",
-			data: e.data,
-			mediaType
-		};
-		return {
-			type: "document",
-			source: {
-				type: "base64",
-				media_type: mediaType,
-				data: e.data
-			}
-		};
-	}
-	return null;
-};
-/**
-* Port of `serde_json::from_value::<InstrumentationChatMessageContentPart>` for a
-* single part, returning the mapped output `ChatMessageContentPart` object or
-* `null` when no variant matches (an unrecognized `type`, or a recognized tag
-* whose inner shape fails). `null` propagates to an all-or-nothing Text fallback.
-*
-* Output objects carry serde's serialized field names; `skip_serializing_if` is
-* reproduced by omitting the field (ChatMessage.tool_call_id only), and `Option`
-* fields WITHOUT skip (`detail`, tool-call `id`/`arguments`) always emit `null`.
-*/
-const parsePart = (el) => {
-	if (!isRecord(el)) return null;
-	switch (el.type) {
-		case "text": {
-			const text = firstString(el.text, el.input_text, el.output_text);
-			return text === void 0 ? null : {
-				type: "text",
-				text
-			};
-		}
-		case "image_url": {
-			if (!isRecord(el.image_url) || typeof el.image_url.url !== "string") return null;
-			const detail = el.image_url.detail;
-			return {
-				type: "image_url",
-				url: el.image_url.url,
-				detail: typeof detail === "string" ? detail : null
-			};
-		}
-		case "image": return parseImage(el);
-		case "document": return parseDocument(el);
-		case "file": return parseFile(el);
-		case "tool-call": {
-			if (typeof el.toolName !== "string") return null;
-			const rawInput = "input" in el ? el.input : el.args;
-			return {
-				type: "tool_call",
-				name: el.toolName,
-				id: typeof el.toolCallId === "string" ? el.toolCallId : null,
-				arguments: rawInput === void 0 || rawInput === null ? null : rawInput
-			};
-		}
-		case "tool-result":
-			if (typeof el.toolCallId !== "string" || typeof el.toolName !== "string") return null;
-			if (!("output" in el || "result" in el)) return null;
-			return {
-				type: "tool-result",
-				toolCallId: el.toolCallId,
-				output: "output" in el ? el.output : el.result,
-				toolName: el.toolName
-			};
-		default: return null;
-	}
-};
-/**
-* Port of `input_chat_messages_from_json`. `input` is the parsed
-* `ai.prompt.messages` array. Each message's `content` becomes either a
-* `ContentPartList` (when EVERY element parses as an instrumentation part) or a
-* Text blob (`json_value_to_string` of the whole content) otherwise. A message
-* missing `role`/`content` would be a server error; we skip it defensively so the
-* hash is still computed over the well-formed remainder.
-*/
-const inputChatMessagesFromJson = (input) => {
-	if (!Array.isArray(input)) return [];
-	const messages = [];
-	for (const message of input) {
-		if (!isRecord(message)) continue;
-		const role = message.role;
-		if (typeof role !== "string" || !("content" in message)) continue;
-		const otelContent = message.content;
-		let parts = null;
-		if (Array.isArray(otelContent)) {
-			parts = [];
-			for (const el of otelContent) {
-				const parsed = parsePart(el);
-				if (parsed === null) {
-					parts = null;
-					break;
-				}
-				parts.push(parsed);
-			}
-		}
-		const out = {
-			role,
-			content: parts !== null ? parts : jsonValueToString(otelContent)
-		};
-		if (typeof message.tool_call_id === "string") out.tool_call_id = message.tool_call_id;
-		messages.push(out);
-	}
-	return messages;
-};
-/**
-* Reshape an AI SDK call's `options.prompt` into the reconstructed message array
-* the server hashes. Version-agnostic: `stringifyPromptForTelemetry` already
-* normalizes V2/V3/V4 prompts (Uint8Array file `data` → base64) into the stored
-* `ai.prompt.messages` JSON, and the reshape operates on that JSON identically
-* across versions.
-*
-* Returns `null` when the prompt cannot be reshaped at all (a `stringify` /
-* `JSON.parse` failure). The caller MUST treat `null` as "can't compute a real
-* key" and degrade to a live call WITHOUT latching: hashing a default/empty
-* payload here would key the lookup off the wrong bytes, force a spurious MISS,
-* and wrongly latch live mode for the rest of the replay.
-*/
-const extractInputMessages = (options) => {
-	let aiPromptMessages;
-	try {
-		aiPromptMessages = JSON.parse(stringifyPromptForTelemetry(options.prompt));
-	} catch {
-		return null;
-	}
-	return inputChatMessagesFromJson(aiPromptMessages);
-};
-//#endregion
 //#region src/debug/hash.ts
 /**
 * Debug-replay input hashing.
@@ -7586,13 +7322,13 @@ const extractInputMessages = (options) => {
 * Computes the per-LLM-call `input_hash` the server-side debugger cache (v2) is
 * keyed by. The SDK and the Rust app-server MUST produce byte-identical hashes,
 * so this is a faithful port of the app-server primitives:
-*   - `canonical_json`        — `app-server/src/traces/input_dedup.rs`
-*   - `extract_system_message`— `app-server/src/traces/prompt_hash.rs`
-*   - `debug_input_hash`      — `app-server/src/traces/debug_cache.rs` (plan 01 §3)
+*   - `canonical_json`     — `app-server/src/traces/input_dedup.rs`
+*   - `debug_input_hash`   — `app-server/src/traces/input_dedup.rs`
 *
-* The whole non-system message array is hashed as ONE blob: strip the first
-* `role === "system"` message (when its text is non-empty), canonicalize the
-* remaining array, then blake3 over its UTF-8 bytes and hex-encode the digest.
+* The whole non-system message array is hashed as ONE blob: strip EVERY
+* `role === "system"` message (regardless of content or position), canonicalize
+* the remaining array, then blake3 over its UTF-8 bytes and hex-encode the
+* digest.
 *
 * Keep this file line-comparable with the Python `debug/hash.py`.
 */
@@ -7613,53 +7349,25 @@ const canonicalJson = (value) => {
 	return JSON.stringify(value);
 };
 /**
-* Extract the system prompt text from a system-role message, or "" when none.
+* Drop EVERY `role === "system"` message, matching the server.
 *
-* Faithful port of Rust `extract_system_message`'s text resolution: a plain
-* string content, else an array of `{text}` blocks joined by a space (only when
-* the join is non-empty), else `parts[0].text` / `parts[0].content`.
+* Content and position are irrelevant: an empty system string, a block-array
+* system, or repeated/trailing system messages are all stripped. The coding
+* agent may add/remove/edit its own system prompt(s) between iterations and
+* those edits must not change the cache key.
 */
-const systemMessageText = (sysMsg) => {
-	const content = sysMsg.content;
-	if (typeof content === "string") return content;
-	if (Array.isArray(content)) {
-		const joined = content.map((block) => block !== null && typeof block === "object" ? block.text : void 0).filter((t) => typeof t === "string").join(" ");
-		if (joined.length > 0) return joined;
-	}
-	const parts = sysMsg.parts;
-	if (Array.isArray(parts) && parts.length > 0) {
-		const first = parts[0];
-		if (first !== null && typeof first === "object") {
-			const f = first;
-			const t = typeof f.text === "string" ? f.text : f.content;
-			if (typeof t === "string") return t;
-		}
-	}
-	return "";
-};
+const stripSystemMessages = (messages) => messages.filter((m) => !(m !== null && typeof m === "object" && m.role === "system"));
 /**
-* Drop the first `role === "system"` message, matching the server.
+* Compute the hex blake3 `input_hash` for a message array.
 *
-* Returns the array unchanged when there is no system message OR when the system
-* message's resolved text is empty (Rust `extract_system_message` returns `None`
-* in both cases, leaving the system message in the hashed array).
-*/
-const stripSystemMessage = (messages) => {
-	const sysIdx = messages.findIndex((m) => m !== null && typeof m === "object" && m.role === "system");
-	if (sysIdx === -1) return messages;
-	if (systemMessageText(messages[sysIdx]).length === 0) return messages;
-	return messages.filter((_, i) => i !== sysIdx);
-};
-/**
-* Compute the hex blake3 `input_hash` for a reconstructed message array.
-*
-* `messages` must already be the server's reconstructed shape (the SDK reshapes
-* provider-specific prompts via `aisdk-normalize.ts` so the hashed bytes match
-* what `spans_v0` stores). The system message is stripped, the remainder
-* canonicalized, and the digest hex-encoded (64 chars).
+* `messages` is the verbatim LanguageModel-level prompt
+* (`JSON.parse(stringifyPromptForTelemetry(options.prompt))`) — the same bytes
+* the SDK records as `gen_ai.input.messages` and the server hashes on ingest.
+* System messages are stripped, the remainder canonicalized, and the digest
+* hex-encoded (64 chars).
 */
 const debugInputHash = (messages) => {
-	const canonical = canonicalJson(stripSystemMessage(messages));
+	const canonical = canonicalJson(stripSystemMessages(messages));
 	return (0, _noble_hashes_utils_js.bytesToHex)((0, _noble_hashes_blake3_js.blake3)(new TextEncoder().encode(canonical)));
 };
 //#endregion
@@ -7719,6 +7427,107 @@ const removeActiveLlmSpan = (span) => {
 /** Most recently pushed still-open LLM span, or undefined if none. */
 const peekActiveLlmSpan = () => openLlmSpans.length > 0 ? openLlmSpans[openLlmSpans.length - 1] : void 0;
 //#endregion
+//#region src/opentelemetry-lib/instrumentation/aisdk/v7-integration/utils.ts
+const serializeJSON$1 = (value) => {
+	if (typeof value === "string") return value;
+	try {
+		return JSON.stringify(value);
+	} catch {
+		return "[unserializable]";
+	}
+};
+const normalizeProvider$1 = (provider) => {
+	if (!provider) return void 0;
+	return provider.split(".").shift()?.toLowerCase().trim() || provider.toLowerCase().trim() || void 0;
+};
+const applyUsage = (attributes, usage) => {
+	if (!usage || typeof usage !== "object") return;
+	if (typeof usage.inputTokens === "number") attributes[require_dist.LaminarAttributes.INPUT_TOKEN_COUNT] = usage.inputTokens;
+	if (typeof usage.outputTokens === "number") attributes[require_dist.LaminarAttributes.OUTPUT_TOKEN_COUNT] = usage.outputTokens;
+	if (typeof usage.totalTokens === "number") attributes[require_dist.LaminarAttributes.TOTAL_TOKEN_COUNT] = usage.totalTokens;
+	else if (typeof usage.inputTokens === "number" || typeof usage.outputTokens === "number") attributes[require_dist.LaminarAttributes.TOTAL_TOKEN_COUNT] = (usage.inputTokens ?? 0) + (usage.outputTokens ?? 0);
+	if (typeof usage.reasoningTokens === "number") attributes["gen_ai.usage.reasoning_tokens"] = usage.reasoningTokens;
+	else if (typeof usage.outputTokenDetails?.reasoningTokens === "number") attributes["gen_ai.usage.reasoning_tokens"] = usage.outputTokenDetails.reasoningTokens;
+	if (typeof usage.cachedInputTokens === "number") attributes["gen_ai.usage.cache_read_input_tokens"] = usage.cachedInputTokens;
+	else if (typeof usage.inputTokenDetails?.cacheReadTokens === "number") attributes["gen_ai.usage.cache_read_input_tokens"] = usage.inputTokenDetails.cacheReadTokens;
+	if (typeof usage.inputTokenDetails?.cacheWriteTokens === "number") attributes["gen_ai.usage.cache_creation_input_tokens"] = usage.inputTokenDetails.cacheWriteTokens;
+};
+const verbatimStandardizedMessages = (event) => {
+	const messages = [];
+	const sys = event.instructions || event.system;
+	if (typeof sys === "string" && sys.length > 0) messages.push({
+		role: "system",
+		content: sys
+	});
+	else if (Array.isArray(sys)) for (const m of sys) messages.push(m);
+	else if (sys && typeof sys === "object") messages.push(sys);
+	if (Array.isArray(event.messages)) for (const m of event.messages) messages.push(m);
+	return messages;
+};
+const buildVerbatimOutputMessages = (content) => {
+	if (!Array.isArray(content) || content.length === 0) return void 0;
+	try {
+		return JSON.stringify([{
+			role: "assistant",
+			content
+		}]);
+	} catch {
+		return;
+	}
+};
+const buildTextOutputMessages = (text) => text.length > 0 ? buildVerbatimOutputMessages([{
+	type: "text",
+	text
+}]) : void 0;
+const applyUsageToSpan = (span, usage) => {
+	const attrs = {};
+	applyUsage(attrs, usage);
+	for (const [k, v] of Object.entries(attrs)) if (v !== void 0) span.setAttribute(k, v);
+};
+const applyFinishReason = (span, finishReason) => {
+	span.setAttribute("gen_ai.response.finish_reason", finishReason);
+	span.setAttribute("ai.response.finishReason", finishReason);
+};
+const applyRequestModelAttributes = (span, event) => {
+	if (typeof event.provider === "string") {
+		const provider = normalizeProvider$1(event.provider);
+		if (provider) span.setAttribute(require_dist.LaminarAttributes.PROVIDER, provider);
+		span.setAttribute("ai.model.provider", event.provider);
+	}
+	if (typeof event.modelId === "string") {
+		span.setAttribute(require_dist.LaminarAttributes.REQUEST_MODEL, event.modelId);
+		span.setAttribute("ai.model.id", event.modelId);
+	}
+};
+const compareHrTime = (a, b) => {
+	if (a[0] !== b[0]) return a[0] - b[0];
+	return a[1] - b[1];
+};
+const readSpanEndTime = (span) => {
+	const innerEnd = span._span?.endTime;
+	if (innerEnd && (innerEnd[0] !== 0 || innerEnd[1] !== 0)) return innerEnd;
+	const outerEnd = span.endTime;
+	if (outerEnd && (outerEnd[0] !== 0 || outerEnd[1] !== 0)) return outerEnd;
+};
+const verbatimPromptString = (prompt) => {
+	try {
+		const serialized = stringifyPromptForTelemetry(prompt);
+		return typeof serialized === "string" ? serialized : null;
+	} catch {
+		return null;
+	}
+};
+const verbatimPromptMessages = (prompt) => {
+	const serialized = verbatimPromptString(prompt);
+	if (serialized === null) return null;
+	try {
+		const parsed = JSON.parse(serialized);
+		return Array.isArray(parsed) ? parsed : null;
+	} catch {
+		return null;
+	}
+};
+//#endregion
 //#region src/opentelemetry-lib/instrumentation/aisdk/base-language-model.ts
 /**
 * Base class for Laminar language model wrappers.
@@ -7761,7 +7570,7 @@ var BaseLaminarLanguageModel = class {
 	async doGenerateOrStreamWithCaching(options, originalFn, buildFromCached) {
 		if (!replayEnabled() || Laminar.debugRunLive) return originalFn(options);
 		const spanToMark = peekActiveLlmSpan() ?? Laminar.getCurrentSpan();
-		const messages = extractInputMessages(options);
+		const messages = verbatimPromptMessages(options.prompt);
 		if (messages === null || messages.length === 0) return originalFn(options);
 		const inputHash = debugInputHash(messages);
 		const outcome = await getRuntime()?.lookupCache(inputHash) ?? { kind: "live" };
@@ -7809,17 +7618,45 @@ var BaseLaminarLanguageModel = class {
 		}];
 		if (output === null || typeof output !== "object") return [];
 		const handleItem = (item) => {
-			if (item.type === "text") return [{
-				type: "text",
-				text: item.text ?? item.content ?? ""
-			}];
-			if (["tool-call", "tool_call"].includes(item.type)) return [{
+			if (item.type === "text") {
+				if (typeof item.text === "string") return [{
+					...item,
+					type: "text",
+					text: item.text
+				}];
+				return [{
+					type: "text",
+					text: item.content ?? ""
+				}];
+			}
+			if (item.type === "tool-call") return [{
+				...item,
 				type: "tool-call",
 				toolCallId: item.toolCallId ?? item.id,
 				toolName: item.toolName ?? item.name,
-				input: JSON.stringify(item.input ?? item.arguments)
+				input: typeof item.input === "string" ? item.input : JSON.stringify(item.input ?? item.arguments)
 			}];
-			if (["reasoning", "thinking"].includes(item.type)) return [{
+			if (item.type === "tool_call") {
+				const rawInput = item.input ?? item.arguments;
+				return [{
+					type: "tool-call",
+					toolCallId: item.toolCallId ?? item.id,
+					toolName: item.toolName ?? item.name,
+					input: typeof rawInput === "string" ? rawInput : JSON.stringify(rawInput)
+				}];
+			}
+			if (item.type === "reasoning") {
+				if (typeof item.text === "string") return [{
+					...item,
+					type: "reasoning",
+					text: item.text
+				}];
+				return [{
+					type: "reasoning",
+					text: item.content ?? ""
+				}];
+			}
+			if (item.type === "thinking") return [{
 				type: "reasoning",
 				text: item.text ?? item.content ?? ""
 			}];
@@ -7885,7 +7722,8 @@ var LaminarLanguageModelV2 = class extends BaseLaminarLanguageModel {
 			const id = `text-${textIndex++}`;
 			parts.push({
 				type: "text-start",
-				id
+				id,
+				providerMetadata: block.providerMetadata
 			});
 			parts.push({
 				type: "text-delta",
@@ -7913,16 +7751,15 @@ var LaminarLanguageModelV2 = class extends BaseLaminarLanguageModel {
 				id
 			});
 			parts.push({
-				type: "tool-call",
-				toolCallId: block.toolCallId,
-				toolName: block.toolName,
-				input: block.input
+				...block,
+				type: "tool-call"
 			});
 		} else if (block.type === "reasoning") {
 			const id = `reasoning-${reasoningIndex++}`;
 			parts.push({
 				type: "reasoning-start",
-				id
+				id,
+				providerMetadata: block.providerMetadata
 			});
 			parts.push({
 				type: "reasoning-delta",
@@ -7987,7 +7824,8 @@ var LaminarLanguageModelV3 = class extends BaseLaminarLanguageModel {
 			const id = `text-${textIndex++}`;
 			parts.push({
 				type: "text-start",
-				id
+				id,
+				providerMetadata: block.providerMetadata
 			});
 			parts.push({
 				type: "text-delta",
@@ -8015,16 +7853,15 @@ var LaminarLanguageModelV3 = class extends BaseLaminarLanguageModel {
 				id
 			});
 			parts.push({
-				type: "tool-call",
-				toolCallId: block.toolCallId,
-				toolName: block.toolName,
-				input: block.input
+				...block,
+				type: "tool-call"
 			});
 		} else if (block.type === "reasoning") {
 			const id = `reasoning-${reasoningIndex++}`;
 			parts.push({
 				type: "reasoning-start",
-				id
+				id,
+				providerMetadata: block.providerMetadata
 			});
 			parts.push({
 				type: "reasoning-delta",
@@ -8089,7 +7926,8 @@ var LaminarLanguageModelV4 = class extends BaseLaminarLanguageModel {
 			const id = `text-${textIndex++}`;
 			parts.push({
 				type: "text-start",
-				id
+				id,
+				providerMetadata: block.providerMetadata
 			});
 			parts.push({
 				type: "text-delta",
@@ -8117,16 +7955,15 @@ var LaminarLanguageModelV4 = class extends BaseLaminarLanguageModel {
 				id
 			});
 			parts.push({
-				type: "tool-call",
-				toolCallId: block.toolCallId,
-				toolName: block.toolName,
-				input: block.input
+				...block,
+				type: "tool-call"
 			});
 		} else if (block.type === "reasoning") {
 			const id = `reasoning-${reasoningIndex++}`;
 			parts.push({
 				type: "reasoning-start",
-				id
+				id,
+				providerMetadata: block.providerMetadata
 			});
 			parts.push({
 				type: "reasoning-delta",
@@ -8206,136 +8043,94 @@ function wrapLanguageModel(languageModel) {
 	return new LaminarLanguageModelV2(languageModel);
 }
 //#endregion
-//#region src/opentelemetry-lib/instrumentation/aisdk/v7-integration/types.ts
-const stepKey = (callId, stepNumber) => `${callId}:${stepNumber}`;
-//#endregion
-//#region src/opentelemetry-lib/instrumentation/aisdk/v7-integration/utils.ts
-const serializeJSON$1 = (value) => {
-	if (typeof value === "string") return value;
+//#region src/opentelemetry-lib/instrumentation/aisdk/v7-integration/package-versions.ts
+let cached;
+const readPackageVersion = (specifier) => {
 	try {
-		return JSON.stringify(value);
+		const pkg = require(`${specifier}/package.json`);
+		return typeof pkg?.version === "string" ? pkg.version : void 0;
 	} catch {
-		return "[unserializable]";
+		return;
 	}
 };
-const normalizeProvider$1 = (provider) => {
-	if (!provider) return void 0;
-	return provider.split(".").shift()?.toLowerCase().trim() || provider.toLowerCase().trim() || void 0;
-};
-const applyUsage = (attributes, usage) => {
-	if (!usage || typeof usage !== "object") return;
-	if (typeof usage.inputTokens === "number") attributes[require_dist.LaminarAttributes.INPUT_TOKEN_COUNT] = usage.inputTokens;
-	if (typeof usage.outputTokens === "number") attributes[require_dist.LaminarAttributes.OUTPUT_TOKEN_COUNT] = usage.outputTokens;
-	if (typeof usage.totalTokens === "number") attributes[require_dist.LaminarAttributes.TOTAL_TOKEN_COUNT] = usage.totalTokens;
-	else if (typeof usage.inputTokens === "number" || typeof usage.outputTokens === "number") attributes[require_dist.LaminarAttributes.TOTAL_TOKEN_COUNT] = (usage.inputTokens ?? 0) + (usage.outputTokens ?? 0);
-	if (typeof usage.reasoningTokens === "number") attributes["gen_ai.usage.reasoning_tokens"] = usage.reasoningTokens;
-	else if (typeof usage.outputTokenDetails?.reasoningTokens === "number") attributes["gen_ai.usage.reasoning_tokens"] = usage.outputTokenDetails.reasoningTokens;
-	if (typeof usage.cachedInputTokens === "number") attributes["gen_ai.usage.cache_read_input_tokens"] = usage.cachedInputTokens;
-	else if (typeof usage.inputTokenDetails?.cacheReadTokens === "number") attributes["gen_ai.usage.cache_read_input_tokens"] = usage.inputTokenDetails.cacheReadTokens;
-	if (typeof usage.inputTokenDetails?.cacheWriteTokens === "number") attributes["gen_ai.usage.cache_creation_input_tokens"] = usage.inputTokenDetails.cacheWriteTokens;
-};
-const standardizedPromptToMessages = (event) => {
-	const messages = [];
-	const sys = event.instructions || event.system;
-	if (typeof sys === "string" && sys.length > 0) messages.push({
-		role: "system",
-		content: sys
-	});
-	else if (Array.isArray(sys)) for (const m of sys) messages.push(m);
-	else if (sys && typeof sys === "object") messages.push(sys);
-	if (Array.isArray(event.messages)) for (const m of event.messages) messages.push(convertRawStringTextToTextBlock(m));
-	return messages;
-};
-const convertRawStringTextToTextBlock = (m) => ({
-	...m,
-	content: typeof m?.content === "string" ? [{
-		type: "text",
-		text: m.content
-	}] : m?.content
-});
-const normalizeToolCalls = (toolCalls) => {
-	if (!Array.isArray(toolCalls)) return [];
-	return toolCalls.map((tc) => ({
-		toolCallType: "function",
-		toolCallId: tc?.toolCallId,
-		toolName: tc?.toolName,
-		args: typeof tc?.input === "string" ? tc.input : serializeJSON$1(tc?.input ?? {})
-	}));
-};
-const buildGenAiOutputMessages = (args) => {
-	const parts = [];
-	if (args.reasoningText && args.reasoningText.length > 0) parts.push({
-		type: "thinking",
-		content: args.reasoningText
-	});
-	if (args.text && args.text.length > 0) parts.push({
-		type: "text",
-		content: args.text
-	});
-	for (const tc of args.toolCalls ?? []) {
-		let argsObj = tc.args;
-		if (typeof argsObj === "string") try {
-			argsObj = JSON.parse(argsObj);
+/**
+* A `node_modules` search-path entry is a package-manager-internal virtual
+* store (pnpm's `.pnpm`, yarn's `.yarn`, etc.) if any path segment starts
+* with `.` — excluding the `.`/`..` relative-path segments themselves, which
+* are unrelated. Packages resolved from inside such a store are some
+* dependency's OWN transitive deps (e.g. `ai`'s `@ai-sdk/provider`), not
+* what the host project declared, so those entries must be skipped.
+*/
+const isPackageManagerInternalPath = (path) => path.split(node_path.sep).some((segment) => segment.startsWith(".") && segment !== "." && segment !== "..");
+/**
+* Given the ordered `node_modules` search-path list Node would use to
+* resolve a module from this file's location, find the closest directory
+* that actually has an `@ai-sdk` scope — skipping package-manager-internal
+* stores — and return the packages listed under it. The first path with a
+* usable `@ai-sdk` directory wins; levels are not merged, so an unrelated
+* ancestor/monorepo-root's `@ai-sdk` scope is never mixed in once a closer
+* one has already matched.
+*/
+const findAiSdkScopeEntries = (searchPaths) => {
+	for (const path of searchPaths) {
+		if (isPackageManagerInternalPath(path)) continue;
+		try {
+			const entries = (0, node_fs.readdirSync)((0, node_path.join)(path, "@ai-sdk"));
+			if (entries.length > 0) return entries;
 		} catch {}
-		parts.push({
-			type: "tool_call",
-			id: tc.toolCallId,
-			name: tc.toolName,
-			arguments: argsObj
-		});
 	}
-	if (parts.length === 0) return void 0;
-	return JSON.stringify([{
-		role: "assistant",
-		parts
-	}]);
+	return [];
 };
-const extractTextFromContent = (content) => {
-	if (!Array.isArray(content)) return "";
-	return content.filter((p) => p && p.type === "text" && typeof p.text === "string").map((p) => p.text).join("");
-};
-const extractReasoningFromContent = (content) => {
-	if (!Array.isArray(content)) return "";
-	return content.filter((p) => p && p.type === "reasoning" && typeof p.text === "string").map((p) => p.text).join("");
-};
-const applyUsageToSpan = (span, usage) => {
-	const attrs = {};
-	applyUsage(attrs, usage);
-	for (const [k, v] of Object.entries(attrs)) if (v !== void 0) span.setAttribute(k, v);
-};
-const applyFinishReason = (span, finishReason) => {
-	span.setAttribute("gen_ai.response.finish_reason", finishReason);
-	span.setAttribute("ai.response.finishReason", finishReason);
-};
-const applyRequestModelAttributes = (span, event) => {
-	if (typeof event.provider === "string") {
-		const provider = normalizeProvider$1(event.provider);
-		if (provider) span.setAttribute(require_dist.LaminarAttributes.PROVIDER, provider);
-		span.setAttribute("ai.model.provider", event.provider);
+const discoverAiSdkPackages = () => {
+	const packages = {};
+	let searchPaths;
+	try {
+		searchPaths = require.resolve.paths("@ai-sdk/__probe__") ?? [];
+	} catch {
+		searchPaths = [];
 	}
-	if (typeof event.modelId === "string") {
-		span.setAttribute(require_dist.LaminarAttributes.REQUEST_MODEL, event.modelId);
-		span.setAttribute("ai.model.id", event.modelId);
+	for (const entry of findAiSdkScopeEntries(searchPaths)) {
+		const specifier = `@ai-sdk/${entry}`;
+		const version = readPackageVersion(specifier);
+		if (version) packages[specifier] = version;
 	}
+	return packages;
 };
-const applyPromptMessages = (span, event) => {
-	const msgs = standardizedPromptToMessages(event);
-	if (msgs.length === 0) return;
-	const serialized = serializeJSON$1(msgs);
-	span.setAttribute("ai.prompt.messages", serialized);
-	span.setAttribute(require_dist.SPAN_INPUT, serialized);
-};
-const compareHrTime = (a, b) => {
-	if (a[0] !== b[0]) return a[0] - b[0];
-	return a[1] - b[1];
+/**
+* Reads installed `ai` / `@ai-sdk/*` package versions once and caches the
+* result for the lifetime of the process — this is expected to be called on
+* every span creation, so the actual `require`/`readdirSync` work must not
+* repeat.
+*/
+const getAiSdkPackageVersions = () => {
+	if (cached) return cached;
+	try {
+		cached = {
+			aiVersion: readPackageVersion("ai"),
+			aiSdkPackages: discoverAiSdkPackages()
+		};
+	} catch {
+		cached = { aiSdkPackages: {} };
+	}
+	return cached;
 };
-const readSpanEndTime = (span) => {
-	const innerEnd = span._span?.endTime;
-	if (innerEnd && (innerEnd[0] !== 0 || innerEnd[1] !== 0)) return innerEnd;
-	const outerEnd = span.endTime;
-	if (outerEnd && (outerEnd[0] !== 0 || outerEnd[1] !== 0)) return outerEnd;
+/**
+* Flat span-attribute object for the `ai` package's instrumentation scope
+* plus one `lmnr.span.instrumentation.@ai-sdk/<pkg>.version` entry per
+* resolvable `@ai-sdk/*` package. Merge this into every span this
+* integration creates.
+*/
+const buildAiSdkInstrumentationAttributes = () => {
+	const { aiVersion, aiSdkPackages } = getAiSdkPackageVersions();
+	const attributes = { [require_dist.SPAN_INSTRUMENTATION_SCOPE_NAME]: "ai" };
+	if (aiVersion) attributes[require_dist.SPAN_INSTRUMENTATION_SCOPE_VERSION] = aiVersion;
+	for (const [pkg, version] of Object.entries(aiSdkPackages)) attributes[`lmnr.span.instrumentation.${pkg}.version`] = version;
+	return attributes;
 };
 //#endregion
+//#region src/opentelemetry-lib/instrumentation/aisdk/v7-integration/types.ts
+const stepKey = (callId, stepNumber) => `${callId}:${stepNumber}`;
+//#endregion
 //#region src/opentelemetry-lib/instrumentation/aisdk/v7-integration/index.ts
 /**
 * The AI SDK v7 diagnostics channel name. Every lifecycle event fires
@@ -8357,6 +8152,8 @@ var LaminarAiSdkTelemetry = class {
 		this.llmByKey = /* @__PURE__ */ new Map();
 		this.toolByCallId = /* @__PURE__ */ new Map();
 		this.activeStreamStepByCallId = /* @__PURE__ */ new Map();
+		this.promptByCallId = /* @__PURE__ */ new Map();
+		this.logger = require_dist.initializeLogger();
 		this.onStart = (event) => {
 			const callId = event?.callId;
 			if (!callId) return;
@@ -8368,6 +8165,7 @@ var LaminarAiSdkTelemetry = class {
 				kind: _opentelemetry_api.SpanKind.CLIENT,
 				attributes: {
 					[require_dist.SPAN_TYPE]: "DEFAULT",
+					...buildAiSdkInstrumentationAttributes(),
 					...typeof event.functionId === "string" ? {
 						"operation.name": event.functionId,
 						"ai.prompt": "_"
@@ -8388,8 +8186,10 @@ var LaminarAiSdkTelemetry = class {
 			if (typeof event.functionId === "string") span.setAttribute("ai.functionId", event.functionId);
 			if (event.operationId === "ai.embed" || event.operationId === "ai.embedMany" || event.operationId === "ai.rerank") span.setAttribute(require_dist.SPAN_TYPE, "LLM");
 			if (this.recordInputs) {
-				if (Array.isArray(event.messages) || event.system !== void 0 || event.instructions !== void 0) applyPromptMessages(span, event);
-				else if (event.value !== void 0) span.setAttribute(require_dist.SPAN_INPUT, serializeJSON$1(event.value));
+				if (Array.isArray(event.messages) || event.system !== void 0 || event.instructions !== void 0) {
+					const msgs = verbatimStandardizedMessages(event);
+					if (msgs.length > 0) span.setAttribute(require_dist.SPAN_INPUT, serializeJSON$1(msgs));
+				} else if (event.value !== void 0) span.setAttribute(require_dist.SPAN_INPUT, serializeJSON$1(event.value));
 				else if (event.query !== void 0 || event.documents !== void 0) span.setAttribute(require_dist.SPAN_INPUT, serializeJSON$1({
 					query: event.query,
 					documents: event.documents
@@ -8404,17 +8204,25 @@ var LaminarAiSdkTelemetry = class {
 			});
 		};
 		this.onStepStart = (event) => {
-			if (!this.createStepSpan) return;
 			const callId = event?.callId;
 			const stepNumber = event?.stepNumber ?? 0;
 			if (!callId) return;
+			if (Array.isArray(event?.promptMessages)) {
+				const serialized = verbatimPromptString(event.promptMessages);
+				if (serialized !== null) this.promptByCallId.set(callId, serialized);
+			}
+			if (!this.createStepSpan) return;
 			const op = this.operationByCallId.get(callId);
 			if (!op) return;
 			const span = getTracer().startSpan(`ai.step`, { kind: _opentelemetry_api.SpanKind.CLIENT }, op.ctx);
 			const spanCtx = _opentelemetry_api.trace.setSpan(op.ctx, span);
 			span.setAttribute(require_dist.SPAN_TYPE, "DEFAULT");
+			span.setAttributes(buildAiSdkInstrumentationAttributes());
 			span.setAttribute("ai.step.number", stepNumber);
-			if (this.recordInputs) applyPromptMessages(span, event);
+			if (this.recordInputs) {
+				const msgs = verbatimStandardizedMessages(event);
+				if (msgs.length > 0) span.setAttribute(require_dist.SPAN_INPUT, serializeJSON$1(msgs));
+			}
 			this.stepByKey.set(stepKey(callId, stepNumber), {
 				span,
 				ctx: spanCtx,
@@ -8430,8 +8238,17 @@ var LaminarAiSdkTelemetry = class {
 			if (!parentCtx) return;
 			const span = getTracer().startSpan(`ai.llm ${event.provider ?? ""}:${event.modelId ?? ""}`, { kind: _opentelemetry_api.SpanKind.CLIENT }, parentCtx);
 			span.setAttribute(require_dist.SPAN_TYPE, "LLM");
+			span.setAttributes(buildAiSdkInstrumentationAttributes());
 			applyRequestModelAttributes(span, event);
-			if (this.recordInputs) applyPromptMessages(span, event);
+			if (this.recordInputs) {
+				if (event.tools) try {
+					span.setAttribute("gen_ai.tool.definitions", JSON.stringify(event.tools));
+				} catch (e) {
+					this.logger.debug(`Failed to record span tool definitions: ${require_dist.errorMessage(e)}`);
+				}
+				const serialized = this.promptByCallId.get(callId);
+				if (serialized !== void 0) span.setAttribute("gen_ai.input.messages", serialized);
+			}
 			this.llmByKey.set(stepKey(callId, stepNumber), {
 				span,
 				textDeltas: []
@@ -8454,18 +8271,14 @@ var LaminarAiSdkTelemetry = class {
 			if (typeof event.responseId === "string") span.setAttribute("gen_ai.response.id", event.responseId);
 			applyUsageToSpan(span, event.usage);
 			if (this.recordOutputs) {
-				const content = Array.isArray(event.content) ? event.content : void 0;
-				const outputMessages = buildGenAiOutputMessages({
-					text: extractTextFromContent(content),
-					reasoningText: extractReasoningFromContent(content),
-					toolCalls: normalizeToolCalls(content ? content.filter((p) => p && p.type === "tool-call") : [])
-				});
+				const outputMessages = buildVerbatimOutputMessages(Array.isArray(event.content) ? event.content : void 0);
 				if (outputMessages) span.setAttribute("gen_ai.output.messages", outputMessages);
 			}
 			span.setStatus({ code: _opentelemetry_api.SpanStatusCode.OK });
 			span.end();
 			removeActiveLlmSpan(span);
 			this.llmByKey.delete(stepKey(callId, stepNumber));
+			this.promptByCallId.delete(callId);
 		};
 		this.onChunk = (event) => {
 			const chunk = event?.chunk;
@@ -8494,7 +8307,7 @@ var LaminarAiSdkTelemetry = class {
 			const llm = this.llmByKey.get(key);
 			if (llm) {
 				if (this.recordOutputs && llm.textDeltas.length > 0) {
-					const outputMessages = buildGenAiOutputMessages({ text: llm.textDeltas.join("") });
+					const outputMessages = buildTextOutputMessages(llm.textDeltas.join(""));
 					if (outputMessages) llm.span.setAttribute("gen_ai.output.messages", outputMessages);
 				}
 				applyUsageToSpan(llm.span, event.usage);
@@ -8502,21 +8315,13 @@ var LaminarAiSdkTelemetry = class {
 				removeActiveLlmSpan(llm.span);
 				this.llmByKey.delete(key);
 			}
+			this.promptByCallId.delete(callId);
 			const step = this.stepByKey.get(key);
 			if (!step) return;
 			if (typeof event.finishReason === "string") applyFinishReason(step.span, event.finishReason);
 			if (this.recordOutputs) {
-				const outputPayload = {};
-				if (typeof event.text === "string" && event.text.length > 0) {
-					outputPayload.text = event.text;
-					step.span.setAttribute("ai.response.text", event.text);
-				}
-				const normalizedToolCallsList = normalizeToolCalls(event.toolCalls);
-				if (normalizedToolCallsList.length > 0) {
-					outputPayload.toolCalls = normalizedToolCallsList;
-					step.span.setAttribute("ai.response.toolCalls", serializeJSON$1(normalizedToolCallsList));
-				}
-				if (Object.keys(outputPayload).length > 0) step.span.setAttribute(require_dist.SPAN_OUTPUT, serializeJSON$1(outputPayload));
+				const outputMessages = buildVerbatimOutputMessages(Array.isArray(event.content) ? event.content : void 0);
+				if (outputMessages) step.span.setAttribute(require_dist.SPAN_OUTPUT, outputMessages);
 			}
 			step.span.setStatus({ code: _opentelemetry_api.SpanStatusCode.OK });
 			step.span.end();
@@ -8529,7 +8334,12 @@ var LaminarAiSdkTelemetry = class {
 			if (!op) return;
 			const span = getTracer().startSpan(`ai.llm ${event.provider ?? ""}:${event.modelId ?? ""}`, { kind: _opentelemetry_api.SpanKind.CLIENT }, op.ctx);
 			span.setAttribute(require_dist.SPAN_TYPE, "LLM");
+			span.setAttributes(buildAiSdkInstrumentationAttributes());
 			applyRequestModelAttributes(span, event);
+			if (this.recordInputs && Array.isArray(event?.promptMessages)) {
+				const serialized = verbatimPromptString(event.promptMessages);
+				if (serialized !== null) span.setAttribute("gen_ai.input.messages", serialized);
+			}
 			this.llmByKey.set(stepKey(callId, 0), {
 				span,
 				textDeltas: []
@@ -8549,7 +8359,7 @@ var LaminarAiSdkTelemetry = class {
 			}
 			applyUsageToSpan(llm.span, event.usage);
 			if (this.recordOutputs && typeof event.objectText === "string") {
-				const outputMessages = buildGenAiOutputMessages({ text: event.objectText });
+				const outputMessages = buildTextOutputMessages(event.objectText);
 				if (outputMessages) llm.span.setAttribute("gen_ai.output.messages", outputMessages);
 			}
 			llm.span.setStatus({ code: _opentelemetry_api.SpanStatusCode.OK });
@@ -8568,6 +8378,7 @@ var LaminarAiSdkTelemetry = class {
 			const span = getTracer().startSpan(`ai.tool ${toolName ?? "unknown"}`, { kind: _opentelemetry_api.SpanKind.CLIENT }, parentCtx);
 			const spanCtx = _opentelemetry_api.trace.setSpan(parentCtx, span);
 			span.setAttribute(require_dist.SPAN_TYPE, "TOOL");
+			span.setAttributes(buildAiSdkInstrumentationAttributes());
 			if (toolName) span.setAttribute("ai.toolCall.name", toolName);
 			span.setAttribute("ai.toolCall.id", toolCallId);
 			if (this.recordInputs && toolCall?.input !== void 0) {
@@ -8645,17 +8456,8 @@ var LaminarAiSdkTelemetry = class {
 			if (typeof event.finishReason === "string") applyFinishReason(op.span, event.finishReason);
 			if (op.operationId === "ai.embed" || op.operationId === "ai.embedMany" || op.operationId === "ai.rerank") applyUsageToSpan(op.span, event.totalUsage ?? event.usage);
 			if (this.recordOutputs) {
-				const hasText = typeof event.text === "string" && event.text.length > 0;
-				if (hasText) {
-					op.span.setAttribute("ai.response.text", event.text);
-					op.span.setAttribute(require_dist.SPAN_OUTPUT, event.text);
-				}
-				const normalizedToolCallsList = normalizeToolCalls(event.toolCalls);
-				if (normalizedToolCallsList.length > 0) {
-					const serialized = serializeJSON$1(normalizedToolCallsList);
-					op.span.setAttribute("ai.response.toolCalls", serialized);
-					if (!hasText) op.span.setAttribute(require_dist.SPAN_OUTPUT, serialized);
-				}
+				const outputMessages = buildVerbatimOutputMessages(Array.isArray(event.content) ? event.content : void 0);
+				if (outputMessages) op.span.setAttribute(require_dist.SPAN_OUTPUT, outputMessages);
 				if (event.embedding !== void 0) {
 					const emb = event.embedding;
 					if (Array.isArray(emb) && Array.isArray(emb[0])) op.span.setAttribute("ai.embed.count", emb.length);
@@ -8759,7 +8561,7 @@ var LaminarAiSdkTelemetry = class {
 		};
 		for (const [key, llm] of this.llmByKey) if (key.startsWith(prefix)) {
 			if (this.recordOutputs && llm.textDeltas.length > 0) {
-				const outputMessages = buildGenAiOutputMessages({ text: llm.textDeltas.join("") });
+				const outputMessages = buildTextOutputMessages(llm.textDeltas.join(""));
 				if (outputMessages) llm.span.setAttribute("gen_ai.output.messages", outputMessages);
 			}
 			llm.span.end();
@@ -8777,6 +8579,7 @@ var LaminarAiSdkTelemetry = class {
 		for (const key of this.llmByKey.keys()) if (key.startsWith(prefix)) this.llmByKey.delete(key);
 		for (const [toolCallId, tool] of this.toolByCallId) if (tool.callId === callId) this.toolByCallId.delete(toolCallId);
 		for (const key of this.stepByKey.keys()) if (key.startsWith(prefix)) this.stepByKey.delete(key);
+		this.promptByCallId.delete(callId);
 		return latest;
 	}
 };