@assistant-ui/eve 0.0.11 → 0.0.13

package/dist/useEveAgentRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useEveAgentRuntime.d.ts","names":[],"sources":["../src/useEveAgentRuntime.ts"],"mappings":";;;KAiEY,4BAA4B,KACtC,mBAAmB,8BAGnB;WACW;aAEM,cAAc;aACd,SAAS;aACT,YAAY;aACZ,QAAQ;aACR,WAAW;;;;;;;;;;cAYjB,qBAAsB,UAAS,2DAA8B"}
+{"version":3,"file":"useEveAgentRuntime.d.ts","names":[],"sources":["../src/useEveAgentRuntime.ts"],"mappings":";;;KAsGY,4BAA4B,KACtC,mBAAmB,8BAGnB;WACW;aAEM,cAAc;aACd,SAAS;aACT,YAAY;aACZ,QAAQ;aACR,WAAW;;;;;;;;;;cAYjB,qBAAsB,UAAS,2DAA8B"}

package/dist/useEveAgentRuntime.js

@@ -1,6 +1,6 @@
 "use client";
 import { convertEveMessages, getEveMessageContent, toEveInputResponse } from "./convertEveMessages.js";
-import { fromThreadMessageLike, generateId, pickExternalStoreSharedOptions } from "@assistant-ui/core";
+import { MessageNotSentError, fromThreadMessageLike, generateId, pickExternalStoreSharedOptions } from "@assistant-ui/core";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useExternalStoreRuntime, useRuntimeAdapters } from "@assistant-ui/core/react";
 import { useEveAgent } from "eve/react";
@@ -9,7 +9,22 @@ const USER_STAGED_STATUS = {
 	type: "complete",
 	reason: "unknown"
 };
-const sendCancelledError = /* @__PURE__ */ new Error("eve send was dropped because the run was cancelled.");
+const sendCancelledError = new MessageNotSentError("eve send was dropped because the run was cancelled.");
+const sendAbandonedError = /* @__PURE__ */ new Error("eve send was dropped because the runtime unmounted.");
+const isDroppedSend = (error) => error === sendCancelledError || error === sendAbandonedError;
+const reportEveLifecycleCallbackError = (name, error) => {
+	console.error(`[assistant-ui/eve] ${name} callback threw an error`, error);
+};
+const invokeEveLifecycleCallback = (name, callback, value) => {
+	if (!callback) return;
+	try {
+		Promise.resolve(callback(value)).catch((error) => {
+			reportEveLifecycleCallbackError(name, error);
+		});
+	} catch (error) {
+		reportEveLifecycleCallbackError(name, error);
+	}
+};
 const hasRunConfig = (runConfig) => runConfig?.custom !== void 0 && Object.keys(runConfig.custom).length > 0;
 /**
 * Only the `custom` bag crosses the wire. Eve reads `clientContext` as its own
@@ -27,14 +42,17 @@ const toEveClientContext = (runConfig) => hasRunConfig(runConfig) ? { clientCont
 */
 const useEveAgentRuntime = (options = {}) => {
 	const { adapters, isDisabled: _isDisabled, isSendDisabled: _isSendDisabled, suggestions: _suggestions, unstable_capabilities: _unstable_capabilities, ...agentOptions } = options;
-	const { onFinish } = agentOptions;
+	const { onError, onEvent, onFinish, onSessionChange } = agentOptions;
 	const lastFinishStatusRef = useRef(null);
 	const agent = useEveAgent({
 		...agentOptions,
+		...onError ? { onError: (error) => invokeEveLifecycleCallback("onError", onError, error) } : {},
+		...onEvent ? { onEvent: (event) => invokeEveLifecycleCallback("onEvent", onEvent, event) } : {},
 		onFinish: (snapshot) => {
 			lastFinishStatusRef.current = snapshot.status;
-			onFinish?.(snapshot);
-		}
+			invokeEveLifecycleCallback("onFinish", onFinish, snapshot);
+		},
+		...onSessionChange ? { onSessionChange: (session) => invokeEveLifecycleCallback("onSessionChange", onSessionChange, session) } : {}
 	});
 	const runtimeAdapters = useRuntimeAdapters();
 	const [toolStatuses, setToolStatuses] = useState({});
@@ -68,17 +86,20 @@ const useEveAgentRuntime = (options = {}) => {
 	messagesRef.current = messages;
 	const sendChainRef = useRef(Promise.resolve());
 	const sendEpochRef = useRef(0);
+	const isMountedRef = useRef(true);
 	const enqueueSend = (payload) => {
 		const epoch = sendEpochRef.current;
 		const next = sendChainRef.current.then(() => {
-			if (epoch !== sendEpochRef.current) throw sendCancelledError;
+			if (epoch !== sendEpochRef.current) throw isMountedRef.current ? sendCancelledError : sendAbandonedError;
 			return agent.send(payload);
 		});
 		sendChainRef.current = next.catch(() => {});
 		return next;
 	};
 	useEffect(() => {
+		isMountedRef.current = true;
 		return () => {
+			isMountedRef.current = false;
 			sendEpochRef.current += 1;
 		};
 	}, []);
@@ -135,7 +156,8 @@ const useEveAgentRuntime = (options = {}) => {
 					...toEveClientContext(message.runConfig)
 				});
 			} catch (error) {
-				if (error !== sendCancelledError) throw error;
+				if (error === sendAbandonedError) return;
+				throw error;
 			}
 		},
 		...stagedMessages ? { onReload: async (parentId, config) => {
@@ -159,7 +181,7 @@ const useEveAgentRuntime = (options = {}) => {
 					stagedInputsRef.current.set(stagedMessage.id, input);
 					messagesRef.current = previousMessages;
 					setStagedMessages(previousMessages);
-					if (error === sendCancelledError) return;
+					if (isDroppedSend(error)) return;
 					throw error;
 				}
 				if (lastFinishStatusRef.current === "error") return;
@@ -174,7 +196,7 @@ const useEveAgentRuntime = (options = {}) => {
 			try {
 				await enqueueSend({ inputResponses: [toEveInputResponse(response)] });
 			} catch (error) {
-				if (error !== sendCancelledError) throw error;
+				if (!isDroppedSend(error)) throw error;
 			}
 		}
 	});

