@assistant-ui/react-langchain 0.0.31 → 0.0.33

package/dist/useSubagentTranscripts.js

@@ -1,14 +1,38 @@
 "use client";
 import { attachSubagentTranscripts, createAttachMemo } from "./attachSubagentTranscripts.js";
+import { groupUIMessagesByParent } from "./converter.js";
 import { convertLangChainBaseMessage } from "./convertMessages.js";
+import { langChainStreamingTimingAccessors } from "./streamingTiming.js";
+import { subagentMessagesProjection } from "./subagentMessagesProjection.js";
+import { UI_CUSTOM_CHANNELS, createUIFoldMemo, foldUIUpdates, mergeUIMessages } from "./uiMessages.js";
+import { stepStreamingTiming } from "@assistant-ui/core";
 import { convertExternalMessages, createExternalMessageConversionCache } from "@assistant-ui/core/react";
 import { useEffect, useRef, useSyncExternalStore } from "react";
 import { STREAM_CONTROLLER } from "@langchain/react";
-import { messagesProjection } from "@langchain/langgraph-sdk/stream";
+import { channelProjection } from "@langchain/langgraph-sdk/stream";
 //#region src/useSubagentTranscripts.ts
 const MAX_SUBAGENT_DEPTH = 16;
+const ROOT_UI_CHANNEL_DEPTH = 1;
 const TRANSCRIPT_METADATA = {};
+const NO_UI_MESSAGES = [];
+const NO_MESSAGE_TIMING = {};
 const sameNamespace = (a, b) => a.length === b.length && a.every((segment, index) => segment === b[index]);
