@assistant-ui/react-ag-ui 0.0.32 → 0.0.33

package/dist/useAgUiRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAgUiRuntime.d.ts","names":[],"sources":["../src/useAgUiRuntime.ts"],"mappings":";;;;KAwBY,oBAAA,GAAuB,gBAAA;EACjC,6BAAA,iBAA8C,aAAA;EAC9C,iCAAA,GACE,SAAA,WAAoB,eAAA,OACjB,OAAA;AAAA;AAAA,iBAGS,cAAA,CACd,OAAA,EAAS,qBAAA,GACR,oBAAoB"}
+{"version":3,"file":"useAgUiRuntime.d.ts","names":[],"sources":["../src/useAgUiRuntime.ts"],"mappings":";;;;KAuBY,oBAAA,GAAuB,gBAAA;EACjC,6BAAA,iBAA8C,aAAA;EAC9C,iCAAA,GACE,SAAA,WAAoB,eAAA,OACjB,OAAA;AAAA;AAAA,iBAGS,cAAA,CACd,OAAA,EAAS,qBAAA,GACR,oBAAoB"}

package/dist/useAgUiRuntime.js

@@ -2,7 +2,7 @@
 import { makeLogger } from "./runtime/logger.js";
 import { AgUiThreadRuntimeCore } from "./runtime/AgUiThreadRuntimeCore.js";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useExternalStoreRuntime, useRuntimeAdapters, useToolInvocations } from "@assistant-ui/core/react";
+import { useExternalStoreRuntime, useRuntimeAdapters } from "@assistant-ui/core/react";
 //#region src/useAgUiRuntime.ts
 function useAgUiRuntime(options) {
 	const logger = useMemo(() => makeLogger(options.logger), [options.logger]);
@@ -32,26 +32,16 @@ function useAgUiRuntime(options) {
 	});
 	const [toolStatuses, setToolStatuses] = useState({});
 	const hasExecutingTools = Object.values(toolStatuses).some((s) => s?.type === "executing");