package/dist/useEveAgentRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEveAgentRuntime.js","names":[],"sources":["../src/useEveAgentRuntime.ts"],"sourcesContent":["\"use client\";\n\nimport { useEffect, useMemo, useRef, useState } from \"react\";\nimport {\n  fromThreadMessageLike,\n  generateId,\n  pickExternalStoreSharedOptions,\n  type AppendMessage,\n  type AttachmentAdapter,\n  type DictationAdapter,\n  type ExternalStoreSharedOptions,\n  type FeedbackAdapter,\n  type RealtimeVoiceAdapter,\n  type SpeechSynthesisAdapter,\n  type ThreadMessage,\n  type ToolExecutionStatus,\n} from \"@assistant-ui/core\";\nimport {\n  useExternalStoreRuntime,\n  useRuntimeAdapters,\n} from \"@assistant-ui/core/react\";\nimport {\n  useEveAgent,\n  type EveMessageData,\n  type UseEveAgentOptions,\n  type UseEveAgentStatus,\n} from \"eve/react\";\nimport type { SendTurnPayload } from \"eve/client\";\nimport {\n  convertEveMessages,\n  getEveMessageContent,\n  toEveInputResponse,\n} from \"./convertEveMessages\";\n\nconst USER_STAGED_STATUS = {\n  type: \"complete\",\n  reason: \"unknown\",\n} as const;\n\nconst sendCancelledError = new Error(\n  \"eve send was dropped because the run was cancelled.\",\n);\n\nconst hasRunConfig = (\n  runConfig: AppendMessage[\"runConfig\"],\n): runConfig is NonNullable<AppendMessage[\"runConfig\"]> =>\n  runConfig?.custom !== undefined && Object.keys(runConfig.custom).length > 0;\n\n/**\n * Only the `custom` bag crosses the wire. Eve reads `clientContext` as its own\n * namespace and serializes it into a model-visible context message, so sending\n * the assistant-ui envelope would surface a literal `\"custom\"` key in the\n * prompt and to every eve-side handler.\n */\nconst toEveClientContext = (\n  runConfig: AppendMessage[\"runConfig\"],\n): Pick<SendTurnPayload, \"clientContext\"> =>\n  hasRunConfig(runConfig)\n    ? {\n        clientContext: runConfig.custom as NonNullable<\n          SendTurnPayload[\"clientContext\"]\n        >,\n      }\n    : {};\n\nexport type UseEveAgentRuntimeOptions = Omit<\n  UseEveAgentOptions<EveMessageData>,\n  \"reducer\"\n> &\n  ExternalStoreSharedOptions & {\n    readonly adapters?:\n      | {\n          readonly attachments?: AttachmentAdapter | undefined;\n          readonly speech?: SpeechSynthesisAdapter | undefined;\n          readonly dictation?: DictationAdapter | undefined;\n          readonly voice?: RealtimeVoiceAdapter | undefined;\n          readonly feedback?: FeedbackAdapter | undefined;\n        }\n      | undefined;\n  };\n\n/**\n * Connects Eve's `useEveAgent` hook to assistant-ui's runtime contract.\n *\n * The runtime renders Eve messages, forwards new user messages to the Eve\n * session, supports cancellation, and maps Eve input requests to assistant-ui\n * tool approval UI.\n */\nexport const useEveAgentRuntime = (options: UseEveAgentRuntimeOptions = {}) => {\n  const {\n    adapters,\n    isDisabled: _isDisabled,\n    isSendDisabled: _isSendDisabled,\n    suggestions: _suggestions,\n    unstable_capabilities: _unstable_capabilities,\n    ...agentOptions\n  } = options;\n  true satisfies keyof typeof agentOptions &\n    keyof ExternalStoreSharedOptions extends never\n    ? true\n    : never;\n\n  const { onFinish } = agentOptions;\n  const lastFinishStatusRef = useRef<UseEveAgentStatus | null>(null);\n  const agent = useEveAgent({\n    ...agentOptions,\n    onFinish: (snapshot) => {\n      lastFinishStatusRef.current = snapshot.status;\n      onFinish?.(snapshot);\n    },\n  });\n  const runtimeAdapters = useRuntimeAdapters();\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n  const [stagedMessages, setStagedMessages] = useState<ThreadMessage[] | null>(\n    null,\n  );\n  const createdAtByMessageIdRef = useRef(new Map<string, Date>());\n  const stagedInputsRef = useRef(\n    new Map<\n      string,\n      { message: AppendMessage; runConfig: AppendMessage[\"runConfig\"] }\n    >(),\n  );\n\n  const hasExecutingTools = Object.values(toolStatuses).some(\n    (status) => status?.type === \"executing\",\n  );\n  const isRunning =\n    agent.status === \"submitted\" ||\n    agent.status === \"streaming\" ||\n    hasExecutingTools;\n\n  const convertedMessages = useMemo(() => {\n    const createdAtByMessageId = createdAtByMessageIdRef.current;\n    const messageIds = new Set(\n      agent.data.messages.map((message) => message.id),\n    );\n    for (const messageId of createdAtByMessageId.keys()) {\n      if (!messageIds.has(messageId)) createdAtByMessageId.delete(messageId);\n    }\n\n    return convertEveMessages(agent.data, {\n      isRunning,\n      error: agent.error,\n      getCreatedAt: (message) => {\n        const existing = createdAtByMessageId.get(message.id);\n        if (existing) return existing;\n\n        const createdAt = new Date();\n        createdAtByMessageId.set(message.id, createdAt);\n        return createdAt;\n      },\n    });\n  }, [agent.data, agent.error, isRunning]);\n\n  const messages = stagedMessages ?? convertedMessages;\n  const messagesRef = useRef(messages);\n  messagesRef.current = messages;\n\n  // Upstream `EveAgentStore.send` rejects while a turn is in flight and only\n  // resolves once the turn's stream parks, so a pending chain link is exactly\n  // an active turn; chaining every send serializes them without watching\n  // status.\n  const sendChainRef = useRef<Promise<void>>(Promise.resolve());\n  const sendEpochRef = useRef(0);\n\n  const enqueueSend = (payload: Parameters<typeof agent.send>[0]) => {\n    const epoch = sendEpochRef.current;\n    const next = sendChainRef.current.then(() => {\n      if (epoch !== sendEpochRef.current) throw sendCancelledError;\n      return agent.send(payload);\n    });\n    sendChainRef.current = next.catch(() => {});\n    return next;\n  };\n\n  // The store outlives the component (useEveAgent holds it in a ref with no\n  // cleanup), so queued sends must not fire server turns after unmount.\n  useEffect(() => {\n    return () => {\n      sendEpochRef.current += 1;\n    };\n  }, []);\n\n  useEffect(() => {\n    if (stagedInputsRef.current.size === 0) return;\n    const baseIds = new Set(convertedMessages.map((message) => message.id));\n    const remaining = messagesRef.current.filter(\n      (message) =>\n        stagedInputsRef.current.has(message.id) && !baseIds.has(message.id),\n    );\n    setStagedMessages(\n      remaining.length > 0 ? [...convertedMessages, ...remaining] : null,\n    );\n  }, [convertedMessages]);\n\n  const getStagedRun = (parentId: string | null) => {\n    if (!parentId || !stagedInputsRef.current.has(parentId)) return null;\n    const staged: {\n      message: ThreadMessage;\n      input: { message: AppendMessage; runConfig: AppendMessage[\"runConfig\"] };\n    }[] = [];\n    for (const message of messagesRef.current) {\n      const input = stagedInputsRef.current.get(message.id);\n      if (input) staged.push({ message, input });\n      if (message.id === parentId) break;\n    }\n    return staged;\n  };\n\n  const stageUserMessage = (message: AppendMessage) => {\n    const threadMessage = fromThreadMessageLike(\n      message,\n      generateId(),\n      USER_STAGED_STATUS,\n    );\n    stagedInputsRef.current.set(threadMessage.id, {\n      message,\n      runConfig: message.runConfig,\n    });\n    const nextMessages = [...messagesRef.current, threadMessage];\n    messagesRef.current = nextMessages;\n    setStagedMessages(nextMessages);\n  };\n\n  return useExternalStoreRuntime({\n    ...pickExternalStoreSharedOptions(options),\n    messages,\n    isRunning,\n    unstable_enableToolInvocations: true,\n    setToolStatuses,\n    adapters: {\n      attachments: adapters?.attachments ?? runtimeAdapters?.attachments,\n      speech: adapters?.speech,\n      dictation: adapters?.dictation,\n      voice: adapters?.voice,\n      feedback: adapters?.feedback,\n    },\n    onNew: async (message) => {\n      if (!(message.startRun ?? message.role === \"user\")) {\n        stageUserMessage(message);\n        return;\n      }\n      try {\n        await enqueueSend({\n          message: getEveMessageContent(message),\n          ...toEveClientContext(message.runConfig),\n        });\n      } catch (error) {\n        if (error !== sendCancelledError) throw error;\n      }\n    },\n    ...(stagedMessages\n      ? {\n          onReload: async (parentId: string | null, config) => {\n            const stagedRun = getStagedRun(parentId);\n            if (!stagedRun)\n              throw new Error(\"Runtime does not support reloading messages.\");\n            const epoch = sendEpochRef.current;\n            for (const { message: stagedMessage, input } of stagedRun) {\n              if (epoch !== sendEpochRef.current) return;\n              const previousMessages = messagesRef.current;\n              stagedInputsRef.current.delete(stagedMessage.id);\n              const nextMessages = previousMessages.filter(\n                (message) => message.id !== stagedMessage.id,\n              );\n              messagesRef.current = nextMessages;\n              setStagedMessages(\n                stagedInputsRef.current.size > 0 ? nextMessages : null,\n              );\n              // The reload config belongs to the message being reloaded; the\n              // drafts promoted ahead of it keep the config they were staged\n              // with, or reloading the tail would rewrite their context too.\n              const runConfig =\n                stagedMessage.id === parentId && hasRunConfig(config.runConfig)\n                  ? config.runConfig\n                  : input.runConfig;\n              try {\n                await enqueueSend({\n                  message: getEveMessageContent(input.message),\n                  ...toEveClientContext(runConfig),\n                });\n              } catch (error) {\n                stagedInputsRef.current.set(stagedMessage.id, input);\n                messagesRef.current = previousMessages;\n                setStagedMessages(previousMessages);\n                if (error === sendCancelledError) return;\n                throw error;\n              }\n              if (lastFinishStatusRef.current === \"error\") return;\n            }\n          },\n        }\n      : {}),\n    onCancel: () => {\n      sendEpochRef.current += 1;\n      agent.stop();\n      return Promise.resolve();\n    },\n    onRespondToToolApproval: async (response) => {\n      try {\n        await enqueueSend({ inputResponses: [toEveInputResponse(response)] });\n      } catch (error) {\n        if (error !== sendCancelledError) throw error;\n      }\n    },\n  });\n};\n"],"mappings":"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"}
+{"version":3,"file":"useEveAgentRuntime.js","names":[],"sources":["../src/useEveAgentRuntime.ts"],"sourcesContent":["\"use client\";\n\nimport { useEffect, useMemo, useRef, useState } from \"react\";\nimport {\n  fromThreadMessageLike,\n  generateId,\n  MessageNotSentError,\n  pickExternalStoreSharedOptions,\n  type AppendMessage,\n  type AttachmentAdapter,\n  type DictationAdapter,\n  type ExternalStoreSharedOptions,\n  type FeedbackAdapter,\n  type RealtimeVoiceAdapter,\n  type SpeechSynthesisAdapter,\n  type ThreadMessage,\n  type ToolExecutionStatus,\n} from \"@assistant-ui/core\";\nimport {\n  useExternalStoreRuntime,\n  useRuntimeAdapters,\n} from \"@assistant-ui/core/react\";\nimport {\n  useEveAgent,\n  type EveMessageData,\n  type UseEveAgentOptions,\n  type UseEveAgentStatus,\n} from \"eve/react\";\nimport type { SendTurnPayload } from \"eve/client\";\nimport {\n  convertEveMessages,\n  getEveMessageContent,\n  toEveInputResponse,\n} from \"./convertEveMessages\";\n\nconst USER_STAGED_STATUS = {\n  type: \"complete\",\n  reason: \"unknown\",\n} as const;\n\nconst sendCancelledError = new MessageNotSentError(\n  \"eve send was dropped because the run was cancelled.\",\n);\n\nconst sendAbandonedError = new Error(\n  \"eve send was dropped because the runtime unmounted.\",\n);\n\nconst isDroppedSend = (error: unknown) =>\n  error === sendCancelledError || error === sendAbandonedError;\n\ntype EveLifecycleCallbackName =\n  | \"onError\"\n  | \"onEvent\"\n  | \"onFinish\"\n  | \"onSessionChange\";\n\nconst reportEveLifecycleCallbackError = (\n  name: EveLifecycleCallbackName,\n  error: unknown,\n) => {\n  console.error(`[assistant-ui/eve] ${name} callback threw an error`, error);\n};\n\nconst invokeEveLifecycleCallback = <T>(\n  name: EveLifecycleCallbackName,\n  callback: ((value: T) => unknown) | undefined,\n  value: T,\n) => {\n  if (!callback) return;\n\n  try {\n    void Promise.resolve(callback(value)).catch((error) => {\n      reportEveLifecycleCallbackError(name, error);\n    });\n  } catch (error) {\n    reportEveLifecycleCallbackError(name, error);\n  }\n};\n\nconst hasRunConfig = (\n  runConfig: AppendMessage[\"runConfig\"],\n): runConfig is NonNullable<AppendMessage[\"runConfig\"]> =>\n  runConfig?.custom !== undefined && Object.keys(runConfig.custom).length > 0;\n\n/**\n * Only the `custom` bag crosses the wire. Eve reads `clientContext` as its own\n * namespace and serializes it into a model-visible context message, so sending\n * the assistant-ui envelope would surface a literal `\"custom\"` key in the\n * prompt and to every eve-side handler.\n */\nconst toEveClientContext = (\n  runConfig: AppendMessage[\"runConfig\"],\n): Pick<SendTurnPayload, \"clientContext\"> =>\n  hasRunConfig(runConfig)\n    ? {\n        clientContext: runConfig.custom as NonNullable<\n          SendTurnPayload[\"clientContext\"]\n        >,\n      }\n    : {};\n\nexport type UseEveAgentRuntimeOptions = Omit<\n  UseEveAgentOptions<EveMessageData>,\n  \"reducer\"\n> &\n  ExternalStoreSharedOptions & {\n    readonly adapters?:\n      | {\n          readonly attachments?: AttachmentAdapter | undefined;\n          readonly speech?: SpeechSynthesisAdapter | undefined;\n          readonly dictation?: DictationAdapter | undefined;\n          readonly voice?: RealtimeVoiceAdapter | undefined;\n          readonly feedback?: FeedbackAdapter | undefined;\n        }\n      | undefined;\n  };\n\n/**\n * Connects Eve's `useEveAgent` hook to assistant-ui's runtime contract.\n *\n * The runtime renders Eve messages, forwards new user messages to the Eve\n * session, supports cancellation, and maps Eve input requests to assistant-ui\n * tool approval UI.\n */\nexport const useEveAgentRuntime = (options: UseEveAgentRuntimeOptions = {}) => {\n  const {\n    adapters,\n    isDisabled: _isDisabled,\n    isSendDisabled: _isSendDisabled,\n    suggestions: _suggestions,\n    unstable_capabilities: _unstable_capabilities,\n    ...agentOptions\n  } = options;\n  true satisfies keyof typeof agentOptions &\n    keyof ExternalStoreSharedOptions extends never\n    ? true\n    : never;\n\n  const { onError, onEvent, onFinish, onSessionChange } = agentOptions;\n  const lastFinishStatusRef = useRef<UseEveAgentStatus | null>(null);\n  const agent = useEveAgent({\n    ...agentOptions,\n    ...(onError\n      ? {\n          onError: (error) =>\n            invokeEveLifecycleCallback(\"onError\", onError, error),\n        }\n      : {}),\n    ...(onEvent\n      ? {\n          onEvent: (event) =>\n            invokeEveLifecycleCallback(\"onEvent\", onEvent, event),\n        }\n      : {}),\n    onFinish: (snapshot) => {\n      lastFinishStatusRef.current = snapshot.status;\n      invokeEveLifecycleCallback(\"onFinish\", onFinish, snapshot);\n    },\n    ...(onSessionChange\n      ? {\n          onSessionChange: (session) =>\n            invokeEveLifecycleCallback(\n              \"onSessionChange\",\n              onSessionChange,\n              session,\n            ),\n        }\n      : {}),\n  });\n  const runtimeAdapters = useRuntimeAdapters();\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n  const [stagedMessages, setStagedMessages] = useState<ThreadMessage[] | null>(\n    null,\n  );\n  const createdAtByMessageIdRef = useRef(new Map<string, Date>());\n  const stagedInputsRef = useRef(\n    new Map<\n      string,\n      { message: AppendMessage; runConfig: AppendMessage[\"runConfig\"] }\n    >(),\n  );\n\n  const hasExecutingTools = Object.values(toolStatuses).some(\n    (status) => status?.type === \"executing\",\n  );\n  const isRunning =\n    agent.status === \"submitted\" ||\n    agent.status === \"streaming\" ||\n    hasExecutingTools;\n\n  const convertedMessages = useMemo(() => {\n    const createdAtByMessageId = createdAtByMessageIdRef.current;\n    const messageIds = new Set(\n      agent.data.messages.map((message) => message.id),\n    );\n    for (const messageId of createdAtByMessageId.keys()) {\n      if (!messageIds.has(messageId)) createdAtByMessageId.delete(messageId);\n    }\n\n    return convertEveMessages(agent.data, {\n      isRunning,\n      error: agent.error,\n      getCreatedAt: (message) => {\n        const existing = createdAtByMessageId.get(message.id);\n        if (existing) return existing;\n\n        const createdAt = new Date();\n        createdAtByMessageId.set(message.id, createdAt);\n        return createdAt;\n      },\n    });\n  }, [agent.data, agent.error, isRunning]);\n\n  const messages = stagedMessages ?? convertedMessages;\n  const messagesRef = useRef(messages);\n  messagesRef.current = messages;\n\n  // Upstream `EveAgentStore.send` rejects while a turn is in flight and only\n  // resolves once the turn's stream parks, so a pending chain link is exactly\n  // an active turn; chaining every send serializes them without watching\n  // status.\n  const sendChainRef = useRef<Promise<void>>(Promise.resolve());\n  const sendEpochRef = useRef(0);\n  const isMountedRef = useRef(true);\n\n  const enqueueSend = (payload: Parameters<typeof agent.send>[0]) => {\n    const epoch = sendEpochRef.current;\n    const next = sendChainRef.current.then(() => {\n      if (epoch !== sendEpochRef.current)\n        throw isMountedRef.current ? sendCancelledError : sendAbandonedError;\n      return agent.send(payload);\n    });\n    sendChainRef.current = next.catch(() => {});\n    return next;\n  };\n\n  // The store outlives the component (useEveAgent holds it in a ref with no\n  // cleanup), so queued sends must not fire server turns after unmount. The\n  // flag separates that teardown from a user cancel, and is re-armed in setup\n  // for a remounted tree.\n  useEffect(() => {\n    isMountedRef.current = true;\n    return () => {\n      isMountedRef.current = false;\n      sendEpochRef.current += 1;\n    };\n  }, []);\n\n  useEffect(() => {\n    if (stagedInputsRef.current.size === 0) return;\n    const baseIds = new Set(convertedMessages.map((message) => message.id));\n    const remaining = messagesRef.current.filter(\n      (message) =>\n        stagedInputsRef.current.has(message.id) && !baseIds.has(message.id),\n    );\n    setStagedMessages(\n      remaining.length > 0 ? [...convertedMessages, ...remaining] : null,\n    );\n  }, [convertedMessages]);\n\n  const getStagedRun = (parentId: string | null) => {\n    if (!parentId || !stagedInputsRef.current.has(parentId)) return null;\n    const staged: {\n      message: ThreadMessage;\n      input: { message: AppendMessage; runConfig: AppendMessage[\"runConfig\"] };\n    }[] = [];\n    for (const message of messagesRef.current) {\n      const input = stagedInputsRef.current.get(message.id);\n      if (input) staged.push({ message, input });\n      if (message.id === parentId) break;\n    }\n    return staged;\n  };\n\n  const stageUserMessage = (message: AppendMessage) => {\n    const threadMessage = fromThreadMessageLike(\n      message,\n      generateId(),\n      USER_STAGED_STATUS,\n    );\n    stagedInputsRef.current.set(threadMessage.id, {\n      message,\n      runConfig: message.runConfig,\n    });\n    const nextMessages = [...messagesRef.current, threadMessage];\n    messagesRef.current = nextMessages;\n    setStagedMessages(nextMessages);\n  };\n\n  return useExternalStoreRuntime({\n    ...pickExternalStoreSharedOptions(options),\n    messages,\n    isRunning,\n    unstable_enableToolInvocations: true,\n    setToolStatuses,\n    adapters: {\n      attachments: adapters?.attachments ?? runtimeAdapters?.attachments,\n      speech: adapters?.speech,\n      dictation: adapters?.dictation,\n      voice: adapters?.voice,\n      feedback: adapters?.feedback,\n    },\n    onNew: async (message) => {\n      if (!(message.startRun ?? message.role === \"user\")) {\n        stageUserMessage(message);\n        return;\n      }\n      try {\n        await enqueueSend({\n          message: getEveMessageContent(message),\n          ...toEveClientContext(message.runConfig),\n        });\n      } catch (error) {\n        // A cancelled send never reached the session, so it rethrows for the\n        // composer to take the draft back; an unmounted one has no composer\n        // left to restore.\n        if (error === sendAbandonedError) return;\n        throw error;\n      }\n    },\n    ...(stagedMessages\n      ? {\n          onReload: async (parentId: string | null, config) => {\n            const stagedRun = getStagedRun(parentId);\n            if (!stagedRun)\n              throw new Error(\"Runtime does not support reloading messages.\");\n            const epoch = sendEpochRef.current;\n            for (const { message: stagedMessage, input } of stagedRun) {\n              if (epoch !== sendEpochRef.current) return;\n              const previousMessages = messagesRef.current;\n              stagedInputsRef.current.delete(stagedMessage.id);\n              const nextMessages = previousMessages.filter(\n                (message) => message.id !== stagedMessage.id,\n              );\n              messagesRef.current = nextMessages;\n              setStagedMessages(\n                stagedInputsRef.current.size > 0 ? nextMessages : null,\n              );\n              // The reload config belongs to the message being reloaded; the\n              // drafts promoted ahead of it keep the config they were staged\n              // with, or reloading the tail would rewrite their context too.\n              const runConfig =\n                stagedMessage.id === parentId && hasRunConfig(config.runConfig)\n                  ? config.runConfig\n                  : input.runConfig;\n              try {\n                await enqueueSend({\n                  message: getEveMessageContent(input.message),\n                  ...toEveClientContext(runConfig),\n                });\n              } catch (error) {\n                stagedInputsRef.current.set(stagedMessage.id, input);\n                messagesRef.current = previousMessages;\n                setStagedMessages(previousMessages);\n                if (isDroppedSend(error)) return;\n                throw error;\n              }\n              if (lastFinishStatusRef.current === \"error\") return;\n            }\n          },\n        }\n      : {}),\n    onCancel: () => {\n      sendEpochRef.current += 1;\n      agent.stop();\n      return Promise.resolve();\n    },\n    onRespondToToolApproval: async (response) => {\n      try {\n        await enqueueSend({ inputResponses: [toEveInputResponse(response)] });\n      } catch (error) {\n        if (!isDroppedSend(error)) throw error;\n      }\n    },\n  });\n};\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/eve",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Eve runtime adapter for assistant-ui",
   "keywords": [
     "eve",
@@ -28,7 +28,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.3.10"
+    "@assistant-ui/core": "^0.3.13"
   },
   "peerDependencies": {
     "@types/react": "*",

package/src/useEveAgentRuntime.test.tsx

@@ -1,7 +1,7 @@
 // @vitest-environment jsdom
 
 import { act, renderHook, waitFor } from "@testing-library/react";
-import { describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 
 const { mockUseEveAgent } = vi.hoisted(() => ({
   mockUseEveAgent: vi.fn(),
@@ -39,7 +39,60 @@ const createAgent = (overrides: Record<string, unknown>) => ({
   ...overrides,
 });
 
+afterEach(() => {
+  vi.restoreAllMocks();
+});
+
 describe("useEveAgentRuntime status forwarding", () => {
+  it.each(
+    (["onError", "onEvent", "onFinish", "onSessionChange"] as const).flatMap(
+      (callbackName) =>
+        (["throws", "rejects"] as const).map(
+          (failureMode) => [callbackName, failureMode] as const,
+        ),
+    ),
+  )(
+    "isolates %s callback errors when it %s",
+    async (callbackName, failureMode) => {
+      const callbackError = new Error(`${callbackName} failed`);
+      const callback = vi.fn(() => {
+        if (failureMode === "throws") throw callbackError;
+        return Promise.reject(callbackError);
+      });
+      const agent = createAgent({ data: { messages: [] } });
+      let capturedOptions: Record<
+        string,
+        ((value: unknown) => void) | undefined
+      > = {};
+      mockUseEveAgent.mockImplementation((options) => {
+        capturedOptions = options as typeof capturedOptions;
+        return agent as never;
+      });
+      const consoleError = vi
+        .spyOn(console, "error")
+        .mockImplementation(() => {});
+
+      renderHook(() =>
+        useEveAgentRuntime({ [callbackName]: callback } as never),
+      );
+
+      const value =
+        callbackName === "onFinish"
+          ? { status: "ready" }
+          : callbackName === "onError"
+            ? new Error("run failed")
+            : {};
+      expect(() => capturedOptions[callbackName]?.(value)).not.toThrow();
+      expect(callback).toHaveBeenCalledWith(value);
+      await waitFor(() => {
+        expect(consoleError).toHaveBeenCalledWith(
+          `[assistant-ui/eve] ${callbackName} callback threw an error`,
+          callbackError,
+        );
+      });
+    },
+  );
+
   it("maps the session error onto the interrupted assistant message", () => {
     mockUseEveAgent.mockReturnValue(
       createAgent({ status: "error", error: new Error("boom") }) as never,
@@ -858,6 +911,142 @@ describe("useEveAgentRuntime concurrent sends", () => {
     expect(send).toHaveBeenCalledTimes(1);
   });
 
+  it("returns a cancelled queued send to the composer", async () => {
+    let resolveFirstSend!: () => void;
+    const send = vi
+      .fn()
+      .mockImplementationOnce(
+        () =>
+          new Promise<void>((resolve) => {
+            resolveFirstSend = resolve;
+          }),
+      )
+      .mockResolvedValue(undefined);
+    const agent = createAgent({ data: settledData, send });
+    mockUseEveAgent.mockReturnValue(agent as never);
+    const { result } = renderHook(() => useEveAgentRuntime());
+
+    await act(async () => {
+      result.current.thread.append({
+        role: "user",
+        content: [{ type: "text", text: "first" }],
+      });
+    });
+    await waitFor(() => expect(send).toHaveBeenCalledTimes(1));
+
+    await act(async () => {
+      result.current.thread.composer.setText("queued");
+      result.current.thread.composer.send();
+    });
+    expect(result.current.thread.composer.getState().text).toBe("");
+
+    act(() => {
+      result.current.thread.cancelRun();
+    });
+    await act(async () => {
+      resolveFirstSend();
+    });
+
+    await waitFor(() => {
+      expect(result.current.thread.composer.getState().text).toBe("queued");
+    });
+    expect(send).toHaveBeenCalledTimes(1);
+    expect(getText(result.current)).toEqual(["earlier", "earlier answer"]);
+  });
+
+  it("returns the queued send when cancel keeps the trailing message", async () => {
+    let resolveFirstSend!: () => void;
+    const send = vi
+      .fn()
+      .mockImplementationOnce(
+        () =>
+          new Promise<void>((resolve) => {
+            resolveFirstSend = resolve;
+          }),
+      )
+      .mockResolvedValue(undefined);
+    // Before the turn streams, the dispatched message is the thread's trailing
+    // user leaf. Eve owns that message and cannot remove it on cancel.
+    const agent = createAgent({
+      data: {
+        messages: [
+          ...settledData.messages,
+          { id: "u2", role: "user", parts: [{ type: "text", text: "first" }] },
+        ],
+      } satisfies EveMessageData,
+      status: "submitted",
+      send,
+    });
+    mockUseEveAgent.mockReturnValue(agent as never);
+    const { result } = renderHook(() => useEveAgentRuntime());
+
+    await act(async () => {
+      result.current.thread.composer.setText("first");
+      result.current.thread.composer.send();
+    });
+    await waitFor(() => expect(send).toHaveBeenCalledTimes(1));
+
+    await act(async () => {
+      result.current.thread.composer.setText("queued");
+      result.current.thread.composer.send();
+    });
+    act(() => {
+      result.current.thread.cancelRun();
+    });
+    expect(result.current.thread.composer.getState().text).toBe("");
+
+    await act(async () => {
+      resolveFirstSend();
+    });
+
+    await waitFor(() => {
+      expect(result.current.thread.composer.getState().text).toBe("queued");
+    });
+    expect(send).toHaveBeenCalledTimes(1);
+  });
+
+  it("keeps a cancelled tool approval discarded", async () => {
+    let resolveFirstSend!: () => void;
+    const send = vi
+      .fn()
+      .mockImplementationOnce(
+        () =>
+          new Promise<void>((resolve) => {
+            resolveFirstSend = resolve;
+          }),
+      )
+      .mockResolvedValue(undefined);
+    const agent = createAgent({ data: approvalData, send });
+    mockUseEveAgent.mockReturnValue(agent as never);
+    const { result } = renderHook(() => useEveAgentRuntime());
+    const before = getText(result.current);
+
+    await act(async () => {
+      result.current.thread.append({
+        role: "user",
+        content: [{ type: "text", text: "go" }],
+      });
+    });
+    await waitFor(() => expect(send).toHaveBeenCalledTimes(1));
+
+    act(() => {
+      result.current.thread
+        .getMessageByIndex(1)
+        .getMessagePartByToolCallId("call_1")
+        .respondToToolApproval({ optionId: "approve" });
+    });
+    act(() => {
+      result.current.thread.cancelRun();
+    });
+    await act(async () => {
+      resolveFirstSend();
+    });
+
+    expect(send).toHaveBeenCalledTimes(1);
+    expect(result.current.thread.composer.getState().text).toBe("");
+    expect(getText(result.current)).toEqual(before);
+  });
+
   it("drops a queued send when the hook unmounts before it dispatches", async () => {
     let resolveFirstSend!: () => void;
     const send = vi

package/src/useEveAgentRuntime.ts

@@ -4,6 +4,7 @@ import { useEffect, useMemo, useRef, useState } from "react";
 import {
   fromThreadMessageLike,
   generateId,
+  MessageNotSentError,
   pickExternalStoreSharedOptions,
   type AppendMessage,
   type AttachmentAdapter,
@@ -37,10 +38,46 @@ const USER_STAGED_STATUS = {
   reason: "unknown",
 } as const;
 
-const sendCancelledError = new Error(
+const sendCancelledError = new MessageNotSentError(
   "eve send was dropped because the run was cancelled.",
 );
 
+const sendAbandonedError = new Error(
+  "eve send was dropped because the runtime unmounted.",
+);
+
+const isDroppedSend = (error: unknown) =>
+  error === sendCancelledError || error === sendAbandonedError;
+
+type EveLifecycleCallbackName =
+  | "onError"
+  | "onEvent"
+  | "onFinish"
+  | "onSessionChange";
+
+const reportEveLifecycleCallbackError = (
+  name: EveLifecycleCallbackName,
+  error: unknown,
+) => {
+  console.error(`[assistant-ui/eve] ${name} callback threw an error`, error);
+};
+
+const invokeEveLifecycleCallback = <T>(
+  name: EveLifecycleCallbackName,
+  callback: ((value: T) => unknown) | undefined,
+  value: T,
+) => {
+  if (!callback) return;
+
+  try {
+    void Promise.resolve(callback(value)).catch((error) => {
+      reportEveLifecycleCallbackError(name, error);
+    });
+  } catch (error) {
+    reportEveLifecycleCallbackError(name, error);
+  }
+};
+
 const hasRunConfig = (
   runConfig: AppendMessage["runConfig"],
 ): runConfig is NonNullable<AppendMessage["runConfig"]> =>
@@ -100,14 +137,36 @@ export const useEveAgentRuntime = (options: UseEveAgentRuntimeOptions = {}) => {
     ? true
     : never;
 
-  const { onFinish } = agentOptions;
+  const { onError, onEvent, onFinish, onSessionChange } = agentOptions;
   const lastFinishStatusRef = useRef<UseEveAgentStatus | null>(null);
   const agent = useEveAgent({
     ...agentOptions,
+    ...(onError
+      ? {
+          onError: (error) =>
+            invokeEveLifecycleCallback("onError", onError, error),
+        }
+      : {}),
+    ...(onEvent
+      ? {
+          onEvent: (event) =>
+            invokeEveLifecycleCallback("onEvent", onEvent, event),
+        }
+      : {}),
     onFinish: (snapshot) => {
       lastFinishStatusRef.current = snapshot.status;
-      onFinish?.(snapshot);
+      invokeEveLifecycleCallback("onFinish", onFinish, snapshot);
     },
+    ...(onSessionChange
+      ? {
+          onSessionChange: (session) =>
+            invokeEveLifecycleCallback(
+              "onSessionChange",
+              onSessionChange,
+              session,
+            ),
+        }
+      : {}),
   });
   const runtimeAdapters = useRuntimeAdapters();
   const [toolStatuses, setToolStatuses] = useState<
@@ -165,11 +224,13 @@ export const useEveAgentRuntime = (options: UseEveAgentRuntimeOptions = {}) => {
   // status.
   const sendChainRef = useRef<Promise<void>>(Promise.resolve());
   const sendEpochRef = useRef(0);
+  const isMountedRef = useRef(true);
 
   const enqueueSend = (payload: Parameters<typeof agent.send>[0]) => {
     const epoch = sendEpochRef.current;
     const next = sendChainRef.current.then(() => {
-      if (epoch !== sendEpochRef.current) throw sendCancelledError;
+      if (epoch !== sendEpochRef.current)
+        throw isMountedRef.current ? sendCancelledError : sendAbandonedError;
       return agent.send(payload);
     });
     sendChainRef.current = next.catch(() => {});
@@ -177,9 +238,13 @@ export const useEveAgentRuntime = (options: UseEveAgentRuntimeOptions = {}) => {
   };
 
   // The store outlives the component (useEveAgent holds it in a ref with no
-  // cleanup), so queued sends must not fire server turns after unmount.
+  // cleanup), so queued sends must not fire server turns after unmount. The
+  // flag separates that teardown from a user cancel, and is re-armed in setup
+  // for a remounted tree.
   useEffect(() => {
+    isMountedRef.current = true;
     return () => {
+      isMountedRef.current = false;
       sendEpochRef.current += 1;
     };
   }, []);
@@ -249,7 +314,11 @@ export const useEveAgentRuntime = (options: UseEveAgentRuntimeOptions = {}) => {
           ...toEveClientContext(message.runConfig),
         });
       } catch (error) {
-        if (error !== sendCancelledError) throw error;
+        // A cancelled send never reached the session, so it rethrows for the
+        // composer to take the draft back; an unmounted one has no composer
+        // left to restore.
+        if (error === sendAbandonedError) return;
+        throw error;
       }
     },
     ...(stagedMessages
@@ -286,7 +355,7 @@ export const useEveAgentRuntime = (options: UseEveAgentRuntimeOptions = {}) => {
                 stagedInputsRef.current.set(stagedMessage.id, input);
                 messagesRef.current = previousMessages;
                 setStagedMessages(previousMessages);
-                if (error === sendCancelledError) return;
+                if (isDroppedSend(error)) return;
                 throw error;
               }
               if (lastFinishStatusRef.current === "error") return;
@@ -303,7 +372,7 @@ export const useEveAgentRuntime = (options: UseEveAgentRuntimeOptions = {}) => {
       try {
         await enqueueSend({ inputResponses: [toEveInputResponse(response)] });
       } catch (error) {
-        if (error !== sendCancelledError) throw error;
+        if (!isDroppedSend(error)) throw error;
       }
     },
   });