@aomi-labs/react 0.3.19 → 0.3.21

package/dist/index.js

@@ -261,6 +261,8 @@ var ThreadStore = class {
 
 // packages/react/src/utils/model-selection.ts
 var PREFERRED_DEFAULT_MODEL_PATTERNS = [
+  /^claude.*opus.*4[.-]?6/i,
+  /^claude.*4[.-]?6.*opus/i,
   /^claude-4\.5-haiku/i,
   /^claude.*haiku/i,
   /^gpt-4o-mini/i,
@@ -304,14 +306,17 @@ function getControlSessionId(clientId, fallbackSessionId) {
 
 // packages/react/src/contexts/control-context.tsx
 import { jsx } from "react/jsx-runtime";
-var API_KEY_STORAGE_KEY = "aomi_api_key";
-var PROVIDER_KEYS_STORAGE_KEY = "aomi_provider_keys";
+var API_KEY_STORAGE_KEY = "aomi_secret_key";
+var BYOK_KEYS_STORAGE_KEY = "aomi_byok_keys";
 var MODEL_SELECTION_STORAGE_KEY = "aomi_model_selection";
-var PROVIDER_KEY_SECRET_PREFIX = "PROVIDER_KEY:";
+var BYOK_SECRET_PREFIX = "PROVIDER_KEY:";
 function getDefaultApp(apps) {
   var _a;
   return apps.includes("default") ? "default" : (_a = apps[0]) != null ? _a : null;
 }
+function namesFromDescriptors(apps) {
+  return apps.map((a) => a.name);
+}
 function readStoredModelPreference() {
   var _a;
   try {
@@ -383,9 +388,10 @@ function ControlContextProvider({
     clientId: getOrCreateClientId(),
     availableModels: [],
     authorizedApps: [],
+    appDescriptors: [],
     defaultModel: null,
     defaultApp: null,
-    providerKeys: {}
+    byokKeys: {}
   }));
   const stateRef = useRef(state);
   stateRef.current = state;
@@ -428,10 +434,10 @@ function ControlContextProvider({
   useEffect(() => {
     var _a2;
     try {
-      const raw = (_a2 = globalThis.localStorage) == null ? void 0 : _a2.getItem(PROVIDER_KEYS_STORAGE_KEY);
+      const raw = (_a2 = globalThis.localStorage) == null ? void 0 : _a2.getItem(BYOK_KEYS_STORAGE_KEY);
       if (raw) {
         const parsed = JSON.parse(raw);
-        setStateInternal((prev) => __spreadProps(__spreadValues({}, prev), { providerKeys: parsed }));
+        setStateInternal((prev) => __spreadProps(__spreadValues({}, prev), { byokKeys: parsed }));
       }
     } catch (e) {
     }
@@ -450,50 +456,53 @@ function ControlContextProvider({
   useEffect(() => {
     var _a2, _b2;
     try {
-      const keys = state.providerKeys;
+      const keys = state.byokKeys;
       if (Object.keys(keys).length > 0) {
         (_a2 = globalThis.localStorage) == null ? void 0 : _a2.setItem(
-          PROVIDER_KEYS_STORAGE_KEY,
+          BYOK_KEYS_STORAGE_KEY,
           JSON.stringify(keys)
         );
       } else {
-        (_b2 = globalThis.localStorage) == null ? void 0 : _b2.removeItem(PROVIDER_KEYS_STORAGE_KEY);
+        (_b2 = globalThis.localStorage) == null ? void 0 : _b2.removeItem(BYOK_KEYS_STORAGE_KEY);
       }
     } catch (e) {
     }
-  }, [state.providerKeys]);
+  }, [state.byokKeys]);
   useEffect(() => {
     if (!state.clientId) return;
-    const keys = stateRef.current.providerKeys;
+    const keys = stateRef.current.byokKeys;
     if (Object.keys(keys).length === 0) return;
     const secrets = {};
     for (const [provider, entry] of Object.entries(keys)) {
-      secrets[`${PROVIDER_KEY_SECRET_PREFIX}${provider}`] = entry.apiKey;
+      secrets[`${BYOK_SECRET_PREFIX}${provider}`] = entry.apiKey;
     }
     void aomiClientRef.current.ingestSecrets(getCurrentControlSessionId(), state.clientId, secrets).catch((err) => {
-      console.error("Failed to auto-ingest provider keys:", err);
+      console.error("Failed to auto-ingest BYOK keys:", err);
     });
-  }, [getCurrentControlSessionId, state.clientId, state.providerKeys]);
+  }, [getCurrentControlSessionId, state.clientId, state.byokKeys]);
   useEffect(() => {
     const fetchApps = async () => {
       var _a2;
       try {
-        const apps = await aomiClientRef.current.getApps(
+        const descriptors = await aomiClientRef.current.getApps(
           getCurrentControlSessionId(),
           {
             publicKey: publicKeyRef.current,
             apiKey: (_a2 = stateRef.current.apiKey) != null ? _a2 : void 0
           }
         );
-        const defaultApp = getDefaultApp(apps);
+        const names = namesFromDescriptors(descriptors);
+        const defaultApp = getDefaultApp(names);
         setStateInternal((prev) => __spreadProps(__spreadValues({}, prev), {
-          authorizedApps: apps,
+          authorizedApps: names,
+          appDescriptors: descriptors,
           defaultApp
         }));
       } catch (error) {
         console.error("Failed to fetch apps:", error);
         setStateInternal((prev) => __spreadProps(__spreadValues({}, prev), {
           authorizedApps: ["default"],
+          appDescriptors: [{ name: "default" }],
           defaultApp: "default"
         }));
       }
@@ -524,29 +533,53 @@ function ControlContextProvider({
     });
   }, []);
   const ingestSecrets = useCallback(
-    async (secrets) => {
+    async (secrets, app) => {
       const clientId = stateRef.current.clientId;
       if (!clientId) throw new Error("clientId not initialized");
       const { handles } = await aomiClientRef.current.ingestSecrets(
         getCurrentControlSessionId(),
         clientId,
-        secrets
+        secrets,
+        app
       );
       return handles;
     },
     [getCurrentControlSessionId]
   );
-  const clearSecrets = useCallback(async () => {
-    var _a2, _b2;
-    const clientId = stateRef.current.clientId;
-    if (!clientId) return;
-    await ((_b2 = (_a2 = aomiClientRef.current).clearSecrets) == null ? void 0 : _b2.call(
-      _a2,
-      getCurrentControlSessionId(),
-      clientId
-    ));
+  const clearSecrets = useCallback(
+    async (app) => {
+      var _a2, _b2;
+      const clientId = stateRef.current.clientId;
+      if (!clientId) return;
+      await ((_b2 = (_a2 = aomiClientRef.current).clearSecrets) == null ? void 0 : _b2.call(
+        _a2,
+        getCurrentControlSessionId(),
+        clientId,
+        app
+      ));
+    },
+    [getCurrentControlSessionId]
+  );
+  const deleteSecret = useCallback(
+    async (name, app) => {
+      const clientId = stateRef.current.clientId;
+      if (!clientId) return;
+      await aomiClientRef.current.deleteSecret(
+        getCurrentControlSessionId(),
+        clientId,
+        name,
+        app
+      );
+    },
+    [getCurrentControlSessionId]
+  );
+  const listSecrets = useCallback(async () => {
+    const { by_app } = await aomiClientRef.current.listSecrets(
+      getCurrentControlSessionId()
+    );
+    return by_app;
   }, [getCurrentControlSessionId]);
-  const setProviderKey = useCallback(
+  const setByok = useCallback(
     async (provider, apiKey, label) => {
       const trimmed = apiKey.trim();
       if (!trimmed) return;
@@ -557,7 +590,7 @@ function ControlContextProvider({
       };
       setStateInternal((prev) => {
         const next = __spreadProps(__spreadValues({}, prev), {
-          providerKeys: __spreadProps(__spreadValues({}, prev.providerKeys), { [provider]: entry })
+          byokKeys: __spreadProps(__spreadValues({}, prev.byokKeys), { [provider]: entry })
         });
         callbacks.current.forEach((cb) => cb(next));
         return next;
@@ -569,41 +602,41 @@ function ControlContextProvider({
             getCurrentControlSessionId(),
             clientId,
             {
-              [`${PROVIDER_KEY_SECRET_PREFIX}${provider}`]: trimmed
+              [`${BYOK_SECRET_PREFIX}${provider}`]: trimmed
             }
           );
         } catch (err) {
-          console.error("Failed to ingest provider key:", err);
+          console.error("Failed to ingest BYOK key:", err);
         }
       }
     },
     [getCurrentControlSessionId]
   );
-  const removeProviderKey = useCallback(
+  const removeByok = useCallback(
     async (provider) => {
       const clientId = stateRef.current.clientId;
       if (clientId) {
         await aomiClientRef.current.deleteSecret(
           getCurrentControlSessionId(),
           clientId,
-          `${PROVIDER_KEY_SECRET_PREFIX}${provider}`
+          `${BYOK_SECRET_PREFIX}${provider}`
         );
       }
       setStateInternal((prev) => {
-        const _a2 = prev.providerKeys, { [provider]: _ } = _a2, rest = __objRest(_a2, [__restKey(provider)]);
-        const next = __spreadProps(__spreadValues({}, prev), { providerKeys: rest });
+        const _a2 = prev.byokKeys, { [provider]: _ } = _a2, rest = __objRest(_a2, [__restKey(provider)]);
+        const next = __spreadProps(__spreadValues({}, prev), { byokKeys: rest });
         callbacks.current.forEach((cb) => cb(next));
         return next;
       });
     },
     [getCurrentControlSessionId]
   );
-  const getProviderKeys = useCallback(
-    () => stateRef.current.providerKeys,
+  const getByokKeys = useCallback(
+    () => stateRef.current.byokKeys,
     []
   );
-  const hasProviderKey = useCallback((provider) => {
-    const keys = stateRef.current.providerKeys;
+  const hasByok = useCallback((provider) => {
+    const keys = stateRef.current.byokKeys;
     if (provider) return provider in keys;
     return Object.keys(keys).length > 0;
   }, []);
@@ -625,23 +658,26 @@ function ControlContextProvider({
   const getAuthorizedApps = useCallback(async () => {
     var _a2;
     try {
-      const apps = await aomiClientRef.current.getApps(
+      const descriptors = await aomiClientRef.current.getApps(
         getCurrentControlSessionId(),
         {
           publicKey: publicKeyRef.current,
           apiKey: (_a2 = stateRef.current.apiKey) != null ? _a2 : void 0
         }
       );
-      const defaultApp = getDefaultApp(apps);
+      const names = namesFromDescriptors(descriptors);
+      const defaultApp = getDefaultApp(names);
       setStateInternal((prev) => __spreadProps(__spreadValues({}, prev), {
-        authorizedApps: apps,
+        authorizedApps: names,
+        appDescriptors: descriptors,
         defaultApp
       }));
-      return apps;
+      return names;
     } catch (error) {
       console.error("Failed to fetch apps:", error);
       setStateInternal((prev) => __spreadProps(__spreadValues({}, prev), {
         authorizedApps: ["default"],
+        appDescriptors: [{ name: "default" }],
         defaultApp: "default"
       }));
       return ["default"];
@@ -896,10 +932,12 @@ function ControlContextProvider({
         setApiKey,
         ingestSecrets,
         clearSecrets,
-        setProviderKey,
-        removeProviderKey,
-        getProviderKeys,
-        hasProviderKey,
+        deleteSecret,
+        listSecrets,
+        setByok,
+        removeByok,
+        getByokKeys,
+        hasByok,
         getAvailableModels,
         getAuthorizedApps,
         getCurrentThreadControl,
@@ -999,6 +1037,7 @@ import {
   createContext as createContext3,
   useCallback as useCallback3,
   useContext as useContext3,
+  useRef as useRef3,
   useState as useState2
 } from "react";
 import { jsx as jsx3 } from "react/jsx-runtime";
@@ -1020,19 +1059,30 @@ function NotificationContextProvider({
   children
 }) {
   const [notifications, setNotifications] = useState2([]);
+  const paymentRequiredIdRef = useRef3(null);
   const showNotification = useCallback3((params) => {
+    if (params.kind === "payment_required" && paymentRequiredIdRef.current) {
+      return paymentRequiredIdRef.current;
+    }
     const id = generateId();
     const notification = __spreadProps(__spreadValues({}, params), {
       id,
       timestamp: Date.now()
     });
+    if (params.kind === "payment_required") {
+      paymentRequiredIdRef.current = id;
+    }
     setNotifications((prev) => [notification, ...prev]);
     return id;
   }, []);
   const dismissNotification = useCallback3((id) => {
+    if (paymentRequiredIdRef.current === id) {
+      paymentRequiredIdRef.current = null;
+    }
     setNotifications((prev) => prev.filter((n) => n.id !== id));
   }, []);
   const clearAll = useCallback3(() => {
+    paymentRequiredIdRef.current = null;
     setNotifications([]);
   }, []);
   const value = {
@@ -1049,7 +1099,7 @@ import {
   createContext as createContext4,
   useContext as useContext4,
   useMemo,
-  useRef as useRef3,
+  useRef as useRef4,
   useSyncExternalStore
 } from "react";
 import { jsx as jsx4 } from "react/jsx-runtime";
@@ -1067,7 +1117,7 @@ function ThreadContextProvider({
   children,
   initialThreadId
 }) {
-  const storeRef = useRef3(null);
+  const storeRef = useRef4(null);
   if (!storeRef.current) {
     storeRef.current = new ThreadStore({ initialThreadId });
   }
@@ -1094,22 +1144,22 @@ function useCurrentThreadMetadata() {
   );
 }
 
-// packages/react/src/contexts/user-context.tsx
+// packages/react/src/contexts/ext-user-context.tsx
 import {
   createContext as createContext5,
   useCallback as useCallback4,
   useContext as useContext5,
-  useRef as useRef4,
+  useRef as useRef5,
   useState as useState3
 } from "react";
 import { UserState } from "@aomi-labs/client";
 import { UserState as UserState2 } from "@aomi-labs/client";
-import { jsx as jsx5 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx5 } from "react/jsx-runtime";
 var UserContext = createContext5(void 0);
 function useUser() {
   const context = useContext5(UserContext);
   if (!context) {
-    throw new Error("useUser must be used within UserContextProvider");
+    throw new Error("useUser must be used within ExtUserProvider");
   }
   return {
     user: context.user,
@@ -1120,7 +1170,14 @@ function useUser() {
     onUserStateChange: context.onUserStateChange
   };
 }
-function UserContextProvider({ children }) {
+function ExtUserProvider({ children }) {
+  const parent = useContext5(UserContext);
+  if (parent) {
+    return /* @__PURE__ */ jsx5(Fragment, { children });
+  }
+  return /* @__PURE__ */ jsx5(ExtUserProviderImpl, { children });
+}
+function ExtUserProviderImpl({ children }) {
   const [user, setUserState] = useState3({
     address: void 0,
     chain_id: void 0,
@@ -1128,9 +1185,9 @@ function UserContextProvider({ children }) {
     ens_name: void 0,
     ext: void 0
   });
-  const userRef = useRef4(user);
+  const userRef = useRef5(user);
   userRef.current = user;
-  const StateChangeCallbacks = useRef4(
+  const StateChangeCallbacks = useRef5(
     /* @__PURE__ */ new Set()
   );
   const notifyStateChange = useCallback4((next) => {
@@ -1147,7 +1204,7 @@ function UserContextProvider({ children }) {
   }, []);
   const setUser = useCallback4((data) => {
     setUserState((prev) => {
-      var _a, _b, _c;
+      var _a, _b;
       const normalizedData = pruneUndefined((_a = UserState.normalize(data)) != null ? _a : {});
       const nextPartial = __spreadValues({}, normalizedData);
       if (nextPartial.is_connected === true && nextPartial.chain_id === void 0) {
@@ -1157,11 +1214,41 @@ function UserContextProvider({ children }) {
           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), nextPartial))) != null ? _c : prev;
+      const merged = (_b = UserState.normalize(__spreadValues(__spreadValues({}, prev), nextPartial))) != null ? _b : prev;
+      let next;
+      if (nextPartial.is_connected === false) {
+        next = __spreadProps(__spreadValues({}, merged), {
+          address: void 0,
+          chain_id: void 0,
+          ens_name: void 0,
+          wallet_kind: void 0,
+          aa_mode: void 0,
+          smart_account_4337: void 0,
+          delegation_7702: void 0,
+          svm_address: void 0,
+          wallet_provider: void 0,
+          auth_method: void 0,
+          sponsored: void 0,
+          sponsor_provider: void 0,
+          sponsor_account: void 0,
+          pending_txs: void 0,
+          pending_eip712s: void 0,
+          pending_solana_txs: void 0
+        });
+      } else {
+        const prevAddress = UserState.address(prev);
+        const nextAddress = UserState.address(merged);
+        const addressChanged = prevAddress !== void 0 && nextAddress !== void 0 && prevAddress.toLowerCase() !== nextAddress.toLowerCase();
+        next = addressChanged ? __spreadProps(__spreadValues({}, merged), {
+          aa_mode: void 0,
+          smart_account_4337: void 0,
+          delegation_7702: void 0,
+          ens_name: void 0,
+          pending_txs: void 0,
+          pending_eip712s: void 0,
+          pending_solana_txs: void 0
+        }) : merged;
+      }
       notifyStateChange(next);
       return next;
     });
@@ -1215,7 +1302,7 @@ function UserContextProvider({ children }) {
 }
 
 // packages/react/src/runtime/core.tsx
-import { useCallback as useCallback8, useEffect as useEffect4, useMemo as useMemo2, useRef as useRef8, useState as useState7 } from "react";
+import { useCallback as useCallback8, useEffect as useEffect4, useMemo as useMemo2, useRef as useRef9, useState as useState7 } from "react";
 import {
   AssistantRuntimeProvider,
   useExternalStoreRuntime
@@ -1223,7 +1310,7 @@ import {
 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 { useCallback as useCallback5, useEffect as useEffect2, useRef as useRef6, useState as useState4 } from "react";
 import { CLIENT_TYPE_WEB_UI } from "@aomi-labs/client";
 
 // packages/react/src/runtime/session-manager.ts
@@ -1286,6 +1373,9 @@ var SessionManager = class {
 };
 
 // packages/react/src/runtime/utils.ts
+import {
+  SUPPORTED_CHAINS as CLIENT_SUPPORTED_CHAINS
+} from "@aomi-labs/client";
 import { clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
 function cn(...inputs) {
@@ -1313,7 +1403,7 @@ function toInboundMessage(msg) {
   if (msg.sender === "system") return null;
   const content = [];
   const role = msg.sender === "user" ? "user" : "assistant";
-  if (msg.content) {
+  if (msg.content && msg.content.trim().length > 0) {
     content.push({ type: "text", text: msg.content });
   }
   const [topic, toolContent] = (_a = parseToolPayload(msg)) != null ? _a : [];
@@ -1332,9 +1422,12 @@ function toInboundMessage(msg) {
       })()
     });
   }
+  if (content.length === 0 && role === "assistant" && !msg.is_streaming) {
+    return null;
+  }
   const threadMessage = __spreadValues({
     role,
-    content: content.length > 0 ? content : [{ type: "text", text: "" }]
+    content
   }, msg.timestamp && { createdAt: new Date(msg.timestamp) });
   return threadMessage;
 }
@@ -1365,10 +1458,14 @@ var getNetworkName = (chainId) => {
       return "optimism";
     case 11155111:
       return "sepolia";
+    case 143:
+      return "monad";
+    case 10143:
+      return "monad-testnet";
     case 1337:
     case 31337:
       return "testnet";
-    case 59140:
+    case 59141:
       return "linea-sepolia";
     case 59144:
       return "linea";
@@ -1377,18 +1474,37 @@ var getNetworkName = (chainId) => {
   }
 };
 var formatAddress = (addr) => addr ? `${addr.slice(0, 6)}...${addr.slice(-4)}` : "Connect Wallet";
-var SUPPORTED_CHAINS = [
-  { id: 1, name: "Ethereum", ticker: "ETH" },
-  { id: 137, name: "Polygon", ticker: "MATIC" },
-  { id: 42161, name: "Arbitrum", ticker: "ARB" },
-  { id: 8453, name: "Base", ticker: "BASE" },
-  { id: 10, name: "Optimism", ticker: "OP" },
-  { id: 11155111, name: "Sepolia", ticker: "SEP" }
-];
+var SUPPORTED_CHAINS = [...CLIENT_SUPPORTED_CHAINS];
 var getChainInfo = (chainId) => chainId === void 0 ? void 0 : SUPPORTED_CHAINS.find((c) => c.id === chainId);
 
 // packages/react/src/runtime/orchestrator.ts
 var toErrorMessage = (error) => error instanceof Error ? error.message : "Message failed to send";
+var getHttpStatus = (error) => {
+  const status = error == null ? void 0 : error.status;
+  if (typeof status === "number") return status;
+  const message = toErrorMessage(error);
+  const match = /\bHTTP\s+(\d{3})\b/i.exec(message);
+  return match ? Number(match[1]) : void 0;
+};
+var isPaymentRequiredError = (error) => getHttpStatus(error) === 402;
+var PAYMENT_REQUIRED_MESSAGE = "You're out of funds, please set up a payment method.";
+var buildPaymentRequiredMessage = () => ({
+  id: `aomi-payment-required-${Date.now()}`,
+  role: "assistant",
+  content: [
+    {
+      type: "text",
+      text: PAYMENT_REQUIRED_MESSAGE
+    }
+  ],
+  createdAt: /* @__PURE__ */ new Date(),
+  metadata: {
+    custom: {
+      aomiNoticeKind: "payment_required",
+      aomiNoticeTitle: "Credits needed"
+    }
+  }
+});
 var getOptimisticStatus = (message) => {
   var _a, _b;
   const status = (_b = (_a = message.metadata) == null ? void 0 : _a.custom) == null ? void 0 : _b.aomiSendStatus;
@@ -1426,23 +1542,39 @@ var updateOptimisticMessage = (threadContext, threadId, messageId, status, error
     threadContext.setThreadMessages(threadId, nextMessages);
   }
 };
+var appendPaymentRequiredMessage = (threadContext, threadId) => {
+  var _a, _b;
+  const messages = threadContext.getThreadMessages(threadId);
+  let hasPaymentNotice = false;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (message.role !== "assistant") continue;
+    hasPaymentNotice = ((_b = (_a = message.metadata) == null ? void 0 : _a.custom) == null ? void 0 : _b.aomiNoticeKind) === "payment_required";
+    break;
+  }
+  if (hasPaymentNotice) return;
+  threadContext.setThreadMessages(threadId, [
+    ...messages,
+    buildPaymentRequiredMessage()
+  ]);
+};
 function useRuntimeOrchestrator(aomiClient, options) {
   const threadContext = useThreadContext();
-  const threadContextRef = useRef5(threadContext);
+  const threadContextRef = useRef6(threadContext);
   threadContextRef.current = threadContext;
-  const aomiClientRef = useRef5(aomiClient);
+  const aomiClientRef = useRef6(aomiClient);
   aomiClientRef.current = aomiClient;
-  const optionsRef = useRef5(options);
+  const optionsRef = useRef6(options);
   optionsRef.current = options;
   const [isRunning, setIsRunning] = useState4(false);
-  const sessionManagerRef = useRef5(null);
+  const sessionManagerRef = useRef6(null);
   if (!sessionManagerRef.current) {
     sessionManagerRef.current = new SessionManager(() => aomiClientRef.current);
   }
-  const pendingFetches = useRef5(/* @__PURE__ */ new Set());
-  const initialStatePromises = useRef5(/* @__PURE__ */ new Map());
-  const hydratedThreadIds = useRef5(/* @__PURE__ */ new Set());
-  const listenerCleanups = useRef5(/* @__PURE__ */ new Map());
+  const pendingFetches = useRef6(/* @__PURE__ */ new Set());
+  const initialStatePromises = useRef6(/* @__PURE__ */ new Map());
+  const hydratedThreadIds = useRef6(/* @__PURE__ */ new Set());
+  const listenerCleanups = useRef6(/* @__PURE__ */ new Map());
   const cleanupSessionListeners = useCallback5((threadId) => {
     var _a;
     (_a = listenerCleanups.current.get(threadId)) == null ? void 0 : _a();
@@ -1633,7 +1765,7 @@ function useRuntimeOrchestrator(aomiClient, options) {
   );
   const sendMessage = useCallback5(
     async (text, threadId) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       const existingMessages = threadContextRef.current.getThreadMessages(threadId);
       const optimisticMessageId = String(existingMessages.length);
       const userMessage = {
@@ -1662,6 +1794,7 @@ function useRuntimeOrchestrator(aomiClient, options) {
         await ((_b = (_a = optionsRef.current).prepareThreadForSend) == null ? void 0 : _b.call(_a, threadId));
         const session = getSession(threadId);
         await session.sendAsync(text);
+        (_d = (_c = optionsRef.current).onSendSuccess) == null ? void 0 : _d.call(_c, threadId);
         if (threadContextRef.current.currentThreadId === threadId) {
           setIsRunning(session.getIsProcessing());
         }
@@ -1671,8 +1804,8 @@ function useRuntimeOrchestrator(aomiClient, options) {
           optimisticMessageId,
           "sent"
         );
-        (_d = (_c = optionsRef.current).onPendingRequestsChange) == null ? void 0 : _d.call(
-          _c,
+        (_f = (_e = optionsRef.current).onPendingRequestsChange) == null ? void 0 : _f.call(
+          _e,
           session.getPendingRequests()
         );
       } catch (error) {
@@ -1686,6 +1819,10 @@ function useRuntimeOrchestrator(aomiClient, options) {
           "failed",
           error
         );
+        if (isPaymentRequiredError(error)) {
+          appendPaymentRequiredMessage(threadContextRef.current, threadId);
+        }
+        await ((_h = (_g = optionsRef.current).onSendError) == null ? void 0 : _h.call(_g, threadId, error));
         throw error;
       }
     },
@@ -1892,14 +2029,14 @@ function useAomiRuntime() {
 }
 
 // packages/react/src/handlers/wallet-handler.ts
-import { useCallback as useCallback6, useRef as useRef6, useState as useState5 } from "react";
+import { useCallback as useCallback6, useRef as useRef7, useState as useState5 } from "react";
 function useWalletHandler({
   getSession
 }) {
   const [pendingRequests, setPendingRequests] = useState5([]);
-  const requestsRef = useRef6(pendingRequests);
-  const inFlightRequestSetRef = useRef6(/* @__PURE__ */ new Set());
-  const suppressedRequestSetRef = useRef6(/* @__PURE__ */ new Set());
+  const requestsRef = useRef7(pendingRequests);
+  const inFlightRequestSetRef = useRef7(/* @__PURE__ */ new Set());
+  const suppressedRequestSetRef = useRef7(/* @__PURE__ */ new Set());
   const syncVisibleRequests = useCallback6(() => {
     setPendingRequests(
       requestsRef.current.filter(
@@ -1985,11 +2122,11 @@ function useWalletHandler({
 import {
   useCallback as useCallback7,
   useEffect as useEffect3,
-  useRef as useRef7,
+  useRef as useRef8,
   useState as useState6
 } from "react";
 import { UserState as UserStateHelpers } from "@aomi-labs/client";
-import { Fragment, jsx as jsx6 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx6 } from "react/jsx-runtime";
 var THREAD_PREFETCH_LIMIT = 5;
 var PREFETCH_IDLE_TIMEOUT_MS = 1500;
 function scheduleBackgroundTask(task) {
@@ -2015,17 +2152,24 @@ function useWalletStateSync(context, sessions, remoteThreads) {
   const { remoteThreadIdsRef } = remoteThreads;
   const walletSnapshot = useCallback7(
     (nextUser) => {
-      var _a;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       return {
         address: UserStateHelpers.address(nextUser),
         chain_id: UserStateHelpers.chainId(nextUser),
         is_connected: (_a = UserStateHelpers.isConnected(nextUser)) != null ? _a : false,
-        ens_name: typeof nextUser.ens_name === "string" ? nextUser.ens_name : void 0
+        ens_name: typeof nextUser.ens_name === "string" ? nextUser.ens_name : void 0,
+        wallet_provider: (_b = UserStateHelpers.walletProvider(nextUser)) != null ? _b : void 0,
+        auth_method: (_c = UserStateHelpers.authMethod(nextUser)) != null ? _c : void 0,
+        sponsored: (_d = UserStateHelpers.sponsored(nextUser)) != null ? _d : void 0,
+        sponsor_provider: (_e = UserStateHelpers.sponsorProvider(nextUser)) != null ? _e : void 0,
+        sponsor_account: (_f = UserStateHelpers.sponsorAccount(nextUser)) != null ? _f : void 0,
+        smart_account_4337: (_g = UserStateHelpers.SmartAccount4337(nextUser)) != null ? _g : void 0,
+        delegation_7702: (_h = UserStateHelpers.Delegation7702(nextUser)) != null ? _h : void 0
       };
     },
     [getUserState]
   );
-  const lastWalletStateRef = useRef7(walletSnapshot(getUserState()));
+  const lastWalletStateRef = useRef8(walletSnapshot(getUserState()));
   useEffect3(() => {
     lastWalletStateRef.current = walletSnapshot(getUserState());
     const unsubscribe = onUserStateChange(async (newUser) => {
@@ -2034,7 +2178,7 @@ function useWalletStateSync(context, sessions, remoteThreads) {
       const prevWalletState = lastWalletStateRef.current;
       const previousAddress = (_a = prevWalletState.address) == null ? void 0 : _a.toLowerCase();
       const nextAddress = (_b = nextWalletState.address) == null ? void 0 : _b.toLowerCase();
-      if (prevWalletState.address === nextWalletState.address && prevWalletState.chain_id === nextWalletState.chain_id && prevWalletState.is_connected === nextWalletState.is_connected && prevWalletState.ens_name === nextWalletState.ens_name) {
+      if (prevWalletState.address === nextWalletState.address && prevWalletState.chain_id === nextWalletState.chain_id && prevWalletState.is_connected === nextWalletState.is_connected && prevWalletState.ens_name === nextWalletState.ens_name && prevWalletState.wallet_provider === nextWalletState.wallet_provider && prevWalletState.auth_method === nextWalletState.auth_method && prevWalletState.sponsored === nextWalletState.sponsored && prevWalletState.sponsor_provider === nextWalletState.sponsor_provider && prevWalletState.sponsor_account === nextWalletState.sponsor_account && prevWalletState.smart_account_4337 === nextWalletState.smart_account_4337 && prevWalletState.delegation_7702 === nextWalletState.delegation_7702) {
         return;
       }
       lastWalletStateRef.current = nextWalletState;
@@ -2082,8 +2226,8 @@ function useUserStateRequestResponder(context, sessions) {
 }
 function useRemoteThreadListSync(context, sessions, remoteThreads) {
   const [isThreadListLoading, setIsThreadListLoading] = useState6(true);
-  const prefetchCancelRef = useRef7(null);
-  const lastConnectedAddressRef = useRef7(void 0);
+  const prefetchCancelRef = useRef8(null);
+  const lastConnectedAddressRef = useRef8(void 0);
   const {
     getControlState,
     threadContextRef,
@@ -2102,6 +2246,7 @@ function useRemoteThreadListSync(context, sessions, remoteThreads) {
     warmedThreadIdsRef,
     warmThread
   } = remoteThreads;
+  const connectedAddress = UserStateHelpers.isConnected(user) ? UserStateHelpers.address(user) : void 0;
   const scheduleThreadPrefetch = useCallback7(
     (threadIds) => {
       var _a;
@@ -2140,7 +2285,7 @@ function useRemoteThreadListSync(context, sessions, remoteThreads) {
   );
   useEffect3(() => {
     var _a, _b;
-    const userAddress = UserStateHelpers.isConnected(user) ? UserStateHelpers.address(user) : void 0;
+    const userAddress = connectedAddress;
     const normalizedUserAddress = userAddress == null ? void 0 : userAddress.toLowerCase();
     const previousAddress = lastConnectedAddressRef.current;
     const walletChanged = previousAddress !== void 0 && normalizedUserAddress !== void 0 && previousAddress !== normalizedUserAddress;
@@ -2181,6 +2326,7 @@ function useRemoteThreadListSync(context, sessions, remoteThreads) {
           getControlState().clientId,
           resetThreadId != null ? resetThreadId : currentContext.currentThreadId
         );
+        await aomiClientRef.current.ensureAccount(controlSessionId, userAddress);
         const threadList = await aomiClientRef.current.listThreads(
           controlSessionId,
           userAddress
@@ -2270,7 +2416,7 @@ function useRemoteThreadListSync(context, sessions, remoteThreads) {
     sessionManager,
     setIsThreadLoading,
     threadContextRef,
-    user,
+    connectedAddress,
     warmPromisesRef,
     warmedThreadIdsRef,
     warmThread
@@ -2291,7 +2437,7 @@ function useRuntimeUserStateEffects({
   const threadContext = useThreadContext();
   const { user, getUserState, onUserStateChange } = useUser();
   const { getControlState } = useControl();
-  const threadContextRef = useRef7(threadContext);
+  const threadContextRef = useRef8(threadContext);
   threadContextRef.current = threadContext;
   const context = {
     getControlState,
@@ -2316,9 +2462,10 @@ function RuntimeUserStateProvider({
   children,
   sessionManager,
   getUserState,
+  setUser,
   onUserStateChange
 }) {
-  const lastSerializedStateRef = useRef7("");
+  const lastSerializedStateRef = useRef8("");
   useEffect3(() => {
     const applyToSessions = (next) => {
       const serialized = stableStateString(next);
@@ -2327,20 +2474,40 @@ function RuntimeUserStateProvider({
       }
       lastSerializedStateRef.current = serialized;
       sessionManager.forEach((session) => {
-        session.resolveUserState(next);
+        session.resolveUserState(next, { skipEmit: true });
       });
     };
+    const sessionListeners = [];
+    sessionManager.forEach((session) => {
+      const handler = (next) => {
+        setUser(next);
+      };
+      session.on("user_state_updated", handler);
+      sessionListeners.push(
+        () => session.off("user_state_updated", handler)
+      );
+    });
     applyToSessions(getUserState());
     const unsubscribe = onUserStateChange((next) => {
       applyToSessions(next);
     });
-    return unsubscribe;
-  }, [getUserState, onUserStateChange, sessionManager]);
-  return /* @__PURE__ */ jsx6(Fragment, { children });
+    return () => {
+      unsubscribe();
+      sessionListeners.forEach((off) => off());
+    };
+  }, [getUserState, onUserStateChange, sessionManager, setUser]);
+  return /* @__PURE__ */ jsx6(Fragment2, { children });
 }
 
 // packages/react/src/runtime/core.tsx
 import { jsx as jsx7 } from "react/jsx-runtime";
+var getHttpStatus2 = (error) => {
+  const status = error == null ? void 0 : error.status;
+  if (typeof status === "number") return status;
+  const message = error instanceof Error ? error.message : String(error);
+  const match = /\bHTTP\s+(\d{3})\b/i.exec(message);
+  return match ? Number(match[1]) : void 0;
+};
 function AomiRuntimeCore({
   children,
   aomiClient
@@ -2355,7 +2522,7 @@ function AomiRuntimeCore({
     getPreferredThreadControl,
     syncCurrentThreadControl
   } = useControl();
-  const sessionManagerRef = useRef8(null);
+  const sessionManagerRef = useRef9(null);
   const walletHandler = useWalletHandler({
     getSession: () => {
       var _a;
@@ -2384,19 +2551,68 @@ function AomiRuntimeCore({
       return (_a = getControlState().clientId) != null ? _a : void 0;
     },
     prepareThreadForSend: async (threadId) => {
-      await ensureBackendThread(threadId);
       await syncCurrentThreadControl();
+      const wasCreated = await ensureBackendThread(threadId);
+      if (wasCreated) {
+        threadsMaterializedForSendRef.current.add(threadId);
+      }
+    },
+    onSendSuccess: (threadId) => {
+      const wasRemote = remoteThreadIdsRef.current.has(threadId);
+      remoteThreadIdsRef.current.add(threadId);
+      warmedThreadIdsRef.current.add(threadId);
+      threadsMaterializedForSendRef.current.delete(threadId);
+      if (!wasRemote && threadContextRef.current.currentThreadId === threadId) {
+        void syncCurrentThreadControl().catch((error) => {
+          console.error("Failed to sync thread controls:", error);
+        });
+      }
+    },
+    onSendError: async (threadId, error) => {
+      const wasMaterializedForSend = threadsMaterializedForSendRef.current.has(threadId);
+      threadsMaterializedForSendRef.current.delete(threadId);
+      const httpStatus = getHttpStatus2(error);
+      if (httpStatus === 402) {
+        notificationContext.showNotification({
+          type: "error",
+          kind: "payment_required",
+          title: "You're out of funds"
+        });
+      }
+      if (httpStatus !== 402 || !wasMaterializedForSend) {
+        return;
+      }
+      try {
+        await aomiClientRef.current.deleteThread(threadId);
+        remoteThreadIdsRef.current.delete(threadId);
+        warmedThreadIdsRef.current.delete(threadId);
+      } catch (deleteError) {
+        console.error("Failed to delete quota-blocked thread:", deleteError);
+      }
     },
     onPendingRequestsChange: walletHandler.setRequests,
     onEvent: (event) => eventContext.dispatch(event)
   });
   sessionManagerRef.current = sessionManager;
-  const threadContextRef = useRef8(threadContext);
+  const threadContextRef = useRef9(threadContext);
   threadContextRef.current = threadContext;
-  const remoteThreadIdsRef = useRef8(/* @__PURE__ */ new Set());
-  const warmedThreadIdsRef = useRef8(/* @__PURE__ */ new Set());
-  const warmPromisesRef = useRef8(/* @__PURE__ */ new Map());
+  const remoteThreadIdsRef = useRef9(/* @__PURE__ */ new Set());
+  const warmedThreadIdsRef = useRef9(/* @__PURE__ */ new Set());
+  const warmPromisesRef = useRef9(/* @__PURE__ */ new Map());
+  const threadsMaterializedForSendRef = useRef9(/* @__PURE__ */ new Set());
+  const ensuredAccountPublicKeysRef = useRef9(/* @__PURE__ */ new Set());
   const [isThreadLoading, setIsThreadLoading] = useState7(false);
+  const ensureAccountForPublicKey = useCallback8(
+    async (sessionId, publicKey) => {
+      const normalizedPublicKey = publicKey.toLowerCase();
+      if (ensuredAccountPublicKeysRef.current.has(normalizedPublicKey)) {
+        return;
+      }
+      await aomiClientRef.current.ensureAccount(sessionId, publicKey);
+      ensuredAccountPublicKeysRef.current.add(normalizedPublicKey);
+    },
+    [aomiClientRef]
+  );
   const warmThread = useCallback8(
     async (threadId) => {
       if (!remoteThreadIdsRef.current.has(threadId) || warmedThreadIdsRef.current.has(threadId)) {
@@ -2408,6 +2624,12 @@ function AomiRuntimeCore({
       }
       const warmPromise = (async () => {
         const userState = getUserState();
+        if (UserState3.isConnected(userState)) {
+          const publicKey = UserState3.address(userState);
+          if (publicKey) {
+            await ensureAccountForPublicKey(threadId, publicKey);
+          }
+        }
         await aomiClientRef.current.createThread(
           threadId,
           UserState3.isConnected(userState) ? UserState3.address(userState) : void 0
@@ -2421,20 +2643,27 @@ function AomiRuntimeCore({
         warmPromisesRef.current.delete(threadId);
       }
     },
-    [aomiClientRef, getUserState]
+    [aomiClientRef, ensureAccountForPublicKey, getUserState]
   );
   const ensureBackendThread = useCallback8(
     async (threadId) => {
-      if (remoteThreadIdsRef.current.has(threadId)) return;
+      if (remoteThreadIdsRef.current.has(threadId)) return false;
       const userState = getUserState();
+      if (UserState3.isConnected(userState)) {
+        const publicKey = UserState3.address(userState);
+        if (publicKey) {
+          await ensureAccountForPublicKey(threadId, publicKey);
+        }
+      }
       await aomiClientRef.current.createThread(
         threadId,
         UserState3.isConnected(userState) ? UserState3.address(userState) : void 0
       );
       remoteThreadIdsRef.current.add(threadId);
       warmedThreadIdsRef.current.add(threadId);
+      return true;
     },
-    [aomiClientRef, getUserState]
+    [aomiClientRef, ensureAccountForPublicKey, getUserState]
   );
   const getRuntimeSession = useCallback8(
     (threadId) => {
@@ -2532,6 +2761,9 @@ function AomiRuntimeCore({
     const showToolNotification = (eventType) => (event) => {
       const payload = event.payload;
       const toolName = typeof (payload == null ? void 0 : payload.tool_name) === "string" ? payload.tool_name : void 0;
+      if (eventType === "tool_complete" && toolName === "commit_txs") {
+        return;
+      }
       const title = toolName ? `${eventType === "tool_update" ? "Tool update" : "Tool complete"}: ${toolName}` : eventType === "tool_update" ? "Tool update" : "Tool complete";
       const message = typeof (payload == null ? void 0 : payload.message) === "string" ? payload.message : typeof (payload == null ? void 0 : payload.result) === "string" ? payload.result : void 0;
       notificationContext.showNotification({
@@ -2568,7 +2800,11 @@ function AomiRuntimeCore({
         (part) => part.type === "text"
       ).map((part) => part.text).join("\n");
       if (text) {
-        await orchestratorSendMessage(text, threadContext.currentThreadId);
+        try {
+          await orchestratorSendMessage(text, threadContext.currentThreadId);
+        } catch (error) {
+          console.error("Failed to send message:", error);
+        }
       }
     },
     onCancel: async () => {
@@ -2714,6 +2950,7 @@ function AomiRuntimeCore({
     {
       sessionManager,
       getUserState: userContext.getUserState,
+      setUser: userContext.setUser,
       onUserStateChange: userContext.onUserStateChange,
       children: /* @__PURE__ */ jsx7(AssistantRuntimeProvider, { runtime, children })
     }
@@ -2731,7 +2968,7 @@ function AomiRuntimeProvider({
     () => new AomiClient(__spreadValues({ baseUrl: backendUrl }, clientOptions)),
     [backendUrl, clientOptions]
   );
-  return /* @__PURE__ */ jsx8(ThreadContextProvider, { children: /* @__PURE__ */ jsx8(NotificationContextProvider, { children: /* @__PURE__ */ jsx8(UserContextProvider, { children: /* @__PURE__ */ jsx8(AomiRuntimeInner, { aomiClient, children }) }) }) });
+  return /* @__PURE__ */ jsx8(ThreadContextProvider, { children: /* @__PURE__ */ jsx8(NotificationContextProvider, { children: /* @__PURE__ */ jsx8(ExtUserProvider, { children: /* @__PURE__ */ jsx8(AomiRuntimeInner, { aomiClient, children }) }) }) });
 }
 function AomiRuntimeInner({
   children,
@@ -2807,12 +3044,12 @@ export {
   ControlContextProvider,
   DISABLED_PROVIDER_STATE,
   EventContextProvider,
+  ExtUserProvider,
   MAX_AUTO_FEE_WEI,
   NotificationContextProvider,
   RuntimeUserStateProvider,
   SUPPORTED_CHAINS,
   ThreadContextProvider,
-  UserContextProvider,
   UserState2 as UserState,
   aaModeFromExecutionKind,
   appendFeeCallToPayload,