@paymanai/payman-ask-sdk 4.0.24 → 4.0.26

package/dist/index.native.js

@@ -55,6 +55,7 @@ var chatStore = {
     memoryStore.delete(key);
   }
 };
+var EMPTY_USER_ACTION_STATE = { prompts: [], notifications: [] };
 var streams = /* @__PURE__ */ new Map();
 var activeStreamStore = {
   has(key) {
@@ -63,7 +64,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) {
@@ -71,6 +76,7 @@ var activeStreamStore = {
     streams.set(key, {
       messages: initialMessages,
       isWaiting: true,
+      userActionState: EMPTY_USER_ACTION_STATE,
       abortController,
       listeners: existing?.listeners ?? /* @__PURE__ */ new Set()
     });
@@ -81,20 +87,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);
@@ -282,6 +295,8 @@ function getEventMessage(event) {
     }
     case "RUN_IN_PROGRESS":
       return event.partialText || "Thinking...";
+    case "LLM_CALL_STARTED":
+      return event.description || "";
     case "RUN_COMPLETED":
       return "Agent run completed";
     case "RUN_FAILED":
@@ -419,7 +434,8 @@ function createInitialV2State() {
     finalData: void 0,
     steps: [],
     stepCounter: 0,
-    currentExecutingStepId: void 0
+    currentExecutingStepId: void 0,
+    trailingActivity: false
   };
 }
 function upsertUserAction(state, req) {
@@ -441,6 +457,7 @@ function processStreamEventV2(rawEvent, state) {
   if (typeof eventType === "string" && eventType.toUpperCase() === "KEEP_ALIVE") {
     if (event.executionId) state.executionId = event.executionId;
     if (event.sessionId) state.sessionId = event.sessionId;
+    if (state.finalResponse) state.trailingActivity = true;
     const description = typeof event.description === "string" ? event.description : "";
     if (description) {
       for (let i = state.steps.length - 1; i >= 0; i--) {
@@ -475,7 +492,12 @@ function processStreamEventV2(rawEvent, state) {
       state.lastEventType = eventType;
       break;
     }
+    case "LLM_CALL_STARTED":
+      if (state.finalResponse) state.trailingActivity = true;
+      state.lastEventType = eventType;
+      break;
     case "INTENT_STARTED": {
+      if (state.finalResponse) state.trailingActivity = true;
       const stepId = `step-${state.stepCounter++}`;
       state.steps.push({
         id: stepId,
@@ -491,6 +513,7 @@ function processStreamEventV2(rawEvent, state) {
       break;
     }
     case "INTENT_COMPLETED": {
+      if (state.finalResponse) state.trailingActivity = true;
       const intentStep = state.steps.find((s2) => s2.eventType === "INTENT_STARTED" && s2.status === "in_progress");
       if (intentStep) {
         intentStep.status = "completed";
@@ -522,6 +545,7 @@ function processStreamEventV2(rawEvent, state) {
           step2.status = "completed";
         }
       });
+      state.trailingActivity = false;
       state.lastEventType = eventType;
       break;
     }
@@ -593,6 +617,7 @@ function processStreamEventV2(rawEvent, state) {
     case "WORKFLOW_ERROR":
       state.hasError = true;
       state.errorMessage = event.errorMessage || event.message || "Workflow error";
+      state.trailingActivity = false;
       state.lastEventType = eventType;
       break;
     // ---- K2 pipeline stage lifecycle events ----
@@ -731,8 +756,7 @@ function buildRequestBody(config, userMessage, sessionId, options) {
     sessionAttributes,
     analysisMode: options?.analysisMode,
     locale: resolveLocale(config.locale),
-    timezone: resolveTimezone(config.timezone),
-    ...options?.attachments?.length ? { attachments: options.attachments } : {}
+    timezone: resolveTimezone(config.timezone)
   };
 }
 function resolveLocale(configured) {
@@ -777,7 +801,6 @@ function buildResolveImagesUrl(config) {
   const basePath = normalizedEndpointPath.endsWith("/stream") ? normalizedEndpointPath.slice(0, -"/stream".length) : normalizedEndpointPath;
   return `${config.api.baseUrl}${basePath}/resolve-image-urls`;
 }
-var NGROK_SKIP_BROWSER_WARNING = "ngrok-skip-browser-warning";
 function buildRequestHeaders(config) {
   const headers = {
     ...config.api.headers
@@ -785,9 +808,6 @@ function buildRequestHeaders(config) {
   if (config.api.authToken) {
     headers.Authorization = `Bearer ${config.api.authToken}`;
   }
-  if (!headers[NGROK_SKIP_BROWSER_WARNING]) {
-    headers[NGROK_SKIP_BROWSER_WARNING] = "true";
-  }
   return headers;
 }
 var RAG_IMAGE_REGEX = /\/api\/rag\/chunks\/[^"'\s]+\/image/;
@@ -886,7 +906,9 @@ function useStreamManagerV2(config, callbacks, setMessages, setIsWaitingForRespo
             const latestUsefulStep = [...state.steps].reverse().find(
               (s2) => s2.message && !isBlandStatus(s2.message)
             );
-            const currentMessage = useful(activeStep?.message) ?? useful(lastInProgressStep?.message) ?? latestUsefulStep?.message ?? useful(getEventMessage(event)) ?? // Last-resort: every candidate is bland (very first event,
+            const eventTypeUpper = typeof event.eventType === "string" ? event.eventType.toUpperCase() : "";
+            const liveEventLabel = eventTypeUpper === "KEEP_ALIVE" || eventTypeUpper === "LLM_CALL_STARTED" ? useful(getEventMessage(event)) : void 0;
+            const currentMessage = useful(activeStep?.message) ?? useful(lastInProgressStep?.message) ?? liveEventLabel ?? latestUsefulStep?.message ?? useful(getEventMessage(event)) ?? // Last-resort: every candidate is bland (very first event,
             // nothing useful seen yet). Render the bland label so the
             // bubble isn't blank.
             activeStep?.message ?? lastInProgressStep?.message ?? getEventMessage(event);
@@ -911,6 +933,7 @@ function useStreamManagerV2(config, callbacks, setMessages, setIsWaitingForRespo
                 streamingContent: state.finalResponse,
                 content: "",
                 currentMessage,
+                hasTrailingActivity: state.trailingActivity,
                 streamProgress: "processing",
                 isError: false,
                 steps: [...state.steps],
@@ -1068,81 +1091,6 @@ function createCancelledMessageUpdate(steps, currentMessage) {
     currentMessage: currentMessage || "Thinking..."
   };
 }
-var DEFAULT_SIGNED_URL_ENDPOINT = "/api/files/signed-url";
-function fileExtension(filename) {
-  const ext = filename.split(".").pop()?.toLowerCase().replace(/^\./, "");
-  return ext && ext.length > 0 ? ext : "bin";
-}
-function resolveMimeType(file) {
-  if (file.type && file.type.trim().length > 0) return file.type;
-  const ext = fileExtension(file.name);
-  const byExt = {
-    pdf: "application/pdf",
-    png: "image/png",
-    jpg: "image/jpeg",
-    jpeg: "image/jpeg",
-    gif: "image/gif",
-    webp: "image/webp"
-  };
-  return byExt[ext] ?? "application/octet-stream";
-}
-function buildSignedUrlEndpoint(config, ext) {
-  const endpoint = config.api.signedUrlEndpoint || DEFAULT_SIGNED_URL_ENDPOINT;
-  const queryParams = new URLSearchParams({ extn: ext.replace(/^\./, "") });
-  return `${config.api.baseUrl}${endpoint}?${queryParams.toString()}`;
-}
-async function requestSignedUrl(config, ext, signal) {
-  const url = buildSignedUrlEndpoint(config, ext);
-  const headers = buildRequestHeaders(config);
-  const response = await fetch(url, {
-    method: "GET",
-    headers,
-    signal
-  });
-  if (!response.ok) {
-    const errorText = await response.text().catch(() => "");
-    throw new Error(
-      errorText ? `Failed to get upload URL (${response.status}): ${errorText}` : `Failed to get upload URL (${response.status})`
-    );
-  }
-  const data = await response.json();
-  if (!data.key || !data.url) {
-    throw new Error("Signed URL response missing key or url");
-  }
-  return { key: data.key, url: data.url };
-}
-async function uploadToSignedUrl(signedUrl, file, mimeType, signal) {
-  const response = await fetch(signedUrl, {
-    method: "PUT",
-    headers: {
-      "Content-Type": mimeType,
-      "x-ms-blob-type": "BlockBlob"
-    },
-    body: file,
-    signal
-  });
-  if (!response.ok) {
-    const errorText = await response.text().catch(() => "");
-    throw new Error(
-      errorText ? `Failed to upload file (${response.status}): ${errorText}` : `Failed to upload file (${response.status})`
-    );
-  }
-}
-async function uploadAttachment(config, file, signal) {
-  const ext = fileExtension(file.name);
-  const mimeType = resolveMimeType(file);
-  const { key, url } = await requestSignedUrl(config, ext, signal);
-  await uploadToSignedUrl(url, file, mimeType, signal);
-  return {
-    tempKey: key,
-    filename: file.name,
-    mimeType
-  };
-}
-async function uploadAttachments(config, files, signal) {
-  const uploads = files.map((file) => uploadAttachment(config, file, signal));
-  return Promise.all(uploads);
-}
 var UserActionStaleError = class extends Error {
   constructor(userActionId, message = "User action is no longer actionable") {
     super(message);
@@ -1179,12 +1127,38 @@ async function cancelUserAction(config, userActionId) {
 async function resendUserAction(config, userActionId) {
   return sendUserActionRequest(config, userActionId, "resend");
 }
-var EMPTY_USER_ACTION_STATE = { prompts: [], notifications: [] };
+async function expireUserAction(config, userActionId) {
+  return sendUserActionRequest(config, userActionId, "expired");
+}
+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;
+}
+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;
@@ -1207,32 +1181,12 @@ function getStoredOrInitialMessages(config) {
 function getSessionIdFromMessages(messages) {
   return messages.find((message) => message.sessionId)?.sessionId;
 }
-var IMAGE_EXTENSIONS = /* @__PURE__ */ new Set(["jpg", "jpeg", "png", "gif", "webp", "avif"]);
-function attachmentKindFromFile(file) {
-  const ext = file.name.split(".").pop()?.toLowerCase() ?? "";
-  if (IMAGE_EXTENSIONS.has(ext) || file.type.startsWith("image/")) return "image";
-  return "file";
-}
-function buildMessageAttachments(files) {
-  return files.map((file, index) => {
-    const kind = attachmentKindFromFile(file);
-    return {
-      id: `att-${Date.now()}-${index}`,
-      filename: file.name,
-      mimeType: file.type || "application/octet-stream",
-      // Blob URL for all local files so PDFs/docs stay previewable after send.
-      previewUrl: URL.createObjectURL(file),
-      kind
-    };
-  });
-}
 function useChatV2(config, callbacks = {}) {
   const [messages, setMessages] = react.useState(() => getStoredOrInitialMessages(config));
   const [isWaitingForResponse, setIsWaitingForResponse] = react.useState(() => {
     if (!config.userId) return false;
     return activeStreamStore.get(config.userId)?.isWaiting ?? false;
   });
-  const [isUploadingAttachments, setIsUploadingAttachments] = react.useState(false);
   const sessionIdRef = react.useRef(
     getSessionIdFromMessages(getStoredOrInitialMessages(config)) ?? config.initialSessionId ?? void 0
   );
@@ -1275,7 +1229,28 @@ function useChatV2(config, callbacks = {}) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
-  const [userActionState, setUserActionState] = react.useState(EMPTY_USER_ACTION_STATE);
+  const [userActionState, setUserActionState] = react.useState(() => {
+    if (!config.userId) return EMPTY_USER_ACTION_STATE2;
+    return activeStreamStore.get(config.userId)?.userActionState ?? EMPTY_USER_ACTION_STATE2;
+  });
+  const storeAwareSetUserActionState = react.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 = react.useMemo(() => ({
     ...callbacksRef.current,
     onMessageSent: (message) => callbacksRef.current.onMessageSent?.(message),
@@ -1285,14 +1260,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);
@@ -1307,45 +1282,21 @@ function useChatV2(config, callbacks = {}) {
   );
   const sendMessage = react.useCallback(
     async (userMessage, options) => {
-      const trimmedMessage = userMessage.trim();
-      const files = options?.files ?? [];
-      const hasPreuploadedAttachments = (options?.attachments?.length ?? 0) > 0;
-      if (!trimmedMessage && files.length === 0 && !hasPreuploadedAttachments) return;
-      let streamAttachments = options?.attachments;
-      if (!streamAttachments && files.length > 0) {
-        setIsUploadingAttachments(true);
-        try {
-          streamAttachments = await uploadAttachments(configRef.current, files);
-        } catch (error) {
-          if (error.name !== "AbortError") {
-            callbacksRef.current.onError?.(error);
-          }
-          throw error;
-        } finally {
-          setIsUploadingAttachments(false);
-        }
-      }
+      if (!userMessage.trim()) return;
       if (!sessionIdRef.current && configRef.current.autoGenerateSessionId !== false) {
         sessionIdRef.current = generateId();
         callbacksRef.current.onSessionIdChange?.(sessionIdRef.current);
       }
-      const messageAttachments = files.length > 0 ? buildMessageAttachments(files) : streamAttachments?.length ? streamAttachments.map((attachment, index) => ({
-        id: `att-${Date.now()}-${index}`,
-        filename: attachment.filename,
-        mimeType: attachment.mimeType,
-        kind: attachment.mimeType.startsWith("image/") ? "image" : "file"
-      })) : void 0;
       const userMessageId = `user-${Date.now()}`;
       const userMsg = {
         id: userMessageId,
         sessionId: sessionIdRef.current,
         role: "user",
-        content: trimmedMessage,
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        attachments: messageAttachments
+        content: userMessage,
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
       };
       setMessages((prev) => [...prev, userMsg]);
-      callbacksRef.current.onMessageSent?.(trimmedMessage);
+      callbacksRef.current.onMessageSent?.(userMessage);
       setIsWaitingForResponse(true);
       callbacksRef.current.onStreamStart?.();
       const streamingId = `assistant-${Date.now()}`;
@@ -1372,14 +1323,11 @@ function useChatV2(config, callbacks = {}) {
         activeStreamStore.start(userId, abortController, initialMessages);
       }
       const newSessionId = await startStream(
-        trimmedMessage,
+        userMessage,
         streamingId,
         sessionIdRef.current,
         abortController,
-        {
-          analysisMode: options?.analysisMode,
-          attachments: streamAttachments
-        }
+        options
       );
       const finalStreamUserId = streamUserIdRef.current ?? userId;
       if (finalStreamUserId) {
@@ -1409,7 +1357,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) {
@@ -1424,7 +1372,7 @@ function useChatV2(config, callbacks = {}) {
         return msg;
       })
     );
-  }, [cancelStreamManager]);
+  }, [cancelStreamManager, storeAwareSetUserActionState]);
   const resetSession = react.useCallback(() => {
     const streamUserId = streamUserIdRef.current ?? configRef.current.userId;
     if (streamUserId) {
@@ -1438,7 +1386,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 = react.useCallback(() => {
     return sessionIdRef.current;
@@ -1448,21 +1396,21 @@ function useChatV2(config, callbacks = {}) {
   }, [messages]);
   const setPromptStatus = react.useCallback(
     (userActionId, status) => {
-      setUserActionState((prev) => ({
+      storeAwareSetUserActionState((prev) => ({
         ...prev,
         prompts: prev.prompts.map(
           (p) => p.userActionId === userActionId ? { ...p, status } : p
         )
       }));
     },
-    []
+    [storeAwareSetUserActionState]
   );
   const removePrompt = react.useCallback((userActionId) => {
-    setUserActionState((prev) => ({
+    storeAwareSetUserActionState((prev) => ({
       ...prev,
       prompts: prev.prompts.filter((p) => p.userActionId !== userActionId)
     }));
-  }, []);
+  }, [storeAwareSetUserActionState]);
   const submitUserAction2 = react.useCallback(
     async (userActionId, content) => {
       setPromptStatus(userActionId, "submitting");
@@ -1517,12 +1465,25 @@ function useChatV2(config, callbacks = {}) {
     },
     [setPromptStatus]
   );
+  const expireUserAction2 = react.useCallback(
+    async (userActionId) => {
+      setPromptStatus(userActionId, "expired");
+      try {
+        await expireUserAction(configRef.current, userActionId);
+      } catch (error) {
+        if (error instanceof UserActionStaleError) return;
+        callbacksRef.current.onError?.(error);
+        throw error;
+      }
+    },
+    [setPromptStatus]
+  );
   const dismissNotification = react.useCallback((id) => {
-    setUserActionState((prev) => ({
+    storeAwareSetUserActionState((prev) => ({
       ...prev,
       notifications: prev.notifications.filter((n) => n.id !== id)
     }));
-  }, []);
+  }, [storeAwareSetUserActionState]);
   react.useEffect(() => {
     const prevSubscriptionUserId = subscriptionPrevUserIdRef.current;
     subscriptionPrevUserIdRef.current = config.userId;
@@ -1531,14 +1492,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]);
@@ -1557,18 +1521,6 @@ function useChatV2(config, callbacks = {}) {
     setMessages(config.initialMessages);
     sessionIdRef.current = getSessionIdFromMessages(config.initialMessages) ?? config.initialSessionId;
   }, [config.initialMessages, config.initialSessionId, config.userId]);
-  const hydratedSessionIdRef = react.useRef(void 0);
-  react.useEffect(() => {
-    if (config.userId) return;
-    if (!config.initialMessages?.length) return;
-    const sessionId = config.initialSessionId;
-    if (hydratedSessionIdRef.current === sessionId && messagesRef.current.length > 0) {
-      return;
-    }
-    hydratedSessionIdRef.current = sessionId;
-    setMessages(config.initialMessages);
-    sessionIdRef.current = getSessionIdFromMessages(config.initialMessages) ?? sessionId;
-  }, [config.initialMessages, config.initialSessionId, config.userId]);
   react.useEffect(() => {
     const prevUserId = prevUserIdRef.current;
     prevUserIdRef.current = config.userId;
@@ -1578,12 +1530,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;
       }
@@ -1603,12 +1557,12 @@ function useChatV2(config, callbacks = {}) {
     getSessionId,
     getMessages,
     isWaitingForResponse,
-    isUploadingAttachments,
     sessionId: sessionIdRef.current,
     userActionState,
     submitUserAction: submitUserAction2,
     cancelUserAction: cancelUserAction2,
     resendUserAction: resendUserAction2,
+    expireUserAction: expireUserAction2,
     dismissNotification
   };
 }
@@ -2571,35 +2525,37 @@ function uaPalette(isDark) {
     grabber: "rgba(15,23,42,0.18)"
   };
 }
-function promptInitialSeconds(prompt) {
-  return prompt && typeof prompt.expirySeconds === "number" && prompt.expirySeconds > 0 ? Math.floor(prompt.expirySeconds) : void 0;
-}
 function promptTimerKey(prompt) {
-  return prompt ? `${prompt.userActionId}|${prompt.subAction ?? ""}` : "";
+  return prompt ? `${prompt.userActionId}|${prompt.subAction ?? ""}|${prompt.expiresAt ?? ""}` : "";
 }
 function useExpiredFlag(prompt) {
-  const initial = promptInitialSeconds(prompt);
   const key = promptTimerKey(prompt);
-  const [expired, setExpired] = react.useState(false);
+  const [expired, setExpired] = react.useState(() => prompt ? isUserActionExpired(prompt) : false);
   react.useEffect(() => {
-    setExpired(false);
-    if (initial === void 0) return;
-    const t = setTimeout(() => setExpired(true), initial * 1e3);
+    const secondsLeft = prompt ? getUserActionSecondsLeft(prompt) : void 0;
+    setExpired(secondsLeft !== void 0 && secondsLeft <= 0);
+    if (secondsLeft === void 0 || secondsLeft <= 0) return;
+    const t = setTimeout(() => setExpired(true), secondsLeft * 1e3);
     return () => clearTimeout(t);
-  }, [key, initial]);
+  }, [key, prompt]);
   return expired;
 }
-function useSecondsLeft(expirySeconds, restartKey) {
-  const initial = typeof expirySeconds === "number" && expirySeconds > 0 ? Math.floor(expirySeconds) : void 0;
-  const [left, setLeft] = react.useState(initial);
+function useSecondsLeft(prompt, restartKey) {
+  const deadlineMs = prompt && typeof prompt.expiresAt === "number" && prompt.expiresAt > 0 ? prompt.expiresAt : prompt && typeof prompt.expirySeconds === "number" && prompt.expirySeconds > 0 ? Date.now() + Math.floor(prompt.expirySeconds) * 1e3 : void 0;
+  const [left, setLeft] = react.useState(
+    () => deadlineMs !== void 0 ? Math.max(0, Math.ceil((deadlineMs - Date.now()) / 1e3)) : void 0
+  );
   react.useEffect(() => {
-    setLeft(initial);
-    if (initial === void 0) return;
-    const id = setInterval(() => {
-      setLeft((s2) => s2 === void 0 ? s2 : s2 <= 1 ? 0 : s2 - 1);
-    }, 1e3);
+    if (deadlineMs === void 0) {
+      setLeft(void 0);
+      return;
+    }
+    const remaining = () => Math.max(0, Math.ceil((deadlineMs - Date.now()) / 1e3));
+    const sync = () => setLeft(remaining());
+    sync();
+    const id = setInterval(sync, 1e3);
     return () => clearInterval(id);
-  }, [restartKey, initial]);
+  }, [restartKey, deadlineMs]);
   return left;
 }
 function SheetTimerPill({
@@ -2607,7 +2563,7 @@ function SheetTimerPill({
   accent,
   isDark
 }) {
-  const left = useSecondsLeft(prompt.expirySeconds, promptTimerKey(prompt));
+  const left = useSecondsLeft(prompt, promptTimerKey(prompt));
   if (left === void 0 || prompt.status === "stale") return null;
   const expired = left <= 0;
   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -2629,7 +2585,7 @@ function CardTimerPill({
   accent,
   isDark
 }) {
-  const left = useSecondsLeft(prompt.expirySeconds, promptTimerKey(prompt));
+  const left = useSecondsLeft(prompt, promptTimerKey(prompt));
   if (left === void 0 || left <= 0) return null;
   return /* @__PURE__ */ jsxRuntime.jsx(reactNative.View, { style: [rc.timer, { backgroundColor: accent + (isDark ? "26" : "14") }], children: /* @__PURE__ */ jsxRuntime.jsxs(reactNative.Text, { style: { color: accent, fontSize: 12, fontWeight: "700" }, children: [
     left,
@@ -2695,6 +2651,7 @@ function VerificationBody({
   expired,
   pal,
   accent,
+  isDark,
   onSubmit,
   onCancel,
   onResend
@@ -2757,7 +2714,11 @@ function VerificationBody({
     } catch {
     }
   }, [locked, onResend, prompt.userActionId, resendSec]);
-  const description = prompt.message?.trim() || (isNumeric ? `Enter the ${codeLen}-digit code to continue` : "Enter the verification code to continue");
+  const promptMessage = prompt.message?.trim();
+  const description = promptMessage || (isNumeric ? `Enter the ${codeLen}-digit code to continue` : "Enter the verification code to continue");
+  const renderMarkdown = !!promptMessage && prompt.metadata?.["payman/messageFormat"] === "markdown";
+  const mdStyles = isDark ? MD_STYLES_DARK : MD_STYLES_LIGHT;
+  const mdRules = react.useMemo(() => makeMdRules(isDark, accent), [isDark, accent]);
   return /* @__PURE__ */ jsxRuntime.jsxs(reactNative.View, { style: ub.bodyWrap, children: [
     /* @__PURE__ */ jsxRuntime.jsxs(
       reactNative.ScrollView,
@@ -2767,7 +2728,7 @@ function VerificationBody({
         keyboardShouldPersistTaps: "handled",
         showsVerticalScrollIndicator: false,
         children: [
-          /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [ub.desc, { color: pal.muted }], children: description }),
+          renderMarkdown ? /* @__PURE__ */ jsxRuntime.jsx(reactNative.View, { style: ub.messageBlock, children: /* @__PURE__ */ jsxRuntime.jsx(Markdown__default.default, { style: mdStyles, rules: mdRules, children: description.replace(/\\n/g, "\n") }) }) : /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [ub.desc, { color: pal.muted }], children: description }),
           isNumeric ? /* @__PURE__ */ jsxRuntime.jsx(
             CodeInput,
             {
@@ -3106,6 +3067,7 @@ function UserActionSheet({
                   expired,
                   pal,
                   accent,
+                  isDark,
                   onSubmit,
                   onCancel,
                   onResend