@aomi-labs/react 0.3.11 → 0.3.13

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { AomiClient, Session, WalletRequest, UserState } from '@aomi-labs/client';
-export { AomiChatResponse, AomiClient, AomiClientOptions, AomiCreateThreadResponse, AomiInterruptResponse, AomiMessage, AomiSSEEvent, AomiStateResponse, AomiSystemEvent, AomiSystemResponse, AomiThread, UserState, WalletEip712Payload, WalletRequest, WalletTxPayload, toViemSignTypedDataArgs } from '@aomi-labs/client';
+import { AomiClient, SessionOptions, Session, UserState, WalletRequest, WalletRequestResult } from '@aomi-labs/client';
+export { AomiChatResponse, AomiClient, AomiClientOptions, AomiCreateThreadResponse, AomiInterruptResponse, AomiMessage, AomiSSEEvent, AomiStateResponse, AomiSystemEvent, AomiSystemResponse, AomiThread, DISABLED_PROVIDER_STATE, UserState, WalletEip712Payload, WalletRequest, WalletRequestResult, WalletTxPayload, aaModeFromExecutionKind, executeWalletCalls, hydrateTxPayloadFromUserState, parseChainId, toAAWalletCall, toAAWalletCalls, toViemSignTypedDataArgs } from '@aomi-labs/client';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode, SetStateAction } from 'react';
 import { ThreadMessageLike } from '@assistant-ui/react';
@@ -11,6 +11,25 @@ type AomiRuntimeProviderProps = {
 };
 declare function AomiRuntimeProvider({ children, backendUrl, }: Readonly<AomiRuntimeProviderProps>): react_jsx_runtime.JSX.Element;
 
