@paymanai/payman-typescript-ask-sdk 4.0.24 → 4.0.25

package/dist/index.mjs

@@ -28,6 +28,7 @@ var chatStore = {
 };
 
 // src/utils/activeStreamStore.ts
+var EMPTY_USER_ACTION_STATE = { prompts: [], notifications: [] };
 var streams = /* @__PURE__ */ new Map();
 var activeStreamStore = {
   has(key) {
@@ -36,7 +37,11 @@ var activeStreamStore = {
   get(key) {
     const entry = streams.get(key);
     if (!entry) return null;
-    return { messages: entry.messages, isWaiting: entry.isWaiting };
+    return {
+      messages: entry.messages,
+      isWaiting: entry.isWaiting,
+      userActionState: entry.userActionState
+    };
   },
   // Called before startStream — registers the controller and initial messages
   start(key, abortController, initialMessages) {
@@ -44,6 +49,7 @@ var activeStreamStore = {
     streams.set(key, {
       messages: initialMessages,
       isWaiting: true,
+      userActionState: EMPTY_USER_ACTION_STATE,
       abortController,
       listeners: existing?.listeners ?? /* @__PURE__ */ new Set()
     });
@@ -54,20 +60,27 @@ var activeStreamStore = {
     if (!entry) return;
     const next = typeof updater === "function" ? updater(entry.messages) : updater;
     entry.messages = next;
-    entry.listeners.forEach((l) => l(next, entry.isWaiting));
+    entry.listeners.forEach((l) => l(next, entry.isWaiting, entry.userActionState));
   },
   setWaiting(key, waiting) {
     const entry = streams.get(key);
     if (!entry) return;
     entry.isWaiting = waiting;
-    entry.listeners.forEach((l) => l(entry.messages, waiting));
+    entry.listeners.forEach((l) => l(entry.messages, waiting, entry.userActionState));
+  },
+  applyUserActionState(key, updater) {
+    const entry = streams.get(key);
+    if (!entry) return;
+    const next = typeof updater === "function" ? updater(entry.userActionState) : updater;
+    entry.userActionState = next;
+    entry.listeners.forEach((l) => l(entry.messages, entry.isWaiting, next));
   },
   // Called when stream completes — persists to chatStore and cleans up
   complete(key) {
     const entry = streams.get(key);
     if (!entry) return;
     entry.isWaiting = false;
-    entry.listeners.forEach((l) => l(entry.messages, false));
+    entry.listeners.forEach((l) => l(entry.messages, false, entry.userActionState));
     const toSave = entry.messages.filter((m) => !m.isStreaming);
     if (toSave.length > 0) chatStore.set(key, toSave);
     streams.delete(key);
@@ -1092,13 +1105,38 @@ async function expireUserAction(config, userActionId) {
   return sendUserActionRequest(config, userActionId, "expired");
 }
 
+// src/utils/userActionExpiry.ts
+function resolveUserActionExpiresAt(req, existing) {
+  if (typeof req.expirySeconds !== "number" || req.expirySeconds <= 0) {
+    return void 0;
+  }
+  if (existing?.expiresAt && existing.userActionId === req.userActionId) {
+    return existing.expiresAt;
+  }
+  return Date.now() + Math.floor(req.expirySeconds) * 1e3;
+}
+function getUserActionSecondsLeft(prompt) {
+  if (typeof prompt.expiresAt === "number" && prompt.expiresAt > 0) {
+    return Math.max(0, Math.ceil((prompt.expiresAt - Date.now()) / 1e3));
+  }
+  if (typeof prompt.expirySeconds === "number" && prompt.expirySeconds > 0) {
+    return Math.floor(prompt.expirySeconds);
+  }
+  return void 0;
+}
+function isUserActionExpired(prompt) {
+  const left = getUserActionSecondsLeft(prompt);
+  return left !== void 0 && left <= 0;
+}
+
 // src/hooks/useChatV2.ts
-var EMPTY_USER_ACTION_STATE = { prompts: [], notifications: [] };
+var EMPTY_USER_ACTION_STATE2 = { prompts: [], notifications: [] };
 function upsertPrompt(prompts, req) {
-  const active = { ...req, status: "pending" };
   const idx = prompts.findIndex(
     (p) => req.toolCallId ? p.toolCallId === req.toolCallId : p.userActionId === req.userActionId
   );
+  const expiresAt = resolveUserActionExpiresAt(req, idx >= 0 ? prompts[idx] : void 0);
+  const active = { ...req, status: "pending", expiresAt };
   if (idx >= 0) {
     const next = prompts.slice();
     next[idx] = active;
@@ -1169,7 +1207,28 @@ function useChatV2(config, callbacks = {}) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
-  const [userActionState, setUserActionState] = useState(EMPTY_USER_ACTION_STATE);
+  const [userActionState, setUserActionState] = useState(() => {
+    if (!config.userId) return EMPTY_USER_ACTION_STATE2;
+    return activeStreamStore.get(config.userId)?.userActionState ?? EMPTY_USER_ACTION_STATE2;
+  });
+  const storeAwareSetUserActionState = useCallback(
+    (updater) => {
+      const streamUserId = streamUserIdRef.current;
+      const currentUserId = configRef.current.userId;
+      const storeKey = streamUserId ?? currentUserId;
+      if (storeKey && activeStreamStore.has(storeKey)) {
+        activeStreamStore.applyUserActionState(
+          storeKey,
+          updater
+        );
+      }
+      if (!streamUserId || streamUserId === currentUserId) {
+        setUserActionState(updater);
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
   const wrappedCallbacks = useMemo(() => ({
     ...callbacksRef.current,
     onMessageSent: (message) => callbacksRef.current.onMessageSent?.(message),
@@ -1179,14 +1238,14 @@ function useChatV2(config, callbacks = {}) {
     onExecutionTraceClick: (data) => callbacksRef.current.onExecutionTraceClick?.(data),
     onSessionIdChange: (sessionId) => callbacksRef.current.onSessionIdChange?.(sessionId),
     onUserActionRequired: (request) => {
-      setUserActionState((prev) => ({
+      storeAwareSetUserActionState((prev) => ({
         ...prev,
         prompts: upsertPrompt(prev.prompts, request)
       }));
       callbacksRef.current.onUserActionRequired?.(request);
     },
     onUserNotification: (notification) => {
-      setUserActionState(
+      storeAwareSetUserActionState(
         (prev) => prev.notifications.some((n) => n.id === notification.id) ? prev : { ...prev, notifications: [...prev.notifications, notification] }
       );
       callbacksRef.current.onUserNotification?.(notification);
@@ -1276,7 +1335,7 @@ function useChatV2(config, callbacks = {}) {
     streamUserIdRef.current = void 0;
     cancelStreamManager();
     setIsWaitingForResponse(false);
-    setUserActionState((prev) => ({ ...prev, prompts: [] }));
+    storeAwareSetUserActionState((prev) => ({ ...prev, prompts: [] }));
     setMessages(
       (prev) => prev.map((msg) => {
         if (msg.isStreaming) {
@@ -1291,7 +1350,7 @@ function useChatV2(config, callbacks = {}) {
         return msg;
       })
     );
-  }, [cancelStreamManager]);
+  }, [cancelStreamManager, storeAwareSetUserActionState]);
   const resetSession = useCallback(() => {
     const streamUserId = streamUserIdRef.current ?? configRef.current.userId;
     if (streamUserId) {
@@ -1305,7 +1364,7 @@ function useChatV2(config, callbacks = {}) {
     sessionIdRef.current = void 0;
     abortControllerRef.current?.abort();
     setIsWaitingForResponse(false);
-    setUserActionState(EMPTY_USER_ACTION_STATE);
+    storeAwareSetUserActionState(EMPTY_USER_ACTION_STATE2);
   }, []);
   const getSessionId = useCallback(() => {
     return sessionIdRef.current;
@@ -1315,21 +1374,21 @@ function useChatV2(config, callbacks = {}) {
   }, [messages]);
   const setPromptStatus = useCallback(
     (userActionId, status) => {
-      setUserActionState((prev) => ({
+      storeAwareSetUserActionState((prev) => ({
         ...prev,
         prompts: prev.prompts.map(
           (p) => p.userActionId === userActionId ? { ...p, status } : p
         )
       }));
     },
-    []
+    [storeAwareSetUserActionState]
   );
   const removePrompt = useCallback((userActionId) => {
-    setUserActionState((prev) => ({
+    storeAwareSetUserActionState((prev) => ({
       ...prev,
       prompts: prev.prompts.filter((p) => p.userActionId !== userActionId)
     }));
-  }, []);
+  }, [storeAwareSetUserActionState]);
   const submitUserAction2 = useCallback(
     async (userActionId, content) => {
       setPromptStatus(userActionId, "submitting");
@@ -1398,11 +1457,11 @@ function useChatV2(config, callbacks = {}) {
     [setPromptStatus]
   );
   const dismissNotification = useCallback((id) => {
-    setUserActionState((prev) => ({
+    storeAwareSetUserActionState((prev) => ({
       ...prev,
       notifications: prev.notifications.filter((n) => n.id !== id)
     }));
-  }, []);
+  }, [storeAwareSetUserActionState]);
   useEffect(() => {
     const prevSubscriptionUserId = subscriptionPrevUserIdRef.current;
     subscriptionPrevUserIdRef.current = config.userId;
@@ -1411,14 +1470,17 @@ function useChatV2(config, callbacks = {}) {
     if (prevSubscriptionUserId && prevSubscriptionUserId !== userId && streamUserIdRef.current === prevSubscriptionUserId && !activeStreamStore.has(prevSubscriptionUserId) && activeStreamStore.has(userId)) {
       streamUserIdRef.current = userId;
     }
-    const unsubscribe = activeStreamStore.subscribe(userId, (msgs, isWaiting) => {
+    const unsubscribe = activeStreamStore.subscribe(userId, (msgs, isWaiting, actions) => {
       setMessages(msgs);
       setIsWaitingForResponse(isWaiting);
+      setUserActionState(actions);
     });
     const active = activeStreamStore.get(userId);
     if (active) {
+      streamUserIdRef.current = userId;
       setMessages(active.messages);
       setIsWaitingForResponse(active.isWaiting);
+      setUserActionState(active.userActionState);
     }
     return unsubscribe;
   }, [config.userId]);
@@ -1446,12 +1508,14 @@ function useChatV2(config, callbacks = {}) {
       setMessages([]);
       sessionIdRef.current = void 0;
       setIsWaitingForResponse(false);
-      setUserActionState(EMPTY_USER_ACTION_STATE);
+      setUserActionState(EMPTY_USER_ACTION_STATE2);
     } else if (config.userId) {
       const active = activeStreamStore.get(config.userId);
       if (active) {
+        streamUserIdRef.current = config.userId;
         setMessages(active.messages);
         setIsWaitingForResponse(active.isWaiting);
+        setUserActionState(active.userActionState);
         sessionIdRef.current = getSessionIdFromMessages(active.messages) ?? config.initialSessionId;
         return;
       }
@@ -1819,6 +1883,6 @@ function migrateActiveStream(oldUserId, newUserId) {
   activeStreamStore.rename(oldUserId, newUserId);
 }
 
-export { UserActionStaleError, buildContent, cancelUserAction, classifyField, classifyUserActionKind, coerceValue, createInitialV2State, defaultValueFor, expireUserAction, generateId, getOptions, isNestedOrUnsupported, isRequired, migrateActiveStream, processStreamEventV2, renderableFields, resendUserAction, streamWorkflowEvents, submitUserAction, useChatV2, useVoice, validateField, validateForm };
+export { UserActionStaleError, buildContent, cancelUserAction, classifyField, classifyUserActionKind, coerceValue, createInitialV2State, defaultValueFor, expireUserAction, generateId, getOptions, getUserActionSecondsLeft, isNestedOrUnsupported, isRequired, isUserActionExpired, migrateActiveStream, processStreamEventV2, renderableFields, resendUserAction, resolveUserActionExpiresAt, streamWorkflowEvents, submitUserAction, useChatV2, useVoice, validateField, validateForm };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map