impact-chatbot 2.3.43 → 2.3.48

package/dist/index.esm.js

@@ -5073,6 +5073,26 @@ const sseevent = (message, messageToStoreRef) => {
             messageToStoreRef.current.chatData.response =
                 messageToStoreRef.current.chatData.response +
                     "There is an error, please reach out to IA with this use case.";
+            // Still process completed/follow-up status even on error chunks
+            // so that initValue is set correctly and dummyButton is suppressed
+            if (parsedData?.status === "completed" ||
+                parsedData?.status === "follow-up") {
+                messageToStoreRef.current.initValue = true;
+                messageToStoreRef.current.sessionId = "";
+                messageToStoreRef.current.uniqueChatId = parsedData?.chat_id
+                    ? parsedData.chat_id
+                    : "";
+                messageToStoreRef.current.status = parsedData?.status;
+            }
+            return new MessageEvent(type, { data: data });
+        }
+        if (parsedData?.status === "notification") {
+            messageToStoreRef.current.notificationData = {
+                message: parsedData?.message || "",
+                chat_id: parsedData?.chat_id || "",
+                session_id: parsedData?.session_id || "",
+            };
+            // Do NOT append notification messages to chatData.response — return early
             return new MessageEvent(type, { data: data });
         }
         if (parsedData?.status === "thinking") {
@@ -5111,13 +5131,6 @@ const sseevent = (message, messageToStoreRef) => {
                 ? parsedData.additional_args
                 : {};
         }
-        if (parsedData?.status === "notification") {
-            messageToStoreRef.current.notificationData = {
-                message: parsedData?.message || "",
-                chat_id: parsedData?.chat_id || "",
-                session_id: parsedData?.session_id || "",
-            };
-        }
         if (parsedData?.status === "completed" ||
             parsedData?.status === "follow-up") {
             messageToStoreRef.current.initValue = true;
@@ -5273,6 +5286,9 @@ const stepFormStreamControl = {
     chatId: "",
     agentId: "",
     baseUrl: "",
+    // Completed/follow-up state — persists across ButtonContent remounts
+    initValue: false,
+    uniqueChatId: "",
 };
 const useStyles$5 = makeStyles((theme) => ({
     buttonContainer: {
@@ -5335,8 +5351,15 @@ const ButtonContent = ({ bodyText, isFormDisabled = false, isStepFormSubmit = fa
     };
     const callInitApiStream = (userInput) => {
         // Prefer module-level values (set synchronously by StreamedContent), fall back to sessionStorage
-        const sessionId = stepFormStreamControl.sessionId || sessionStorage.getItem("stepForm_sessionId") || "";
-        const chatId = stepFormStreamControl.chatId || sessionStorage.getItem("stepForm_chatId") || "";
+        // If a previous completed/follow-up response updated the state, use those values.
+        // Read from module-level stepFormStreamControl (survives remounts) instead of local messageStoreRef.
+        const hasCompletedState = stepFormStreamControl.initValue === true;
+        const sessionId = hasCompletedState
+            ? (stepFormStreamControl.sessionId ?? "")
+            : (stepFormStreamControl.sessionId || sessionStorage.getItem("stepForm_sessionId") || "");
+        const chatId = hasCompletedState
+            ? (stepFormStreamControl.uniqueChatId ?? "")
+            : (stepFormStreamControl.chatId || sessionStorage.getItem("stepForm_chatId") || "");
         const agentId = stepFormStreamControl.agentId || sessionStorage.getItem("stepForm_agentId") || "";
         const baseUrl = stepFormStreamControl.baseUrl || sessionStorage.getItem("stepForm_baseUrl") || "";
         const payload = {
@@ -5344,9 +5367,14 @@ const ButtonContent = ({ bodyText, isFormDisabled = false, isStepFormSubmit = fa
             session_id: sessionId,
             chat_id: chatId,
             user_input: userInput,
-            init: false,
+            init: hasCompletedState ? true : false,
             delay: 0.3,
         };
+        // Reset the flag so subsequent calls don't re-use stale completed state
+        if (hasCompletedState) {
+            messageStoreRef.current.initValue = false;
+            stepFormStreamControl.initValue = false;
+        }
         const endPoint = baseUrl
             ? `${BASE_API}${baseUrl}/chatbot/agent/init`
             : `${BASE_API}/core/chatbot/agent/init`;
@@ -5365,10 +5393,10 @@ const ButtonContent = ({ bodyText, isFormDisabled = false, isStepFormSubmit = fa
             if (sessionId) {
                 stopAgentFlow({ session_id: sessionId }, baseUrl);
             }
-            dispatch(setStepFormStreamData({ status: "error", chunks: [...chunksRef] }));
+            dispatch(setStepFormStreamData({ status: "error", chunks: [...chunksRef], sessionId }));
         };
         // Signal that streaming has started (after setting stepFormStreamControl so useEffect sees the flag)
-        dispatch(setStepFormStreamData({ status: "streaming_start", chunks: [] }));
+        dispatch(setStepFormStreamData({ status: "streaming_start", chunks: [], sessionId }));
         // Fire DOM event so SmartBot can show stop icon (Redux gets cleared by TabularContent before parent effects run)
         window.dispatchEvent(new CustomEvent("stepFormStreamStart"));
         sourceRef.current = AxiosSource(endPoint, {
@@ -5388,24 +5416,40 @@ const ButtonContent = ({ bodyText, isFormDisabled = false, isStepFormSubmit = fa
                 console.log("[ButtonContent] SSE chunk:", data);
                 if (data?.status === "step" || data?.status === "step_form" || data?.status === "questions" || data?.status === "thinking" || data?.status === "widget") {
                     chunksRef.push(data);
+                    // Dispatch widget chunks immediately for real-time rendering
+                    if (data?.status === "widget") {
+                        dispatch(setStepFormStreamData({ status: "widget_chunk", chunks: [data], sessionId }));
+                    }
                     // If this chunk also carries [DONE], dispatch collected chunks now
                     if (data?.message === "[DONE]") {
                         stepFormStreamControl.isStreaming = false;
                         stepFormStreamControl.abort = null;
                         window.dispatchEvent(new CustomEvent("stepFormStreamEnd"));
-                        dispatch(setStepFormStreamData({ status: "done", chunks: [...chunksRef] }));
+                        dispatch(setStepFormStreamData({ status: "done", chunks: [...chunksRef], sessionId }));
                     }
                 }
-                else if (data?.status === "completed" || data?.message === "[DONE]") {
+                else if (data?.status === "completed" || data?.status === "follow-up" || data?.message === "[DONE]") {
+                    // Update messageStoreRef the same way AxiosEventSource does for completed/follow-up
+                    if (data?.status === "completed" || data?.status === "follow-up") {
+                        messageStoreRef.current.initValue = true;
+                        messageStoreRef.current.sessionId = "";
+                        messageStoreRef.current.uniqueChatId = data?.chat_id ? data.chat_id : "";
+                        // Also persist on module-level object so it survives ButtonContent remounts
+                        stepFormStreamControl.initValue = true;
+                        stepFormStreamControl.sessionId = "";
+                        stepFormStreamControl.uniqueChatId = data?.chat_id ? data.chat_id : "";
+                    }
                     // Stream ended — dispatch all collected chunks at once
                     stepFormStreamControl.isStreaming = false;
                     stepFormStreamControl.abort = null;
                     window.dispatchEvent(new CustomEvent("stepFormStreamEnd"));
-                    // Signal tab switch to agent_response when status is "completed"
-                    if (data?.status === "completed") {
+                    // Signal tab switch to agent_response when status is "completed",
+                    // but only if the response doesn't contain a new step_form that needs user interaction
+                    const hasStepForm = chunksRef.some((c) => c.status === "step_form");
+                    if (data?.status === "completed" && !hasStepForm) {
                         window.dispatchEvent(new CustomEvent("stepFormStreamCompleted"));
                     }
-                    dispatch(setStepFormStreamData({ status: "done", chunks: [...chunksRef] }));
+                    dispatch(setStepFormStreamData({ status: "done", chunks: [...chunksRef], sessionId }));
                 }
                 else if (data?.message) {
                     chunksRef.push({ status: "content", message: data.message });
@@ -5420,7 +5464,7 @@ const ButtonContent = ({ bodyText, isFormDisabled = false, isStepFormSubmit = fa
             stepFormStreamControl.isStreaming = false;
             stepFormStreamControl.abort = null;
             window.dispatchEvent(new CustomEvent("stepFormStreamEnd"));
-            dispatch(setStepFormStreamData({ status: "error", chunks: chunksRef }));
+            dispatch(setStepFormStreamData({ status: "error", chunks: chunksRef, sessionId }));
         });
     };
     const renderButtons = () => {
@@ -6512,10 +6556,8 @@ const getQuestionStatus$1 = (questionSteps) => {
 /**
  * Renders a single progress bar item (main point + sub-items)
  */
-const ProgressBarItem$1 = ({ question, questionSteps, isLast, classes, formData, showSavedFilters = true, isFormDisabled, isRestreaming = false, onAllSubItemsAnimated = undefined }) => {
-    const baseStatus = getQuestionStatus$1(questionSteps);
-    // When restreaming and this is the last item, show as in-progress
-    const status = (isRestreaming && isLast) ? "in-progress" : baseStatus;
+const ProgressBarItem$1 = ({ question, questionSteps, isLast, classes, formData, showSavedFilters = true, isFormDisabled, onAllSubItemsAnimated = undefined }) => {
+    const status = getQuestionStatus$1(questionSteps);
     const animatedCountRef = useRef(0);
     const [isExpanded, setIsExpanded] = useState(true);
     const dotClass = status === "completed"
@@ -6559,8 +6601,14 @@ const Steps$1 = ({ steps, setSteps, done, setTabValue, setDone, finalStepDone, s
     const lastQuestionCompleted = lastQuestionSteps &&
         lastQuestionSteps.length > 0 &&
         lastQuestionSteps.every((s) => s.step_status === "completed");
+    const hasStepFormData = Object.keys(stepFormDataMap).length > 0;
     useEffect(() => {
         if (done) {
+            // Don't auto-switch to agent_response tab when there's a step form pending user interaction
+            if (hasStepFormData) {
+                setFinalStepDone(true);
+                return;
+            }
             if (!finalStepDone) {
                 if (currentMode === "navigation") {
                     let updatedSteps = steps.map((step) => ({
@@ -6610,7 +6658,7 @@ const Steps$1 = ({ steps, setSteps, done, setTabValue, setDone, finalStepDone, s
                     step_status: "not-completed",
                 },
             ];
-        return (jsx("div", { className: classes.progressBarContainer, children: jsx(ProgressBarItem$1, { question: fallbackQuestion, questionSteps: fallbackSteps, isLast: true, classes: classes, formData: null, isFormDisabled: isFormDisabled, showSavedFilters: true }) }));
+        return (jsx("div", { className: classes.progressBarContainer, children: jsx(ProgressBarItem$1, { question: fallbackQuestion, questionSteps: fallbackSteps, isLast: true, classes: classes, formData: null, isFormDisabled: isFormDisabled }) }));
     }
     return (jsxs("div", { className: classes.progressBarContainer, children: [questions.map((question, index) => {
                 const questionData = questionsStepsMap[question];
@@ -6633,17 +6681,40 @@ const Steps$1 = ({ steps, setSteps, done, setTabValue, setDone, finalStepDone, s
                 }, children: jsx(ProgressBarItem$1, { question: "Thinking", questionSteps: [{ header: "", sub_header: "", step_status: "not-completed" }], isLast: true, classes: classes, formData: null, isFormDisabled: isFormDisabled }) }))] }));
 };
 
+const renderWidgetItem = (item, index) => {
+    try {
+        const parsedData = parseResponse(item, item.type, "", "", true);
+        if (!parsedData)
+            return null;
+        const key = `streaming-widget-${index}`;
+        switch (parsedData.bodyType) {
+            case "text":
+                return jsx(TextContent, { bodyText: parsedData.bodyText, botData: parsedData }, key);
+            case "table":
+                return jsx(TableContent, { bodyText: parsedData.bodyText }, key);
+            case "graph":
+                return jsx(GraphContent, { bodyText: parsedData.bodyText }, key);
+            default:
+                return null;
+        }
+    }
+    catch (e) {
+        console.error("[AgentResponse] renderWidgetItem error:", e);
+        return null;
+    }
+};
 const AgentResponse$1 = (props) => {
-    const { content, isStreaming } = props;
+    const { content, isStreaming, streamingWidgetData = [] } = props;
     const classes = useStyles$4();
     const chatClasses = useStyles$7();
-    return (jsx("div", { className: chatClasses.agentResponseContainer, children: content ? (jsxs(Typography, { className: chatClasses.bodyTextStyling, children: [jsx(TextRenderer, { text: content }), isStreaming && jsx("span", { className: classes.cursor })] })) : (
-        // Show cursor even when no content yet
-        isStreaming && jsx("span", { className: classes.cursor })) }));
+    const renderedWidgets = streamingWidgetData
+        .map((item, index) => renderWidgetItem(item, index))
+        .filter(Boolean);
+    return (jsxs("div", { className: chatClasses.agentResponseContainer, children: [content ? (jsxs(Typography, { className: chatClasses.bodyTextStyling, children: [jsx(TextRenderer, { text: content }), isStreaming && renderedWidgets.length === 0 && jsx("span", { className: classes.cursor })] })) : null, renderedWidgets.length > 0 && (jsx("div", { className: "streaming-widget-content", children: renderedWidgets })), isStreaming && (renderedWidgets.length > 0 || !content) && (jsx("span", { className: classes.cursor }))] }));
 };
 
 const StepsResponseTab = (props) => {
-    const { steps, setSteps, stepsDone, setStepsDone, finalStepDone, setFinalStepDone, content, isStreaming, stepChange, currentMode, questions, questionsStepsMap, stepFormDataMap, isFormDisabled, } = props;
+    const { steps, setSteps, stepsDone, setStepsDone, finalStepDone, setFinalStepDone, content, isStreaming, stepChange, currentMode, questions, questionsStepsMap, stepFormDataMap, isFormDisabled, streamingWidgetData, } = props;
     const [tabValue, setTabValue] = useState("steps");
     const handleChangeTabValue = (_event, newValue) => {
         setTabValue(newValue);
@@ -6661,7 +6732,7 @@ const StepsResponseTab = (props) => {
                 },
             ], tabPanels: [
                 jsx(Steps$1, { steps: steps, setSteps: setSteps, done: stepsDone, setDone: setStepsDone, setTabValue: setTabValue, finalStepDone: finalStepDone, setFinalStepDone: setFinalStepDone, stepChange: stepChange, currentMode: currentMode, questions: questions, questionsStepsMap: questionsStepsMap, stepFormDataMap: stepFormDataMap, isFormDisabled: isFormDisabled }),
-                jsx(AgentResponse$1, { content: content, isStreaming: isStreaming }),
+                jsx(AgentResponse$1, { content: content, isStreaming: isStreaming, streamingWidgetData: streamingWidgetData }),
             ], value: tabValue }) }));
 };
 
@@ -6711,6 +6782,7 @@ const StreamedContent = ({ botData }) => {
     // const [thinkingContent, setThinkingContent] = useState("");
     const [thinkDone, setThinkDone] = useState(false);
     const [isStreaming, setIsStreaming] = useState(true);
+    const [streamingWidgetData, setStreamingWidgetData] = useState([]);
     const [thinkingStarted, setThinkingStarted] = useState(false);
     const [isStreamingDone, setIsStreamingDone] = useState(false);
     const [isThinking, setIsThinking] = useState(false);
@@ -6885,7 +6957,7 @@ const StreamedContent = ({ botData }) => {
                     }));
                     return;
                 }
-                if (data?.message || data?.status === "step" || data?.status === "step_form" || data?.status === "thinking" || data?.status === "questions") {
+                if (data?.message || data?.status === "step" || data?.status === "step_form" || data?.status === "thinking" || data?.status === "questions" || data?.status === "widget") {
                     if (data.status === "questions") {
                         const incomingQuestions = data.widget_data?.[0]?.questions || [];
                         questionsRef.current = incomingQuestions;
@@ -6998,6 +7070,15 @@ const StreamedContent = ({ botData }) => {
                             : [data.widget_data];
                         const currentIntent = data.current_intent || formWidgetData?.[0]?.current_intent;
                         if (currentIntent) {
+                            // Auto-create question/intent entry if no prior step chunk created it
+                            if (!questionsStepsMapRef.current[currentIntent]) {
+                                questionsStepsMapRef.current[currentIntent] = [];
+                                if (!questionsRef.current.includes(currentIntent)) {
+                                    questionsRef.current = [...questionsRef.current, currentIntent];
+                                    setQuestions([...questionsRef.current]);
+                                }
+                                setQuestionsStepsMap(cloneDeep(questionsStepsMapRef.current));
+                            }
                             const sendButton = document.getElementById("chat-input-send-button");
                             const stepFormSubmitButton = {
                                 type: "button",
@@ -7037,12 +7118,20 @@ const StreamedContent = ({ botData }) => {
                         stepFormStreamControl.baseUrl = _burl;
                         // If this is the [DONE] chunk, mark streaming as complete
                         if (data.message === "[DONE]") {
+                            setStepsDone(true);
                             setIsStreamingDone(true);
                             const doneState = streamStateMap.get(streamKey);
                             if (doneState)
                                 doneState.completed = true;
                         }
                     }
+                    else if (data.status === "widget") {
+                        // Render widget data immediately as it arrives during streaming
+                        const widgetItems = isArray(data.widget_data)
+                            ? data.widget_data
+                            : [data.widget_data];
+                        setStreamingWidgetData((prev) => [...prev, ...widgetItems]);
+                    }
                     else if (data.message !== "[DONE]") {
                         if (!thinkingDoneRef?.current && currentMode === "agent") {
                             thinkingDoneRef.current = true;
@@ -7125,6 +7214,13 @@ const StreamedContent = ({ botData }) => {
             const store = messageToStoreRef.current;
             // Restore accumulated content
             setContent(store.chatData?.response || "");
+            // Restore widget data received so far
+            if (isArray(store.appendedData) && store.appendedData.length > 0) {
+                setStreamingWidgetData(store.appendedData);
+            }
+            else if (store.appendedData && !isArray(store.appendedData) && Object.keys(store.appendedData).length > 0) {
+                setStreamingWidgetData([store.appendedData]);
+            }
             // Restore thinking state
             if (store.chatData?.thinkingResponse?.thinkingStream) {
                 thinkingContentRef.current = store.chatData.thinkingResponse.thinkingStream;
@@ -7191,15 +7287,21 @@ const StreamedContent = ({ botData }) => {
                     dispatch(setCurrentAgentChatId(messageToStoreRef.current.uniqueChatId));
                 }
                 // Persist IDs for step form restream (ButtonContent reads these)
-                sessionStorage.setItem("stepForm_sessionId", messageToStoreRef.current.sessionId || "");
-                sessionStorage.setItem("stepForm_chatId", messageToStoreRef.current.uniqueChatId || "");
-                sessionStorage.setItem("stepForm_agentId", botData.inputBody?.agent_id || "");
-                sessionStorage.setItem("stepForm_baseUrl", baseUrl || "");
-                // Also sync module-level control object
-                stepFormStreamControl.sessionId = messageToStoreRef.current.sessionId || "";
-                stepFormStreamControl.chatId = messageToStoreRef.current.uniqueChatId || "";
-                stepFormStreamControl.agentId = botData.inputBody?.agent_id || "";
-                stepFormStreamControl.baseUrl = baseUrl || "";
+                const _sid2 = messageToStoreRef.current.sessionId || "";
+                const _cid2 = messageToStoreRef.current.uniqueChatId || "";
+                const _aid2 = botData.inputBody?.agent_id || "";
+                const _burl2 = baseUrl || "";
+                sessionStorage.setItem("stepForm_sessionId", _sid2);
+                sessionStorage.setItem("stepForm_chatId", _cid2);
+                sessionStorage.setItem("stepForm_agentId", _aid2);
+                sessionStorage.setItem("stepForm_baseUrl", _burl2);
+                stepFormStreamControl.sessionId = _sid2;
+                stepFormStreamControl.chatId = _cid2;
+                stepFormStreamControl.agentId = _aid2;
+                stepFormStreamControl.baseUrl = _burl2;
+                // Persist completed/follow-up state so ButtonContent can read it after remount
+                stepFormStreamControl.initValue = messageToStoreRef.current.initValue;
+                stepFormStreamControl.uniqueChatId = _cid2;
                 let appendedDataLength = 0;
                 // Use appendedDataFromLastChunk for field number calculation like host app
                 if (isArray(messageToStoreRef.current.appendedDataFromLastChunk)) {
@@ -7247,14 +7349,16 @@ const StreamedContent = ({ botData }) => {
                             data: isEmpty(dummyButton)
                                 ? [textResponseTobeParsed, ...finalData]
                                 : [textResponseTobeParsed, ...finalData, dummyButton],
+                            session_id: messageToStoreRef.current.sessionId || "",
                         },
                     },
                 };
+                const hasStepFormWidgets = !isEmpty(stepFormDataMapRef.current);
                 processResponse(response, botData.inputBody, currentMode, botData.utilityObject.customChatConfig, {
                     newChatData: chatDataInfoRef,
                     isTabEnabled: true,
                     steps: cloneDeep(stepRef.current),
-                    currentTabValue: stepsDone ? "agent_response" : undefined,
+                    currentTabValue: (stepsDone && !hasStepFormWidgets) ? "agent_response" : "steps",
                     questions: cloneDeep(questionsRef.current),
                     questionsStepsMap: cloneDeep(questionsStepsMapRef.current),
                     stepFormDataMap: { ...stepFormDataMapRef.current },
@@ -7330,6 +7434,7 @@ const StreamedContent = ({ botData }) => {
                     data: {
                         data: {
                             data: [textResponseTobeParsed, ...finalData],
+                            session_id: messageToStoreRef.current.sessionId || "",
                         },
                     },
                 };
@@ -7340,7 +7445,7 @@ const StreamedContent = ({ botData }) => {
                     newChatData: chatDataInfoRef,
                     isTabEnabled: true,
                     steps: cloneDeep(stepRef.current),
-                    currentTabValue: stepsDone ? "agent_response" : undefined,
+                    currentTabValue: stepsDone ? "agent_response" : "steps",
                     questions: cloneDeep(questionsRef.current),
                     questionsStepsMap: cloneDeep(questionsStepsMapRef.current),
                     stepFormDataMap: { ...stepFormDataMapRef.current },
@@ -7487,7 +7592,7 @@ const StreamedContent = ({ botData }) => {
      * @returns {JSX.Element} Rendered content with optional blinking cursor
      */
     const renderContent = () => {
-        return (jsx("div", { className: classes.streamContainer, children: jsx(StepsResponseTab, { steps: steps, stepChange: stepChange, setSteps: setSteps, stepsDone: stepsDone, setStepsDone: setStepsDone, finalStepDone: finalStepDone, setFinalStepDone: setFinalStepDone, content: content, isStreaming: isStreaming, currentMode: currentMode, questions: questions, questionsStepsMap: questionsStepsMap, stepFormDataMap: stepFormDataMap, isFormDisabled: botData?.isFormDisabled || false }) }));
+        return (jsx("div", { className: classes.streamContainer, children: jsx(StepsResponseTab, { steps: steps, stepChange: stepChange, setSteps: setSteps, stepsDone: stepsDone, setStepsDone: setStepsDone, finalStepDone: finalStepDone, setFinalStepDone: setFinalStepDone, content: content, isStreaming: isStreaming, currentMode: currentMode, questions: questions, questionsStepsMap: questionsStepsMap, stepFormDataMap: stepFormDataMap, isFormDisabled: botData?.isFormDisabled || false, streamingWidgetData: streamingWidgetData }) }));
     };
     if (currentMode === "agent") {
         return renderContent();
@@ -7750,7 +7855,11 @@ const AgentResponse = ({ children }) => {
     return (jsx("div", { className: classes.agentResponseContainer, children: children }));
 };
 
-const TabularContent = ({ steps: initialSteps, currentTabValue, children, questions: initialQuestions = [], questionsStepsMap: initialQuestionsStepsMap = {}, stepFormDataMap: initialStepFormDataMap = {}, isFormDisabled = false }) => {
+// Module-level counter and active instance tracker.
+// Only the active instance should process stepFormStreamData from Redux.
+let instanceCounter = 0;
+let activeTabularInstanceId = null;
+const TabularContent = ({ steps: initialSteps, currentTabValue, children, questions: initialQuestions = [], questionsStepsMap: initialQuestionsStepsMap = {}, stepFormDataMap: initialStepFormDataMap = {}, isFormDisabled = false, sessionId: propSessionId = "" }) => {
     const dispatch = useDispatch();
     const stepFormStreamData = useSelector((state) => state.smartBotReducer.stepFormStreamData);
     const [tabValue, setTabValue] = useState(currentTabValue);
@@ -7774,6 +7883,12 @@ const TabularContent = ({ steps: initialSteps, currentTabValue, children, questi
     const [stepFormSubmitted, setStepFormSubmitted] = useState(false);
     const [hasNewStepFormFromRestream, setHasNewStepFormFromRestream] = useState(false);
     const [activeFormIntent, setActiveFormIntent] = useState(null);
+    // Stable unique instance ID for this TabularContent mount
+    const instanceIdRef = useRef(null);
+    if (instanceIdRef.current === null) {
+        instanceCounter += 1;
+        instanceIdRef.current = instanceCounter;
+    }
     // Refs for accumulating state during streaming (avoids stale closures)
     const stepsRef = useRef(stepsState);
     const questionsRef = useRef(questionsState);
@@ -7815,10 +7930,21 @@ const TabularContent = ({ steps: initialSteps, currentTabValue, children, questi
             return null;
         }
     };
+    // Register as active instance when this TabularContent has an active step form
+    useEffect(() => {
+        const hasActiveForm = Object.keys(initialStepFormDataMap).length > 0;
+        if (hasActiveForm) {
+            activeTabularInstanceId = instanceIdRef.current;
+        }
+    }, [initialStepFormDataMap]);
     // Watch Redux for batched SSE chunks dispatched by ButtonContent
     useEffect(() => {
         if (!stepFormStreamData)
             return;
+        // Only the active instance should process stepFormStreamData
+        if (activeTabularInstanceId !== null && activeTabularInstanceId !== instanceIdRef.current) {
+            return;
+        }
         const payload = stepFormStreamData;
         // Clear Redux immediately
         dispatch(setStepFormStreamData(null));
@@ -7829,6 +7955,24 @@ const TabularContent = ({ steps: initialSteps, currentTabValue, children, questi
             setTabValue("steps");
             return;
         }
+        // Handle real-time widget chunks dispatched immediately by ButtonContent
+        if (payload.status === "widget_chunk") {
+            const chunks = payload.chunks || [];
+            const newWidgets = [];
+            chunks.forEach((data) => {
+                if (data.status === "widget") {
+                    const widgetItems = isArray$2(data.widget_data) ? data.widget_data : [data.widget_data];
+                    widgetItems.forEach((item) => {
+                        if (item)
+                            newWidgets.push(item);
+                    });
+                }
+            });
+            if (newWidgets.length > 0) {
+                setWidgetContent((prev) => [...prev, ...newWidgets]);
+            }
+            return;
+        }
         // Process all collected chunks at once (done or error)
         const chunks = payload.chunks || [];
         let newSteps = cloneDeep(stepsRef.current);
@@ -7902,6 +8046,13 @@ const TabularContent = ({ steps: initialSteps, currentTabValue, children, questi
                 const formWidgetData = isArray$2(data.widget_data) ? data.widget_data : [data.widget_data];
                 const currentIntent = data.current_intent || formWidgetData?.[0]?.current_intent;
                 if (currentIntent) {
+                    // Auto-create question/intent entry if no prior step chunk created it
+                    if (!newQuestionsStepsMap[currentIntent]) {
+                        newQuestionsStepsMap[currentIntent] = [];
+                        if (!newQuestions.includes(currentIntent)) {
+                            newQuestions.push(currentIntent);
+                        }
+                    }
                     const submitButton = {
                         type: "button",
                         data: {
@@ -7922,13 +8073,7 @@ const TabularContent = ({ steps: initialSteps, currentTabValue, children, questi
                     };
                 }
             }
-            if (data.status === "widget") {
-                const widgetItems = isArray$2(data.widget_data) ? data.widget_data : [data.widget_data];
-                widgetItems.forEach((item) => {
-                    if (item)
-                        newWidgets.push(item);
-                });
-            }
+            if (data.status === "widget") ;
             if (data.status === "content" && data.message) {
                 newWidgets.push({ type: "text", response: data.message });
             }
@@ -7953,6 +8098,8 @@ const TabularContent = ({ steps: initialSteps, currentTabValue, children, questi
             setStepFormSubmitted(false);
             setHasNewStepFormFromRestream(true);
             setActiveFormIntent(latestIntent || null);
+            // Re-register as active instance since this TabularContent now owns the new form
+            activeTabularInstanceId = instanceIdRef.current;
             // Clear stale persisted form values and context so the new form starts fresh
             dispatch(clearPersistedFormValues());
             dispatch(setChatbotContext({}));
@@ -7977,6 +8124,10 @@ const TabularContent = ({ steps: initialSteps, currentTabValue, children, questi
                 jsxs(AgentResponse, { children: [children, renderedWidgets.length > 0 && (jsx("div", { className: "restream-widget-content", children: renderedWidgets }))] }),
             ], value: tabValue }) }));
 };
+/** Reset the active instance tracker (call when a new conversation starts from the input field) */
+const resetActiveTabularInstance = () => {
+    activeTabularInstanceId = null;
+};
 
 const CombinedContent = ({ botData, props }) => {
     const isFormDisabled = botData?.isFormDisabled || false;
@@ -8045,7 +8196,7 @@ const CombinedContent = ({ botData, props }) => {
     const validContent = renderedContent.filter(content => content !== null);
     const renderCombinedContent = () => (jsx("div", { className: "combined-content-container", children: validContent.length > 0 ? (validContent.map((content, index) => (jsx("div", { className: "combined-content-item", children: content }, `wrapper-${index}`)))) : (jsx("div", { children: "No valid content to display" })) }));
     if (isTabEnabled) {
-        return (jsx(TabularContent, { steps: botData?.utilityData?.steps || [], currentTabValue: botData?.utilityData?.currentTabValue || "steps", questions: botData?.utilityData?.questions || [], questionsStepsMap: botData?.utilityData?.questionsStepsMap || {}, stepFormDataMap: botData?.utilityData?.stepFormDataMap || {}, isFormDisabled: isFormDisabled, children: renderCombinedContent() }));
+        return (jsx(TabularContent, { steps: botData?.utilityData?.steps || [], currentTabValue: botData?.utilityData?.currentTabValue || "steps", questions: botData?.utilityData?.questions || [], questionsStepsMap: botData?.utilityData?.questionsStepsMap || {}, stepFormDataMap: botData?.utilityData?.stepFormDataMap || {}, isFormDisabled: isFormDisabled, sessionId: botData?.sessionId || "", children: renderCombinedContent() }));
     }
     return renderCombinedContent();
 };
@@ -10552,7 +10703,21 @@ const ChatbotInput = (props) => {
         if (newChatScreen) {
             clearFilterValuesCache();
         }
+        // Auto-focus editor on mount
+        setTimeout(() => {
+            if (editorRef.current) {
+                editorRef.current.focus();
+            }
+        }, 100);
     }, []);
+    // Effect: Re-focus editor when filter set changes (e.g. chip cleared)
+    useEffect(() => {
+        setTimeout(() => {
+            if (editorRef.current) {
+                editorRef.current.focus();
+            }
+        }, 50);
+    }, [selectedFilterSet]);
     // Effect: Cleanup tooltips on unmount
     useEffect(() => {
         return () => {
@@ -10762,7 +10927,8 @@ const ChatbotInput = (props) => {
                 !target.closest("button") &&
                 !target.closest(".chat-actions") &&
                 !target.closest(".filter-set-trigger-wrapper") &&
-                !target.closest(".filter-set-chip-clear")) {
+                !target.closest(".filter-set-chip-clear") &&
+                !target.closest(".mention-select-wrapper")) {
                 editorRef.current.focus();
             }
         }, children: jsxs("div", { className: `chat-input-wrapper ${isFixed ? "stacked" : ""} ${selectedFilterSet ? "has-filter-selected" : ""} ${(!isFixed || inputValue === "") && !newChatScreen && !selectedFilterSet ? "empty" : ""} ${!newChatScreen && !isFixed && !selectedFilterSet ? "single-line-textarea" : ""}`, style: { height }, children: [jsxs("div", { className: "chat-input-left-actions", children: [jsxs("div", { className: "filter-set-trigger-wrapper", ref: filterSetSelectRef, children: [jsx(Tooltip, { title: hasMentionsInEditor || showMentionSelect ? "Cannot use filter set while @ mentions are active" : "Add filter set", children: jsx("button", { type: "button", className: `filter-set-plus-btn${hasMentionsInEditor || showMentionSelect ? " disabled" : ""}`, onClick: () => {
@@ -11551,10 +11717,13 @@ const useStyles = makeStyles({
     buttonWrapper: {
         marginTop: "16px",
     },
+    hidden: {
+        display: "none",
+    },
 });
 const ChatbotSaveFilterComponent = (props) => {
     const classes = useStyles();
-    const { savedFilterSets } = props;
+    const { savedFilterSets, partialClose, chatBotWidth } = props;
     const [showFilter, setShowFilter] = useState(!isEmpty$1(savedFilterSets));
     /**
  * onFilterDashboardClick function is called when we click the apply filter
@@ -11588,6 +11757,12 @@ const ChatbotSaveFilterComponent = (props) => {
             setShowFilter(true);
         }
     }, [savedFilterSets]);
+    useEffect(() => {
+        const drawer = document.querySelector(".MuiModal-root.MuiDrawer-root");
+        if (drawer) {
+            drawer.style.display = partialClose ? "none" : "";
+        }
+    }, [partialClose]);
     useEffect(() => {
         if (!showFilter)
             return;
@@ -11621,11 +11796,13 @@ const ChatbotSaveFilterComponent = (props) => {
             }
             const filterContainer = document.querySelector(".impact_drawer_filter_container.impact_drawer_filter_container_large");
             if (filterContainer) {
-                filterContainer.style.setProperty("width", "616px");
+                const computedWidth = chatBotWidth ? `${chatBotWidth - 86}px` : "616px";
+                filterContainer.style.setProperty("width", computedWidth);
             }
             const rightPanel = document.querySelector(".impact_drawer_filter_container .impact_drawer_filter_container_right_panel");
             if (rightPanel) {
                 rightPanel.style.setProperty("height", "600px");
+                rightPanel.style.setProperty("width", "100%");
             }
             const backdrop = document.querySelector(".MuiBackdrop-root.MuiModal-backdrop");
             if (backdrop) {
@@ -11659,8 +11836,8 @@ const ChatbotSaveFilterComponent = (props) => {
         const observer = new MutationObserver(patchDrawer);
         observer.observe(document.body, { childList: true, subtree: true });
         return () => observer.disconnect();
-    }, [showFilter]);
-    return (jsx(Fragment, { children: !showFilter ?
+    }, [showFilter, chatBotWidth]);
+    return (jsx("div", { className: partialClose ? classes.hidden : undefined, children: !showFilter ?
             jsxs("div", { className: classes.container, children: [jsx(NoFilterSetSavedIcon, { width: "189px", height: "126px", className: classes.icon }), jsx("p", { className: classes.title, children: "No filter set saved!" }), jsx("p", { className: classes.subtitle, children: "Create and save a filter set to use as your default scope or apply it anytime during a conversation" }), jsx("div", { className: classes.buttonWrapper, children: jsx(Button, { variant: "primary", onClick: () => setShowFilter(true), children: "Create A Filter Set" }) })] }) :
             jsx("div", { children: jsx(CoreComponentScreen, { showPageHeader: false, 
                     // Filter dashboard props
@@ -11693,6 +11870,7 @@ const SmartBot = (props) => {
     // Per-mode conversation ID tracking — prevents cross-mode contamination when
     // switching tabs while streams are pending.
     useRef({});
+    const activeConversationIdRef = useRef(activeConversationId);
     const activeTab = useRef({
         activeTab: "dashboard",
     });
@@ -11711,6 +11889,7 @@ const SmartBot = (props) => {
     const [filterOptions, setFilterOptions] = useState([]);
     const [savedFilterSets, setSavedFilterSets$1] = useState([]);
     const [selectedFilterSet, setSelectedFilterSet] = useState(null);
+    const [chatBotWidth, setChatBotWidth] = useState(null);
     useRef(0);
     const { setUserFlow, setUserScreenAndFlow, fetchUserResultsFromQuery, getCurrentDateTimeString, setLink, } = useChatFlow(chatDataRef, setLoader, setFlowType, setScreenName, setUserInput, setQuestionIndex, setCurrentAppLink, flowType, screenName, questionIndex, userInput, dateFormat, currentMode, activeConversationId, setIsModuleChanged, chatBodyRef, filterReducerState, dispatch, navigate, setShowChatPlaceholder, baseUrl, setChatDataState, setCurrentSessionId, customChatConfig, chatDataInfoRef, chatbotContext, setInitValue, setSessionId, thinkingContent, setThinkingContent, isThinking, setIsThinking, chatId, setChatId, isStop, setIsStop, functionsRef, functionsState, setFunctionsState, thinkingHeaderMessage, setThinkingHeaderMessage, uniqueChatId, initValue, sessionId, fieldNumber, setFieldNumber, additionalArgs, setActiveConversationId, navSessionId, setNavSessionId);
     const { parseSavedFlow, saveCurrentChanges, endCurrentSession, clearChatSession, initiateNewChat, hasUnsavedChanges, } = useChatSession(chatDataRef, setFlowType, setScreenName, setUserInput, setTemplateData, chatDataScreenLinkRef, setShowModal, setMinimizedMode, setSelectedModule, setChatDataState, currentMode, setUserFlow, getCurrentDateTimeString, setCurrentAppLink, selectedModule, fetchUserResultsFromQuery, props.closeBot, activeConversationId, setActiveConversationId, setShowChatPlaceholder);
@@ -11743,6 +11922,10 @@ const SmartBot = (props) => {
         setFieldNumber,
         setAdditionalArgs,
     });
+    // Keep activeConversationIdRef in sync so event handlers with [] deps can access the latest value
+    useEffect(() => {
+        activeConversationIdRef.current = activeConversationId;
+    }, [activeConversationId]);
     // Show/hide stop icon when step-form restream (second init API from ButtonContent) starts/ends.
     // Must live here (SmartBot) because StreamedContent unmounts after the first stream completes.
     useEffect(() => {
@@ -11764,6 +11947,23 @@ const SmartBot = (props) => {
         };
         const handleStepFormStreamEnd = () => {
             setIsStop(false);
+            // Update the timestamp on the last bot message to reflect when the restream completed
+            try {
+                const mode = localStorage.getItem("currentModeData") || "agent";
+                const convId = activeConversationIdRef.current;
+                const messages = chatDataInfoRef?.current?.[mode]?.conversations?.[convId]?.messages;
+                if (messages && messages.length > 0) {
+                    const lastBotIdx = messages.reduce((lastIdx, msg, idx) => msg.userType === "bot" ? idx : lastIdx, -1);
+                    if (lastBotIdx !== -1) {
+                        messages[lastBotIdx].timeStamp = moment().format(dateFormat);
+                        // Trigger re-render so the UI reflects the updated timestamp
+                        setChatDataState((prev) => ({ ...prev }));
+                    }
+                }
+            }
+            catch (e) {
+                console.error("Error updating timestamp after step form stream:", e);
+            }
         };
         window.addEventListener("stepFormStreamStart", handleStepFormStreamStart);
         window.addEventListener("stepFormStreamEnd", handleStepFormStreamEnd);
@@ -12069,7 +12269,6 @@ const SmartBot = (props) => {
                         newMessage.utilityObject = originalUtilityObject;
                     }
                     message.jsx = (jsx(BotMessage, { botData: newMessage, state: loadingState, handleLikeDislike: handleLikeDislike, props: properties }));
-                    message.firstMessage = true;
                     let actualProps = {
                         botData: newMessage,
                         state: loadingState,
@@ -12077,6 +12276,7 @@ const SmartBot = (props) => {
                         props: properties,
                     };
                     message.actualProps = actualProps;
+                    message.firstMessage = true;
                     // message.enableLikes = true;
                 }
             });
@@ -12200,6 +12400,9 @@ const SmartBot = (props) => {
     };
     const onSendIconClick = (params, params2) => {
         try {
+            // Reset step form stream state so old TabularContent instances don't process new data
+            dispatch(setStepFormStreamData(null));
+            resetActiveTabularInstance();
             // dispatch(setChatbotContext({}));
             setUserInput(params?.text);
             handleSendMessage(params?.text, params?.userExplicitInput, params?.textWithColumnNames);
@@ -12366,6 +12569,8 @@ const SmartBot = (props) => {
                     localStorage.setItem("isStreaming", "false");
                     dispatch(setChatbotContext({}));
                     dispatch(clearPersistedFormValues());
+                    dispatch(setStepFormStreamData(null));
+                    resetActiveTabularInstance();
                     setConversation([]);
                     chatDataInfoRef.current[currentMode] = {
                         conversations: {},
@@ -12515,18 +12720,50 @@ const SmartBot = (props) => {
                         // isActive: activeTab.current.activeTab === "agent",
                         // initialClick: true,
                         onClick: (params) => {
+                            // if (localStorage.getItem("isStreaming") === "true") {
+                            //   displaySnackMessages(
+                            //     "Please wait till the current request is completed",
+                            //     "warning"
+                            //   );
+                            //   return;
+                            // } else {
+                            // const agentConversations = chatDataInfoRef?.current[params?.name?.toLowerCase()]?.conversations;
+                            // const firstConversationId = agentConversations ? Object.keys(agentConversations)[0] : undefined;
                             if (params?.name?.toLowerCase() === "saved filters") {
                                 setNewChatScreen(false);
                                 setShowChatPlaceholder(false);
                                 setShowSavedFilters(true);
+                                // if (
+                                //   !isEmpty(
+                                //     agentConversations?.[firstConversationId]?.messages
+                                //   )
+                                // ) {
+                                //   setShowChatPlaceholder(false);
+                                // } else {
+                                //   setShowChatPlaceholder(true);
+                                // }
                             }
+                            // setCurrentMode(params?.name?.toLowerCase());
+                            // if (firstConversationId) {
+                            //   setActiveConversationId(firstConversationId);
+                            // }
+                            // localStorage.setItem(
+                            //   "currentModeData",
+                            //   params?.name?.toLowerCase()
+                            // );
+                            // setNewChatScreen(false);
+                            // activeTab.current.activeTab = "agent";
+                            // setIsStop(false);
+                            // }
+                            // setConversation([]);
+                            // chatDataInfoRef.current[currentMode] = [];
                         },
                         icon: jsx(SvgSaveFilterTab, {}),
                     },
                 ], utilityList: utilityList, isAssistantThinking: false, isCustomScreen: showChatPlaceholder ? showChatPlaceholder : showSavedFilters, customScreenJsx: showChatPlaceholder ?
                     jsx(ChatPlaceholder, { dateFormat: dateFormat, chatDataRef: chatDataRef, currentMode: currentMode, setShowChatPlaceholder: setShowChatPlaceholder, setLoader: setLoader, setCurrentAgentId: setCurrentAgentId, baseUrl: baseUrl, setBaseUrl: setBaseUrl, setCurrentSessionId: setCurrentSessionId, customChatConfig: customChatConfig, chatDataInfoRef: chatDataInfoRef, setChatDataState: setChatDataState, userInput: userInput, legacyAgentScreen: legacyAgentScreen, activeConversationId: activeConversationId, chatBodyRef: chatBodyRef, chatbotContext: chatbotContext, setInitValue: setInitValue, setSessionId: setSessionId, thinkingContent: thinkingContext?.thinkingContent, setThinkingContent: setThinkingContent, isThinking: isThinking, setIsThinking: setIsThinking, chatId: chatId, setChatId: setChatId, isStop: isStop, setIsStop: setIsStop, functionsRef: functionsRef, functionsState: functionsState, setFunctionsState: setFunctionsState, thinkingHeaderMessage: thinkingContext?.thinkingHeaderMessage, setThinkingHeaderMessage: setThinkingHeaderMessage, uniqueChatId: uniqueChatId, setUniqueChatId: setUniqueChatId, fieldNumber: fieldNumber, setFieldNumber: setFieldNumber, setAdditionalArgs: setAdditionalArgs, displayQuestions: displayQuestions, questions: questions, setActiveConversationId: setActiveConversationId })
                     :
-                        jsx(ChatbotSaveFilterComponent$1, { savedFilterSets: savedFilterSets }), inputText: userInput, threadList: ["Home"], hideMenuArrow: hideMenu, newChatScreen: newChatScreen, isModuleListLoading: modulesLoading, suggestionBanner: {
+                        jsx(ChatbotSaveFilterComponent$1, { savedFilterSets: savedFilterSets, partialClose: partialClose, chatBotWidth: chatBotWidth }), inputText: userInput, threadList: ["Home"], hideMenuArrow: hideMenu, newChatScreen: newChatScreen, isModuleListLoading: modulesLoading, suggestionBanner: {
                     freeTextHeading: "Try adding more details :",
                     freeTextContent: "Alan works better when you provide more context and pointed questions",
                 }, isStopIcon: isStop, onStopIconClick: onStopIconClick, footerText: "AI-generated responses may contain errors\u2014please verify important information", showSuggestionBanner: showSavedFilters ? false : showSuggestionBanner, onCloseSuggestionBanner: () => {
@@ -12546,7 +12783,9 @@ const SmartBot = (props) => {
                 }, handleSaveChat: () => {
                     // Handle save chat logic here
                     saveCurrentChat();
-                } })] }));
+                }, onChatBotResize: (params) => {
+                    setChatBotWidth(params);
+                }, onMinimiseChatBot: null })] }));
 };
 
 export { SmartBot as default };