-	const [runtimeRef] = useState(() => ({ get current() {
-		return runtime;
-	} }));
-	const toolInvocationsRef = useRef({
-		reset: () => {},
-		abort: () => Promise.resolve(),
-		resume: (_toolCallId, _payload) => {}
-	});
 	const threadList = useMemo(() => {
 		if (!threadListAdapter) return void 0;
 		const { onSwitchToNewThread, onSwitchToThread } = threadListAdapter;
 		return {
 			threadId: threadListAdapter.threadId,
 			onSwitchToNewThread: onSwitchToNewThread ? async () => {
-				toolInvocationsRef.current.reset();
 				await onSwitchToNewThread();
 				core.applyExternalMessages([]);
 			} : void 0,
 			onSwitchToThread: onSwitchToThread ? async (threadId) => {
-				toolInvocationsRef.current.reset();
 				const result = await onSwitchToThread(threadId);
 				core.applyExternalMessages(result.messages);
 				if (result.state) core.loadExternalState(result.state);
@@ -70,43 +60,22 @@ function useAgUiRuntime(options) {
 		runtimeAdapters,
 		threadList
 	]);
-	toolInvocationsRef.current = useToolInvocations({
-		state: {
-			messages: core.getMessages(),
-			isRunning: core.isRunning() || hasExecutingTools
-		},
-		getTools: () => runtimeRef.current.thread.getModelContext().tools,
-		onResult: (command) => {
-			if (command.type === "add-tool-result") {
-				const messageId = core.findMessageIdForToolCall(command.toolCallId);
-				if (messageId) core.addToolResult({
-					messageId,
-					toolCallId: command.toolCallId,
-					toolName: command.toolName,
-					result: command.result,
-					isError: command.isError,
-					...command.artifact && { artifact: command.artifact }
-				});
-			}
-		},
-		setToolStatuses
-	});
 	const baseRuntime = useExternalStoreRuntime(useMemo(() => {
 		return {
 			isLoading: core.isLoading,
 			messages: core.getMessages(),
 			state: core.getState(),
 			isRunning: core.isRunning() || hasExecutingTools,
+			unstable_enableToolInvocations: true,
+			setToolStatuses,
 			onNew: (message) => core.append(message),
 			onEdit: (message) => core.edit(message),
 			onReload: (parentId, config) => core.reload(parentId, config),
 			onCancel: async () => {
 				core.cancel();
-				await toolInvocationsRef.current.abort();
 			},
 			onAddToolResult: (options) => core.addToolResult(options),
 			onResume: (config) => core.resume(config),
-			onResumeToolCall: (options) => toolInvocationsRef.current.resume(options.toolCallId, options.payload),
 			setMessages: (messages) => core.applyExternalMessages(messages),
 			onImport: (messages) => core.applyExternalMessages(messages),
 			onLoadExternalState: (state) => core.loadExternalState(state),

package/dist/useAgUiRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAgUiRuntime.js","names":[],"sources":["../src/useAgUiRuntime.ts"],"sourcesContent":["\"use client\";\n\nimport { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport {\n  useExternalStoreRuntime,\n  useRuntimeAdapters,\n  useToolInvocations,\n} from \"@assistant-ui/core/react\";\nimport type { ToolExecutionStatus } from \"@assistant-ui/core/react\";\nimport type {\n  AssistantRuntime,\n  AppendMessage,\n  ExternalStoreAdapter,\n  ThreadMessage,\n} from \"@assistant-ui/core\";\nimport type { ReadonlyJSONValue } from \"assistant-stream/utils\";\nimport { makeLogger } from \"./runtime/logger\";\nimport type {\n  AgUiInterrupt,\n  AgUiResumeEntry,\n  UseAgUiRuntimeOptions,\n} from \"./runtime/types\";\nimport { AgUiThreadRuntimeCore } from \"./runtime/AgUiThreadRuntimeCore\";\n\nexport type AgUiAssistantRuntime = AssistantRuntime & {\n  unstable_getPendingInterrupts: () => readonly AgUiInterrupt[];\n  unstable_submitInterruptResponses: (\n    responses: readonly AgUiResumeEntry[],\n  ) => Promise<void>;\n};\n\nexport function useAgUiRuntime(\n  options: UseAgUiRuntimeOptions,\n): AgUiAssistantRuntime {\n  const logger = useMemo(() => makeLogger(options.logger), [options.logger]);\n  const [_version, setVersion] = useState(0);\n  const notifyUpdate = useCallback(() => setVersion((v) => v + 1), []);\n  const coreRef = useRef<AgUiThreadRuntimeCore | null>(null);\n  const runtimeAdapters = useRuntimeAdapters();\n\n  const historyAdapter = options.adapters?.history ?? runtimeAdapters?.history;\n  const threadListAdapter = options.adapters?.threadList;\n\n  if (!coreRef.current) {\n    coreRef.current = new AgUiThreadRuntimeCore({\n      agent: options.agent,\n      logger,\n      showThinking: options.showThinking ?? true,\n      ...(options.onError && { onError: options.onError }),\n      ...(options.onCancel && { onCancel: options.onCancel }),\n      ...(historyAdapter && { history: historyAdapter }),\n      notifyUpdate,\n    });\n  }\n\n  const core = coreRef.current;\n  core.updateOptions({\n    agent: options.agent,\n    logger,\n    showThinking: options.showThinking ?? true,\n    ...(options.onError && { onError: options.onError }),\n    ...(options.onCancel && { onCancel: options.onCancel }),\n    ...(historyAdapter && { history: historyAdapter }),\n  });\n\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n\n  const hasExecutingTools = Object.values(toolStatuses).some(\n    (s) => s?.type === \"executing\",\n  );\n\n  const [runtimeRef] = useState(() => ({\n    get current(): AssistantRuntime {\n      return runtime;\n    },\n  }));\n\n  const toolInvocationsRef = useRef({\n    reset: () => {},\n    abort: (): Promise<void> => Promise.resolve(),\n    resume: (_toolCallId: string, _payload: unknown) => {},\n  });\n\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            toolInvocationsRef.current.reset();\n            await onSwitchToNewThread();\n            core.applyExternalMessages([]);\n          }\n        : undefined,\n      onSwitchToThread: onSwitchToThread\n        ? async (threadId: string) => {\n            toolInvocationsRef.current.reset();\n            const result = await onSwitchToThread(threadId);\n            core.applyExternalMessages(result.messages);\n            if (result.state) {\n              core.loadExternalState(result.state);\n            }\n          }\n        : undefined,\n    };\n  }, [threadListAdapter, core]);\n\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      feedback: adapters?.feedback,\n      threadList,\n    }),\n    [adapters, runtimeAdapters, threadList],\n  );\n\n  const toolInvocations = useToolInvocations({\n    state: {\n      messages: core.getMessages(),\n      isRunning: core.isRunning() || hasExecutingTools,\n    },\n    getTools: () => runtimeRef.current.thread.getModelContext().tools,\n    onResult: (command) => {\n      if (command.type === \"add-tool-result\") {\n        const messageId = core.findMessageIdForToolCall(command.toolCallId);\n        if (messageId) {\n          core.addToolResult({\n            messageId,\n            toolCallId: command.toolCallId,\n            toolName: command.toolName,\n            result: command.result,\n            isError: command.isError,\n            ...(command.artifact && { artifact: command.artifact }),\n          });\n        }\n      }\n    },\n    setToolStatuses,\n  });\n  toolInvocationsRef.current = toolInvocations;\n\n  const store = useMemo(\n    () => {\n      void _version; // rerender on version change\n\n      return {\n        isLoading: core.isLoading,\n        messages: core.getMessages(),\n        state: core.getState(),\n        isRunning: core.isRunning() || hasExecutingTools,\n        onNew: (message: AppendMessage) => core.append(message),\n        onEdit: (message: AppendMessage) => core.edit(message),\n        onReload: (parentId: string | null, config: { runConfig?: any }) =>\n          core.reload(parentId, config),\n        onCancel: async () => {\n          core.cancel();\n          await toolInvocationsRef.current.abort();\n        },\n        onAddToolResult: (options) => core.addToolResult(options),\n        onResume: (config) => core.resume(config),\n        onResumeToolCall: (options) =>\n          toolInvocationsRef.current.resume(\n            options.toolCallId,\n            options.payload,\n          ),\n        setMessages: (messages: readonly ThreadMessage[]) =>\n          core.applyExternalMessages(messages),\n        onImport: (messages: readonly ThreadMessage[]) =>\n          core.applyExternalMessages(messages),\n        onLoadExternalState: (state: ReadonlyJSONValue) =>\n          core.loadExternalState(state),\n        adapters: adapterAdapters,\n      } satisfies ExternalStoreAdapter<ThreadMessage>;\n    },\n    // _version is intentionally included to trigger re-computation when core state changes via notifyUpdate\n    // toolInvocations intentionally excluded: abort/resume use refs internally and work with stale captures\n    [adapterAdapters, core, _version, hasExecutingTools],\n  );\n\n  const baseRuntime = useExternalStoreRuntime(store);\n\n  const runtime = useMemo<AgUiAssistantRuntime>(() => {\n    const wrapper = Object.create(baseRuntime) as AgUiAssistantRuntime;\n    wrapper.unstable_getPendingInterrupts = () =>\n      core.getPendingInterrupts()?.interrupts ?? [];\n    wrapper.unstable_submitInterruptResponses = (responses) =>\n      core.submitInterruptResponses(responses);\n    return wrapper;\n  }, [baseRuntime, core]);\n\n  useEffect(() => {\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":"useAgUiRuntime.js","names":[],"sources":["../src/useAgUiRuntime.ts"],"sourcesContent":["\"use client\";\n\nimport { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport {\n  useExternalStoreRuntime,\n  useRuntimeAdapters,\n} from \"@assistant-ui/core/react\";\nimport type { ToolExecutionStatus } from \"@assistant-ui/core\";\nimport type {\n  AssistantRuntime,\n  AppendMessage,\n  ExternalStoreAdapter,\n  ThreadMessage,\n} from \"@assistant-ui/core\";\nimport type { ReadonlyJSONValue } from \"assistant-stream/utils\";\nimport { makeLogger } from \"./runtime/logger\";\nimport type {\n  AgUiInterrupt,\n  AgUiResumeEntry,\n  UseAgUiRuntimeOptions,\n} from \"./runtime/types\";\nimport { AgUiThreadRuntimeCore } from \"./runtime/AgUiThreadRuntimeCore\";\n\nexport type AgUiAssistantRuntime = AssistantRuntime & {\n  unstable_getPendingInterrupts: () => readonly AgUiInterrupt[];\n  unstable_submitInterruptResponses: (\n    responses: readonly AgUiResumeEntry[],\n  ) => Promise<void>;\n};\n\nexport function useAgUiRuntime(\n  options: UseAgUiRuntimeOptions,\n): AgUiAssistantRuntime {\n  const logger = useMemo(() => makeLogger(options.logger), [options.logger]);\n  const [_version, setVersion] = useState(0);\n  const notifyUpdate = useCallback(() => setVersion((v) => v + 1), []);\n  const coreRef = useRef<AgUiThreadRuntimeCore | null>(null);\n  const runtimeAdapters = useRuntimeAdapters();\n\n  const historyAdapter = options.adapters?.history ?? runtimeAdapters?.history;\n  const threadListAdapter = options.adapters?.threadList;\n\n  if (!coreRef.current) {\n    coreRef.current = new AgUiThreadRuntimeCore({\n      agent: options.agent,\n      logger,\n      showThinking: options.showThinking ?? true,\n      ...(options.onError && { onError: options.onError }),\n      ...(options.onCancel && { onCancel: options.onCancel }),\n      ...(historyAdapter && { history: historyAdapter }),\n      notifyUpdate,\n    });\n  }\n\n  const core = coreRef.current;\n  core.updateOptions({\n    agent: options.agent,\n    logger,\n    showThinking: options.showThinking ?? true,\n    ...(options.onError && { onError: options.onError }),\n    ...(options.onCancel && { onCancel: options.onCancel }),\n    ...(historyAdapter && { history: historyAdapter }),\n  });\n\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n\n  const hasExecutingTools = Object.values(toolStatuses).some(\n    (s) => s?.type === \"executing\",\n  );\n\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            await onSwitchToNewThread();\n            core.applyExternalMessages([]);\n          }\n        : undefined,\n      onSwitchToThread: onSwitchToThread\n        ? async (threadId: string) => {\n            const result = await onSwitchToThread(threadId);\n            core.applyExternalMessages(result.messages);\n            if (result.state) {\n              core.loadExternalState(result.state);\n            }\n          }\n        : undefined,\n    };\n  }, [threadListAdapter, core]);\n\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      feedback: adapters?.feedback,\n      threadList,\n    }),\n    [adapters, runtimeAdapters, threadList],\n  );\n\n  const store = useMemo(\n    () => {\n      void _version; // rerender on version change\n\n      return {\n        isLoading: core.isLoading,\n        messages: core.getMessages(),\n        state: core.getState(),\n        isRunning: core.isRunning() || hasExecutingTools,\n        unstable_enableToolInvocations: true,\n        setToolStatuses,\n        onNew: (message: AppendMessage) => core.append(message),\n        onEdit: (message: AppendMessage) => core.edit(message),\n        onReload: (parentId: string | null, config: { runConfig?: any }) =>\n          core.reload(parentId, config),\n        onCancel: async () => {\n          core.cancel();\n        },\n        onAddToolResult: (options) => core.addToolResult(options),\n        onResume: (config) => core.resume(config),\n        setMessages: (messages: readonly ThreadMessage[]) =>\n          core.applyExternalMessages(messages),\n        onImport: (messages: readonly ThreadMessage[]) =>\n          core.applyExternalMessages(messages),\n        onLoadExternalState: (state: ReadonlyJSONValue) =>\n          core.loadExternalState(state),\n        adapters: adapterAdapters,\n      } satisfies ExternalStoreAdapter<ThreadMessage>;\n    },\n    // _version is intentionally included to trigger re-computation when core state changes via notifyUpdate\n    // toolInvocations intentionally excluded: abort/resume use refs internally and work with stale captures\n    [adapterAdapters, core, _version, hasExecutingTools],\n  );\n\n  const baseRuntime = useExternalStoreRuntime(store);\n\n  const runtime = useMemo<AgUiAssistantRuntime>(() => {\n    const wrapper = Object.create(baseRuntime) as AgUiAssistantRuntime;\n    wrapper.unstable_getPendingInterrupts = () =>\n      core.getPendingInterrupts()?.interrupts ?? [];\n    wrapper.unstable_submitInterruptResponses = (responses) =>\n      core.submitInterruptResponses(responses);\n    return wrapper;\n  }, [baseRuntime, core]);\n\n  useEffect(() => {\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-ag-ui",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "description": "AG-UI protocol adapter for assistant-ui",
   "keywords": [
     "ag-ui",

package/src/useAgUiRuntime.ts

@@ -4,9 +4,8 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
   useExternalStoreRuntime,
   useRuntimeAdapters,
-  useToolInvocations,
 } from "@assistant-ui/core/react";
-import type { ToolExecutionStatus } from "@assistant-ui/core/react";
+import type { ToolExecutionStatus } from "@assistant-ui/core";
 import type {
   AssistantRuntime,
   AppendMessage,
@@ -71,18 +70,6 @@ export function useAgUiRuntime(
     (s) => s?.type === "executing",
   );
 
-  const [runtimeRef] = useState(() => ({
-    get current(): AssistantRuntime {
-      return runtime;
-    },
-  }));
-
-  const toolInvocationsRef = useRef({
-    reset: () => {},
-    abort: (): Promise<void> => Promise.resolve(),
-    resume: (_toolCallId: string, _payload: unknown) => {},
-  });
-
   const threadList = useMemo(() => {
     if (!threadListAdapter) return undefined;
 
@@ -92,14 +79,12 @@ export function useAgUiRuntime(
       threadId: threadListAdapter.threadId,
       onSwitchToNewThread: onSwitchToNewThread
         ? async () => {
-            toolInvocationsRef.current.reset();
             await onSwitchToNewThread();
             core.applyExternalMessages([]);
           }
         : undefined,
       onSwitchToThread: onSwitchToThread
         ? async (threadId: string) => {
-            toolInvocationsRef.current.reset();
             const result = await onSwitchToThread(threadId);
             core.applyExternalMessages(result.messages);
             if (result.state) {
@@ -122,31 +107,6 @@ export function useAgUiRuntime(
     [adapters, runtimeAdapters, threadList],
   );
 
-  const toolInvocations = useToolInvocations({
-    state: {
-      messages: core.getMessages(),
-      isRunning: core.isRunning() || hasExecutingTools,
-    },
-    getTools: () => runtimeRef.current.thread.getModelContext().tools,
-    onResult: (command) => {
-      if (command.type === "add-tool-result") {
-        const messageId = core.findMessageIdForToolCall(command.toolCallId);
-        if (messageId) {
-          core.addToolResult({
-            messageId,
-            toolCallId: command.toolCallId,
-            toolName: command.toolName,
-            result: command.result,
-            isError: command.isError,
-            ...(command.artifact && { artifact: command.artifact }),
-          });
-        }
-      }
-    },
-    setToolStatuses,
-  });
-  toolInvocationsRef.current = toolInvocations;
-
   const store = useMemo(
     () => {
       void _version; // rerender on version change
@@ -156,21 +116,17 @@ export function useAgUiRuntime(
         messages: core.getMessages(),
         state: core.getState(),
         isRunning: core.isRunning() || hasExecutingTools,
+        unstable_enableToolInvocations: true,
+        setToolStatuses,
         onNew: (message: AppendMessage) => core.append(message),
         onEdit: (message: AppendMessage) => core.edit(message),
         onReload: (parentId: string | null, config: { runConfig?: any }) =>
           core.reload(parentId, config),
         onCancel: async () => {
           core.cancel();
-          await toolInvocationsRef.current.abort();
         },
         onAddToolResult: (options) => core.addToolResult(options),
         onResume: (config) => core.resume(config),
-        onResumeToolCall: (options) =>
-          toolInvocationsRef.current.resume(
-            options.toolCallId,
-            options.payload,
-          ),
         setMessages: (messages: readonly ThreadMessage[]) =>
           core.applyExternalMessages(messages),
         onImport: (messages: readonly ThreadMessage[]) =>