+declare class SessionManager {
+    private readonly clientFactory;
+    private sessions;
+    constructor(clientFactory: () => AomiClient);
+    getOrCreate(threadId: string, opts: Omit<SessionOptions, "sessionId">): Session;
+    get(threadId: string): Session | undefined;
+    forEach(callback: (session: Session, threadId: string) => void): void;
+    close(threadId: string): void;
+    closeAll(): void;
+}
+
+type RuntimeUserStateProviderProps = {
+    children: ReactNode;
+    sessionManager: SessionManager;
+    getUserState: () => UserState;
+    onUserStateChange: (callback: (user: UserState) => void) => () => void;
+};
+declare function RuntimeUserStateProvider({ children, sessionManager, getUserState, onUserStateChange, }: RuntimeUserStateProviderProps): react_jsx_runtime.JSX.Element;
+
 type ThreadContext = {
     currentThreadId: string;
     setCurrentThreadId: (id: string) => void;
@@ -121,11 +140,6 @@ declare function NotificationContextProvider({ children, }: NotificationContextP
 
 type WalletRequestKind = "transaction" | "eip712_sign";
 type WalletRequestStatus = "pending" | "processing";
-type WalletRequestResult = {
-    txHash?: string;
-    signature?: string;
-    amount?: string;
-};
 type WalletHandlerConfig = {
     /** Get the ClientSession for the current thread. */
     getSession: () => Session | undefined;
@@ -193,7 +207,7 @@ type AomiRuntimeApi = {
     clearAllNotifications: () => void;
     /** All queued wallet requests (tx + eip712 signing) */
     pendingWalletRequests: WalletRequest[];
-    /** Mark a wallet request as being processed */
+    /** Mark a wallet request as in-flight — suppresses it from the pending list until acked */
     startWalletRequest: (id: string) => void;
     /** Complete a wallet request after the backend acknowledges the response */
     resolveWalletRequest: (id: string, result: WalletRequestResult) => Promise<void>;
@@ -380,4 +394,4 @@ type ControlContextProviderProps = {
 };
 declare function ControlContextProvider({ children, aomiClient, sessionId, publicKey, getThreadMetadata, updateThreadMetadata, }: ControlContextProviderProps): react_jsx_runtime.JSX.Element;
 
-export { type AomiRuntimeApi, AomiRuntimeProvider, type AomiRuntimeProviderProps, type ChainInfo, type ControlContextApi, ControlContextProvider, type ControlContextProviderProps, type ControlState, type EventContext, EventContextProvider, type EventContextProviderProps, type EventSubscriber, type InboundEvent, type Notification$1 as Notification, type NotificationApi, NotificationContextProvider, type NotificationContextProviderProps, type NotificationContextApi as NotificationContextValue, type NotificationHandlerConfig, type NotificationType, type SSEStatus, SUPPORTED_CHAINS, type NotificationData as ShowNotificationParams, type StoredProviderKey, type ThreadContext, ThreadContextProvider, type ThreadControlState, type ThreadMetadata, type UserConfig, UserContextProvider, type WalletHandlerApi, type WalletHandlerConfig, type WalletRequestKind, type WalletRequestResult, type WalletRequestStatus, cn, formatAddress, getChainInfo, getNetworkName, initThreadControl, useAomiRuntime, useControl, useCurrentThreadMessages, useCurrentThreadMetadata, useEventContext, useNotification, useNotificationHandler, useThreadContext, useUser, useWalletHandler };
+export { type AomiRuntimeApi, AomiRuntimeProvider, type AomiRuntimeProviderProps, type ChainInfo, type ControlContextApi, ControlContextProvider, type ControlContextProviderProps, type ControlState, type EventContext, EventContextProvider, type EventContextProviderProps, type EventSubscriber, type InboundEvent, type Notification$1 as Notification, type NotificationApi, NotificationContextProvider, type NotificationContextProviderProps, type NotificationContextApi as NotificationContextValue, type NotificationHandlerConfig, type NotificationType, RuntimeUserStateProvider, type SSEStatus, SUPPORTED_CHAINS, type NotificationData as ShowNotificationParams, type StoredProviderKey, type ThreadContext, ThreadContextProvider, type ThreadControlState, type ThreadMetadata, type UserConfig, UserContextProvider, type WalletHandlerApi, type WalletHandlerConfig, type WalletRequestKind, type WalletRequestStatus, cn, formatAddress, getChainInfo, getNetworkName, initThreadControl, useAomiRuntime, useControl, useCurrentThreadMessages, useCurrentThreadMetadata, useEventContext, useNotification, useNotificationHandler, useThreadContext, useUser, useWalletHandler };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { AomiClient, Session, WalletRequest, UserState } from '@aomi-labs/client';
-export { AomiChatResponse, AomiClient, AomiClientOptions, AomiCreateThreadResponse, AomiInterruptResponse, AomiMessage, AomiSSEEvent, AomiStateResponse, AomiSystemEvent, AomiSystemResponse, AomiThread, UserState, WalletEip712Payload, WalletRequest, WalletTxPayload, toViemSignTypedDataArgs } from '@aomi-labs/client';
+import { AomiClient, SessionOptions, Session, UserState, WalletRequest, WalletRequestResult } from '@aomi-labs/client';
+export { AomiChatResponse, AomiClient, AomiClientOptions, AomiCreateThreadResponse, AomiInterruptResponse, AomiMessage, AomiSSEEvent, AomiStateResponse, AomiSystemEvent, AomiSystemResponse, AomiThread, DISABLED_PROVIDER_STATE, UserState, WalletEip712Payload, WalletRequest, WalletRequestResult, WalletTxPayload, aaModeFromExecutionKind, executeWalletCalls, hydrateTxPayloadFromUserState, parseChainId, toAAWalletCall, toAAWalletCalls, toViemSignTypedDataArgs } from '@aomi-labs/client';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode, SetStateAction } from 'react';
 import { ThreadMessageLike } from '@assistant-ui/react';
@@ -11,6 +11,25 @@ type AomiRuntimeProviderProps = {
 };
 declare function AomiRuntimeProvider({ children, backendUrl, }: Readonly<AomiRuntimeProviderProps>): react_jsx_runtime.JSX.Element;
 
+declare class SessionManager {
+    private readonly clientFactory;
+    private sessions;
+    constructor(clientFactory: () => AomiClient);
+    getOrCreate(threadId: string, opts: Omit<SessionOptions, "sessionId">): Session;
+    get(threadId: string): Session | undefined;
+    forEach(callback: (session: Session, threadId: string) => void): void;
+    close(threadId: string): void;
+    closeAll(): void;
+}
+
+type RuntimeUserStateProviderProps = {
+    children: ReactNode;
+    sessionManager: SessionManager;
+    getUserState: () => UserState;
+    onUserStateChange: (callback: (user: UserState) => void) => () => void;
+};
+declare function RuntimeUserStateProvider({ children, sessionManager, getUserState, onUserStateChange, }: RuntimeUserStateProviderProps): react_jsx_runtime.JSX.Element;
+
 type ThreadContext = {
     currentThreadId: string;
     setCurrentThreadId: (id: string) => void;
@@ -121,11 +140,6 @@ declare function NotificationContextProvider({ children, }: NotificationContextP
 
 type WalletRequestKind = "transaction" | "eip712_sign";
 type WalletRequestStatus = "pending" | "processing";
-type WalletRequestResult = {
-    txHash?: string;
-    signature?: string;
-    amount?: string;
-};
 type WalletHandlerConfig = {
     /** Get the ClientSession for the current thread. */
     getSession: () => Session | undefined;
@@ -193,7 +207,7 @@ type AomiRuntimeApi = {
     clearAllNotifications: () => void;
     /** All queued wallet requests (tx + eip712 signing) */
     pendingWalletRequests: WalletRequest[];
-    /** Mark a wallet request as being processed */
+    /** Mark a wallet request as in-flight — suppresses it from the pending list until acked */
     startWalletRequest: (id: string) => void;
     /** Complete a wallet request after the backend acknowledges the response */
     resolveWalletRequest: (id: string, result: WalletRequestResult) => Promise<void>;
@@ -380,4 +394,4 @@ type ControlContextProviderProps = {
 };
 declare function ControlContextProvider({ children, aomiClient, sessionId, publicKey, getThreadMetadata, updateThreadMetadata, }: ControlContextProviderProps): react_jsx_runtime.JSX.Element;
 
-export { type AomiRuntimeApi, AomiRuntimeProvider, type AomiRuntimeProviderProps, type ChainInfo, type ControlContextApi, ControlContextProvider, type ControlContextProviderProps, type ControlState, type EventContext, EventContextProvider, type EventContextProviderProps, type EventSubscriber, type InboundEvent, type Notification$1 as Notification, type NotificationApi, NotificationContextProvider, type NotificationContextProviderProps, type NotificationContextApi as NotificationContextValue, type NotificationHandlerConfig, type NotificationType, type SSEStatus, SUPPORTED_CHAINS, type NotificationData as ShowNotificationParams, type StoredProviderKey, type ThreadContext, ThreadContextProvider, type ThreadControlState, type ThreadMetadata, type UserConfig, UserContextProvider, type WalletHandlerApi, type WalletHandlerConfig, type WalletRequestKind, type WalletRequestResult, type WalletRequestStatus, cn, formatAddress, getChainInfo, getNetworkName, initThreadControl, useAomiRuntime, useControl, useCurrentThreadMessages, useCurrentThreadMetadata, useEventContext, useNotification, useNotificationHandler, useThreadContext, useUser, useWalletHandler };
+export { type AomiRuntimeApi, AomiRuntimeProvider, type AomiRuntimeProviderProps, type ChainInfo, type ControlContextApi, ControlContextProvider, type ControlContextProviderProps, type ControlState, type EventContext, EventContextProvider, type EventContextProviderProps, type EventSubscriber, type InboundEvent, type Notification$1 as Notification, type NotificationApi, NotificationContextProvider, type NotificationContextProviderProps, type NotificationContextApi as NotificationContextValue, type NotificationHandlerConfig, type NotificationType, RuntimeUserStateProvider, type SSEStatus, SUPPORTED_CHAINS, type NotificationData as ShowNotificationParams, type StoredProviderKey, type ThreadContext, ThreadContextProvider, type ThreadControlState, type ThreadMetadata, type UserConfig, UserContextProvider, type WalletHandlerApi, type WalletHandlerConfig, type WalletRequestKind, type WalletRequestStatus, cn, formatAddress, getChainInfo, getNetworkName, initThreadControl, useAomiRuntime, useControl, useCurrentThreadMessages, useCurrentThreadMetadata, useEventContext, useNotification, useNotificationHandler, useThreadContext, useUser, useWalletHandler };

package/dist/index.js

@@ -33,7 +33,16 @@ var __objRest = (source, exclude) => {
 
 // packages/react/src/index.ts
 import { AomiClient as AomiClient2 } from "@aomi-labs/client";
-import { toViemSignTypedDataArgs } from "@aomi-labs/client";
+import {
+  toViemSignTypedDataArgs,
+  hydrateTxPayloadFromUserState,
+  toAAWalletCalls,
+  toAAWalletCall,
+  executeWalletCalls,
+  DISABLED_PROVIDER_STATE,
+  parseChainId,
+  aaModeFromExecutionKind
+} from "@aomi-labs/client";
 
 // packages/react/src/runtime/aomi-runtime.tsx
 import { useMemo as useMemo3 } from "react";
@@ -911,30 +920,46 @@ function UserContextProvider({ children }) {
   const StateChangeCallbacks = useRef4(
     /* @__PURE__ */ new Set()
   );
+  const notifyStateChange = useCallback4((next) => {
+    queueMicrotask(() => {
+      StateChangeCallbacks.current.forEach((callback) => {
+        callback(next);
+      });
+    });
+  }, []);
+  const pruneUndefined = useCallback4((state) => {
+    return Object.fromEntries(
+      Object.entries(state).filter(([, value]) => value !== void 0)
+    );
+  }, []);
   const setUser = useCallback4((data) => {
     setUserState((prev) => {
       var _a, _b, _c;
-      const normalizedData = (_a = UserState.normalize(data)) != null ? _a : {};
-      const next = normalizedData.is_connected === false ? __spreadProps(__spreadValues({}, (_b = UserState.normalize(__spreadValues(__spreadValues({}, prev), normalizedData))) != null ? _b : prev), {
+      const normalizedData = pruneUndefined((_a = UserState.normalize(data)) != null ? _a : {});
+      const nextPartial = __spreadValues({}, normalizedData);
+      if (nextPartial.is_connected === true && nextPartial.chain_id === void 0) {
+        if (prev.chain_id !== void 0) {
+          nextPartial.chain_id = prev.chain_id;
+        } else {
+          delete nextPartial.is_connected;
+        }
+      }
+      const next = nextPartial.is_connected === false ? __spreadProps(__spreadValues({}, (_b = UserState.normalize(__spreadValues(__spreadValues({}, prev), nextPartial))) != null ? _b : prev), {
         address: void 0,
         chain_id: void 0,
         ens_name: void 0
-      }) : (_c = UserState.normalize(__spreadValues(__spreadValues({}, prev), normalizedData))) != null ? _c : prev;
-      StateChangeCallbacks.current.forEach((callback) => {
-        callback(next);
-      });
+      }) : (_c = UserState.normalize(__spreadValues(__spreadValues({}, prev), nextPartial))) != null ? _c : prev;
+      notifyStateChange(next);
       return next;
     });
-  }, []);
+  }, [notifyStateChange, pruneUndefined]);
   const addExtValue = useCallback4((key, value) => {
     setUserState((prev) => {
       const next = UserState.withExt(prev, key, value);
-      StateChangeCallbacks.current.forEach((callback) => {
-        callback(next);
-      });
+      notifyStateChange(next);
       return next;
     });
-  }, []);
+  }, [notifyStateChange]);
   const removeExtValue = useCallback4((key) => {
     setUserState((prev) => {
       const ext = prev.ext;
@@ -946,12 +971,10 @@ function UserContextProvider({ children }) {
       const next = __spreadProps(__spreadValues({}, prev), {
         ext: Object.keys(nextExt).length > 0 ? nextExt : void 0
       });
-      StateChangeCallbacks.current.forEach((callback) => {
-        callback(next);
-      });
+      notifyStateChange(next);
       return next;
     });
-  }, []);
+  }, [notifyStateChange]);
   const getUserState = useCallback4(() => userRef.current, []);
   const onUserStateChange = useCallback4(
     (callback) => {
@@ -979,7 +1002,7 @@ function UserContextProvider({ children }) {
 }
 
 // packages/react/src/runtime/core.tsx
-import { useCallback as useCallback7, useEffect as useEffect3, useMemo as useMemo2, useRef as useRef7 } from "react";
+import { useCallback as useCallback7, useEffect as useEffect4, useMemo as useMemo2, useRef as useRef8 } from "react";
 import {
   AssistantRuntimeProvider,
   useExternalStoreRuntime
@@ -988,6 +1011,7 @@ import { UserState as UserState3 } from "@aomi-labs/client";
 
 // packages/react/src/runtime/orchestrator.ts
 import { useCallback as useCallback5, useEffect as useEffect2, useRef as useRef5, useState as useState4 } from "react";
+import { CLIENT_TYPE_WEB_UI } from "@aomi-labs/client";
 
 // packages/react/src/runtime/session-manager.ts
 import { Session as ClientSession } from "@aomi-labs/client";
@@ -1008,6 +1032,11 @@ var SessionManager = class {
   get(threadId) {
     return this.sessions.get(threadId);
   }
+  forEach(callback) {
+    for (const [threadId, session] of this.sessions) {
+      callback(session, threadId);
+    }
+  }
   close(threadId) {
     const session = this.sessions.get(threadId);
     if (session) {
@@ -1143,14 +1172,30 @@ function useRuntimeOrchestrator(aomiClient, options) {
     (threadId) => {
       var _a, _b, _c, _d, _e;
       const manager = sessionManagerRef.current;
+      const nextApp = options.getApp();
+      const nextPublicKey = (_a = options.getPublicKey) == null ? void 0 : _a.call(options);
+      const nextApiKey = (_c = (_b = options.getApiKey) == null ? void 0 : _b.call(options)) != null ? _c : void 0;
+      const nextClientId = (_d = options.getClientId) == null ? void 0 : _d.call(options);
+      const nextUserState = (_e = options.getUserState) == null ? void 0 : _e.call(options);
       const existing = manager.get(threadId);
-      if (existing) return existing;
+      if (existing) {
+        existing.syncRuntimeOptions({
+          app: nextApp,
+          publicKey: nextPublicKey,
+          apiKey: nextApiKey,
+          clientId: nextClientId,
+          userState: nextUserState
+        });
+        return existing;
+      }
       const session = manager.getOrCreate(threadId, {
-        app: options.getApp(),
-        publicKey: (_a = options.getPublicKey) == null ? void 0 : _a.call(options),
-        apiKey: (_c = (_b = options.getApiKey) == null ? void 0 : _b.call(options)) != null ? _c : void 0,
-        clientId: (_d = options.getClientId) == null ? void 0 : _d.call(options),
-        userState: (_e = options.getUserState) == null ? void 0 : _e.call(options)
+        app: nextApp,
+        publicKey: nextPublicKey,
+        apiKey: nextApiKey,
+        clientId: nextClientId,
+        clientType: CLIENT_TYPE_WEB_UI,
+        syncPendingTxRequestsFromUserState: false,
+        userState: nextUserState
       });
       const cleanups = [];
       cleanups.push(
@@ -1210,15 +1255,13 @@ function useRuntimeOrchestrator(aomiClient, options) {
   );
   const ensureInitialState = useCallback5(
     async (threadId) => {
-      var _a, _b;
+      var _a;
       if (pendingFetches.current.has(threadId)) return;
       pendingFetches.current.add(threadId);
       try {
         const session = getSession(threadId);
-        const userState = (_a = options.getUserState) == null ? void 0 : _a.call(options);
-        if (userState) session.resolveUserState(userState);
         await session.fetchCurrentState();
-        (_b = options.onPendingRequestsChange) == null ? void 0 : _b.call(options, session.getPendingRequests());
+        (_a = options.onPendingRequestsChange) == null ? void 0 : _a.call(options, session.getPendingRequests());
         if (threadContextRef.current.currentThreadId === threadId) {
           setIsRunning(session.getIsProcessing());
         }
@@ -1235,10 +1278,8 @@ function useRuntimeOrchestrator(aomiClient, options) {
   );
   const sendMessage = useCallback5(
     async (text, threadId) => {
-      var _a, _b;
+      var _a;
       const session = getSession(threadId);
-      const userState = (_a = options.getUserState) == null ? void 0 : _a.call(options);
-      if (userState) session.resolveUserState(userState);
       const existingMessages = threadContextRef.current.getThreadMessages(threadId);
       const userMessage = {
         role: "user",
@@ -1253,7 +1294,7 @@ function useRuntimeOrchestrator(aomiClient, options) {
         lastActiveAt: (/* @__PURE__ */ new Date()).toISOString()
       });
       await session.sendAsync(text);
-      (_b = options.onPendingRequestsChange) == null ? void 0 : _b.call(options, session.getPendingRequests());
+      (_a = options.onPendingRequestsChange) == null ? void 0 : _a.call(options, session.getPendingRequests());
     },
     [getSession]
   );
@@ -1525,8 +1566,41 @@ function useWalletHandler({
   };
 }
 
+// packages/react/src/runtime/user-state-provider.tsx
+import { useEffect as useEffect3, useRef as useRef7 } from "react";
+import { Fragment, jsx as jsx6 } from "react/jsx-runtime";
+function stableStateString(state) {
+  return JSON.stringify(state != null ? state : {});
+}
+function RuntimeUserStateProvider({
+  children,
+  sessionManager,
+  getUserState,
+  onUserStateChange
+}) {
+  const lastSerializedStateRef = useRef7("");
+  useEffect3(() => {
+    const applyToSessions = (next) => {
+      const serialized = stableStateString(next);
+      if (serialized === lastSerializedStateRef.current) {
+        return;
+      }
+      lastSerializedStateRef.current = serialized;
+      sessionManager.forEach((session) => {
+        session.resolveUserState(next);
+      });
+    };
+    applyToSessions(getUserState());
+    const unsubscribe = onUserStateChange((next) => {
+      applyToSessions(next);
+    });
+    return unsubscribe;
+  }, [getUserState, onUserStateChange, sessionManager]);
+  return /* @__PURE__ */ jsx6(Fragment, { children });
+}
+
 // packages/react/src/runtime/core.tsx
-import { jsx as jsx6 } from "react/jsx-runtime";
+import { jsx as jsx7 } from "react/jsx-runtime";
 function AomiRuntimeCore({
   children,
   aomiClient
@@ -1536,7 +1610,7 @@ function AomiRuntimeCore({
   const notificationContext = useNotification();
   const { user, onUserStateChange, getUserState } = useUser();
   const { getControlState, getCurrentThreadApp } = useControl();
-  const sessionManagerRef = useRef7(null);
+  const sessionManagerRef = useRef8(null);
   const walletHandler = useWalletHandler({
     getSession: () => {
       var _a;
@@ -1577,8 +1651,8 @@ function AomiRuntimeCore({
     },
     [getUserState]
   );
-  const lastWalletStateRef = useRef7(walletSnapshot(getUserState()));
-  useEffect3(() => {
+  const lastWalletStateRef = useRef8(walletSnapshot(getUserState()));
+  useEffect4(() => {
     lastWalletStateRef.current = walletSnapshot(getUserState());
     const unsubscribe = onUserStateChange(async (newUser) => {
       const nextWalletState = walletSnapshot(newUser);
@@ -1602,10 +1676,10 @@ function AomiRuntimeCore({
     getUserState,
     walletSnapshot
   ]);
-  const threadContextRef = useRef7(threadContext);
+  const threadContextRef = useRef8(threadContext);
   threadContextRef.current = threadContext;
-  const remoteThreadIdsRef = useRef7(/* @__PURE__ */ new Set());
-  const warmedThreadIdsRef = useRef7(/* @__PURE__ */ new Set());
+  const remoteThreadIdsRef = useRef8(/* @__PURE__ */ new Set());
+  const warmedThreadIdsRef = useRef8(/* @__PURE__ */ new Set());
   const warmThread = useCallback7(
     async (threadId) => {
       if (!remoteThreadIdsRef.current.has(threadId) || warmedThreadIdsRef.current.has(threadId)) {
@@ -1620,7 +1694,7 @@ function AomiRuntimeCore({
     },
     [aomiClientRef, getUserState]
   );
-  useEffect3(() => {
+  useEffect4(() => {
     const unsubscribe = eventContext.subscribe(
       "user_state_request",
       () => {
@@ -1635,7 +1709,7 @@ function AomiRuntimeCore({
     );
     return unsubscribe;
   }, [eventContext, threadContext.currentThreadId, getSession, getUserState]);
-  useEffect3(() => {
+  useEffect4(() => {
     const threadId = threadContext.currentThreadId;
     let cancelled = false;
     void (async () => {
@@ -1648,7 +1722,7 @@ function AomiRuntimeCore({
       cancelled = true;
     };
   }, [ensureInitialState, threadContext.currentThreadId, warmThread]);
-  useEffect3(() => {
+  useEffect4(() => {
     const threadId = threadContext.currentThreadId;
     const currentMeta = threadContext.getThreadMetadata(threadId);
     if (currentMeta && currentMeta.control.isProcessing !== isRunning) {
@@ -1662,7 +1736,7 @@ function AomiRuntimeCore({
   const currentMessages = threadContext.getThreadMessages(
     threadContext.currentThreadId
   );
-  useEffect3(() => {
+  useEffect4(() => {
     const userAddress = UserState3.isConnected(user) ? UserState3.address(user) : void 0;
     if (!userAddress) {
       remoteThreadIdsRef.current.clear();
@@ -1731,7 +1805,7 @@ function AomiRuntimeCore({
       threadContext.allThreadsMetadata
     ]
   );
-  useEffect3(() => {
+  useEffect4(() => {
     const showToolNotification = (eventType) => (event) => {
       const payload = event.payload;
       const toolName = typeof (payload == null ? void 0 : payload.tool_name) === "string" ? payload.tool_name : void 0;
@@ -1756,7 +1830,7 @@ function AomiRuntimeCore({
       unsubscribeComplete();
     };
   }, [eventContext, notificationContext]);
-  useEffect3(() => {
+  useEffect4(() => {
     const unsubscribe = eventContext.subscribe("system_notice", (_event) => {
     });
     return unsubscribe;
@@ -1779,7 +1853,7 @@ function AomiRuntimeCore({
     convertMessage: (msg) => msg,
     adapters: { threadList: threadListAdapter }
   });
-  useEffect3(() => {
+  useEffect4(() => {
     return () => {
       sessionManager.closeAll();
     };
@@ -1893,17 +1967,25 @@ function AomiRuntimeCore({
       eventContext
     ]
   );
-  return /* @__PURE__ */ jsx6(AomiRuntimeApiProvider, { value: aomiRuntimeApi, children: /* @__PURE__ */ jsx6(AssistantRuntimeProvider, { runtime, children }) });
+  return /* @__PURE__ */ jsx7(AomiRuntimeApiProvider, { value: aomiRuntimeApi, children: /* @__PURE__ */ jsx7(
+    RuntimeUserStateProvider,
+    {
+      sessionManager,
+      getUserState: userContext.getUserState,
+      onUserStateChange: userContext.onUserStateChange,
+      children: /* @__PURE__ */ jsx7(AssistantRuntimeProvider, { runtime, children })
+    }
+  ) });
 }
 
 // packages/react/src/runtime/aomi-runtime.tsx
-import { jsx as jsx7 } from "react/jsx-runtime";
+import { jsx as jsx8 } from "react/jsx-runtime";
 function AomiRuntimeProvider({
   children,
   backendUrl = "http://localhost:8080"
 }) {
   const aomiClient = useMemo3(() => new AomiClient({ baseUrl: backendUrl }), [backendUrl]);
-  return /* @__PURE__ */ jsx7(ThreadContextProvider, { children: /* @__PURE__ */ jsx7(NotificationContextProvider, { children: /* @__PURE__ */ jsx7(UserContextProvider, { children: /* @__PURE__ */ jsx7(AomiRuntimeInner, { aomiClient, children }) }) }) });
+  return /* @__PURE__ */ jsx8(ThreadContextProvider, { children: /* @__PURE__ */ jsx8(NotificationContextProvider, { children: /* @__PURE__ */ jsx8(UserContextProvider, { children: /* @__PURE__ */ jsx8(AomiRuntimeInner, { aomiClient, children }) }) }) });
 }
 function AomiRuntimeInner({
   children,
@@ -1912,7 +1994,7 @@ function AomiRuntimeInner({
   var _a;
   const threadContext = useThreadContext();
   const { user } = useUser();
-  return /* @__PURE__ */ jsx7(
+  return /* @__PURE__ */ jsx8(
     ControlContextProvider,
     {
       aomiClient,
@@ -1920,12 +2002,12 @@ function AomiRuntimeInner({
       publicKey: UserState4.isConnected(user) ? (_a = UserState4.address(user)) != null ? _a : void 0 : void 0,
       getThreadMetadata: threadContext.getThreadMetadata,
       updateThreadMetadata: threadContext.updateThreadMetadata,
-      children: /* @__PURE__ */ jsx7(
+      children: /* @__PURE__ */ jsx8(
         EventContextProvider,
         {
           aomiClient,
           sessionId: threadContext.currentThreadId,
-          children: /* @__PURE__ */ jsx7(AomiRuntimeCore, { aomiClient, children })
+          children: /* @__PURE__ */ jsx8(AomiRuntimeCore, { aomiClient, children })
         }
       )
     }
@@ -1933,7 +2015,7 @@ function AomiRuntimeInner({
 }
 
 // packages/react/src/handlers/notification-handler.ts
-import { useCallback as useCallback8, useEffect as useEffect4, useState as useState6 } from "react";
+import { useCallback as useCallback8, useEffect as useEffect5, useState as useState6 } from "react";
 var notificationIdCounter2 = 0;
 function generateNotificationId() {
   return `notif-${Date.now()}-${++notificationIdCounter2}`;
@@ -1943,7 +2025,7 @@ function useNotificationHandler({
 } = {}) {
   const { subscribe } = useEventContext();
   const [notifications, setNotifications] = useState6([]);
-  useEffect4(() => {
+  useEffect5(() => {
     const unsubscribe = subscribe("notification", (event) => {
       var _a, _b;
       const payload = event.payload;
@@ -1977,16 +2059,24 @@ export {
   AomiClient2 as AomiClient,
   AomiRuntimeProvider,
   ControlContextProvider,
+  DISABLED_PROVIDER_STATE,
   EventContextProvider,
   NotificationContextProvider,
+  RuntimeUserStateProvider,
   SUPPORTED_CHAINS,
   ThreadContextProvider,
   UserContextProvider,
+  aaModeFromExecutionKind,
   cn,
+  executeWalletCalls,
   formatAddress,
   getChainInfo,
   getNetworkName,
+  hydrateTxPayloadFromUserState,
   initThreadControl,
+  parseChainId,
+  toAAWalletCall,
+  toAAWalletCalls,
   toViemSignTypedDataArgs,
   useAomiRuntime,
   useControl,