@assistant-ui/react-a2a 0.2.40 → 0.2.42

package/dist/useA2ARuntime.js

@@ -3,7 +3,7 @@ import { A2AClient } from "./A2AClient.js";
 import { A2AThreadRuntimeCore } from "./A2AThreadRuntimeCore.js";
 import { a2aExtras } from "./a2aExtras.js";
 import { useExternalStoreRuntime, useExternalStoreSharedOptions, useRuntimeAdapters } from "@assistant-ui/core/react";
-import { useCallback, useEffect, useInsertionEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useInsertionEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
 import { useReplaySafeEffect } from "@assistant-ui/store/internal";
 //#region src/useA2ARuntime.ts
 const serializeManagedClientOptions = (options) => {
@@ -14,8 +14,6 @@ const serializeManagedClientOptions = (options) => {
 	});
 };
 function useA2ARuntime(options) {
-	const [_version, setVersion] = useState(0);
-	const notifyUpdate = useCallback(() => setVersion((v) => v + 1), []);
 	const runtimeAdapters = useRuntimeAdapters();
 	const historyAdapter = options.adapters?.history ?? runtimeAdapters?.history;
 	const threadListAdapter = options.adapters?.threadList;
@@ -70,8 +68,7 @@ function useA2ARuntime(options) {
 	coreOptionsRef.current = coreOptions;
 	const createCore = () => new A2AThreadRuntimeCore({
 		...coreOptionsRef.current,
-		client,
-		notifyUpdate
+		client
 	});
 	const [pinnedCore, setPinnedCore] = useState(() => ({
 		client,
@@ -86,33 +83,48 @@ function useA2ARuntime(options) {
 		setPinnedCore(currentCore);
 	}
 	const core = currentCore.core;
+	const snapshot = useSyncExternalStore(core.subscribe, core.getSnapshot, core.getSnapshot);
 	useEffect(() => {
 		core.updateOptions(coreOptions);
 	});
 	const threadSwitchGenerationRef = useRef(0);
+	const switchingGenerationRef = useRef(null);
 	const threadList = useMemo(() => {
 		if (!threadListAdapter) return void 0;
 		const { onSwitchToNewThread, onSwitchToThread } = threadListAdapter;
+		const releaseSwitch = (generation) => {
+			if (switchingGenerationRef.current === generation) switchingGenerationRef.current = null;
+		};
 		return {
 			threadId: threadListAdapter.threadId,
 			onSwitchToNewThread: onSwitchToNewThread ? async () => {
 				const generation = ++threadSwitchGenerationRef.current;
-				core.applyExternalMessages([]);
-				core.resetContext();
-				await onSwitchToNewThread();
-				if (generation !== threadSwitchGenerationRef.current) return;
-				core.applyExternalMessages([]);
-				core.resetContext();
+				switchingGenerationRef.current = generation;
+				try {
+					core.applyExternalMessages([]);
+					core.resetContext();
+					await onSwitchToNewThread();
+					if (generation !== threadSwitchGenerationRef.current) return;
+					core.applyExternalMessages([]);
+					core.resetContext();
+				} finally {
+					releaseSwitch(generation);
+				}
 			} : void 0,
 			onSwitchToThread: onSwitchToThread ? async (threadId) => {
 				const generation = ++threadSwitchGenerationRef.current;
-				core.applyExternalMessages([]);
-				core.resetContext();
-				const result = await onSwitchToThread(threadId);
-				if (generation !== threadSwitchGenerationRef.current) return;
-				core.applyExternalMessages([]);
-				core.applyExternalMessages(result.messages);
-				core.resetContext();
+				switchingGenerationRef.current = generation;
+				try {
+					core.applyExternalMessages([]);
+					core.resetContext();
+					const result = await onSwitchToThread(threadId);
+					if (generation !== threadSwitchGenerationRef.current) return;
+					core.applyExternalMessages([]);
+					core.applyExternalMessages(result.messages);
+					core.resetContext();
+				} finally {
+					releaseSwitch(generation);
+				}
 			} : void 0
 		};
 	}, [threadListAdapter, core]);
@@ -133,19 +145,19 @@ function useA2ARuntime(options) {
 	const store = useMemo(() => {
 		return {
 			...shared,
-			isLoading: core.isLoading,
-			messageRepository: core.getMessageRepository(),
-			isRunning: core.isRunning(),
+			isLoading: snapshot.isLoading,
+			messageRepository: snapshot.messageRepository,
+			isRunning: snapshot.isRunning,
 			unstable_persistsHistory: true,
 			extras: a2aExtras.provide({
-				task: core.getTask(),
-				artifacts: core.getArtifacts(),
-				agentCard: core.getAgentCard()
+				task: snapshot.task,
+				artifacts: snapshot.artifacts,
+				agentCard: snapshot.agentCard
 			}),
-			onNew: (message) => core.append(message),
+			onNew: (message) => switchingGenerationRef.current === null ? core.append(message) : Promise.resolve(),
 			onVoiceTranscript: (message) => core.appendVoiceTranscript(message),
-			onEdit: (message) => core.edit(message),
-			onReload: (parentId) => core.reload(parentId),
+			onEdit: (message) => switchingGenerationRef.current === null ? core.edit(message) : Promise.resolve(),
+			onReload: (parentId) => switchingGenerationRef.current === null ? core.reload(parentId) : Promise.resolve(),
 			onCancel: () => core.cancel(),
 			unstable_onRecordToolInteraction: (options) => core.recordToolInteraction(options),
 			setMessages: (messages) => core.applyExternalMessages(messages),
@@ -155,7 +167,7 @@ function useA2ARuntime(options) {
 	}, [
 		adapterAdapters,
 		core,
-		_version,
+		snapshot,
 		shared
 	]);
 	const runtime = useExternalStoreRuntime(store);

package/dist/useA2ARuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"useA2ARuntime.js","names":[],"sources":["../src/useA2ARuntime.ts"],"sourcesContent":["\"use client\";\n\nimport {\n  useCallback,\n  useEffect,\n  useInsertionEffect,\n  useMemo,\n  useRef,\n  useState,\n} from \"react\";\nimport {\n  useExternalStoreRuntime,\n  useExternalStoreSharedOptions,\n  useRuntimeAdapters,\n} from \"@assistant-ui/core/react\";\nimport { useReplaySafeEffect } from \"@assistant-ui/store/internal\";\nimport type {\n  AssistantRuntime,\n  AppendMessage,\n  ExternalStoreAdapter,\n  ThreadMessage,\n} from \"@assistant-ui/core\";\nimport { A2AClient, type A2AClientOptions } from \"./A2AClient\";\nimport { A2AThreadRuntimeCore } from \"./A2AThreadRuntimeCore\";\nimport { a2aExtras } from \"./a2aExtras\";\nimport type { UseA2ARuntimeOptions } from \"./types\";\n\ntype ManagedA2AClientOptions = Omit<A2AClientOptions, \"headers\">;\n\nconst serializeManagedClientOptions = (\n  options: ManagedA2AClientOptions,\n): string => {\n  const fetchOptions = Object.fromEntries(\n    Object.entries(options.fetchOptions ?? {}).sort(([a], [b]) =>\n      a.localeCompare(b),\n    ),\n  );\n\n  return JSON.stringify({\n    ...options,\n    fetchOptions,\n  });\n};\n\nexport function useA2ARuntime(options: UseA2ARuntimeOptions): AssistantRuntime {\n  const [_version, setVersion] = useState(0);\n  const notifyUpdate = useCallback(() => setVersion((v) => v + 1), []);\n  const runtimeAdapters = useRuntimeAdapters();\n  const historyAdapter = options.adapters?.history ?? runtimeAdapters?.history;\n  const threadListAdapter = options.adapters?.threadList;\n\n  const headersRef = useRef(options.headers);\n  useInsertionEffect(() => {\n    headersRef.current = options.headers;\n  });\n  const resolveHeaders = useCallback(() => {\n    const headers = headersRef.current;\n    return typeof headers === \"function\" ? headers() : (headers ?? {});\n  }, []);\n\n  const managedClientOptionsKey = options.client\n    ? null\n    : options.baseUrl\n      ? serializeManagedClientOptions({\n          baseUrl: options.baseUrl,\n          basePath: options.basePath,\n          tenant: options.tenant,\n          extensions: options.extensions,\n          fetchOptions: options.fetchOptions,\n        })\n      : null;\n\n  const createClient = () => {\n    if (options.client) return options.client;\n    if (!managedClientOptionsKey) {\n      throw new Error(\"useA2ARuntime requires either `client` or `baseUrl`\");\n    }\n\n    return new A2AClient({\n      ...(JSON.parse(managedClientOptionsKey) as ManagedA2AClientOptions),\n      headers: resolveHeaders,\n    });\n  };\n  const [pinnedClient, setPinnedClient] = useState(() => ({\n    key: managedClientOptionsKey,\n    provided: options.client,\n    client: createClient(),\n  }));\n  let currentClient = pinnedClient;\n  if (\n    pinnedClient.key !== managedClientOptionsKey ||\n    pinnedClient.provided !== options.client\n  ) {\n    currentClient = {\n      key: managedClientOptionsKey,\n      provided: options.client,\n      client: createClient(),\n    };\n    setPinnedClient(currentClient);\n  }\n  const client = currentClient.client;\n\n  const coreOptions = {\n    client,\n    contextId: options.contextId,\n    configuration: options.configuration,\n    ...(options.onError && { onError: options.onError }),\n    ...(options.onCancel && { onCancel: options.onCancel }),\n    ...(options.onArtifactComplete && {\n      onArtifactComplete: options.onArtifactComplete,\n    }),\n    ...(historyAdapter && { history: historyAdapter }),\n  };\n  const coreOptionsRef = useRef(coreOptions);\n  coreOptionsRef.current = coreOptions;\n\n  const createCore = () =>\n    new A2AThreadRuntimeCore({\n      ...coreOptionsRef.current,\n      client,\n      notifyUpdate,\n    });\n  const [pinnedCore, setPinnedCore] = useState(() => ({\n    client,\n    core: createCore(),\n  }));\n  let currentCore = pinnedCore;\n  if (pinnedCore.client !== client) {\n    currentCore = { client, core: createCore() };\n    setPinnedCore(currentCore);\n  }\n  const core = currentCore.core;\n\n  useEffect(() => {\n    core.updateOptions(coreOptions);\n  });\n\n  // Thread list\n  const threadSwitchGenerationRef = useRef(0);\n  const threadList = useMemo(() => {\n    if (!threadListAdapter) return undefined;\n\n    const { onSwitchToNewThread, onSwitchToThread } = threadListAdapter;\n\n    return {\n      threadId: threadListAdapter.threadId,\n      onSwitchToNewThread: onSwitchToNewThread\n        ? async () => {\n            const generation = ++threadSwitchGenerationRef.current;\n            // Clear before the thread id flips, or the old messages leak\n            // into the new thread as a sibling branch.\n            core.applyExternalMessages([]);\n            core.resetContext();\n            await onSwitchToNewThread();\n            if (generation !== threadSwitchGenerationRef.current) return;\n            // Apply first so the abort inside resetContext finds an already\n            // cleared repository and cannot persist the old thread's partial\n            // assistant message.\n            core.applyExternalMessages([]);\n            core.resetContext();\n          }\n        : undefined,\n      onSwitchToThread: onSwitchToThread\n        ? async (threadId: string) => {\n            const generation = ++threadSwitchGenerationRef.current;\n            // Clear before the thread id flips, or the old messages leak\n            // into the new thread as a sibling branch.\n            core.applyExternalMessages([]);\n            core.resetContext();\n            const result = await onSwitchToThread(threadId);\n            if (generation !== threadSwitchGenerationRef.current) return;\n            core.applyExternalMessages([]);\n            core.applyExternalMessages(result.messages);\n            core.resetContext();\n          }\n        : undefined,\n    };\n  }, [threadListAdapter, core]);\n\n  // Adapters\n  const adapters = options.adapters;\n  const adapterAdapters = useMemo(\n    () => ({\n      attachments: adapters?.attachments ?? runtimeAdapters?.attachments,\n      speech: adapters?.speech,\n      dictation: adapters?.dictation,\n      voice: adapters?.voice,\n      feedback: adapters?.feedback,\n      threadList,\n    }),\n    [adapters, runtimeAdapters, threadList],\n  );\n\n  // Build store adapter\n  const shared = useExternalStoreSharedOptions(options);\n  const store = useMemo(() => {\n    void _version;\n\n    return {\n      ...shared,\n      isLoading: core.isLoading,\n      messageRepository: core.getMessageRepository(),\n      isRunning: core.isRunning(),\n      unstable_persistsHistory: true,\n      extras: a2aExtras.provide({\n        task: core.getTask(),\n        artifacts: core.getArtifacts(),\n        agentCard: core.getAgentCard(),\n      }),\n      onNew: (message: AppendMessage) => core.append(message),\n      onVoiceTranscript: (message: ThreadMessage) =>\n        core.appendVoiceTranscript(message),\n      onEdit: (message: AppendMessage) => core.edit(message),\n      onReload: (parentId: string | null) => core.reload(parentId),\n      onCancel: () => core.cancel(),\n      unstable_onRecordToolInteraction: (options) =>\n        core.recordToolInteraction(options),\n      setMessages: (messages: readonly ThreadMessage[]) =>\n        core.applyExternalMessages(messages),\n      onImport: (messages: readonly ThreadMessage[]) =>\n        core.applyExternalMessages(messages),\n      adapters: adapterAdapters,\n    } satisfies ExternalStoreAdapter<ThreadMessage>;\n  }, [adapterAdapters, core, _version, shared]);\n\n  const runtime = useExternalStoreRuntime(store);\n\n  useReplaySafeEffect(() => {\n    core.attachRuntime(runtime);\n    return () => {\n      core.detachRuntime();\n    };\n  }, [core, runtime]);\n\n  useEffect(() => {\n    core.__internal_load();\n  }, [core]);\n\n  return runtime;\n}\n"],"mappings":"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"}
+{"version":3,"file":"useA2ARuntime.js","names":[],"sources":["../src/useA2ARuntime.ts"],"sourcesContent":["\"use client\";\n\nimport {\n  useCallback,\n  useEffect,\n  useInsertionEffect,\n  useMemo,\n  useRef,\n  useState,\n  useSyncExternalStore,\n} from \"react\";\nimport {\n  useExternalStoreRuntime,\n  useExternalStoreSharedOptions,\n  useRuntimeAdapters,\n} from \"@assistant-ui/core/react\";\nimport { useReplaySafeEffect } from \"@assistant-ui/store/internal\";\nimport type {\n  AssistantRuntime,\n  AppendMessage,\n  ExternalStoreAdapter,\n  ThreadMessage,\n} from \"@assistant-ui/core\";\nimport { A2AClient, type A2AClientOptions } from \"./A2AClient\";\nimport { A2AThreadRuntimeCore } from \"./A2AThreadRuntimeCore\";\nimport { a2aExtras } from \"./a2aExtras\";\nimport type { UseA2ARuntimeOptions } from \"./types\";\n\ntype ManagedA2AClientOptions = Omit<A2AClientOptions, \"headers\">;\n\nconst serializeManagedClientOptions = (\n  options: ManagedA2AClientOptions,\n): string => {\n  const fetchOptions = Object.fromEntries(\n    Object.entries(options.fetchOptions ?? {}).sort(([a], [b]) =>\n      a.localeCompare(b),\n    ),\n  );\n\n  return JSON.stringify({\n    ...options,\n    fetchOptions,\n  });\n};\n\nexport function useA2ARuntime(options: UseA2ARuntimeOptions): AssistantRuntime {\n  const runtimeAdapters = useRuntimeAdapters();\n  const historyAdapter = options.adapters?.history ?? runtimeAdapters?.history;\n  const threadListAdapter = options.adapters?.threadList;\n\n  const headersRef = useRef(options.headers);\n  useInsertionEffect(() => {\n    headersRef.current = options.headers;\n  });\n  const resolveHeaders = useCallback(() => {\n    const headers = headersRef.current;\n    return typeof headers === \"function\" ? headers() : (headers ?? {});\n  }, []);\n\n  const managedClientOptionsKey = options.client\n    ? null\n    : options.baseUrl\n      ? serializeManagedClientOptions({\n          baseUrl: options.baseUrl,\n          basePath: options.basePath,\n          tenant: options.tenant,\n          extensions: options.extensions,\n          fetchOptions: options.fetchOptions,\n        })\n      : null;\n\n  const createClient = () => {\n    if (options.client) return options.client;\n    if (!managedClientOptionsKey) {\n      throw new Error(\"useA2ARuntime requires either `client` or `baseUrl`\");\n    }\n\n    return new A2AClient({\n      ...(JSON.parse(managedClientOptionsKey) as ManagedA2AClientOptions),\n      headers: resolveHeaders,\n    });\n  };\n  const [pinnedClient, setPinnedClient] = useState(() => ({\n    key: managedClientOptionsKey,\n    provided: options.client,\n    client: createClient(),\n  }));\n  let currentClient = pinnedClient;\n  if (\n    pinnedClient.key !== managedClientOptionsKey ||\n    pinnedClient.provided !== options.client\n  ) {\n    currentClient = {\n      key: managedClientOptionsKey,\n      provided: options.client,\n      client: createClient(),\n    };\n    setPinnedClient(currentClient);\n  }\n  const client = currentClient.client;\n\n  const coreOptions = {\n    client,\n    contextId: options.contextId,\n    configuration: options.configuration,\n    ...(options.onError && { onError: options.onError }),\n    ...(options.onCancel && { onCancel: options.onCancel }),\n    ...(options.onArtifactComplete && {\n      onArtifactComplete: options.onArtifactComplete,\n    }),\n    ...(historyAdapter && { history: historyAdapter }),\n  };\n  const coreOptionsRef = useRef(coreOptions);\n  coreOptionsRef.current = coreOptions;\n\n  const createCore = () =>\n    new A2AThreadRuntimeCore({\n      ...coreOptionsRef.current,\n      client,\n    });\n  const [pinnedCore, setPinnedCore] = useState(() => ({\n    client,\n    core: createCore(),\n  }));\n  let currentCore = pinnedCore;\n  if (pinnedCore.client !== client) {\n    currentCore = { client, core: createCore() };\n    setPinnedCore(currentCore);\n  }\n  const core = currentCore.core;\n  const snapshot = useSyncExternalStore(\n    core.subscribe,\n    core.getSnapshot,\n    core.getSnapshot,\n  );\n\n  useEffect(() => {\n    core.updateOptions(coreOptions);\n  });\n\n  // Thread list\n  const threadSwitchGenerationRef = useRef(0);\n  const switchingGenerationRef = useRef<number | null>(null);\n  const threadList = useMemo(() => {\n    if (!threadListAdapter) return undefined;\n\n    const { onSwitchToNewThread, onSwitchToThread } = threadListAdapter;\n\n    const releaseSwitch = (generation: number) => {\n      if (switchingGenerationRef.current === generation) {\n        switchingGenerationRef.current = null;\n      }\n    };\n\n    return {\n      threadId: threadListAdapter.threadId,\n      onSwitchToNewThread: onSwitchToNewThread\n        ? async () => {\n            const generation = ++threadSwitchGenerationRef.current;\n            switchingGenerationRef.current = generation;\n            try {\n              // Clear before the thread id flips, or the old messages leak\n              // into the new thread as a sibling branch.\n              core.applyExternalMessages([]);\n              core.resetContext();\n              await onSwitchToNewThread();\n              if (generation !== threadSwitchGenerationRef.current) return;\n              // Apply first so the abort inside resetContext finds an already\n              // cleared repository and cannot persist the old thread's partial\n              // assistant message.\n              core.applyExternalMessages([]);\n              core.resetContext();\n            } finally {\n              releaseSwitch(generation);\n            }\n          }\n        : undefined,\n      onSwitchToThread: onSwitchToThread\n        ? async (threadId: string) => {\n            const generation = ++threadSwitchGenerationRef.current;\n            switchingGenerationRef.current = generation;\n            try {\n              // Clear before the thread id flips, or the old messages leak\n              // into the new thread as a sibling branch.\n              core.applyExternalMessages([]);\n              core.resetContext();\n              const result = await onSwitchToThread(threadId);\n              if (generation !== threadSwitchGenerationRef.current) return;\n              core.applyExternalMessages([]);\n              core.applyExternalMessages(result.messages);\n              core.resetContext();\n            } finally {\n              releaseSwitch(generation);\n            }\n          }\n        : undefined,\n    };\n  }, [threadListAdapter, core]);\n\n  // Adapters\n  const adapters = options.adapters;\n  const adapterAdapters = useMemo(\n    () => ({\n      attachments: adapters?.attachments ?? runtimeAdapters?.attachments,\n      speech: adapters?.speech,\n      dictation: adapters?.dictation,\n      voice: adapters?.voice,\n      feedback: adapters?.feedback,\n      threadList,\n    }),\n    [adapters, runtimeAdapters, threadList],\n  );\n\n  // Build store adapter\n  const shared = useExternalStoreSharedOptions(options);\n  const store = useMemo(() => {\n    return {\n      ...shared,\n      isLoading: snapshot.isLoading,\n      messageRepository: snapshot.messageRepository,\n      isRunning: snapshot.isRunning,\n      unstable_persistsHistory: true,\n      extras: a2aExtras.provide({\n        task: snapshot.task,\n        artifacts: snapshot.artifacts,\n        agentCard: snapshot.agentCard,\n      }),\n      onNew: (message: AppendMessage) =>\n        switchingGenerationRef.current === null\n          ? core.append(message)\n          : Promise.resolve(),\n      onVoiceTranscript: (message: ThreadMessage) =>\n        core.appendVoiceTranscript(message),\n      onEdit: (message: AppendMessage) =>\n        switchingGenerationRef.current === null\n          ? core.edit(message)\n          : Promise.resolve(),\n      onReload: (parentId: string | null) =>\n        switchingGenerationRef.current === null\n          ? core.reload(parentId)\n          : Promise.resolve(),\n      onCancel: () => core.cancel(),\n      unstable_onRecordToolInteraction: (options) =>\n        core.recordToolInteraction(options),\n      setMessages: (messages: readonly ThreadMessage[]) =>\n        core.applyExternalMessages(messages),\n      onImport: (messages: readonly ThreadMessage[]) =>\n        core.applyExternalMessages(messages),\n      adapters: adapterAdapters,\n    } satisfies ExternalStoreAdapter<ThreadMessage>;\n  }, [adapterAdapters, core, snapshot, shared]);\n\n  const runtime = useExternalStoreRuntime(store);\n\n  useReplaySafeEffect(() => {\n    core.attachRuntime(runtime);\n    return () => {\n      core.detachRuntime();\n    };\n  }, [core, runtime]);\n\n  useEffect(() => {\n    core.__internal_load();\n  }, [core]);\n\n  return runtime;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-a2a",
-  "version": "0.2.40",
+  "version": "0.2.42",
   "description": "A2A (Agent-to-Agent) v1.0 protocol adapter for assistant-ui",
   "keywords": [
     "a2a",
@@ -29,10 +29,10 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.3.23",
-    "@assistant-ui/react-generative-ui": "^0.0.23",
-    "@assistant-ui/store": "^0.3.17",
-    "assistant-stream": "^0.3.47"
+    "@assistant-ui/core": "^0.3.25",
+    "@assistant-ui/generative-ui": "^0.0.1",
+    "@assistant-ui/store": "^0.3.18",
+    "assistant-stream": "^0.3.49"
   },
   "peerDependencies": {
     "@types/react": "*",
@@ -49,7 +49,7 @@
     "@testing-library/dom": "^10.4.2",
     "@testing-library/react": "^16.3.3",
     "@types/react": "^19.3.0",
-    "jsdom": "^30.0.1",
+    "jsdom": "^30.1.2",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
     "vitest": "^5.0.3"
@@ -70,6 +70,7 @@
   "scripts": {
     "build": "aui-build",
     "test": "vitest run",
+    "test:coverage": "vitest run --coverage --coverage.reporter=text --coverage.reporter=html --coverage.reporter=json-summary",
     "typecheck": "tsc --noEmit",
     "test:peer-react18": "vitest run --config vitest.peer-react18.config.ts",
     "test:types:peer-react18": "aui-react18-types",

package/src/A2AClient.test.ts

@@ -1149,6 +1149,75 @@ describe("A2AClient", () => {
       expect(evt.event.status.message?.role).toBe("agent");
     });
 
+    it("forwards configurable SSE line and event limits", async () => {
+      const sseData = JSON.stringify({
+        status_update: {
+          task_id: "t1",
+          context_id: "ctx-1",
+          status: {
+            state: "TASK_STATE_WORKING",
+            message: {
+              message_id: "s1",
+              role: "ROLE_AGENT",
+              parts: [{ text: "x".repeat(64) }],
+            },
+          },
+        },
+      });
+      const consume = async (options: {
+        maxStreamLineLength: number;
+        maxStreamEventLength: number;
+      }) => {
+        fetchMock.mockResolvedValueOnce(
+          mockSSEResponse([`data: ${sseData}`, "", ""]),
+        );
+        const limitedClient = new A2AClient({
+          baseUrl: "https://agent.test",
+          ...options,
+        });
+        const events: A2AStreamEvent[] = [];
+        for await (const event of limitedClient.streamMessage(userMessage)) {
+          events.push(event);
+        }
+        return events;
+      };
+
+      await expect(
+        consume({ maxStreamLineLength: 32, maxStreamEventLength: 1_024 }),
+      ).rejects.toThrow("SSE line exceeds maxLineLength");
+      await expect(
+        consume({ maxStreamLineLength: 1_024, maxStreamEventLength: 32 }),
+      ).rejects.toThrow("SSE event exceeds maxEventLength");
+      await expect(
+        consume({ maxStreamLineLength: 1_024, maxStreamEventLength: 1_024 }),
+      ).resolves.toHaveLength(1);
+    });
+
+    it("releases the response reader when decoder limits are invalid", async () => {
+      const cancel = vi.fn();
+      const body = new ReadableStream<Uint8Array>({ cancel });
+      fetchMock.mockResolvedValueOnce(
+        new Response(body, {
+          headers: { "Content-Type": "text/event-stream" },
+        }),
+      );
+      const limitedClient = new A2AClient({
+        baseUrl: "https://agent.test",
+        maxStreamLineLength: 0,
+      });
+      const consume = async () => {
+        for await (const _event of limitedClient.streamMessage(userMessage)) {
+          void _event;
+        }
+      };
+
+      await expect(consume()).rejects.toThrow(
+        "maxLineLength must be a positive safe integer",
+      );
+      expect(cancel).toHaveBeenCalledOnce();
+      expect(body.locked).toBe(false);
+    });
+
     it("drops a wrapped task or message whose ids are not strings", async () => {
       const frames = [
         {

package/src/A2AClient.ts

@@ -1,5 +1,5 @@
 import { SSEEventDecoder, type SSEEvent } from "assistant-stream/utils";
-import { isRecord } from "@assistant-ui/core/internal";
+import { isRecord, raceWithAbortSignal } from "@assistant-ui/core/internal";
 import type {
   A2AAgentCard,
   A2AErrorInfo,
@@ -33,6 +33,10 @@ export type A2AClientOptions = {
   fetchOptions?:
     | Omit<RequestInit, "headers" | "body" | "method" | "signal">
     | undefined;
+  /** Maximum UTF-16 code units accepted in one SSE line. Defaults to 16 MiB. */
+  maxStreamLineLength?: number | undefined;
+  /** Maximum UTF-16 code units retained across one SSE event. Defaults to 16 MiB. */
+  maxStreamEventLength?: number | undefined;
 };
 
 export class A2AError extends Error {
@@ -680,49 +684,6 @@ function signalInit(signal?: AbortSignal): RequestInit {
   return signal ? { signal } : {};
 }
 
-const getAbortReason = (signal: AbortSignal): unknown => {
-  if (signal.reason !== undefined) return signal.reason;
-  const error = new Error("The operation was aborted");
-  error.name = "AbortError";
-  return error;
-};
-
-const raceWithAbortSignal = <T>(
-  signal: AbortSignal | undefined,
-  operation: () => T | PromiseLike<T>,
-): Promise<T> => {
-  if (!signal) return Promise.resolve().then(operation);
-  if (signal.aborted) return Promise.reject(getAbortReason(signal));
-
-  return new Promise<T>((resolve, reject) => {
-    let settled = false;
-    const cleanup = () => signal.removeEventListener("abort", handleAbort);
-    const resolveOnce = (value: T) => {
-      if (settled) return;
-      settled = true;
-      cleanup();
-      resolve(value);
-    };
-    const rejectOnce = (error: unknown) => {
-      if (settled) return;
-      settled = true;
-      cleanup();
-      reject(error);
-    };
-    const handleAbort = () => rejectOnce(getAbortReason(signal));
-
-    signal.addEventListener("abort", handleAbort, { once: true });
-    let result: T | PromiseLike<T>;
-    try {
-      result = operation();
-    } catch (error) {
-      rejectOnce(error);
-      return;
-    }
-    Promise.resolve(result).then(resolveOnce, rejectOnce);
-  });
-};
-
 const SKIPPED_FRAME_SNIPPET_LENGTH = 120;
 
 function describeSkippedFrame(data: string, reason: string): string {
@@ -739,6 +700,8 @@ export class A2AClient {
   private basePath: string;
   private tenant: string | undefined;
   private extensionUris: string[] | undefined;
+  private maxStreamLineLength: number | undefined;
+  private maxStreamEventLength: number | undefined;
   private fetchOptions: Omit<
     RequestInit,
     "headers" | "body" | "method" | "signal"
@@ -754,6 +717,8 @@ export class A2AClient {
       : "";
     this.tenant = options.tenant;
     this.extensionUris = options.extensions;
+    this.maxStreamLineLength = options.maxStreamLineLength;
+    this.maxStreamEventLength = options.maxStreamEventLength;
     const {
       headers: _h,
       body: _b,
@@ -1112,7 +1077,6 @@ export class A2AClient {
     if (!reader) throw new Error("No response body");
 
     const decoder = new TextDecoder();
-    const sseDecoder = new SSEEventDecoder();
 
     let firstSkipReason: string | undefined;
     const noteSkip = (data: string, reason: string) => {
@@ -1148,6 +1112,10 @@ export class A2AClient {
 
     let shouldCancel = true;
     try {
+      const sseDecoder = new SSEEventDecoder({
+        maxLineLength: this.maxStreamLineLength,
+        maxEventLength: this.maxStreamEventLength,
+      });
       while (true) {
         let result: ReadableStreamReadResult<Uint8Array>;
         try {

package/src/A2AThreadRuntimeCore.test.ts

@@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import {
   applyA2uiOperations,
   convertSurfaceToUISpec,
-} from "@assistant-ui/react-generative-ui/a2ui";
+} from "@assistant-ui/generative-ui/a2ui";
 import { A2AThreadRuntimeCore } from "./A2AThreadRuntimeCore";
 import type { A2AClient } from "./A2AClient";
 import type {
@@ -155,10 +155,10 @@ const toolInteraction = {
 };
 
 describe("A2AThreadRuntimeCore", () => {
-  let notifyUpdate: ReturnType<typeof vi.fn>;
+  let onUpdate = vi.fn<() => void>();
 
   beforeEach(() => {
-    notifyUpdate = vi.fn();
+    onUpdate = vi.fn<() => void>();
   });
 
   afterEach(() => {
@@ -169,11 +169,12 @@ describe("A2AThreadRuntimeCore", () => {
     clientOverrides: Partial<A2AClient> = {},
     coreOverrides: Record<string, unknown> = {},
   ) {
-    return new A2AThreadRuntimeCore({
+    const core = new A2AThreadRuntimeCore({
       client: createMockClient(clientOverrides),
-      notifyUpdate: notifyUpdate as unknown as () => void,
       ...coreOverrides,
     });
+    core.subscribe(onUpdate);
+    return core;
   }
 
   describe("late history loading", () => {
@@ -406,11 +407,11 @@ describe("A2AThreadRuntimeCore", () => {
       expect(core.isLoading).toBe(true);
       core.applyExternalMessages([]);
       core.resetContext();
-      const updatesAfterReplacement = notifyUpdate.mock.calls.length;
+      const updatesAfterReplacement = onUpdate.mock.calls.length;
       expect(core.isLoading).toBe(false);
       resolve({ messages: [] });
       await loading;
-      expect(notifyUpdate).toHaveBeenCalledTimes(updatesAfterReplacement);
+      expect(onUpdate).toHaveBeenCalledTimes(updatesAfterReplacement);
     });
 
     it("does not import old history when agent-card discovery settles after a thread switch", async () => {
@@ -635,13 +636,10 @@ describe("A2AThreadRuntimeCore", () => {
       const client = createMockClient({ streamMessage });
       const core = new A2AThreadRuntimeCore({
         client,
-        notifyUpdate: notifyUpdate as unknown as () => void,
       });
 
       await core.append(createUserAppendMessage("First"));
 
-      // useA2ARuntime re-applies its options on every render, including the
-      // renders triggered by the stream's own notifyUpdate calls.
       core.updateOptions({ client, contextId: undefined });
 
       await core.append(createUserAppendMessage("Second"));
@@ -657,7 +655,6 @@ describe("A2AThreadRuntimeCore", () => {
       const client = createMockClient({ streamMessage });
       const core = new A2AThreadRuntimeCore({
         client,
-        notifyUpdate: notifyUpdate as unknown as () => void,
       });
 
       await core.append(createUserAppendMessage("First"));
@@ -711,7 +708,6 @@ describe("A2AThreadRuntimeCore", () => {
       const client = createMockClient({ streamMessage });
       const core = new A2AThreadRuntimeCore({
         client,
-        notifyUpdate: notifyUpdate as unknown as () => void,
       });
 
       await core.append(createUserAppendMessage("First"));
@@ -731,7 +727,6 @@ describe("A2AThreadRuntimeCore", () => {
       const client = createMockClient({ streamMessage });
       const core = new A2AThreadRuntimeCore({
         client,
-        notifyUpdate: notifyUpdate as unknown as () => void,
       });
 
       await core.append(createUserAppendMessage("First"));
@@ -1778,7 +1773,6 @@ describe("A2AThreadRuntimeCore", () => {
           }),
         }),
         onArtifactComplete,
-        notifyUpdate: notifyUpdate as unknown as () => void,
       });
 
       await core.append(createUserAppendMessage("Go"));
@@ -2363,6 +2357,65 @@ describe("A2AThreadRuntimeCore", () => {
     });
   });
 
+  // --- Runtime detachment ---
+
+  describe("runtime detachment", () => {
+    it("keeps an onCancel replacement run abortable", async () => {
+      const streamSignals: AbortSignal[] = [];
+      const releaseStreams: Array<() => void> = [];
+      const streamMessage = vi.fn().mockImplementation(async function* (
+        _msg: any,
+        _cfg: any,
+        _meta: any,
+        signal: AbortSignal,
+      ) {
+        const streamIndex = streamSignals.push(signal) - 1;
+        yield statusUpdateEvent("working");
+        if (signal.aborted) return;
+        await new Promise<void>((resolve) => {
+          releaseStreams[streamIndex] = resolve;
+          signal.addEventListener("abort", () => resolve(), { once: true });
+        });
+      });
+      let core!: A2AThreadRuntimeCore;
+      let replacementRun: Promise<void> | undefined;
+      let startReplacement = true;
+      core = createCore(
+        {
+          getAgentCard: vi.fn().mockResolvedValue({
+            name: "Agent",
+            url: "https://agent.example",
+          }),
+          streamMessage,
+        },
+        {
+          onCancel: () => {
+            if (!startReplacement) return;
+            startReplacement = false;
+            replacementRun = core.append(
+              createUserAppendMessage("Replacement"),
+            );
+          },
+        },
+      );
+
+      const firstRun = core.append(createUserAppendMessage("First"));
+      await vi.waitFor(() => expect(streamSignals).toHaveLength(1));
+
+      core.detachRuntime();
+      await vi.waitFor(() => expect(streamSignals).toHaveLength(2));
+      await vi.waitFor(() => expect(releaseStreams[1]).toBeTypeOf("function"));
+
+      await core.cancel();
+      const replacementWasAborted = streamSignals[1]!.aborted;
+      releaseStreams[1]!();
+      await Promise.all([firstRun, replacementRun]);
+
+      expect(streamSignals[0]!.aborted).toBe(true);
+      expect(replacementWasAborted).toBe(true);
+    });
+  });
+
   // --- Cancel ---
 
   describe("cancel", () => {
@@ -2380,13 +2433,13 @@ describe("A2AThreadRuntimeCore", () => {
         status: { state: "working" },
       };
       (core as any).abortController = new AbortController();
-      notifyUpdate.mockClear();
+      onUpdate.mockClear();
 
       await core.cancel();
 
       expect(cancelTask).toHaveBeenCalledWith("t1");
       expect(core.getTask()!.status.state).toBe("canceled");
-      expect(notifyUpdate).toHaveBeenCalledOnce();
+      expect(onUpdate).toHaveBeenCalledOnce();
     });
 
     it("does nothing when no abort controller", async () => {
@@ -2487,6 +2540,67 @@ describe("A2AThreadRuntimeCore", () => {
       expect(core.getTask()?.status.state).toBe("working");
     });
 
+    it("keeps the run onCancel starts when a send supersedes the active run", async () => {
+      const signals: AbortSignal[] = [];
+      const streamMessage = vi.fn().mockImplementation(async function* (
+        _msg: any,
+        _cfg: any,
+        _meta: any,
+        signal: AbortSignal,
+      ) {
+        signals.push(signal);
+        await new Promise<void>((resolve) => {
+          if (signal.aborted) resolve();
+          else
+            signal.addEventListener("abort", () => resolve(), { once: true });
+        });
+      });
+      let restarted = false;
+      let core!: A2AThreadRuntimeCore;
+      core = createCore(
+        { streamMessage },
+        {
+          onCancel: () => {
+            if (restarted) return;
+            restarted = true;
+            void core.append({
+              ...createUserAppendMessage("from onCancel"),
+              parentId: core.getMessages().at(-1)!.id,
+            });
+          },
+        },
+      );
+
+      void core.append(createUserAppendMessage("first"));
+      await vi.waitFor(() => expect(signals).toHaveLength(1));
+      void core.append({
+        ...createUserAppendMessage("second"),
+        parentId: core.getMessages().at(-1)!.id,
+      });
+      await vi.waitFor(() => expect(signals).toHaveLength(2));
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      expect(signals).toHaveLength(2);
+      expect(
+        core.getMessages().map((message) => ({
+          role: message.role,
+          text: message.content.map((part) =>
+            part.type === "text" ? part.text : "",
+          ),
+        })),
+      ).toEqual([
+        { role: "user", text: ["first"] },
+        { role: "assistant", text: [] },
+        { role: "user", text: ["second"] },
+        { role: "user", text: ["from onCancel"] },
+        { role: "assistant", text: [] },
+      ]);
+
+      await core.cancel();
+
+      expect(signals.every((signal) => signal.aborted)).toBe(true);
+      expect(core.isRunning()).toBe(false);
+    });
+
     it("still cancels the server task when onCancel clears the thread", async () => {
       let resolveCancel!: (task: A2ATask) => void;
       const cancelTask = vi.fn().mockReturnValue(
@@ -2602,7 +2716,6 @@ describe("A2AThreadRuntimeCore", () => {
           })),
         }),
         onError,
-        notifyUpdate: notifyUpdate as unknown as () => void,
       });
 
       await expect(core.append(createUserAppendMessage("Go"))).rejects.toThrow(
@@ -2848,7 +2961,6 @@ describe("outbound message conversion", () => {
     });
     const core = new A2AThreadRuntimeCore({
       client: createMockClient({ streamMessage }),
-      notifyUpdate: vi.fn() as unknown as () => void,
     });
     return { core, streamMessage };
   }