@assistant-ui/core 0.3.18 → 0.3.20

package/dist/react/runtimes/cloud/AssistantCloudThreadHistoryAdapter.js

@@ -1,16 +1,21 @@
-import { auiV0Decode, auiV0Encode } from "./auiV0.js";
+import { auiV0DecodeSafely, auiV0Encode } from "./auiV0.js";
 import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
 import { useEffect, useRef, useState } from "@assistant-ui/tap/react-shim";
 import { getClientId, useAui } from "@assistant-ui/store";
-import { CloudMessagePersistence, createFormattedPersistence, createRunReport, createRunTelemetryToolCall, deriveRunOutcome, describeRunError, extractRunTelemetryModelId, normalizeRunTelemetryUsage, truncateRunTelemetryText } from "assistant-cloud";
+import { CloudEngagementReporter, CloudMessagePersistence, CloudRunReporter, createFormattedPersistence, createRunTelemetryToolCall, deriveRunOutcome, describeRunError, extractRunTelemetryModelId, normalizeRunTelemetryUsage, truncateRunTelemetryText } from "assistant-cloud";
+import { extractAISDKRunTelemetry } from "assistant-cloud/ai-sdk";
 //#region src/react/runtimes/cloud/AssistantCloudThreadHistoryAdapter.ts
 const globalPersistence = /* @__PURE__ */ new WeakMap();
 var AssistantCloudThreadHistoryAdapter = class {
 	cloudRef;
 	getAui;
+	runReporter;
+	engagementReporter;
 	constructor(cloudRef, getAui) {
 		this.cloudRef = cloudRef;
 		this.getAui = getAui;
+		this.runReporter = new CloudRunReporter(() => this.cloudRef.current);
+		this.engagementReporter = new CloudEngagementReporter(() => this.cloudRef.current, (threadId, messageId, options) => this.resolveEngagementEventIds(threadId, messageId, options));
 	}
 	get aui() {
 		return this.getAui();
@@ -40,7 +45,7 @@ var AssistantCloudThreadHistoryAdapter = class {
 			...remoteMessageId ? { message_id: remoteMessageId } : void 0
 		};
 	}
-	feedback = { submit: ({ message, type }) => {
+	feedback = { submit: ({ message, type, comment }) => {
 		(async () => {
 			const threadListItem = this.tryGetKeyedThreadListItem();
 			const remoteThreadId = threadListItem?.getState().remoteId;
@@ -53,7 +58,10 @@ var AssistantCloudThreadHistoryAdapter = class {
 				console.warn(`[assistant-ui] Skipping feedback for message ${message.id}: no cloud message id is mapped.`);
 				return;
 			}
-			await this.cloudRef.current.threads.messages.feedback(remoteThreadId, cloudMessageId, { type });
+			await this.cloudRef.current.threads.messages.feedback(remoteThreadId, cloudMessageId, {
+				type,
+				...comment ? { comment } : void 0
+			});
 		})().catch((error) => {
 			console.error("[assistant-ui] Cloud feedback submission failed:", error);
 		});
@@ -103,7 +111,7 @@ var AssistantCloudThreadHistoryAdapter = class {
 			},
 			reportTelemetry(items, options) {
 				const encodedRunMessages = items.map((item) => formatAdapter.encode(item));
-				adapter._reportRunTelemetry(formatAdapter.format, encodedRunMessages, options, resolvePinned(), extractLastRunMessageInfo(items, formatAdapter));
+				adapter._reportRunTelemetry(formatAdapter.format, encodedRunMessages, options, resolvePinned(), mergeRunMessageInfo(extractLastRunMessageInfo(items, formatAdapter), options?.message ? extractRunMessageInfo(options.message, "aui/v0") : void 0));
 			},
 			async load() {
 				const pinned = pinCurrent();
@@ -135,14 +143,23 @@ var AssistantCloudThreadHistoryAdapter = class {
 	async load() {
 		const remoteId = this.aui.threadListItem.getState().remoteId;
 		if (!remoteId) return { messages: [] };
-		return { messages: (await this._persistence.load(remoteId, "aui/v0")).filter((m) => m.format === "aui/v0").map(auiV0Decode).reverse() };
+		const rows = (await this._persistence.load(remoteId, "aui/v0")).filter((m) => m.format === "aui/v0").reverse();
+		const loaded = [];
+		const loadedIds = /* @__PURE__ */ new Set();
+		for (const row of rows) {
+			const item = auiV0DecodeSafely(row);
+			if (!item) continue;
+			if (item.parentId && !loadedIds.has(item.parentId)) continue;
+			loadedIds.add(item.message.id);
+			loaded.push(item);
+		}
+		return { messages: loaded };
 	}
 	_reportRunTelemetry(format, runMessages, options, threadListItem, messageInfo) {
-		if (!this.cloudRef.current.telemetry.enabled) return;
 		const item = threadListItem ?? this.aui.threadListItem;
 		const remoteId = item.getState().remoteId;
 		if (!remoteId) return;
-		const extracted = extractRunTelemetry(format, runMessages);
+		const extracted = extractRunTelemetry(format, runMessages) ?? (messageInfo?.status !== void 0 ? { status: "incomplete" } : void 0);
 		if (!extracted) return;
 		this._sendReport(remoteId, extracted, options?.durationMs, options?.stepTimestamps, messageInfo, this.getPersistence(item));
 	}
@@ -154,7 +171,7 @@ var AssistantCloudThreadHistoryAdapter = class {
 	_sendReport(remoteId, data, durationMs, stepTimestamps, messageInfo, persistence = this._persistence) {
 		const mergedSteps = mergeStepTimestamps(data.steps, stepTimestamps);
 		const messageId = messageInfo?.localMessageId ? persistence.getResolvedRemoteId(messageInfo.localMessageId) : void 0;
-		const initial = createRunReport({
+		this.runReporter.report({
 			threadId: remoteId,
 			status: messageInfo?.status ?? data.status,
 			outcome: messageInfo?.outcomeType,
@@ -164,48 +181,30 @@ var AssistantCloudThreadHistoryAdapter = class {
 			traceId: messageInfo?.traceId,
 			modelId: data.modelId,
 			provider: messageInfo?.provider,
-			usage: {
-				inputTokens: data.inputTokens,
-				outputTokens: data.outputTokens,
-				reasoningTokens: data.reasoningTokens,
-				cachedInputTokens: data.cachedInputTokens
-			},
-			steps: toRunReportSteps(mergedSteps),
+			usage: data.usage,
+			steps: mergedSteps,
 			totalSteps: data.totalSteps,
 			toolCalls: data.toolCalls,
 			durationMs,
 			firstTokenMs: messageInfo?.firstTokenMs,
 			outputText: data.outputText,
-			metadata: data.metadata,
-			telemetry: this.cloudRef.current.telemetry
+			metadata: data.metadata
 		});
-		const { beforeReport } = this.cloudRef.current.telemetry;
-		const report = beforeReport ? beforeReport(initial) : initial;
-		if (!report) return;
-		this.cloudRef.current.runs.report(report).catch(() => {});
 	}
 };
-function toRunReportSteps(steps) {
-	if (!steps) return void 0;
-	return steps.map((step) => ({
-		usage: {
-			inputTokens: step.input_tokens,
-			outputTokens: step.output_tokens,
-			reasoningTokens: step.reasoning_tokens,
-			cachedInputTokens: step.cached_input_tokens
-		},
-		toolCalls: step.tool_calls,
-		startMs: step.start_ms,
-		endMs: step.end_ms
-	}));
-}
 function mergeStepTimestamps(steps, timestamps) {
 	if (!timestamps) return steps;
-	if (!steps) return timestamps.map((t) => ({ ...t }));
+	if (!steps) return timestamps.map(({ start_ms, end_ms }) => ({
+		startMs: start_ms,
+		endMs: end_ms
+	}));
 	const len = Math.min(steps.length, timestamps.length);
-	return steps.map((s, i) => ({
-		...s,
-		...i < len ? timestamps[i] : void 0
+	return steps.map((step, index) => ({
+		...step,
+		...index < len ? {
+			startMs: timestamps[index].start_ms,
+			endMs: timestamps[index].end_ms
+		} : void 0
 	}));
 }
 function extractLastRunMessageInfo(items, formatAdapter) {
@@ -215,29 +214,36 @@ function extractLastRunMessageInfo(items, formatAdapter) {
 		if (info) return info;
 	}
 }
+function mergeRunMessageInfo(stored, observed) {
+	if (!observed) return stored;
+	const { localMessageId: _observedId, ...outcome } = observed;
+	return {
+		...stored,
+		...outcome
+	};
+}
 function extractRunMessageInfo(message, format, localMessageId) {
 	if (!isRecord(message) || message.role !== "assistant") return void 0;
 	const status = isRecord(message.status) ? message.status : void 0;
 	const metadata = isRecord(message.metadata) ? message.metadata : void 0;
 	const custom = isRecord(metadata?.custom) ? metadata.custom : void 0;
-	const timing = isRecord(metadata?.timing) ? metadata.timing : void 0;
-	const streamStartTime = timing?.streamStartTime;
-	const firstTokenTime = timing?.firstTokenTime;
-	const firstTokenMs = typeof streamStartTime === "number" && Number.isFinite(streamStartTime) && typeof firstTokenTime === "number" && Number.isFinite(firstTokenTime) ? Math.round(firstTokenTime - streamStartTime) : void 0;
-	const finishReason = status?.type === "incomplete" ? status.reason : typeof metadata?.finishReason === "string" ? metadata.finishReason : void 0;
+	const firstTokenTime = (isRecord(metadata?.timing) ? metadata.timing : void 0)?.firstTokenTime;
+	const firstTokenMs = typeof firstTokenTime === "number" && Number.isFinite(firstTokenTime) ? Math.round(firstTokenTime) : void 0;
+	const finishReason = status?.type === "incomplete" ? typeof status.reason === "string" ? status.reason : void 0 : typeof metadata?.finishReason === "string" ? metadata.finishReason : void 0;
 	const failed = status?.type === "incomplete" && status.reason === "error";
 	const outcome = deriveRunOutcome({
-		finishReason: typeof finishReason === "string" ? finishReason : void 0,
+		finishReason,
 		isError: failed
 	});
 	const outcomeType = outcome.outcome;
+	const runStatus = outcome.status === "error" ? "error" : status?.type === "incomplete" ? "incomplete" : finishReason !== void 0 ? outcome.status : void 0;
 	const failure = failed ? describeRunError(status.error) : {};
 	const messageId = localMessageId ?? (typeof message.id === "string" ? message.id : void 0);
 	const traceId = format === "aui/v0" ? custom?.traceId : format === "ai-sdk/v6" ? metadata?.traceId : void 0;
 	const provider = typeof custom?.provider === "string" ? custom.provider : typeof metadata?.provider === "string" ? metadata.provider : void 0;
 	return {
 		...messageId ? { localMessageId: messageId } : void 0,
-		...outcome.status === "error" ? { status: "error" } : void 0,
+		...runStatus !== void 0 ? { status: runStatus } : void 0,
 		...outcomeType ? { outcomeType } : void 0,
 		...failure,
 		...firstTokenMs != null && firstTokenMs >= 0 ? { firstTokenMs } : void 0,
@@ -251,22 +257,18 @@ function isRecord(value) {
 function extractTelemetry(format, content) {
 	switch (format) {
 		case "aui/v0": return extractAuiV0(content);
-		case "ai-sdk/v6": return extractAiSdkV6(content);
+		case "ai-sdk/v6": return extractAISDKRunTelemetry([content]);
 		default: return null;
 	}
 }
 function extractRunTelemetry(format, runMessages) {
-	if (format === "ai-sdk/v6") return aggregateAiSdkV6RunSteps(runMessages);
+	if (format === "ai-sdk/v6") return extractAISDKRunTelemetry(runMessages);
 	for (let i = runMessages.length - 1; i >= 0; i--) {
 		const result = extractTelemetry(format, runMessages[i]);
 		if (result) return result;
 	}
 	return null;
 }
-const AUI_STATUS_MAP = {
-	error: "error",
-	incomplete: "incomplete"
-};
 function extractAuiV0(content) {
 	const msg = content;
 	if (msg.role !== "assistant") return null;
@@ -320,196 +322,26 @@ function extractAuiV0(content) {
 		reasoningTokens = hasReasoning ? totalReasoning : void 0;
 		cachedInputTokens = hasCachedInput ? totalCachedInput : void 0;
 	}
-	const statusType = msg.status?.type;
-	const status = statusType === "incomplete" && msg.status?.reason === "error" ? "error" : statusType && AUI_STATUS_MAP[statusType] || "completed";
+	const status = msg.status?.type === "incomplete" ? "incomplete" : "completed";
 	const metadata = msg.metadata?.custom;
 	const modelId = extractRunTelemetryModelId(msg.metadata);
-	const telemetrySteps = steps && steps.length > 1 ? steps.map((s) => {
-		const usage = s.usage ? normalizeRunTelemetryUsage(s.usage) : void 0;
-		return {
-			...usage?.inputTokens != null ? { input_tokens: usage.inputTokens } : void 0,
-			...usage?.outputTokens != null ? { output_tokens: usage.outputTokens } : void 0,
-			...usage?.reasoningTokens != null ? { reasoning_tokens: usage.reasoningTokens } : void 0,
-			...usage?.cachedInputTokens != null ? { cached_input_tokens: usage.cachedInputTokens } : void 0
-		};
-	}) : void 0;
+	const telemetrySteps = steps && steps.length > 0 ? steps.map((step) => step.usage ? { usage: step.usage } : {}) : void 0;
 	return {
 		status,
 		...toolCalls && toolCalls.length > 0 ? { toolCalls } : void 0,
 		...steps?.length ? { totalSteps: steps.length } : void 0,
-		...inputTokens != null ? { inputTokens } : void 0,
-		...outputTokens != null ? { outputTokens } : void 0,
-		...reasoningTokens != null ? { reasoningTokens } : void 0,
-		...cachedInputTokens != null ? { cachedInputTokens } : void 0,
+		...inputTokens != null || outputTokens != null || reasoningTokens != null || cachedInputTokens != null ? { usage: {
+			...inputTokens != null ? { inputTokens } : void 0,
+			...outputTokens != null ? { outputTokens } : void 0,
+			...reasoningTokens != null ? { reasoningTokens } : void 0,
+			...cachedInputTokens != null ? { cachedInputTokens } : void 0
+		} } : void 0,
 		...outputText != null ? { outputText } : void 0,
 		...metadata ? { metadata } : void 0,
 		...telemetrySteps ? { steps: telemetrySteps } : void 0,
 		...modelId ? { modelId } : void 0
 	};
 }
-function isToolCallPart(p) {
-	if (!p.toolCallId) return false;
-	if (p.type === "tool-call" || p.type === "dynamic-tool") return !!p.toolName;
-	return p.type.startsWith("tool-") || p.type.startsWith("dynamic-tool-");
-}
-function isDynamicToolPart(p) {
-	return p.type === "dynamic-tool" || p.type.startsWith("dynamic-tool-");
-}
-function partToToolCall(p) {
-	const toolSource = isDynamicToolPart(p) ? "mcp" : "frontend";
-	return createRunTelemetryToolCall({
-		toolName: p.toolName ?? p.type.slice(5),
-		toolCallId: p.toolCallId,
-		args: p.args ?? p.input,
-		result: p.result ?? p.output,
-		toolSource
-	});
-}
-function collectAiSdkV6Parts(parts) {
-	const textParts = [];
-	const toolCalls = [];
-	const stepsData = [];
-	let currentStepToolCalls = null;
-	for (const p of parts) if (p.type === "step-start") {
-		if (currentStepToolCalls !== null) stepsData.push({ tool_calls: currentStepToolCalls });
-		currentStepToolCalls = [];
-	} else if (p.type === "text" && p.text) textParts.push(p.text);
-	else if (isToolCallPart(p)) {
-		const tc = partToToolCall(p);
-		toolCalls.push(tc);
-		if (currentStepToolCalls !== null) currentStepToolCalls.push(tc);
-	}
-	if (currentStepToolCalls !== null) stepsData.push({ tool_calls: currentStepToolCalls });
-	return {
-		textParts,
-		toolCalls,
-		stepsData
-	};
-}
-function buildAiSdkV6Result(textParts, toolCalls, totalSteps, metadata, stepsData, usage) {
-	const hasText = textParts.length > 0;
-	const outputText = hasText ? truncateRunTelemetryText(textParts.join("")) : void 0;
-	const modelId = extractRunTelemetryModelId(metadata);
-	const steps = stepsData && stepsData.length > 1 ? stepsData.map((s) => ({ ...s.tool_calls.length > 0 ? { tool_calls: s.tool_calls } : void 0 })) : void 0;
-	return {
-		status: hasText ? "completed" : "incomplete",
-		...toolCalls.length > 0 ? { toolCalls } : void 0,
-		...totalSteps > 0 ? { totalSteps } : void 0,
-		...usage?.inputTokens != null ? { inputTokens: usage.inputTokens } : void 0,
-		...usage?.outputTokens != null ? { outputTokens: usage.outputTokens } : void 0,
-		...usage?.reasoningTokens != null ? { reasoningTokens: usage.reasoningTokens } : void 0,
-		...usage?.cachedInputTokens != null ? { cachedInputTokens: usage.cachedInputTokens } : void 0,
-		...outputText != null ? { outputText } : void 0,
-		...metadata ? { metadata } : void 0,
-		...steps ? { steps } : void 0,
-		...modelId ? { modelId } : void 0
-	};
-}
-function extractAiSdkV6Usage(metadata) {
-	const usage = metadata?.usage;
-	if (usage) {
-		const normalized = normalizeRunTelemetryUsage(usage);
-		if (normalized) return normalized;
-	}
-	const steps = metadata?.steps;
-	if (steps && steps.length > 0) {
-		let inputTokens = 0;
-		let outputTokens = 0;
-		let reasoningTokens = 0;
-		let cachedInputTokens = 0;
-		let hasInput = false;
-		let hasOutput = false;
-		let hasReasoning = false;
-		let hasCachedInput = false;
-		let hasAny = false;
-		for (const s of steps) {
-			if (!s.usage) continue;
-			const n = normalizeRunTelemetryUsage(s.usage);
-			if (n) {
-				if (n.inputTokens != null) {
-					inputTokens += n.inputTokens;
-					hasInput = true;
-				}
-				if (n.outputTokens != null) {
-					outputTokens += n.outputTokens;
-					hasOutput = true;
-				}
-				if (n.reasoningTokens != null) {
-					reasoningTokens += n.reasoningTokens;
-					hasReasoning = true;
-				}
-				if (n.cachedInputTokens != null) {
-					cachedInputTokens += n.cachedInputTokens;
-					hasCachedInput = true;
-				}
-				hasAny = true;
-			}
-		}
-		if (hasAny) return {
-			...hasInput ? { inputTokens } : void 0,
-			...hasOutput ? { outputTokens } : void 0,
-			...hasReasoning ? { reasoningTokens } : void 0,
-			...hasCachedInput ? { cachedInputTokens } : void 0
-		};
-	}
-}
-function extractAiSdkV6(content) {
-	const msg = content;
-	if (msg.role !== "assistant") return null;
-	const { textParts, toolCalls, stepsData } = collectAiSdkV6Parts(msg.parts ?? []);
-	return buildAiSdkV6Result(textParts, toolCalls, stepsData.length, msg.metadata, stepsData, extractAiSdkV6Usage(msg.metadata));
-}
-function aggregateAiSdkV6RunSteps(stepMessages) {
-	const allTextParts = [];
-	const allToolCalls = [];
-	const allStepsData = [];
-	let hasAssistant = false;
-	let metadata;
-	let inputTokens = 0;
-	let outputTokens = 0;
-	let reasoningTokens = 0;
-	let cachedInputTokens = 0;
-	let hasInput = false;
-	let hasOutput = false;
-	let hasReasoning = false;
-	let hasCachedInput = false;
-	for (const content of stepMessages) {
-		const msg = content;
-		if (msg.role !== "assistant") continue;
-		hasAssistant = true;
-		const { textParts, toolCalls, stepsData } = collectAiSdkV6Parts(msg.parts ?? []);
-		allTextParts.push(...textParts);
-		allToolCalls.push(...toolCalls);
-		allStepsData.push(...stepsData);
-		if (msg.metadata) metadata = msg.metadata;
-		const usage = extractAiSdkV6Usage(msg.metadata);
-		if (usage) {
-			if (usage.inputTokens != null) {
-				inputTokens += usage.inputTokens;
-				hasInput = true;
-			}
-			if (usage.outputTokens != null) {
-				outputTokens += usage.outputTokens;
-				hasOutput = true;
-			}
-			if (usage.reasoningTokens != null) {
-				reasoningTokens += usage.reasoningTokens;
-				hasReasoning = true;
-			}
-			if (usage.cachedInputTokens != null) {
-				cachedInputTokens += usage.cachedInputTokens;
-				hasCachedInput = true;
-			}
-		}
-	}
-	if (!hasAssistant) return null;
-	return buildAiSdkV6Result(allTextParts, allToolCalls, allStepsData.length, metadata, allStepsData, {
-		...hasInput ? { inputTokens } : void 0,
-		...hasOutput ? { outputTokens } : void 0,
-		...hasReasoning ? { reasoningTokens } : void 0,
-		...hasCachedInput ? { cachedInputTokens } : void 0
-	});
-}
 function useAssistantCloudThreadHistoryAdapter(cloudRef) {
 	const aui = useAui();
 	const auiRef = useRef(aui);
@@ -517,7 +349,7 @@ function useAssistantCloudThreadHistoryAdapter(cloudRef) {
 		auiRef.current = aui;
 	});
 	const [adapter] = useState(() => new AssistantCloudThreadHistoryAdapter(cloudRef, () => auiRef.current));
-	useAssistantCloudEngagementEvents(cloudRef, adapter, aui);
+	useAssistantCloudEngagementEvents(adapter, aui);
 	return adapter;
 }
 const rootEngagementTrackers = /* @__PURE__ */ new WeakMap();
@@ -526,38 +358,29 @@ const rootEngagementTrackers = /* @__PURE__ */ new WeakMap();
 * client reports them; every thread runtime mounted under it shares the
 * subscription and the last one to unmount removes it.
 */
-const useRootEngagementEvents = (cloudRef, adapter, aui) => {
-	const $ = c(5);
+const useRootEngagementEvents = (adapter, aui) => {
+	const $ = c(6);
 	let t0;
-	let t1;
-	if ($[0] !== adapter || $[1] !== aui || $[2] !== cloudRef) {
+	if ($[0] !== adapter.engagementReporter || $[1] !== aui) {
 		t0 = () => {
 			let tracker = rootEngagementTrackers.get(aui);
 			if (!tracker) {
 				const created = {
 					count: 0,
-					adapter,
-					cloudRef,
+					engagementReporter: adapter.engagementReporter,
 					dispose: _temp
 				};
 				created.dispose = aui.on({
 					scope: "*",
 					event: "threads.selectionChanged"
 				}, (payload) => {
-					created.adapter.resolveEngagementEventIds(payload.threadId).then((ids) => {
-						if (!ids.thread_id) return;
-						created.cloudRef.current.events?.track({
-							kind: "thread_switched",
-							...ids
-						});
-					}).catch(_temp2);
+					created.engagementReporter.threadSwitched(payload.threadId);
 				});
 				rootEngagementTrackers.set(aui, created);
 				tracker = created;
 			}
 			const active = tracker;
-			active.adapter = adapter;
-			active.cloudRef = cloudRef;
+			active.engagementReporter = adapter.engagementReporter;
 			active.count = active.count + 1;
 			return () => {
 				active.count = active.count - 1;
@@ -567,222 +390,173 @@ const useRootEngagementEvents = (cloudRef, adapter, aui) => {
 				}
 			};
 		};
-		t1 = [
-			adapter,
-			aui,
-			cloudRef
-		];
-		$[0] = adapter;
+		$[0] = adapter.engagementReporter;
 		$[1] = aui;
-		$[2] = cloudRef;
-		$[3] = t0;
-		$[4] = t1;
-	} else {
-		t0 = $[3];
-		t1 = $[4];
-	}
+		$[2] = t0;
+	} else t0 = $[2];
+	let t1;
+	if ($[3] !== adapter || $[4] !== aui) {
+		t1 = [adapter, aui];
+		$[3] = adapter;
+		$[4] = aui;
+		$[5] = t1;
+	} else t1 = $[5];
 	useEffect(t0, t1);
 };
-const useAssistantCloudEngagementEvents = (cloudRef, adapter, aui) => {
-	const $ = c(13);
-	useRootEngagementEvents(cloudRef, adapter, aui);
+const useAssistantCloudEngagementEvents = (adapter, aui) => {
+	const $ = c(12);
+	useRootEngagementEvents(adapter, aui);
 	let t0;
-	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-		t0 = /* @__PURE__ */ new Map();
-		$[0] = t0;
-	} else t0 = $[0];
-	const runStartedAt = useRef(t0);
-	let t1;
-	if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
-		t1 = /* @__PURE__ */ new Map();
-		$[1] = t1;
-	} else t1 = $[1];
-	const runEndedAt = useRef(t1);
-	let t2;
-	if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
-		t2 = /* @__PURE__ */ new Set();
-		$[2] = t2;
-	} else t2 = $[2];
-	const shownSuggestions = useRef(t2);
-	let t3;
-	let t4;
-	if ($[3] !== adapter || $[4] !== aui || $[5] !== cloudRef) {
-		t3 = () => {
-			const track = (event, threadId, messageId, options) => {
-				adapter.resolveEngagementEventIds(threadId, messageId, options).then((ids) => {
-					cloudRef.current.events?.track({
-						...event,
-						...ids
-					});
-				}).catch(_temp3);
-			};
-			const trackRunStopped = (threadId_0) => {
-				const startedAt = runStartedAt.current.get(threadId_0);
-				if (startedAt === void 0) return;
-				runStartedAt.current.delete(threadId_0);
-				track({
-					kind: "run_stopped",
-					value: Math.max(0, Date.now() - startedAt)
-				}, threadId_0);
-			};
+	if ($[0] !== adapter.engagementReporter || $[1] !== aui) {
+		t0 = () => {
+			const reporter = adapter.engagementReporter;
 			const unsubscribers = [
 				aui.on({
 					scope: "thread",
 					event: "composer.send"
 				}, (payload) => {
-					const previousRunEndedAt = runEndedAt.current.get(payload.threadId);
-					track({
-						kind: payload.messageId ? "message_edited" : "message_sent",
-						...payload.messageId ? { props: { chars: payload.chars } } : { props: {
-							chars: payload.chars,
-							attachments: payload.attachments
-						} },
-						...!payload.messageId && previousRunEndedAt !== void 0 ? { value: Math.max(0, Date.now() - previousRunEndedAt) } : void 0
-					}, payload.threadId, payload.messageId, { awaitThread: !payload.messageId });
-					if (payload.suggestion) track({ kind: "suggestion_clicked" }, payload.threadId);
+					if (payload.messageId) reporter.messageEdited(payload.threadId, {
+						messageId: payload.messageId,
+						chars: payload.chars
+					});
+					else reporter.messageSent(payload.threadId, {
+						chars: payload.chars,
+						attachments: payload.attachments
+					});
+					if (payload.suggestion) reporter.suggestionClicked(payload.threadId);
 				}),
 				aui.on({
 					scope: "thread",
 					event: "composer.attachmentAdd"
 				}, (payload_0) => {
-					track({
-						kind: "attachment_added",
-						...payload_0.contentType ? { props: { type: payload_0.contentType } } : void 0
-					}, payload_0.threadId, payload_0.messageId);
+					reporter.attachmentAdded(payload_0.threadId, {
+						messageId: payload_0.messageId,
+						contentType: payload_0.contentType
+					});
 				}),
 				aui.on({
 					scope: "thread",
 					event: "composer.attachmentAddError"
 				}, (payload_1) => {
-					track({
-						kind: "attachment_failed",
-						...payload_1.contentType ? { props: { type: payload_1.contentType } } : void 0
-					}, payload_1.threadId, payload_1.messageId);
+					reporter.attachmentFailed(payload_1.threadId, {
+						messageId: payload_1.messageId,
+						contentType: payload_1.contentType
+					});
 				}),
 				aui.on({
 					scope: "thread",
 					event: "composer.cancel"
 				}, (payload_2) => {
-					trackRunStopped(payload_2.threadId);
+					reporter.runStopped(payload_2.threadId);
 				}),
 				aui.on({
 					scope: "thread",
 					event: "thread.runStart"
 				}, (payload_3) => {
-					runStartedAt.current.set(payload_3.threadId, Date.now());
+					reporter.runStarted(payload_3.threadId);
 				}),
 				aui.on({
 					scope: "thread",
 					event: "thread.runEnd"
 				}, (payload_4) => {
-					runStartedAt.current.delete(payload_4.threadId);
-					runEndedAt.current.set(payload_4.threadId, Date.now());
+					reporter.runEnded(payload_4.threadId);
 				}),
 				aui.on({
 					scope: "thread",
 					event: "thread.cancelRun"
 				}, (payload_5) => {
-					trackRunStopped(payload_5.threadId);
+					reporter.runStopped(payload_5.threadId);
 				}),
 				aui.on({
 					scope: "thread",
 					event: "thread.voiceStarted"
 				}, (payload_6) => {
-					track({ kind: "voice_started" }, payload_6.threadId);
+					reporter.voiceStarted(payload_6.threadId);
 				}),
 				aui.on({
 					scope: "thread",
 					event: "message.reload"
 				}, (payload_7) => {
-					track({ kind: "message_regenerated" }, payload_7.threadId, payload_7.messageId);
+					reporter.messageRegenerated(payload_7.threadId, payload_7.messageId);
 				}),
 				aui.on({
 					scope: "thread",
 					event: "message.branchSwitched"
 				}, (payload_8) => {
-					track({ kind: "branch_switched" }, payload_8.threadId, payload_8.messageId);
+					reporter.branchSwitched(payload_8.threadId, payload_8.messageId);
 				}),
 				aui.on({
 					scope: "thread",
 					event: "message.copied"
 				}, (payload_9) => {
-					track({ kind: "message_copied" }, payload_9.threadId, payload_9.messageId);
+					reporter.messageCopied(payload_9.threadId, payload_9.messageId);
 				}),
 				aui.on({
 					scope: "thread",
-					event: "message.speak"
+					event: "thread.toolApprovalAnswered"
 				}, (payload_10) => {
-					track({ kind: "speech_started" }, payload_10.threadId, payload_10.messageId);
+					if (payload_10.approved) reporter.toolApproved(payload_10.threadId, payload_10.messageId, payload_10.toolCallId, payload_10.toolName);
+					else reporter.toolRejected(payload_10.threadId, payload_10.messageId, payload_10.toolCallId, payload_10.toolName);
 				}),
 				aui.on({
 					scope: "thread",
-					event: "message.error"
+					event: "message.speak"
 				}, (payload_11) => {
-					track({
-						kind: "error_shown",
-						props: { reason: payload_11.reason }
-					}, payload_11.threadId, payload_11.messageId);
+					reporter.speechStarted(payload_11.threadId, payload_11.messageId);
+				}),
+				aui.on({
+					scope: "thread",
+					event: "message.error"
+				}, (payload_12) => {
+					reporter.errorShown(payload_12.threadId, {
+						messageId: payload_12.messageId,
+						reason: payload_12.reason
+					});
 				})
 			];
 			return () => {
 				for (const unsubscribe of unsubscribers) unsubscribe();
 			};
 		};
-		t4 = [
-			adapter,
-			aui,
-			cloudRef
-		];
+		$[0] = adapter.engagementReporter;
+		$[1] = aui;
+		$[2] = t0;
+	} else t0 = $[2];
+	let t1;
+	if ($[3] !== adapter || $[4] !== aui) {
+		t1 = [adapter, aui];
 		$[3] = adapter;
 		$[4] = aui;
-		$[5] = cloudRef;
-		$[6] = t3;
-		$[7] = t4;
-	} else {
-		t3 = $[6];
-		t4 = $[7];
-	}
-	useEffect(t3, t4);
-	let t5;
-	let t6;
-	if ($[8] !== adapter || $[9] !== aui || $[10] !== cloudRef) {
-		t5 = () => {
+		$[5] = t1;
+	} else t1 = $[5];
+	useEffect(t0, t1);
+	let t2;
+	if ($[6] !== adapter.engagementReporter || $[7] !== aui) {
+		t2 = () => {
 			const reportSuggestions = () => {
 				const { mainThreadId } = aui.threads.getState();
 				if (aui.threadListItem.getState().id !== mainThreadId) return;
 				const { isEmpty, suggestions } = aui.thread.getState();
-				if (!isEmpty || suggestions.length === 0 || shownSuggestions.current.has(mainThreadId)) return;
-				shownSuggestions.current.add(mainThreadId);
-				adapter.resolveEngagementEventIds(mainThreadId).then((ids_0) => {
-					cloudRef.current.events?.track({
-						kind: "suggestions_shown",
-						value: suggestions.length,
-						...ids_0
-					});
-				});
+				if (!isEmpty || suggestions.length === 0) return;
+				adapter.engagementReporter.suggestionsShown(mainThreadId, suggestions.length);
 			};
 			reportSuggestions();
 			return aui.subscribe(reportSuggestions);
 		};
-		t6 = [
-			adapter,
-			aui,
-			cloudRef
-		];
-		$[8] = adapter;
-		$[9] = aui;
-		$[10] = cloudRef;
-		$[11] = t5;
-		$[12] = t6;
-	} else {
-		t5 = $[11];
-		t6 = $[12];
-	}
-	useEffect(t5, t6);
+		$[6] = adapter.engagementReporter;
+		$[7] = aui;
+		$[8] = t2;
+	} else t2 = $[8];
+	let t3;
+	if ($[9] !== adapter || $[10] !== aui) {
+		t3 = [adapter, aui];
+		$[9] = adapter;
+		$[10] = aui;
+		$[11] = t3;
+	} else t3 = $[11];
+	useEffect(t2, t3);
 };
 function _temp() {}
-function _temp2() {}
-function _temp3() {}
 //#endregion
 export { extractAuiV0, useAssistantCloudThreadHistoryAdapter };