@paymanai/payman-ask-sdk 4.0.23 → 4.0.25

package/dist/index.mjs

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { createContext, forwardRef, useCallback, useRef, useState, useMemo, useEffect, useImperativeHandle, useLayoutEffect, useContext } from 'react';
 import { AnimatePresence, motion } from 'framer-motion';
 import { clsx } from 'clsx';
@@ -34,6 +33,7 @@ var chatStore = {
     memoryStore.delete(key);
   }
 };
+var EMPTY_USER_ACTION_STATE = { prompts: [], notifications: [] };
 var streams = /* @__PURE__ */ new Map();
 var activeStreamStore = {
   has(key) {
@@ -42,7 +42,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) {
@@ -50,6 +54,7 @@ var activeStreamStore = {
     streams.set(key, {
       messages: initialMessages,
       isWaiting: true,
+      userActionState: EMPTY_USER_ACTION_STATE,
       abortController,
       listeners: existing?.listeners ?? /* @__PURE__ */ new Set()
     });
@@ -60,20 +65,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);
@@ -496,9 +508,9 @@ function processStreamEventV2(rawEvent, state) {
         state.hasError = true;
         state.errorMessage = "WORKFLOW_FAILED";
       }
-      state.steps.forEach((step) => {
-        if (step.status === "in_progress") {
-          step.status = "completed";
+      state.steps.forEach((step2) => {
+        if (step2.status === "in_progress") {
+          step2.status = "completed";
         }
       });
       state.lastEventType = eventType;
@@ -913,11 +925,11 @@ function useStreamManagerV2(config, callbacks, setMessages, setIsWaitingForRespo
                   errorDetails: isAborted ? void 0 : error.message,
                   content: isAborted ? state.finalResponse || "" : state.finalResponse || FRIENDLY_ERROR_MESSAGE,
                   currentMessage: isAborted ? "Thinking..." : void 0,
-                  steps: [...state.steps].map((step) => {
-                    if (step.status === "in_progress" && isAborted) {
-                      return { ...step, status: "pending" };
+                  steps: [...state.steps].map((step2) => {
+                    if (step2.status === "in_progress" && isAborted) {
+                      return { ...step2, status: "pending" };
                     }
-                    return step;
+                    return step2;
                   }),
                   currentExecutingStepId: void 0
                 } : msg
@@ -1003,11 +1015,11 @@ function useStreamManagerV2(config, callbacks, setMessages, setIsWaitingForRespo
               isCancelled: isAborted,
               errorDetails: isAborted ? void 0 : error.message,
               content: isAborted ? state.finalResponse || "" : state.finalResponse || FRIENDLY_ERROR_MESSAGE,
-              steps: [...state.steps].map((step) => {
-                if (step.status === "in_progress" && isAborted) {
-                  return { ...step, status: "pending" };
+              steps: [...state.steps].map((step2) => {
+                if (step2.status === "in_progress" && isAborted) {
+                  return { ...step2, status: "pending" };
                 }
-                return step;
+                return step2;
               }),
               currentExecutingStepId: void 0
             } : msg
@@ -1028,11 +1040,11 @@ function useStreamManagerV2(config, callbacks, setMessages, setIsWaitingForRespo
   };
 }
 function createCancelledMessageUpdate(steps, currentMessage) {
-  const updatedSteps = steps.map((step) => {
-    if (step.status === "in_progress") {
-      return { ...step, status: "pending" };
+  const updatedSteps = steps.map((step2) => {
+    if (step2.status === "in_progress") {
+      return { ...step2, status: "pending" };
     }
-    return step;
+    return step2;
   });
   return {
     isStreaming: false,
@@ -1081,12 +1093,31 @@ async function resendUserAction(config, userActionId) {
 async function expireUserAction(config, userActionId) {
   return sendUserActionRequest(config, userActionId, "expired");
 }
-var EMPTY_USER_ACTION_STATE = { prompts: [], notifications: [] };
+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;
+}
+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;
@@ -1157,7 +1188,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),
@@ -1167,14 +1219,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);
@@ -1264,7 +1316,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) {
@@ -1279,7 +1331,7 @@ function useChatV2(config, callbacks = {}) {
         return msg;
       })
     );
-  }, [cancelStreamManager]);
+  }, [cancelStreamManager, storeAwareSetUserActionState]);
   const resetSession = useCallback(() => {
     const streamUserId = streamUserIdRef.current ?? configRef.current.userId;
     if (streamUserId) {
@@ -1293,7 +1345,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;
@@ -1303,21 +1355,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");
@@ -1386,11 +1438,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;
@@ -1399,14 +1451,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]);
@@ -1434,12 +1489,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;
       }
@@ -2269,7 +2326,7 @@ function createMarkdownComponents(options = {}) {
     },
     pre: ({ children }) => /* @__PURE__ */ jsx("pre", { className: "my-2 max-w-full overflow-x-auto rounded-lg", children }),
     ul: ({ children }) => /* @__PURE__ */ jsx("ul", { className: "mb-3 ml-4 list-disc space-y-1 text-sm", children }),
-    ol: ({ children }) => /* @__PURE__ */ jsx("ol", { className: "mb-3 ml-4 list-decimal space-y-1 text-sm", children }),
+    ol: ({ children, start }) => /* @__PURE__ */ jsx("ol", { className: "mb-3 ml-4 list-decimal space-y-1 text-sm", start, children }),
     li: ({ children }) => /* @__PURE__ */ jsx("li", { className: "text-sm leading-relaxed", children }),
     h1: ({ children }) => /* @__PURE__ */ jsx("h1", { className: "mt-4 mb-2 text-lg font-semibold first:mt-0", children }),
     h2: ({ children }) => /* @__PURE__ */ jsx("h2", { className: "mt-3 mb-2 text-base font-semibold first:mt-0", children }),
@@ -2338,7 +2395,7 @@ function AgentMessage({
     }
     wasStreamingRef.current = isStreaming;
   }, [isStreaming, hasSteps]);
-  const totalElapsedMs = hasSteps ? message.steps.reduce((sum, step) => sum + (step.elapsedMs || 0), 0) : 0;
+  const totalElapsedMs = hasSteps ? message.steps.reduce((sum, step2) => sum + (step2.elapsedMs || 0), 0) : 0;
   const currentMessage = message.currentMessage;
   const rawContent = message.streamingContent || message.content || "";
   const content = rawContent.replace(/\\n/g, "\n");
@@ -2366,25 +2423,25 @@ function AgentMessage({
     }
     return `${count} ${stepWord} completed`;
   };
-  const renderStepIcon = (step, isCurrentlyExecuting) => {
+  const renderStepIcon = (step2, isCurrentlyExecuting) => {
     const wrapper = "h-4 w-4 flex items-center justify-center shrink-0";
     if (isCurrentlyExecuting)
       return /* @__PURE__ */ jsx("div", { className: wrapper, children: /* @__PURE__ */ jsx(Loader2, { className: "h-3.5 w-3.5 payman-agent-step-icon--active animate-spin" }) });
-    if (step.status === "pending" && isCancelled)
+    if (step2.status === "pending" && isCancelled)
       return /* @__PURE__ */ jsx("div", { className: wrapper, children: /* @__PURE__ */ jsx("div", { className: "h-1.5 w-1.5 rounded-full payman-agent-step-icon--pending" }) });
-    if (step.status === "pending" || step.status === "in_progress")
+    if (step2.status === "pending" || step2.status === "in_progress")
       return /* @__PURE__ */ jsx("div", { className: wrapper, children: /* @__PURE__ */ jsx(Loader2, { className: "h-3.5 w-3.5 payman-agent-step-icon--in-progress-dim animate-spin" }) });
-    if (step.status === "completed")
+    if (step2.status === "completed")
       return /* @__PURE__ */ jsx("div", { className: wrapper, children: /* @__PURE__ */ jsx(
         Check,
         {
           className: cn(
             "h-3.5 w-3.5",
-            step.eventType === "USER_ACTION_SUCCESS" ? "payman-agent-step-icon--success" : "payman-agent-step-icon--success-dim"
+            step2.eventType === "USER_ACTION_SUCCESS" ? "payman-agent-step-icon--success" : "payman-agent-step-icon--success-dim"
           )
         }
       ) });
-    if (step.status === "error")
+    if (step2.status === "error")
       return /* @__PURE__ */ jsx("div", { className: wrapper, children: /* @__PURE__ */ jsx(X, { className: "h-3.5 w-3.5 payman-agent-step-icon--error" }) });
     return /* @__PURE__ */ jsx("div", { className: wrapper, children: /* @__PURE__ */ jsx("div", { className: "h-1.5 w-1.5 rounded-full payman-agent-step-icon--pending-dim" }) });
   };
@@ -2396,33 +2453,33 @@ function AgentMessage({
       exit: { height: 0, opacity: 0 },
       transition: { duration: 0.2, ease: "easeInOut" },
       className: "overflow-hidden",
-      children: /* @__PURE__ */ jsx("div", { className: "pt-1.5", children: message.steps.map((step) => {
-        const isCurrentlyExecuting = step.id === currentExecutingStepId && step.status === "in_progress" && isStreaming && !isCancelled;
-        const hasTime = step.elapsedMs != null && step.elapsedMs > 0;
+      children: /* @__PURE__ */ jsx("div", { className: "pt-1.5", children: message.steps.map((step2) => {
+        const isCurrentlyExecuting = step2.id === currentExecutingStepId && step2.status === "in_progress" && isStreaming && !isCancelled;
+        const hasTime = step2.elapsedMs != null && step2.elapsedMs > 0;
         return /* @__PURE__ */ jsxs("div", { className: "mb-1.5", children: [
           /* @__PURE__ */ jsxs("div", { className: "flex gap-1.5 items-start", children: [
-            /* @__PURE__ */ jsx("div", { className: "mt-px", children: renderStepIcon(step, isCurrentlyExecuting) }),
+            /* @__PURE__ */ jsx("div", { className: "mt-px", children: renderStepIcon(step2, isCurrentlyExecuting) }),
             /* @__PURE__ */ jsx(
               "span",
               {
                 className: cn(
                   "text-xs leading-relaxed min-w-0 break-words",
                   isCurrentlyExecuting && "shimmer-text font-medium",
-                  !isCurrentlyExecuting && step.status === "error" && "payman-agent-step-text--error",
-                  !isCurrentlyExecuting && step.eventType === "USER_ACTION_SUCCESS" && "payman-agent-step-text--success",
-                  !isCurrentlyExecuting && step.status === "completed" && "payman-agent-step-text--completed",
-                  !isCurrentlyExecuting && step.status === "pending" && "payman-agent-step-text--pending",
-                  !isCurrentlyExecuting && step.status === "in_progress" && "payman-agent-step-text--in-progress"
+                  !isCurrentlyExecuting && step2.status === "error" && "payman-agent-step-text--error",
+                  !isCurrentlyExecuting && step2.eventType === "USER_ACTION_SUCCESS" && "payman-agent-step-text--success",
+                  !isCurrentlyExecuting && step2.status === "completed" && "payman-agent-step-text--completed",
+                  !isCurrentlyExecuting && step2.status === "pending" && "payman-agent-step-text--pending",
+                  !isCurrentlyExecuting && step2.status === "in_progress" && "payman-agent-step-text--in-progress"
                 ),
-                children: step.message
+                children: step2.message
               }
             )
           ] }),
           hasTime && /* @__PURE__ */ jsx("div", { className: "pl-[22px] mt-1", children: /* @__PURE__ */ jsxs("span", { className: "inline-flex items-center gap-1 px-1.5 py-0.5 rounded-md payman-agent-step-time leading-none", children: [
             /* @__PURE__ */ jsx(Clock, { className: "h-2.5 w-2.5 shrink-0 payman-agent-step-time-icon" }),
-            /* @__PURE__ */ jsx("span", { className: "text-[10px] font-mono payman-agent-step-time-text", children: formatElapsedTime(step.elapsedMs) })
+            /* @__PURE__ */ jsx("span", { className: "text-[10px] font-mono payman-agent-step-time-text", children: formatElapsedTime(step2.elapsedMs) })
           ] }) })
-        ] }, step.id);
+        ] }, step2.id);
       }) })
     }
   ) });
@@ -3379,92 +3436,13 @@ function MarkdownImageV2({
     }
   ) });
 }
-var RAG_SOURCE_CLASS = "payman-v2-rag-source";
-var RAG_FOLLOW_UP_CLASS = "payman-v2-rag-follow-up";
-var SOURCE_PATTERN = /^Sources?:\s*\S/i;
-var MAX_FOLLOW_UP_LENGTH = 320;
-var HR_PATTERN = /^-{3,}$|^_{3,}$|^\*{3,}$/;
-function normalizeRagParagraphText(text) {
-  return text.replace(/\s+/g, " ").trim();
-}
-function isRagSourceParagraph(text) {
-  return SOURCE_PATTERN.test(normalizeRagParagraphText(text));
-}
-function isRagFollowUpCandidate(text) {
-  const normalized = normalizeRagParagraphText(text);
-  return normalized.length > 0 && normalized.length <= MAX_FOLLOW_UP_LENGTH && normalized.endsWith("?");
-}
-function extractRagParagraphTexts(content) {
-  const paragraphs = [];
-  const currentParagraph = [];
-  const flushParagraph = () => {
-    const paragraph = normalizeRagParagraphText(currentParagraph.join(" "));
-    currentParagraph.length = 0;
-    if (paragraph) paragraphs.push(paragraph);
-  };
-  content.replace(/\\n/g, "\n").split(/\r?\n/).forEach((line) => {
-    const trimmedLine = line.trim();
-    if (!trimmedLine) {
-      flushParagraph();
-      return;
-    }
-    if (HR_PATTERN.test(trimmedLine)) {
-      flushParagraph();
-      return;
-    }
-    currentParagraph.push(trimmedLine);
-  });
-  flushParagraph();
-  return paragraphs;
-}
-function getRagAnswerParagraphRoles(paragraphs) {
-  const normalized = paragraphs.map(normalizeRagParagraphText);
-  const roles = normalized.map(() => null);
-  const sourceIndexes = normalized.map((paragraph, index) => isRagSourceParagraph(paragraph) ? index : -1).filter((index) => index >= 0);
-  for (const sourceIndex of sourceIndexes) {
-    roles[sourceIndex] = "source";
-    for (const candidateIndex of [sourceIndex - 1, sourceIndex + 1]) {
-      if (candidateIndex >= 0 && candidateIndex < normalized.length && roles[candidateIndex] == null && isRagFollowUpCandidate(normalized[candidateIndex] ?? "")) {
-        roles[candidateIndex] = "follow-up";
-      }
-    }
-  }
-  return roles;
-}
-function getRagAnswerParagraphRole(paragraph, paragraphs) {
-  const normalizedParagraph = normalizeRagParagraphText(paragraph);
-  if (isRagSourceParagraph(normalizedParagraph)) return "source";
-  const roles = getRagAnswerParagraphRoles(paragraphs);
-  return paragraphs.map(normalizeRagParagraphText).some((candidate, index) => {
-    return candidate === normalizedParagraph && roles[index] === "follow-up";
-  }) ? "follow-up" : null;
-}
-function ragAnswerRoleClassName(role) {
-  if (role === "source") return RAG_SOURCE_CLASS;
-  if (role === "follow-up") return RAG_FOLLOW_UP_CLASS;
-  return void 0;
-}
-function reactNodeText(node) {
-  if (typeof node === "string" || typeof node === "number") return String(node);
-  if (Array.isArray(node)) return node.map(reactNodeText).join("");
-  if (React.isValidElement(node)) {
-    return reactNodeText(node.props.children);
-  }
-  return "";
-}
-function buildComponents(onImageClick, isResolvingRef, ragParagraphsRef) {
+function buildComponents(onImageClick, isResolvingRef) {
   return {
-    p: ({ children }) => {
-      const role = getRagAnswerParagraphRole(
-        reactNodeText(children),
-        ragParagraphsRef?.current ?? []
-      );
-      return /* @__PURE__ */ jsx("p", { className: ragAnswerRoleClassName(role), children });
-    },
+    p: ({ children }) => /* @__PURE__ */ jsx("p", { children }),
     code: ({ children }) => /* @__PURE__ */ jsx("code", { children }),
     pre: ({ children }) => /* @__PURE__ */ jsx("div", { className: "payman-v2-markdown-pre", children: /* @__PURE__ */ jsx("pre", { children }) }),
     ul: ({ children }) => /* @__PURE__ */ jsx("ul", { children }),
-    ol: ({ children }) => /* @__PURE__ */ jsx("ol", { children }),
+    ol: ({ children, start }) => /* @__PURE__ */ jsx("ol", { start, children }),
     li: ({ children }) => /* @__PURE__ */ jsx("li", { children }),
     h1: ({ children }) => /* @__PURE__ */ jsx("h1", { children }),
     h2: ({ children }) => /* @__PURE__ */ jsx("h2", { children }),
@@ -3498,13 +3476,8 @@ function MarkdownRendererV2({
 }) {
   const isResolvingRef = useRef(isResolvingImages);
   isResolvingRef.current = isResolvingImages;
-  const ragParagraphsRef = useRef([]);
-  ragParagraphsRef.current = useMemo(
-    () => extractRagParagraphTexts(content),
-    [content]
-  );
   const components = useMemo(
-    () => buildComponents(onImageClick, isResolvingRef, ragParagraphsRef),
+    () => buildComponents(onImageClick, isResolvingRef),
     [onImageClick]
   );
   return /* @__PURE__ */ jsx(
@@ -3770,6 +3743,87 @@ function FeedbackReasonModal({
     }
   ) : null });
 }
+
+// src/utils/markdownImageToken.ts
+function step(text, i) {
+  if (text[i] === "\\" && i + 1 < text.length) return i + 2;
+  return i + 1;
+}
+function scanAltText(text, start) {
+  let i = start;
+  while (i < text.length) {
+    if (text[i] === "]") return i;
+    i = step(text, i);
+  }
+  return -1;
+}
+function scanOptionalTitle(text, start) {
+  let i = start;
+  while (i < text.length && /[\t\n ]/.test(text[i])) i++;
+  if (i >= text.length) return i;
+  const quote = text[i];
+  if (quote !== '"' && quote !== "'") return i;
+  i++;
+  while (i < text.length) {
+    if (text[i] === quote) return i + 1;
+    i = step(text, i);
+  }
+  return -1;
+}
+function scanAngleBracketDestination(text, start) {
+  let i = start + 1;
+  while (i < text.length) {
+    if (text[i] === ">") return i + 1;
+    i = step(text, i);
+  }
+  return -1;
+}
+function scanRawDestination(text, start) {
+  let i = start;
+  let depth = 1;
+  while (i < text.length) {
+    const char = text[i];
+    if (char === "\\") {
+      if (i + 1 >= text.length) return -1;
+      i += 2;
+      continue;
+    }
+    if (char === "(") depth++;
+    else if (char === ")") {
+      depth--;
+      if (depth === 0) return i + 1;
+    }
+    i++;
+  }
+  return -1;
+}
+function completeMarkdownImageTokenLength(text) {
+  if (!text.startsWith("![")) return 0;
+  const altEnd = scanAltText(text, 2);
+  if (altEnd === -1 || altEnd + 1 >= text.length || text[altEnd + 1] !== "(") {
+    return 0;
+  }
+  let i = altEnd + 2;
+  if (i >= text.length) return 0;
+  if (text[i] === "<") {
+    i = scanAngleBracketDestination(text, i);
+    if (i === -1) return 0;
+    i = scanOptionalTitle(text, i);
+    if (i === -1 || i >= text.length || text[i] !== ")") return 0;
+    return i + 1;
+  }
+  i = scanRawDestination(text, i);
+  return i === -1 ? 0 : i;
+}
+function stripIncompleteImageToken(text) {
+  const lastBang = text.lastIndexOf("![");
+  if (lastBang === -1) return text;
+  const suffix = text.slice(lastBang);
+  if (completeMarkdownImageTokenLength(suffix) > 0) return text;
+  return text.slice(0, lastBang);
+}
+
+// src/components/v2/useTypingEffect.ts
 var RESPONSE_SPEED = {
   normal: [2, 4],
   fast: 1,
@@ -3777,7 +3831,6 @@ var RESPONSE_SPEED = {
   newline: [4, 6],
   idle: 15
 };
-var MARKDOWN_IMAGE_REGEX = /^!\[[^\]]*\]\([^)]*\)/;
 function charDelay(char, speed, multiplier) {
   const raw = (() => {
     if (char === "*") return speed.fast;
@@ -3836,9 +3889,9 @@ function useTypingEffect(targetText, enabled, speed = RESPONSE_SPEED, initialDis
       }
       if (displayedRef.current.length < targetRef.current.length) {
         const remaining = targetRef.current.slice(displayedRef.current.length);
-        const imgMatch = MARKDOWN_IMAGE_REGEX.exec(remaining);
-        if (imgMatch) {
-          displayedRef.current += imgMatch[0];
+        const imageTokenLength = completeMarkdownImageTokenLength(remaining);
+        if (imageTokenLength > 0) {
+          displayedRef.current += remaining.slice(0, imageTokenLength);
           setDisplayedText(displayedRef.current);
           timerRef.current = setTimeout(tick, 0);
           return;
@@ -3867,13 +3920,6 @@ function useTypingEffect(targetText, enabled, speed = RESPONSE_SPEED, initialDis
     isTyping
   };
 }
-function stripIncompleteImageToken(text) {
-  const lastBang = text.lastIndexOf("![");
-  if (lastBang === -1) return text;
-  const after = text.slice(lastBang);
-  if (/^!\[[^\]]*\]\([^)]*\)/.test(after)) return text;
-  return text.slice(0, lastBang);
-}
 function getFeedbackState(message) {
   const feedback = message.feedback;
   if (feedback === "up" || feedback === "down") return feedback;
@@ -4623,14 +4669,15 @@ function NotificationInline({ notification, onDismiss }) {
   ] });
 }
 function useExpiryCountdown(prompt) {
-  const initial = typeof prompt.expirySeconds === "number" && prompt.expirySeconds > 0 ? Math.floor(prompt.expirySeconds) : void 0;
-  const [secondsLeft, setSecondsLeft] = useState(initial);
+  const deadlineMs = typeof prompt.expiresAt === "number" && prompt.expiresAt > 0 ? prompt.expiresAt : typeof prompt.expirySeconds === "number" && prompt.expirySeconds > 0 ? Date.now() + Math.floor(prompt.expirySeconds) * 1e3 : void 0;
+  const [secondsLeft, setSecondsLeft] = useState(
+    () => deadlineMs !== void 0 ? Math.max(0, Math.ceil((deadlineMs - Date.now()) / 1e3)) : void 0
+  );
   useEffect(() => {
-    if (initial === void 0) {
+    if (deadlineMs === void 0) {
       setSecondsLeft(void 0);
       return;
     }
-    const deadlineMs = Date.now() + initial * 1e3;
     let intervalId;
     const remaining = () => Math.max(0, Math.ceil((deadlineMs - Date.now()) / 1e3));
     const sync = () => {
@@ -4652,8 +4699,8 @@ function useExpiryCountdown(prompt) {
       window.removeEventListener("focus", sync);
       window.removeEventListener("pageshow", sync);
     };
-  }, [prompt.userActionId, prompt.subAction, initial]);
-  const expired = initial !== void 0 && secondsLeft === 0;
+  }, [prompt.userActionId, prompt.subAction, deadlineMs]);
+  const expired = deadlineMs !== void 0 && (getUserActionSecondsLeft(prompt) ?? secondsLeft ?? 0) <= 0;
   return [secondsLeft, expired];
 }
 function UserActionInline({
@@ -5757,9 +5804,9 @@ var PRE_PIPELINE_STEPS = /* @__PURE__ */ new Set([
   "build_pipeline",
   "load_skill_index"
 ]);
-function stepColor(step) {
-  if (step.status === "failed") return "#ef4444";
-  if (PRE_PIPELINE_STEPS.has(step.step)) return "#f59e0b";
+function stepColor(step2) {
+  if (step2.status === "failed") return "#ef4444";
+  if (PRE_PIPELINE_STEPS.has(step2.step)) return "#f59e0b";
   return "#3b82f6";
 }
 function formatMs(ms) {
@@ -5936,10 +5983,10 @@ function TimelineBars({
   totalMs,
   unaccountedMs
 }) {
-  const bars = trace.pipelineSteps.map((step) => {
-    const duration = step.durationMs ?? 0;
+  const bars = trace.pipelineSteps.map((step2) => {
+    const duration = step2.durationMs ?? 0;
     const widthPct = totalMs > 0 ? duration / totalMs * 100 : 0;
-    const llmMs = step.llmCall?.durationMs ?? null;
+    const llmMs = step2.llmCall?.durationMs ?? null;
     return /* @__PURE__ */ jsxs("div", { style: { marginBottom: 8 }, children: [
       /* @__PURE__ */ jsxs(
         "div",
@@ -5953,8 +6000,8 @@ function TimelineBars({
           },
           children: [
             /* @__PURE__ */ jsxs("span", { children: [
-              step.step,
-              step.status === "failed" && /* @__PURE__ */ jsx("span", { style: { color: "#fca5a5", marginLeft: 6 }, children: "(failed)" })
+              step2.step,
+              step2.status === "failed" && /* @__PURE__ */ jsx("span", { style: { color: "#fca5a5", marginLeft: 6 }, children: "(failed)" })
             ] }),
             /* @__PURE__ */ jsxs("span", { style: { opacity: 0.75 }, children: [
               formatMs(duration),
@@ -5982,14 +6029,14 @@ function TimelineBars({
               style: {
                 height: "100%",
                 width: `${Math.max(widthPct, 0.3)}%`,
-                background: stepColor(step),
+                background: stepColor(step2),
                 transition: "width 0.2s ease"
               }
             }
           )
         }
       )
-    ] }, `${step.step}-${step.startTime}`);
+    ] }, `${step2.step}-${step2.startTime}`);
   });
   return /* @__PURE__ */ jsxs("div", { children: [
     bars,