+const needsNamespaceResolution = (snapshot) => snapshot.namespace.length === 1 && snapshot.namespace[0] === `tools:${snapshot.id}`;
+const requestSubagentNamespace = (source, controller, request) => {
+	request.attempts += 1;
+	request.pending = true;
+	request.retryQueued = false;
+	controller.resolveSubagentNamespace(request.id).catch(() => {}).finally(() => {
+		if (source.controller !== controller || source.namespaceRequests.get(request.id) !== request) return;
+		request.pending = false;
+		if (!request.retryQueued && request.attempts === 1 && request.status !== "running") request.retryQueued = true;
+		if (!request.retryQueued || request.attempts >= 2) {
+			request.retryQueued = false;
+			return;
+		}
+		requestSubagentNamespace(source, controller, request);
+	});
+};
 const sameTranscriptEntries = (a, b) => a?.size === b.size && [...b].every(([id, transcript]) => a.get(id) === transcript);
 const collectUIMessages = (messages, uiMessagesByParent) => {
 	const collected = [];
@@ -20,20 +44,39 @@ const collectUIMessages = (messages, uiMessagesByParent) => {
 	return collected;
 };
 const sameUIMessages = (a, b) => a.length === b.length && a.every((ui, index) => ui === b[index]);
-const convertWithUIMessages = (uiMessagesByParent) => (message, metadata) => convertLangChainBaseMessage(message, {
+const foldLocalUIMessages = (resource) => {
+	const events = resource.uiStore?.getSnapshot();
+	if (events === void 0) return NO_UI_MESSAGES;
+	return foldUIUpdates(events, resource.uiFoldMemo);
+};
+const mergeLocalUIMessages = (uiMessagesByParent, localUiMessages) => {
+	const merged = new Map(uiMessagesByParent);
+	for (const [parentId, messages] of groupUIMessagesByParent(localUiMessages)) merged.set(parentId, mergeUIMessages(messages, merged.get(parentId)));
+	return merged;
+};
+const createConverter = (uiMessagesByParent, messageTiming) => (message, metadata) => convertLangChainBaseMessage(message, {
 	...metadata,
-	uiMessagesByParent
+	uiMessagesByParent,
+	messageTiming
 });
+const updateTiming = (resource) => {
+	if (resource.timing === void 0) return;
+	const startedAt = resource.snapshot.startedAt.getTime();
+	const completedAt = resource.snapshot.completedAt?.getTime();
+	if (resource.timing.startedAt === startedAt && resource.timing.completedAt === completedAt) return;
+	resource.timing = {
+		startedAt,
+		...completedAt !== void 0 && { completedAt }
+	};
+};
 const createSubagentTranscriptSource = () => {
-	const uiMessagesByParent = /* @__PURE__ */ new Map();
 	const source = {
 		resources: /* @__PURE__ */ new Map(),
-		requestedNamespaceIds: /* @__PURE__ */ new Set(),
+		namespaceRequests: /* @__PURE__ */ new Map(),
 		snapshot: /* @__PURE__ */ new Map(),
 		listeners: /* @__PURE__ */ new Set(),
 		controller: void 0,
-		uiMessagesByParent,
-		convert: convertWithUIMessages(uiMessagesByParent),
+		uiMessagesByParent: /* @__PURE__ */ new Map(),
 		subscribe(listener) {
 			source.listeners.add(listener);
 			return () => source.listeners.delete(listener);
@@ -42,20 +85,22 @@ const createSubagentTranscriptSource = () => {
 			return source.snapshot;
 		},
 		reconcile(controller, subagents, uiMessagesByParent) {
-			if (source.uiMessagesByParent !== uiMessagesByParent) {
-				source.uiMessagesByParent = uiMessagesByParent;
-				source.convert = convertWithUIMessages(uiMessagesByParent);
-			}
+			source.uiMessagesByParent = uiMessagesByParent;
+			const rebound = /* @__PURE__ */ new Map();
 			if (source.controller !== controller) {
 				source.dispose();
 				source.controller = controller;
 			}
-			for (const id of source.requestedNamespaceIds) if (!subagents.has(id)) source.requestedNamespaceIds.delete(id);
+			for (const id of source.namespaceRequests.keys()) if (!subagents.has(id)) source.namespaceRequests.delete(id);
 			for (const [id, resource] of source.resources) {
 				const snapshot = subagents.get(id);
 				if (!snapshot || snapshot.depth > 16 || !sameNamespace(resource.namespace, snapshot.namespace)) {
-					resource.unsubscribe();
-					resource.release();
+					if (snapshot && snapshot.depth <= 16) rebound.set(id, {
+						timing: resource.timing,
+						timingState: resource.timingState,
+						messageTiming: resource.messageTiming
+					});
+					resource.dispose();
 					source.resources.delete(id);
 					continue;
 				}
@@ -63,47 +108,75 @@ const createSubagentTranscriptSource = () => {
 			}
 			for (const snapshot of subagents.values()) {
 				if (snapshot.depth > 16) continue;
-				if (!source.requestedNamespaceIds.has(snapshot.id)) {
-					source.requestedNamespaceIds.add(snapshot.id);
-					controller.resolveSubagentNamespace(snapshot.id).catch(() => {
-						if (source.controller === controller) source.requestedNamespaceIds.delete(snapshot.id);
-					});
+				if (!needsNamespaceResolution(snapshot)) source.namespaceRequests.delete(snapshot.id);
+				else {
+					const request = source.namespaceRequests.get(snapshot.id);
+					if (!request) {
+						const nextRequest = {
+							id: snapshot.id,
+							attempts: 0,
+							pending: false,
+							retryQueued: false,
+							status: snapshot.status
+						};
+						source.namespaceRequests.set(snapshot.id, nextRequest);
+						requestSubagentNamespace(source, controller, nextRequest);
+					} else if (request.status !== snapshot.status) {
+						request.status = snapshot.status;
+						if (request.pending) request.retryQueued = request.attempts < 2;
+						else if (request.attempts < 2) requestSubagentNamespace(source, controller, request);
+					}
 				}
 				if (source.resources.has(snapshot.id)) continue;
-				const acquired = controller.registry.acquire(messagesProjection(snapshot.namespace));
+				const acquired = controller.registry.acquire(subagentMessagesProjection(snapshot.namespace));
+				const acquiredUI = snapshot.namespace.length > ROOT_UI_CHANNEL_DEPTH ? controller.registry.acquire(channelProjection(UI_CUSTOM_CHANNELS, snapshot.namespace)) : void 0;
 				const resource = {
 					snapshot,
 					namespace: snapshot.namespace,
 					store: acquired.store,
-					unsubscribe: () => {},
-					release: acquired.release,
+					uiStore: acquiredUI?.store,
+					dispose: () => {},
 					storeSnapshot: void 0,
 					status: void 0,
+					uiFoldMemo: createUIFoldMemo(),
+					localUiMessages: NO_UI_MESSAGES,
+					rootUiMessagesByParent: source.uiMessagesByParent,
+					uiMessagesByParent: source.uiMessagesByParent,
+					timingState: rebound.get(snapshot.id)?.timingState ?? null,
+					messageTiming: rebound.get(snapshot.id)?.messageTiming ?? NO_MESSAGE_TIMING,
+					convertedMessageTiming: void 0,
+					convert: createConverter(source.uiMessagesByParent, NO_MESSAGE_TIMING),
 					uiMessages: [],
 					converted: void 0,
 					childTranscripts: void 0,
 					transcript: void 0,
+					timing: rebound.has(snapshot.id) ? rebound.get(snapshot.id).timing : snapshot.status === "running" ? { startedAt: snapshot.startedAt.getTime() } : void 0,
+					entry: void 0,
 					memo: createAttachMemo(),
 					cache: createExternalMessageConversionCache()
 				};
-				resource.unsubscribe = resource.store.subscribe(() => rebuild());
+				const unsubscribe = resource.store.subscribe(() => rebuild());
+				const unsubscribeUI = resource.uiStore?.subscribe(() => rebuild());
+				resource.dispose = () => {
+					unsubscribe();
+					unsubscribeUI?.();
+					acquired.release();
+					acquiredUI?.release();
+				};
 				source.resources.set(snapshot.id, resource);
 			}
 			rebuild();
 		},
 		dispose() {
-			for (const resource of source.resources.values()) {
-				resource.unsubscribe();
-				resource.release();
-			}
+			for (const resource of source.resources.values()) resource.dispose();
 			source.resources.clear();
-			source.requestedNamespaceIds.clear();
+			source.namespaceRequests.clear();
 			source.snapshot = /* @__PURE__ */ new Map();
 			for (const listener of source.listeners) listener();
 		}
 	};
 	const rebuild = () => {
-		const { convert, uiMessagesByParent } = source;
+		const { uiMessagesByParent } = source;
 		const resources = [...source.resources.values()];
 		const childrenByParent = /* @__PURE__ */ new Map();
 		for (const resource of resources) {
@@ -121,16 +194,30 @@ const createSubagentTranscriptSource = () => {
 			built.add(resource.snapshot.id);
 			const children = depth < 16 ? childrenByParent.get(resource.snapshot.id) ?? [] : [];
 			for (const child of children) build(child, depth + 1);
-			const childTranscripts = new Map(children.flatMap((child) => child.transcript ? [[child.snapshot.id, child.transcript]] : []));
+			const childTranscripts = new Map(children.flatMap((child) => child.entry ? [[child.snapshot.id, child.entry]] : []));
 			const storeSnapshot = resource.store.getSnapshot();
 			const status = resource.snapshot.status;
-			const uiMessages = collectUIMessages(storeSnapshot, uiMessagesByParent);
-			const conversionChanged = resource.converted === void 0 || resource.storeSnapshot !== storeSnapshot || resource.status !== status || !sameUIMessages(resource.uiMessages, uiMessages);
+			const stepped = stepStreamingTiming(resource.timingState, storeSnapshot, status === "running", langChainStreamingTimingAccessors, void 0);
+			resource.timingState = stepped.state;
+			if (Object.keys(stepped.timings).length > 0) resource.messageTiming = {
+				...resource.messageTiming,
+				...stepped.timings
+			};
+			const localUiMessages = foldLocalUIMessages(resource);
+			if (resource.localUiMessages !== localUiMessages || resource.rootUiMessagesByParent !== uiMessagesByParent || resource.convertedMessageTiming !== resource.messageTiming) {
+				resource.localUiMessages = localUiMessages;
+				resource.rootUiMessagesByParent = uiMessagesByParent;
+				resource.uiMessagesByParent = localUiMessages.length === 0 ? uiMessagesByParent : mergeLocalUIMessages(uiMessagesByParent, localUiMessages);
+				resource.convert = createConverter(resource.uiMessagesByParent, resource.messageTiming);
+			}
+			const uiMessages = collectUIMessages(storeSnapshot, resource.uiMessagesByParent);
+			const conversionChanged = resource.converted === void 0 || resource.storeSnapshot !== storeSnapshot || resource.status !== status || resource.convertedMessageTiming !== resource.messageTiming || !sameUIMessages(resource.uiMessages, uiMessages);
 			if (conversionChanged) {
-				resource.converted = convertExternalMessages(storeSnapshot, convert, status === "running", TRANSCRIPT_METADATA, resource.cache);
+				resource.converted = convertExternalMessages(storeSnapshot, resource.convert, status === "running", TRANSCRIPT_METADATA, resource.cache);
 				resource.storeSnapshot = storeSnapshot;
 				resource.status = status;
 				resource.uiMessages = uiMessages;
+				resource.convertedMessageTiming = resource.messageTiming;
 			}
 			if (resource.transcript === void 0 || conversionChanged || !sameTranscriptEntries(resource.childTranscripts, childTranscripts)) {
 				const transcript = attachSubagentTranscripts(resource.converted, childTranscripts, resource.memo);
@@ -138,8 +225,16 @@ const createSubagentTranscriptSource = () => {
 				resource.transcript = transcript;
 				resource.childTranscripts = childTranscripts;
 			}
+			updateTiming(resource);
+			if (resource.entry === void 0 || resource.entry.messages !== resource.transcript || resource.entry.timing !== resource.timing) {
+				resource.entry = {
+					messages: resource.transcript,
+					...resource.timing && { timing: resource.timing }
+				};
+				changed = true;
+			}
 			if (!source.snapshot.has(resource.snapshot.id)) changed = true;
-			transcripts.set(resource.snapshot.id, resource.transcript);
+			transcripts.set(resource.snapshot.id, resource.entry);
 		};
 		for (const resource of resources) if (resource.snapshot.parentId == null || !source.resources.has(resource.snapshot.parentId)) build(resource, 1);
 		for (const resource of resources) build(resource, 16);

package/dist/useSubagentTranscripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSubagentTranscripts.js","names":[],"sources":["../src/useSubagentTranscripts.ts"],"sourcesContent":["\"use client\";\n\nimport { useEffect, useRef, useSyncExternalStore } from \"react\";\nimport type { ThreadMessage } from \"@assistant-ui/core\";\nimport {\n  convertExternalMessages,\n  createExternalMessageConversionCache,\n  type ExternalMessageConversionCache,\n  type useExternalMessageConverter,\n} from \"@assistant-ui/core/react\";\nimport { STREAM_CONTROLLER, type AnyStream } from \"@langchain/react\";\nimport type { BaseMessage } from \"@langchain/core/messages\";\nimport { messagesProjection } from \"@langchain/langgraph-sdk/stream\";\nimport type { SubagentDiscoverySnapshot } from \"@langchain/react\";\nimport {\n  attachSubagentTranscripts,\n  type AttachMemo,\n  createAttachMemo,\n} from \"./attachSubagentTranscripts\";\nimport { convertLangChainBaseMessage } from \"./convertMessages\";\nimport type { LangChainBaseMessage, UIMessage } from \"./types\";\n\nexport const MAX_SUBAGENT_DEPTH = 16;\n\nconst TRANSCRIPT_METADATA = {};\n\ntype ProjectionStore = {\n  getSnapshot(): BaseMessage[];\n  subscribe(listener: () => void): () => void;\n};\n\ntype ProjectionResource = {\n  snapshot: SubagentDiscoverySnapshot;\n  namespace: readonly string[];\n  store: ProjectionStore;\n  unsubscribe: () => void;\n  release: () => void;\n  storeSnapshot: BaseMessage[] | undefined;\n  status: SubagentDiscoverySnapshot[\"status\"] | undefined;\n  uiMessages: readonly UIMessage[];\n  converted: readonly ThreadMessage[] | undefined;\n  childTranscripts: ReadonlyMap<string, readonly ThreadMessage[]> | undefined;\n  transcript: readonly ThreadMessage[] | undefined;\n  memo: AttachMemo;\n  cache: ExternalMessageConversionCache;\n};\n\ntype SubagentTranscriptSource = {\n  resources: Map<string, ProjectionResource>;\n  requestedNamespaceIds: Set<string>;\n  snapshot: ReadonlyMap<string, readonly ThreadMessage[]>;\n  listeners: Set<() => void>;\n  controller: AnyStream[typeof STREAM_CONTROLLER] | undefined;\n  uiMessagesByParent: Map<string, UIMessage[]>;\n  convert: useExternalMessageConverter.Callback<LangChainBaseMessage>;\n  subscribe(listener: () => void): () => void;\n  getSnapshot(): ReadonlyMap<string, readonly ThreadMessage[]>;\n  reconcile(\n    controller: AnyStream[typeof STREAM_CONTROLLER],\n    subagents: AnyStream[\"subagents\"],\n    uiMessagesByParent: Map<string, UIMessage[]>,\n  ): void;\n  dispose(): void;\n};\n\nconst sameNamespace = (a: readonly string[], b: readonly string[]) =>\n  a.length === b.length && a.every((segment, index) => segment === b[index]);\n\nconst sameTranscriptEntries = (\n  a: ReadonlyMap<string, readonly ThreadMessage[]> | undefined,\n  b: ReadonlyMap<string, readonly ThreadMessage[]>,\n) =>\n  a?.size === b.size &&\n  [...b].every(([id, transcript]) => a.get(id) === transcript);\n\nconst collectUIMessages = (\n  messages: readonly BaseMessage[],\n  uiMessagesByParent: Map<string, UIMessage[]>,\n) => {\n  const collected: UIMessage[] = [];\n  if (uiMessagesByParent.size === 0) return collected;\n  for (const message of messages) {\n    const uiMessages = message.id && uiMessagesByParent.get(message.id);\n    if (uiMessages) collected.push(...uiMessages);\n  }\n  return collected;\n};\n\nconst sameUIMessages = (a: readonly UIMessage[], b: readonly UIMessage[]) =>\n  a.length === b.length && a.every((ui, index) => ui === b[index]);\n\nconst convertWithUIMessages =\n  (\n    uiMessagesByParent: Map<string, UIMessage[]>,\n  ): useExternalMessageConverter.Callback<LangChainBaseMessage> =>\n  (message, metadata) =>\n    convertLangChainBaseMessage(message, { ...metadata, uiMessagesByParent });\n\nconst createSubagentTranscriptSource = (): SubagentTranscriptSource => {\n  const uiMessagesByParent = new Map<string, UIMessage[]>();\n  const source: SubagentTranscriptSource = {\n    resources: new Map(),\n    requestedNamespaceIds: new Set(),\n    snapshot: new Map(),\n    listeners: new Set(),\n    controller: undefined,\n    uiMessagesByParent,\n    convert: convertWithUIMessages(uiMessagesByParent),\n    subscribe(listener) {\n      source.listeners.add(listener);\n      return () => source.listeners.delete(listener);\n    },\n    getSnapshot() {\n      return source.snapshot;\n    },\n    reconcile(controller, subagents, uiMessagesByParent) {\n      if (source.uiMessagesByParent !== uiMessagesByParent) {\n        source.uiMessagesByParent = uiMessagesByParent;\n        source.convert = convertWithUIMessages(uiMessagesByParent);\n      }\n\n      if (source.controller !== controller) {\n        source.dispose();\n        source.controller = controller;\n      }\n\n      for (const id of source.requestedNamespaceIds) {\n        if (!subagents.has(id)) source.requestedNamespaceIds.delete(id);\n      }\n\n      for (const [id, resource] of source.resources) {\n        const snapshot = subagents.get(id);\n        if (\n          !snapshot ||\n          snapshot.depth > MAX_SUBAGENT_DEPTH ||\n          !sameNamespace(resource.namespace, snapshot.namespace)\n        ) {\n          resource.unsubscribe();\n          resource.release();\n          source.resources.delete(id);\n          continue;\n        }\n        resource.snapshot = snapshot;\n      }\n\n      for (const snapshot of subagents.values()) {\n        if (snapshot.depth > MAX_SUBAGENT_DEPTH) continue;\n        if (!source.requestedNamespaceIds.has(snapshot.id)) {\n          source.requestedNamespaceIds.add(snapshot.id);\n          void controller.resolveSubagentNamespace(snapshot.id).catch(() => {\n            if (source.controller === controller)\n              source.requestedNamespaceIds.delete(snapshot.id);\n          });\n        }\n        if (source.resources.has(snapshot.id)) continue;\n        const acquired = controller.registry.acquire(\n          messagesProjection(snapshot.namespace),\n        );\n        const resource: ProjectionResource = {\n          snapshot,\n          namespace: snapshot.namespace,\n          store: acquired.store,\n          unsubscribe: () => {},\n          release: acquired.release,\n          storeSnapshot: undefined,\n          status: undefined,\n          uiMessages: [],\n          converted: undefined,\n          childTranscripts: undefined,\n          transcript: undefined,\n          memo: createAttachMemo(),\n          cache: createExternalMessageConversionCache(),\n        };\n        resource.unsubscribe = resource.store.subscribe(() => rebuild());\n        source.resources.set(snapshot.id, resource);\n      }\n\n      rebuild();\n    },\n    dispose() {\n      for (const resource of source.resources.values()) {\n        resource.unsubscribe();\n        resource.release();\n      }\n      source.resources.clear();\n      source.requestedNamespaceIds.clear();\n      source.snapshot = new Map();\n      for (const listener of source.listeners) listener();\n    },\n  };\n\n  const rebuild = () => {\n    const { convert, uiMessagesByParent } = source;\n    const resources = [...source.resources.values()];\n    const childrenByParent = new Map<string, ProjectionResource[]>();\n\n    for (const resource of resources) {\n      const parentId = resource.snapshot.parentId;\n      if (parentId == null) continue;\n      const children = childrenByParent.get(parentId);\n      if (children) children.push(resource);\n      else childrenByParent.set(parentId, [resource]);\n    }\n\n    const transcripts = new Map<string, readonly ThreadMessage[]>();\n    let changed = source.snapshot.size !== resources.length;\n    const built = new Set<string>();\n\n    const build = (resource: ProjectionResource, depth: number) => {\n      if (built.has(resource.snapshot.id)) return;\n      built.add(resource.snapshot.id);\n      const children =\n        depth < MAX_SUBAGENT_DEPTH\n          ? (childrenByParent.get(resource.snapshot.id) ?? [])\n          : [];\n      for (const child of children) build(child, depth + 1);\n      const childTranscripts = new Map(\n        children.flatMap((child) =>\n          child.transcript\n            ? [[child.snapshot.id, child.transcript] as const]\n            : [],\n        ),\n      );\n      const storeSnapshot = resource.store.getSnapshot();\n      const status = resource.snapshot.status;\n      const uiMessages = collectUIMessages(storeSnapshot, uiMessagesByParent);\n\n      const conversionChanged =\n        resource.converted === undefined ||\n        resource.storeSnapshot !== storeSnapshot ||\n        resource.status !== status ||\n        !sameUIMessages(resource.uiMessages, uiMessages);\n      if (conversionChanged) {\n        resource.converted = convertExternalMessages(\n          storeSnapshot as LangChainBaseMessage[],\n          convert,\n          status === \"running\",\n          TRANSCRIPT_METADATA,\n          resource.cache,\n        );\n        resource.storeSnapshot = storeSnapshot;\n        resource.status = status;\n        resource.uiMessages = uiMessages;\n      }\n\n      if (\n        resource.transcript === undefined ||\n        conversionChanged ||\n        !sameTranscriptEntries(resource.childTranscripts, childTranscripts)\n      ) {\n        const transcript = attachSubagentTranscripts(\n          resource.converted!,\n          childTranscripts,\n          resource.memo,\n        );\n        changed ||= resource.transcript !== transcript;\n        resource.transcript = transcript;\n        resource.childTranscripts = childTranscripts;\n      }\n\n      if (!source.snapshot.has(resource.snapshot.id)) changed = true;\n      transcripts.set(resource.snapshot.id, resource.transcript);\n    };\n\n    for (const resource of resources) {\n      if (\n        resource.snapshot.parentId == null ||\n        !source.resources.has(resource.snapshot.parentId)\n      )\n        build(resource, 1);\n    }\n    for (const resource of resources) build(resource, MAX_SUBAGENT_DEPTH);\n\n    if (!changed) return;\n    source.snapshot = transcripts;\n    for (const listener of source.listeners) listener();\n  };\n\n  return source;\n};\n\nexport const useSubagentTranscripts = (\n  stream: AnyStream,\n  uiMessagesByParent: Map<string, UIMessage[]>,\n): ReadonlyMap<string, readonly ThreadMessage[]> => {\n  const sourceRef = useRef<SubagentTranscriptSource | undefined>(undefined);\n  if (!sourceRef.current) {\n    sourceRef.current = createSubagentTranscriptSource();\n  }\n  const source = sourceRef.current;\n  const controller = stream[STREAM_CONTROLLER];\n\n  useEffect(() => {\n    source.reconcile(controller, stream.subagents, uiMessagesByParent);\n  }, [controller, source, stream.subagents, uiMessagesByParent]);\n\n  useEffect(() => () => source.dispose(), [source]);\n\n  return useSyncExternalStore(\n    source.subscribe,\n    source.getSnapshot,\n    source.getSnapshot,\n  );\n};\n"],"mappings":"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"}
+{"version":3,"file":"useSubagentTranscripts.js","names":[],"sources":["../src/useSubagentTranscripts.ts"],"sourcesContent":["\"use client\";\n\nimport { useEffect, useRef, useSyncExternalStore } from \"react\";\nimport {\n  stepStreamingTiming,\n  type MessageTiming,\n  type StreamingTimingState,\n  type ThreadMessage,\n  type ToolCallTiming,\n} from \"@assistant-ui/core\";\nimport {\n  convertExternalMessages,\n  createExternalMessageConversionCache,\n  type ExternalMessageConversionCache,\n  type useExternalMessageConverter,\n} from \"@assistant-ui/core/react\";\nimport { STREAM_CONTROLLER, type AnyStream } from \"@langchain/react\";\nimport type { BaseMessage } from \"@langchain/core/messages\";\nimport { channelProjection, type Event } from \"@langchain/langgraph-sdk/stream\";\nimport type { SubagentDiscoverySnapshot } from \"@langchain/react\";\nimport {\n  attachSubagentTranscripts,\n  type AttachMemo,\n  createAttachMemo,\n  type SubagentTranscript,\n} from \"./attachSubagentTranscripts\";\nimport { convertLangChainBaseMessage } from \"./convertMessages\";\nimport { groupUIMessagesByParent } from \"./converter\";\nimport { langChainStreamingTimingAccessors } from \"./streamingTiming\";\nimport { subagentMessagesProjection } from \"./subagentMessagesProjection\";\nimport type { LangChainBaseMessage, UIMessage } from \"./types\";\nimport {\n  createUIFoldMemo,\n  foldUIUpdates,\n  mergeUIMessages,\n  UI_CUSTOM_CHANNELS,\n  type UIFoldMemo,\n} from \"./uiMessages\";\n\nexport const MAX_SUBAGENT_DEPTH = 16;\n\nconst ROOT_UI_CHANNEL_DEPTH = 1;\n\nconst TRANSCRIPT_METADATA = {};\n\nconst NO_UI_MESSAGES: readonly UIMessage[] = [];\n\nconst NO_MESSAGE_TIMING: Record<string, MessageTiming> = {};\n\ntype ProjectionStore<T> = {\n  getSnapshot(): T;\n  subscribe(listener: () => void): () => void;\n};\n\ntype ProjectionResource = {\n  snapshot: SubagentDiscoverySnapshot;\n  namespace: readonly string[];\n  store: ProjectionStore<BaseMessage[]>;\n  uiStore: ProjectionStore<readonly Event[]> | undefined;\n  dispose: () => void;\n  storeSnapshot: BaseMessage[] | undefined;\n  status: SubagentDiscoverySnapshot[\"status\"] | undefined;\n  uiFoldMemo: UIFoldMemo;\n  localUiMessages: readonly UIMessage[];\n  rootUiMessagesByParent: Map<string, UIMessage[]>;\n  uiMessagesByParent: Map<string, UIMessage[]>;\n  timingState: StreamingTimingState | null;\n  messageTiming: Record<string, MessageTiming>;\n  convertedMessageTiming: Record<string, MessageTiming> | undefined;\n  convert: useExternalMessageConverter.Callback<LangChainBaseMessage>;\n  uiMessages: readonly UIMessage[];\n  converted: readonly ThreadMessage[] | undefined;\n  childTranscripts: ReadonlyMap<string, SubagentTranscript> | undefined;\n  transcript: readonly ThreadMessage[] | undefined;\n  timing: ToolCallTiming | undefined;\n  entry: SubagentTranscript | undefined;\n  memo: AttachMemo;\n  cache: ExternalMessageConversionCache;\n};\n\ntype MeasuredTiming = {\n  timing: ToolCallTiming | undefined;\n  timingState: StreamingTimingState | null;\n  messageTiming: Record<string, MessageTiming>;\n};\n\ntype NamespaceRequest = {\n  id: string;\n  attempts: number;\n  pending: boolean;\n  retryQueued: boolean;\n  status: SubagentDiscoverySnapshot[\"status\"];\n};\n\ntype SubagentTranscriptSource = {\n  resources: Map<string, ProjectionResource>;\n  namespaceRequests: Map<string, NamespaceRequest>;\n  snapshot: ReadonlyMap<string, SubagentTranscript>;\n  listeners: Set<() => void>;\n  controller: AnyStream[typeof STREAM_CONTROLLER] | undefined;\n  uiMessagesByParent: Map<string, UIMessage[]>;\n  subscribe(listener: () => void): () => void;\n  getSnapshot(): ReadonlyMap<string, SubagentTranscript>;\n  reconcile(\n    controller: AnyStream[typeof STREAM_CONTROLLER],\n    subagents: AnyStream[\"subagents\"],\n    uiMessagesByParent: Map<string, UIMessage[]>,\n  ): void;\n  dispose(): void;\n};\n\nconst sameNamespace = (a: readonly string[], b: readonly string[]) =>\n  a.length === b.length && a.every((segment, index) => segment === b[index]);\n\nconst needsNamespaceResolution = (snapshot: SubagentDiscoverySnapshot) =>\n  snapshot.namespace.length === 1 &&\n  snapshot.namespace[0] === `tools:${snapshot.id}`;\n\nconst requestSubagentNamespace = (\n  source: SubagentTranscriptSource,\n  controller: AnyStream[typeof STREAM_CONTROLLER],\n  request: NamespaceRequest,\n) => {\n  request.attempts += 1;\n  request.pending = true;\n  request.retryQueued = false;\n  void controller\n    .resolveSubagentNamespace(request.id)\n    .catch(() => {})\n    .finally(() => {\n      if (\n        source.controller !== controller ||\n        source.namespaceRequests.get(request.id) !== request\n      )\n        return;\n\n      request.pending = false;\n      if (\n        !request.retryQueued &&\n        request.attempts === 1 &&\n        request.status !== \"running\"\n      ) {\n        request.retryQueued = true;\n      }\n      if (!request.retryQueued || request.attempts >= 2) {\n        request.retryQueued = false;\n        return;\n      }\n      requestSubagentNamespace(source, controller, request);\n    });\n};\n\nconst sameTranscriptEntries = (\n  a: ReadonlyMap<string, SubagentTranscript> | undefined,\n  b: ReadonlyMap<string, SubagentTranscript>,\n) =>\n  a?.size === b.size &&\n  [...b].every(([id, transcript]) => a.get(id) === transcript);\n\nconst collectUIMessages = (\n  messages: readonly BaseMessage[],\n  uiMessagesByParent: Map<string, UIMessage[]>,\n) => {\n  const collected: UIMessage[] = [];\n  if (uiMessagesByParent.size === 0) return collected;\n  for (const message of messages) {\n    const uiMessages = message.id && uiMessagesByParent.get(message.id);\n    if (uiMessages) collected.push(...uiMessages);\n  }\n  return collected;\n};\n\nconst sameUIMessages = (a: readonly UIMessage[], b: readonly UIMessage[]) =>\n  a.length === b.length && a.every((ui, index) => ui === b[index]);\n\nconst foldLocalUIMessages = (resource: ProjectionResource) => {\n  const events = resource.uiStore?.getSnapshot();\n  if (events === undefined) return NO_UI_MESSAGES;\n  return foldUIUpdates(events, resource.uiFoldMemo);\n};\n\nconst mergeLocalUIMessages = (\n  uiMessagesByParent: Map<string, UIMessage[]>,\n  localUiMessages: readonly UIMessage[],\n) => {\n  const merged = new Map(uiMessagesByParent);\n  for (const [parentId, messages] of groupUIMessagesByParent<UIMessage>(\n    localUiMessages,\n  )) {\n    merged.set(parentId, mergeUIMessages(messages, merged.get(parentId)));\n  }\n  return merged;\n};\n\nconst createConverter =\n  (\n    uiMessagesByParent: Map<string, UIMessage[]>,\n    messageTiming: Record<string, MessageTiming>,\n  ): useExternalMessageConverter.Callback<LangChainBaseMessage> =>\n  (message, metadata) =>\n    convertLangChainBaseMessage(message, {\n      ...metadata,\n      uiMessagesByParent,\n      messageTiming,\n    });\n\nconst updateTiming = (resource: ProjectionResource) => {\n  if (resource.timing === undefined) return;\n  const startedAt = resource.snapshot.startedAt.getTime();\n  const completedAt = resource.snapshot.completedAt?.getTime();\n  if (\n    resource.timing.startedAt === startedAt &&\n    resource.timing.completedAt === completedAt\n  )\n    return;\n  resource.timing = {\n    startedAt,\n    ...(completedAt !== undefined && { completedAt }),\n  };\n};\n\nconst createSubagentTranscriptSource = (): SubagentTranscriptSource => {\n  const uiMessagesByParent = new Map<string, UIMessage[]>();\n  const source: SubagentTranscriptSource = {\n    resources: new Map(),\n    namespaceRequests: new Map(),\n    snapshot: new Map(),\n    listeners: new Set(),\n    controller: undefined,\n    uiMessagesByParent,\n    subscribe(listener) {\n      source.listeners.add(listener);\n      return () => source.listeners.delete(listener);\n    },\n    getSnapshot() {\n      return source.snapshot;\n    },\n    reconcile(controller, subagents, uiMessagesByParent) {\n      source.uiMessagesByParent = uiMessagesByParent;\n      // A resource is rebuilt from scratch when its namespace resolves, which\n      // routinely happens after the subagent finished. Its timing was measured\n      // while the client watched the task run and cannot be measured again.\n      const rebound = new Map<string, MeasuredTiming>();\n\n      if (source.controller !== controller) {\n        source.dispose();\n        source.controller = controller;\n      }\n\n      for (const id of source.namespaceRequests.keys()) {\n        if (!subagents.has(id)) source.namespaceRequests.delete(id);\n      }\n\n      for (const [id, resource] of source.resources) {\n        const snapshot = subagents.get(id);\n        if (\n          !snapshot ||\n          snapshot.depth > MAX_SUBAGENT_DEPTH ||\n          !sameNamespace(resource.namespace, snapshot.namespace)\n        ) {\n          if (snapshot && snapshot.depth <= MAX_SUBAGENT_DEPTH)\n            rebound.set(id, {\n              timing: resource.timing,\n              timingState: resource.timingState,\n              messageTiming: resource.messageTiming,\n            });\n          resource.dispose();\n          source.resources.delete(id);\n          continue;\n        }\n        resource.snapshot = snapshot;\n      }\n\n      for (const snapshot of subagents.values()) {\n        if (snapshot.depth > MAX_SUBAGENT_DEPTH) continue;\n        if (!needsNamespaceResolution(snapshot)) {\n          source.namespaceRequests.delete(snapshot.id);\n        } else {\n          const request = source.namespaceRequests.get(snapshot.id);\n          if (!request) {\n            const nextRequest: NamespaceRequest = {\n              id: snapshot.id,\n              attempts: 0,\n              pending: false,\n              retryQueued: false,\n              status: snapshot.status,\n            };\n            source.namespaceRequests.set(snapshot.id, nextRequest);\n            requestSubagentNamespace(source, controller, nextRequest);\n          } else if (request.status !== snapshot.status) {\n            request.status = snapshot.status;\n            if (request.pending) {\n              request.retryQueued = request.attempts < 2;\n            } else if (request.attempts < 2) {\n              requestSubagentNamespace(source, controller, request);\n            }\n          }\n        }\n        if (source.resources.has(snapshot.id)) continue;\n        const acquired = controller.registry.acquire(\n          subagentMessagesProjection(snapshot.namespace),\n        );\n        const acquiredUI =\n          snapshot.namespace.length > ROOT_UI_CHANNEL_DEPTH\n            ? controller.registry.acquire(\n                channelProjection(UI_CUSTOM_CHANNELS, snapshot.namespace),\n              )\n            : undefined;\n        const resource: ProjectionResource = {\n          snapshot,\n          namespace: snapshot.namespace,\n          store: acquired.store,\n          uiStore: acquiredUI?.store,\n          dispose: () => {},\n          storeSnapshot: undefined,\n          status: undefined,\n          uiFoldMemo: createUIFoldMemo(),\n          localUiMessages: NO_UI_MESSAGES,\n          rootUiMessagesByParent: source.uiMessagesByParent,\n          uiMessagesByParent: source.uiMessagesByParent,\n          timingState: rebound.get(snapshot.id)?.timingState ?? null,\n          messageTiming:\n            rebound.get(snapshot.id)?.messageTiming ?? NO_MESSAGE_TIMING,\n          convertedMessageTiming: undefined,\n          convert: createConverter(\n            source.uiMessagesByParent,\n            NO_MESSAGE_TIMING,\n          ),\n          uiMessages: [],\n          converted: undefined,\n          childTranscripts: undefined,\n          transcript: undefined,\n          timing: rebound.has(snapshot.id)\n            ? rebound.get(snapshot.id)!.timing\n            : snapshot.status === \"running\"\n              ? { startedAt: snapshot.startedAt.getTime() }\n              : undefined,\n          entry: undefined,\n          memo: createAttachMemo(),\n          cache: createExternalMessageConversionCache(),\n        };\n        const unsubscribe = resource.store.subscribe(() => rebuild());\n        const unsubscribeUI = resource.uiStore?.subscribe(() => rebuild());\n        resource.dispose = () => {\n          unsubscribe();\n          unsubscribeUI?.();\n          acquired.release();\n          acquiredUI?.release();\n        };\n        source.resources.set(snapshot.id, resource);\n      }\n\n      rebuild();\n    },\n    dispose() {\n      for (const resource of source.resources.values()) resource.dispose();\n      source.resources.clear();\n      source.namespaceRequests.clear();\n      source.snapshot = new Map();\n      for (const listener of source.listeners) listener();\n    },\n  };\n\n  const rebuild = () => {\n    const { uiMessagesByParent } = source;\n    const resources = [...source.resources.values()];\n    const childrenByParent = new Map<string, ProjectionResource[]>();\n\n    for (const resource of resources) {\n      const parentId = resource.snapshot.parentId;\n      if (parentId == null) continue;\n      const children = childrenByParent.get(parentId);\n      if (children) children.push(resource);\n      else childrenByParent.set(parentId, [resource]);\n    }\n\n    const transcripts = new Map<string, SubagentTranscript>();\n    let changed = source.snapshot.size !== resources.length;\n    const built = new Set<string>();\n\n    const build = (resource: ProjectionResource, depth: number) => {\n      if (built.has(resource.snapshot.id)) return;\n      built.add(resource.snapshot.id);\n      const children =\n        depth < MAX_SUBAGENT_DEPTH\n          ? (childrenByParent.get(resource.snapshot.id) ?? [])\n          : [];\n      for (const child of children) build(child, depth + 1);\n      const childTranscripts = new Map(\n        children.flatMap((child) =>\n          child.entry ? [[child.snapshot.id, child.entry] as const] : [],\n        ),\n      );\n      const storeSnapshot = resource.store.getSnapshot();\n      const status = resource.snapshot.status;\n      const stepped = stepStreamingTiming(\n        resource.timingState,\n        storeSnapshot as LangChainBaseMessage[],\n        status === \"running\",\n        langChainStreamingTimingAccessors,\n        undefined,\n      );\n      resource.timingState = stepped.state;\n      if (Object.keys(stepped.timings).length > 0) {\n        resource.messageTiming = {\n          ...resource.messageTiming,\n          ...stepped.timings,\n        };\n      }\n      const localUiMessages = foldLocalUIMessages(resource);\n      if (\n        resource.localUiMessages !== localUiMessages ||\n        resource.rootUiMessagesByParent !== uiMessagesByParent ||\n        resource.convertedMessageTiming !== resource.messageTiming\n      ) {\n        resource.localUiMessages = localUiMessages;\n        resource.rootUiMessagesByParent = uiMessagesByParent;\n        resource.uiMessagesByParent =\n          localUiMessages.length === 0\n            ? uiMessagesByParent\n            : mergeLocalUIMessages(uiMessagesByParent, localUiMessages);\n        resource.convert = createConverter(\n          resource.uiMessagesByParent,\n          resource.messageTiming,\n        );\n      }\n      const uiMessages = collectUIMessages(\n        storeSnapshot,\n        resource.uiMessagesByParent,\n      );\n\n      const conversionChanged =\n        resource.converted === undefined ||\n        resource.storeSnapshot !== storeSnapshot ||\n        resource.status !== status ||\n        resource.convertedMessageTiming !== resource.messageTiming ||\n        !sameUIMessages(resource.uiMessages, uiMessages);\n      if (conversionChanged) {\n        resource.converted = convertExternalMessages(\n          storeSnapshot as LangChainBaseMessage[],\n          resource.convert,\n          status === \"running\",\n          TRANSCRIPT_METADATA,\n          resource.cache,\n        );\n        resource.storeSnapshot = storeSnapshot;\n        resource.status = status;\n        resource.uiMessages = uiMessages;\n        resource.convertedMessageTiming = resource.messageTiming;\n      }\n\n      if (\n        resource.transcript === undefined ||\n        conversionChanged ||\n        !sameTranscriptEntries(resource.childTranscripts, childTranscripts)\n      ) {\n        const transcript = attachSubagentTranscripts(\n          resource.converted!,\n          childTranscripts,\n          resource.memo,\n        );\n        changed ||= resource.transcript !== transcript;\n        resource.transcript = transcript;\n        resource.childTranscripts = childTranscripts;\n      }\n\n      updateTiming(resource);\n      if (\n        resource.entry === undefined ||\n        resource.entry.messages !== resource.transcript ||\n        resource.entry.timing !== resource.timing\n      ) {\n        resource.entry = {\n          messages: resource.transcript!,\n          ...(resource.timing && { timing: resource.timing }),\n        };\n        changed = true;\n      }\n\n      if (!source.snapshot.has(resource.snapshot.id)) changed = true;\n      transcripts.set(resource.snapshot.id, resource.entry);\n    };\n\n    for (const resource of resources) {\n      if (\n        resource.snapshot.parentId == null ||\n        !source.resources.has(resource.snapshot.parentId)\n      )\n        build(resource, 1);\n    }\n    for (const resource of resources) build(resource, MAX_SUBAGENT_DEPTH);\n\n    if (!changed) return;\n    source.snapshot = transcripts;\n    for (const listener of source.listeners) listener();\n  };\n\n  return source;\n};\n\nexport const useSubagentTranscripts = (\n  stream: AnyStream,\n  uiMessagesByParent: Map<string, UIMessage[]>,\n): ReadonlyMap<string, SubagentTranscript> => {\n  const sourceRef = useRef<SubagentTranscriptSource | undefined>(undefined);\n  if (!sourceRef.current) {\n    sourceRef.current = createSubagentTranscriptSource();\n  }\n  const source = sourceRef.current;\n  const controller = stream[STREAM_CONTROLLER];\n\n  useEffect(() => {\n    source.reconcile(controller, stream.subagents, uiMessagesByParent);\n  }, [controller, source, stream.subagents, uiMessagesByParent]);\n\n  useEffect(() => () => source.dispose(), [source]);\n\n  return useSyncExternalStore(\n    source.subscribe,\n    source.getSnapshot,\n    source.getSnapshot,\n  );\n};\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-langchain",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "LangChain useStream adapter for assistant-ui",
   "keywords": [
     "langchain",
@@ -40,18 +40,22 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.3.19",
-    "@assistant-ui/store": "^0.3.13",
+    "@assistant-ui/core": "^0.3.21",
+    "@assistant-ui/store": "^0.3.15",
     "assistant-cloud": "*",
-    "assistant-stream": "^0.3.43"
+    "assistant-stream": "^0.3.45"
   },
   "peerDependencies": {
+    "@langchain/core": "^1.0.0",
     "@langchain/langgraph-sdk": "^1.9.20",
     "@langchain/react": "^1.0.20",
     "@types/react": "*",
     "react": "^18 || ^19"
   },
   "peerDependenciesMeta": {
+    "@langchain/core": {
+      "optional": true
+    },
     "@langchain/langgraph-sdk": {
       "optional": true
     },
@@ -63,15 +67,15 @@
     }
   },
   "devDependencies": {
-    "@assistant-ui/x-buildutils": "0.0.27",
-    "@langchain/core": "^1.2.9",
-    "@langchain/langgraph-sdk": "^1.10.2",
-    "@langchain/react": "^1.0.35",
+    "@assistant-ui/x-buildutils": "0.0.29",
+    "@langchain/core": "^1.2.11",
+    "@langchain/langgraph-sdk": "^1.11.0",
+    "@langchain/react": "^1.1.0",
     "@testing-library/react": "^16.3.3",
-    "@types/react": "^19.2.18",
+    "@types/react": "^19.3.0",
     "jsdom": "^30.0.1",
-    "react": "^19.2.8",
-    "vitest": "^5.0.0"
+    "react": "^19.3.0",
+    "vitest": "^5.0.1"
   },
   "publishConfig": {
     "access": "public",
@@ -89,6 +93,7 @@
   "scripts": {
     "build": "aui-build",
     "test": "vitest run",
+    "typecheck": "tsc --noEmit",
     "test:watch": "vitest"
   }
 }

package/src/attachSubagentTranscripts.test.ts

@@ -7,6 +7,7 @@ import { describe, expect, it } from "vitest";
 import {
   attachSubagentTranscripts,
   createAttachMemo,
+  type SubagentTranscript,
 } from "./attachSubagentTranscripts";
 
 const assistantMessage = (id: string, toolCallId?: string): ThreadMessage =>
@@ -35,7 +36,13 @@ const assistantMessage = (id: string, toolCallId?: string): ThreadMessage =>
     },
   }) as ThreadMessage;
 
-const transcript = (id: string) => [assistantMessage(id)];
+const transcript = (
+  id: string,
+  timing: SubagentTranscript["timing"] = {
+    startedAt: 1_000,
+    completedAt: 3_500,
+  },
+): SubagentTranscript => ({ messages: [assistantMessage(id)], timing });
 
 describe("attachSubagentTranscripts", () => {
   it("returns the input array when no tool call has a transcript", () => {
@@ -68,7 +75,8 @@ describe("attachSubagentTranscripts", () => {
     const part = attached[0]!.content[0]!;
     expect(part.type).toBe("tool-call");
     if (part.type !== "tool-call") throw new Error("expected a tool call");
-    expect(part.messages).toBe(childTranscript);
+    expect(part.messages).toBe(childTranscript.messages);
+    expect(part.timing).toBe(childTranscript.timing);
   });
 
   it("reuses the attached array when transcript identities are unchanged", () => {
@@ -141,10 +149,10 @@ describe("attachSubagentTranscripts", () => {
       memo,
     );
 
-    expect(before?.content[0]).toMatchObject({ messages: nested });
+    expect(before?.content[0]).toMatchObject({ messages: nested.messages });
     expect(after).not.toBe(before);
     expect(after?.content[0]).toBe(first);
-    expect(after?.content[1]).toMatchObject({ messages: nested });
+    expect(after?.content[1]).toMatchObject({ messages: nested.messages });
   });
 
   it("keeps untouched parts of a partially matched message by reference", () => {
@@ -164,7 +172,7 @@ describe("attachSubagentTranscripts", () => {
     );
 
     expect(attached?.content[0]).toBe(text);
-    expect(attached?.content[1]).toMatchObject({ messages: nested });
+    expect(attached?.content[1]).toMatchObject({ messages: nested.messages });
     expect(attached?.content[2]).toBe(unmatched);
   });
 

package/src/attachSubagentTranscripts.ts

@@ -2,9 +2,20 @@ import {
   bindExternalStoreMessage,
   getExternalStoreMessages,
   type ThreadMessage,
+  type ToolCallTiming,
 } from "@assistant-ui/core";
 
-type AttachedTranscript = readonly [string, readonly ThreadMessage[]];
+export type SubagentTranscript = {
+  readonly messages: readonly ThreadMessage[];
+  /**
+   * Only present when the client watched the task run: the discovery
+   * timestamps are stamped when the task call is first seen, so a thread
+   * seeded from a checkpoint would report a duration of zero.
+   */
+  readonly timing?: ToolCallTiming;
+};
+
+type AttachedTranscript = readonly [string, SubagentTranscript];
 
 type AttachedMessage = {
   transcripts: readonly AttachedTranscript[];
@@ -33,7 +44,7 @@ const sameTranscripts = (
 
 export const attachSubagentTranscripts = (
   messages: readonly ThreadMessage[],
-  transcripts: ReadonlyMap<string, readonly ThreadMessage[]>,
+  transcripts: ReadonlyMap<string, SubagentTranscript>,
   memo: AttachMemo,
 ): readonly ThreadMessage[] => {
   let attachedAny = false;
@@ -52,11 +63,19 @@ export const attachSubagentTranscripts = (
 
     const attached = {
       ...message,
-      content: message.content.map((part) =>
-        part.type === "tool-call" && transcripts.has(part.toolCallId)
-          ? { ...part, messages: transcripts.get(part.toolCallId)! }
-          : part,
-      ),
+      content: message.content.map((part) => {
+        const transcript =
+          part.type === "tool-call"
+            ? transcripts.get(part.toolCallId)
+            : undefined;
+        return transcript
+          ? {
+              ...part,
+              messages: transcript.messages,
+              ...(transcript.timing && { timing: transcript.timing }),
+            }
+          : part;
+      }),
     } as ThreadMessage;
     memo.messages.set(message, { transcripts: attachedTranscripts, attached });
     return attached;

package/src/convertMessages.test.ts

@@ -27,6 +27,27 @@ const contentOf = (result: ReturnType<typeof convertLangChainBaseMessage>) => {
   return result.content;
 };
 
+describe("convertLangChainBaseMessage modality", () => {
+  it("lifts voice modality onto human and ai messages and ignores unknown values", () => {
+    for (const message of [humanMessage("Question"), aiMessage("Answer")]) {
+      const spoken = convertLangChainBaseMessage({
+        ...message,
+        additional_kwargs: { modality: "voice" },
+      });
+      const unknown = convertLangChainBaseMessage({
+        ...message,
+        additional_kwargs: { modality: "video" },
+      });
+
+      expect(spoken).toHaveProperty("metadata", {
+        custom: {},
+        modality: "voice",
+      });
+      expect(unknown).toHaveProperty("metadata", { custom: {} });
+    }
+  });
+});
+
 describe("convertLangChainBaseMessage file content parts", () => {
   it("converts a base64 file block", () => {
     const result = convertLangChainBaseMessage(
@@ -1113,6 +1134,54 @@ describe("convertLangChainBaseMessage malformed messages", () => {
     ]);
   });
 
+  it("normalizes missing, string, and array tool-call args to an object", () => {
+    for (const args of [undefined, "not-json", ["x"], null]) {
+      const result = convertLangChainBaseMessage(
+        {
+          ...aiMessage([]),
+          tool_calls: [{ id: "call-1", name: "lookup", args }],
+        } as unknown as LangChainBaseMessage,
+        {},
+      );
+      expect(contentOf(result)).toEqual([
+        {
+          type: "tool-call",
+          toolCallId: "call-1",
+          toolName: "lookup",
+          args: {},
+          argsText: "{}",
+        },
+      ]);
+    }
+  });
+
+  it("normalizes unsafe object tool-call args to an empty object", () => {
+    const cyclic: Record<string, unknown> = {};
+    cyclic.self = cyclic;
+    class CustomArgs {
+      query = "x";
+    }
+
+    for (const args of [new Date(0), new Map(), new CustomArgs(), cyclic]) {
+      const result = convertLangChainBaseMessage(
+        {
+          ...aiMessage([]),
+          tool_calls: [{ id: "call-1", name: "lookup", args }],
+        } as unknown as LangChainBaseMessage,
+        {},
+      );
+      expect(contentOf(result)).toEqual([
+        {
+          type: "tool-call",
+          toolCallId: "call-1",
+          toolName: "lookup",
+          args: {},
+          argsText: "{}",
+        },
+      ]);
+    }
+  });
+
   it("converts a system message with null content to empty text", () => {
     const result = convertLangChainBaseMessage(
       { _getType: () => "system", id: "msg-4", content: null },