← All changes | js/chat-script.js +206 -515 3.2.2 → 3.0.4 View file →

		@@ -1,23 +1,6 @@
1	1	jQuery(document).ready(function($) {
2	2
3		- // Nonce refresh is deferred until first user interaction (ensureSession)
4		- // to avoid admin-ajax calls on passive page loads.
5		- var nonceRefreshed = false;
6		- function refreshNonceIfNeeded(callback) {
7		- if (nonceRefreshed || typeof mxchatChat === 'undefined' || !mxchatChat.ajax_url) {
8		- if (callback) callback();
9		- return;
10		- }
11		- nonceRefreshed = true;
12		- $.post(mxchatChat.ajax_url, { action: 'mxchat_refresh_nonce' }, function(res) {
13		- if (res && res.success && res.data && res.data.nonce) {
14		- mxchatChat.nonce = res.data.nonce;
15		- }
16		- if (callback) callback();
17		- });
18		- }
19		-
20	3	// ====================================
21	4	// MULTI-INSTANCE MANAGEMENT SYSTEM
22	5	// ====================================
23	6
		@@ -27,15 +10,11 @@
27	10
28	11	// Initialize an instance for a bot
29	12	init: function(botId) {
30	13	if (!this.instances[botId]) {
31		- // When persistence is OFF, track when this session started
32		- // so the AI only sees messages from this page load
33		- var chatPersistenceEnabled = typeof mxchatChat !== 'undefined' && mxchatChat.chat_persistence_toggle === 'on';
34		-
35	14	this.instances[botId] = {
36	15	botId: botId,
37		- sessionId: null,
	16	+ sessionId: this.getChatSession(botId),
38	17	lastSeenMessageId: '',
39	18	notificationCheckInterval: null,
40	19	pollingInterval: null,
41	20	processedMessageIds: new Set(),
		@@ -41,11 +20,9 @@
41	20	processedMessageIds: new Set(),
42	21	activePdfFile: null,
43	22	activeWordFile: null,
44	23	chatHistoryLoaded: false,
45		- isStreaming: false,
46		- // Fresh context timestamp - only used when persistence is OFF
47		- sessionStartTimestamp: chatPersistenceEnabled ? 0 : Date.now()
	24	+ isStreaming: false
48	25	};
49	26	}
50	27	return this.instances[botId];
51	28	},
		@@ -60,64 +37,23 @@
60	37	return Object.keys(this.instances);
61	38	},
62	39
63	40	// Session management per bot
64		- // Returns existing session ID from cookie or localStorage, or null if none exists.
65		- // Does NOT create a new session — use ensureSession() for that.
66	41	getChatSession: function(botId) {
67	42	var cookieName = 'mxchat_session_id_' + botId;
68		- var storageKey = 'mxchat_session_id_' + botId;
69	43	var sessionId = getCookie(cookieName);
70	44
71		- // Fallback to localStorage if cookie is missing (e.g. cleared by browser/consent)
72	45	if (!sessionId) {
73		- try { sessionId = localStorage.getItem(storageKey); } catch (e) {}
	46	+ sessionId = generateSessionId();
	47	+ this.setChatSession(botId, sessionId);
74	48	}
75	49
76		- // Re-sync cookie from localStorage if cookie was lost
77		- if (sessionId && !getCookie(cookieName)) {
78		- document.cookie = cookieName + "=" + sessionId + "; path=/; max-age=86400; SameSite=Lax";
79		- }
80		-
81		- return sessionId || null;
	50	+ return sessionId;
82	51	},
83	52
84		- // Lazy session initializer — called on first user interaction
85		- ensureSession: function(botId) {
86		- botId = botId || 'default';
87		- var instance = this.instances[botId] || this.init(botId);
88		-
89		- if (instance.sessionId) {
90		- return instance.sessionId;
91		- }
92		-
93		- // Check for existing session from cookie or localStorage
94		- var existingSession = this.getChatSession(botId);
95		-
96		- if (existingSession) {
97		- instance.sessionId = existingSession;
98		- } else {
99		- // Brand new session
100		- var newId = generateSessionId();
101		- this.setChatSession(botId, newId);
102		- instance.sessionId = newId;
103		- }
104		-
105		- // Now that we have a session, do the deferred work
106		- refreshNonceIfNeeded();
107		- trackOriginatingPage();
108		-
109		- // Note: loadChatHistory is handled by showChatContainerForBot with loader UI,
110		- // so we do NOT call it here to avoid a race condition.
111		-
112		- return instance.sessionId;
113		- },
114		-
115	53	setChatSession: function(botId, sessionId) {
116	54	var cookieName = 'mxchat_session_id_' + botId;
117		- var storageKey = 'mxchat_session_id_' + botId;
118	55	document.cookie = cookieName + "=" + sessionId + "; path=/; max-age=86400; SameSite=Lax";
119		- try { localStorage.setItem(storageKey, sessionId); } catch (e) {}
120	56	if (this.instances[botId]) {
121	57	this.instances[botId].sessionId = sessionId;
122	58	}
123	59	},
		@@ -122,10 +58,8 @@
122	58	}
123	59	},
124	60
125	61	resetChatSession: function(botId) {
126		- // Clear old session from localStorage before setting new one
127		- try { localStorage.removeItem('mxchat_session_id_' + botId); } catch (e) {}
128	62	var newSessionId = generateSessionId();
129	63	this.setChatSession(botId, newSessionId);
130	64	var $chatBox = getElement(botId, 'chat-box');
131	65	if ($chatBox.length) {
		@@ -134,20 +68,8 @@
134	68	if (this.instances[botId]) {
135	69	this.instances[botId].chatHistoryLoaded = false;
136	70	this.instances[botId].processedMessageIds = new Set();
137	71	}
138		- },
139		-
140		- // Silent reset — new session ID without clearing the chat UI
141		- // Used when IP changes mid-conversation so the user doesn't see messages vanish
142		- silentResetSession: function(botId) {
143		- try { localStorage.removeItem('mxchat_session_id_' + botId); } catch (e) {}
144		- var newSessionId = generateSessionId();
145		- this.setChatSession(botId, newSessionId);
146		- if (this.instances[botId]) {
147		- this.instances[botId].sessionId = newSessionId;
148		- }
149		- return newSessionId;
150	72	}
151	73	};
152	74
153	75	// ====================================
		@@ -452,9 +374,8 @@
452	374
453	375	// Update your existing sendMessage function
454	376	function sendMessage(botId) {
455	377	botId = botId || 'default';
456		- MxChatInstances.ensureSession(botId);
457	378	var $chatInput = getElement(botId, 'chat-input');
458	379	var message = $chatInput.val();
459	380
460	381	// ADD PROMPT HOOK HERE
		@@ -462,14 +383,10 @@
462	383	message = customMxChatFilter(message, "prompt");
463	384	}
464	385
465	386	if (message) {
466		- // Don't disable input in live agent mode - let users chat freely
467		- var modeIndicator = getElementDOM(botId, 'chat-mode-indicator');
468		- var isAgentMode = modeIndicator && modeIndicator.textContent === 'Live Agent';
469		- if (!isAgentMode) {
470		- disableChatInput(botId);
471		- }
	387	+ // Disable input while waiting for response
	388	+ disableChatInput(botId);
472	389
473	390	appendMessage("user", message, '', [], false, botId);
474	391	$chatInput.val('');
475	392	$chatInput.css('height', 'auto');
		@@ -479,9 +396,9 @@
479	396	}
480	397	appendThinkingMessage(botId);
481	398	scrollToBottom(botId);
482	399
483		- const currentModel = mxchatChat.model || 'gpt-5.1-chat-latest';
	400	+ const currentModel = mxchatChat.model || 'gpt-4o';
484	401
485	402	// Check if streaming is enabled AND supported for this model
486	403	if (shouldUseStreaming(currentModel)) {
487	404	callMxChatStream(message, function(response) {
		@@ -497,9 +414,8 @@
497	414
498	415	// Update your existing sendMessageToChatbot function
499	416	function sendMessageToChatbot(message, botId) {
500	417	botId = botId || 'default';
501		- MxChatInstances.ensureSession(botId);
502	418
503	419	// ADD PROMPT HOOK HERE
504	420	if (typeof customMxChatFilter === 'function') {
505	421	message = customMxChatFilter(message, "prompt");
		@@ -504,14 +420,10 @@
504	420	if (typeof customMxChatFilter === 'function') {
505	421	message = customMxChatFilter(message, "prompt");
506	422	}
507	423
508		- // Don't disable input in live agent mode - let users chat freely
509		- var modeIndicator = getElementDOM(botId, 'chat-mode-indicator');
510		- var isAgentMode = modeIndicator && modeIndicator.textContent === 'Live Agent';
511		- if (!isAgentMode) {
512		- disableChatInput(botId);
513		- }
	424	+ // Disable input while waiting for response
	425	+ disableChatInput(botId);
514	426
515	427	var sessionId = getChatSession(botId);
516	428
517	429	if (hasQuickQuestions(botId)) {
		@@ -519,9 +431,9 @@
519	431	}
520	432	appendThinkingMessage(botId);
521	433	scrollToBottom(botId);
522	434
523		- const currentModel = mxchatChat.model || 'gpt-5.1-chat-latest';
	435	+ const currentModel = mxchatChat.model || 'gpt-4o';
524	436
525	437	// Check if streaming is enabled AND supported for this model
526	438	if (shouldUseStreaming(currentModel)) {
527	439	callMxChatStream(message, function(response) {
		@@ -596,11 +508,8 @@
596	508
597	509	// Get page context if contextual awareness is enabled
598	510	const pageContext = getPageContext();
599	511
600		- // Get instance for session start timestamp (used when persistence is OFF)
601		- var instance = MxChatInstances.get(botId);
602		-
603	512	// Prepare AJAX data
604	513	const ajaxData = {
605	514	action: 'mxchat_handle_chat_request',
606	515	message: message,
		@@ -607,11 +516,9 @@
607	516	session_id: getChatSession(botId),
608	517	nonce: mxchatChat.nonce,
609	518	current_page_url: window.location.href,
610	519	current_page_title: document.title,
611		- bot_id: botId,
612		- // Pass session start timestamp so AI context matches what user sees
613		- session_start_timestamp: instance.sessionStartTimestamp || 0
	520	+ bot_id: botId
614	521	};
615	522
616	523	// Add page context if available
617	524	if (pageContext) {
		@@ -667,16 +574,23 @@
667	574	errorMessage = "An error occurred. Please try again or contact support.";
668	575	}
669	576
670	577	// Handle session reset action (IP changed, session expired, etc.)
671		- // Silent reset — keep chat UI intact, just get a new session and retry
672	578	if (response.data && response.data.action === 'reset_session') {
673		- MxChatInstances.silentResetSession(botId);
674		- // Re-send the original message with the new session (user message is already displayed)
	579	+ // Clear the old session and generate a new one
	580	+ resetChatSession(botId);
	581	+ // Remove the temporary loading message
	582	+ getElement(botId, 'chat-box').find('.bot-message.temporary-message').remove();
	583	+ // Re-send the original message with the new session
675	584	var originalMessage = getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message');
676	585	if (originalMessage) {
677	586	getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message', null);
678		- var currentModel = mxchatChat.model || 'gpt-5.1-chat-latest';
	587	+ // Re-add the user message and thinking indicator
	588	+ appendMessage("user", originalMessage, '', [], false, botId);
	589	+ appendThinkingMessage(botId);
	590	+ scrollToBottom(botId);
	591	+ // Determine whether to use streaming
	592	+ const currentModel = mxchatChat.model || 'gpt-4o';
679	593	if (shouldUseStreaming(currentModel)) {
680	594	callMxChatStream(originalMessage, function(response) {
681	595	getElement(botId, 'chat-box').find('.bot-message.temporary-message').removeClass('temporary-message');
682	596	}, botId);
		@@ -733,11 +647,9 @@
733	647	}
734	648
735	649	// Check for live agent response
736	650	if (response.success && response.data && response.data.status === 'waiting_for_agent') {
737		- removeThinkingDots(botId);
738	651	updateChatModeIndicator('agent', botId);
739		- enableChatInput(botId);
740	652	return;
741	653	}
742	654
743	655	// Handle the message and show notification if chat is hidden
		@@ -770,13 +682,9 @@
770	682	$badge.show();
771	683	}
772	684	}
773	685	} else {
774		- var emptyMsg = "I received an empty response. Please try again or contact support if this persists.";
775		- if (response.vectorstore_error) {
776		- emptyMsg = "I received an empty response. Debug info: " + response.vectorstore_error;
777		- }
778		- replaceLastMessage("bot", emptyMsg, '', [], botId);
	686	+ replaceLastMessage("bot", "I received an empty response. Please try again or contact support if this persists.", '', [], botId);
779	687	}
780	688
781	689	if (response.message_id) {
782	690	var instance = MxChatInstances.get(botId);
		@@ -826,9 +734,9 @@
826	734
827	735	// Store the message in case we need to retry after session reset
828	736	getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message', message);
829	737
830		- const currentModel = mxchatChat.model || 'gpt-5.1-chat-latest';
	738	+ const currentModel = mxchatChat.model || 'gpt-4o';
831	739	if (!isStreamingSupported(currentModel)) {
832	740	callMxChat(message, callback, botId);
833	741	return;
834	742	}
		@@ -835,11 +743,8 @@
835	743
836	744	// Get page context if contextual awareness is enabled
837	745	const pageContext = getPageContext();
838	746
839		- // Get instance for session start timestamp (used when persistence is OFF)
840		- var instance = MxChatInstances.get(botId);
841		-
842	747	const formData = new FormData();
843	748	formData.append('action', 'mxchat_stream_chat');
844	749	formData.append('message', message);
845	750	formData.append('session_id', getChatSession(botId));
		@@ -846,11 +751,9 @@
846	751	formData.append('nonce', mxchatChat.nonce);
847	752	formData.append('current_page_url', window.location.href);
848	753	formData.append('current_page_title', document.title);
849	754	formData.append('bot_id', botId);
850		- // Pass session start timestamp so AI context matches what user sees
851		- formData.append('session_start_timestamp', instance.sessionStartTimestamp || 0);
852		-
	755	+
853	756	// Add page context if available
854	757	if (pageContext) {
855	758	formData.append('page_context', JSON.stringify(pageContext));
856	759	}
		@@ -1087,16 +990,21 @@
1087	990	errorMessage = "An error occurred. Please try again or contact support.";
1088	991	}
1089	992
1090	993	// Handle session reset action (IP changed, session expired, etc.)
1091		- // Silent reset — keep chat UI intact, just get a new session and retry
1092	994	if (data.data && data.data.action === 'reset_session') {
1093		- MxChatInstances.silentResetSession(botId);
1094		- // Re-send the original message with the new session (user message is already displayed)
	995	+ // Clear the old session and generate a new one
	996	+ resetChatSession(botId);
	997	+ // Re-send the original message with the new session
1095	998	var originalMessage = getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message');
1096	999	if (originalMessage) {
1097	1000	getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message', null);
1098		- var currentModel = mxchatChat.model || 'gpt-5.1-chat-latest';
	1001	+ // Re-add the user message and thinking indicator
	1002	+ appendMessage("user", originalMessage, '', [], false, botId);
	1003	+ appendThinkingMessage(botId);
	1004	+ scrollToBottom(botId);
	1005	+ // Determine whether to use streaming
	1006	+ const currentModel = mxchatChat.model || 'gpt-4o';
1099	1007	if (shouldUseStreaming(currentModel)) {
1100	1008	callMxChatStream(originalMessage, callback, botId);
1101	1009	} else {
1102	1010	callMxChat(originalMessage, callback, botId);
		@@ -1118,22 +1026,8 @@
1118	1026	}
1119	1027	return; // Exit early for errors
1120	1028	}
1121	1029
1122		- // Check for live agent response
1123		- if (data.success && data.data && data.data.status === 'waiting_for_agent') {
1124		- removeThinkingDots(botId);
1125		- // Also remove any leftover bot-message that lost its temporary-message class
1126		- var $chatBox = getElement(botId, 'chat-box');
1127		- $chatBox.find('.bot-message .thinking-dots').closest('.bot-message').remove();
1128		- updateChatModeIndicator('agent', botId);
1129		- enableChatInput(botId);
1130		- if (callback) {
1131		- callback('');
1132		- }
1133		- return;
1134		- }
1135		-
1136	1030	// Handle different response formats
1137	1031	if (data.text || data.html || data.message) {
1138	1032
1139	1033	// Apply response hooks
		@@ -1178,15 +1072,19 @@
1178	1072	}
1179	1073
1180	1074	// Enhanced updateChatModeIndicator function for immediate DOM updates
1181	1075	function updateChatModeIndicator(mode, botId) {
	1076	+ console.log('[MxChat] updateChatModeIndicator called with mode:', mode, 'botId:', botId);
1182	1077	botId = botId || 'default';
1183	1078	const indicator = getElementDOM(botId, 'chat-mode-indicator');
	1079	+ console.log('[MxChat] chat-mode-indicator element found:', !!indicator);
1184	1080	if (indicator) {
1185	1081	const oldText = indicator.textContent;
	1082	+ console.log('[MxChat] Current indicator text:', oldText, '-> changing to mode:', mode);
1186	1083
1187	1084	if (mode === 'agent') {
1188	1085	indicator.textContent = 'Live Agent';
	1086	+ console.log('[MxChat] Mode is agent, calling startPolling...');
1189	1087	startPolling(botId);
1190	1088	} else {
1191	1089	// Everything else is AI mode
1192	1090	const customAiText = indicator.getAttribute('data-ai-text') || 'AI Agent';
		@@ -1257,12 +1155,9 @@
1257	1155	// Update the event handlers to use the correct function names (using event delegation)
1258	1156	// Use class-based selectors for multi-instance support
1259	1157	$(document).on('click', '.send-button', function() {
1260	1158	var botId = getBotIdFromElement(this);
1261		- var modeIndicator = getElementDOM(botId, 'chat-mode-indicator');
1262		- if (!(modeIndicator && modeIndicator.textContent === 'Live Agent')) {
1263		- disableChatInput(botId);
1264		- }
	1159	+ disableChatInput(botId);
1265	1160	sendMessage(botId);
1266	1161	});
1267	1162
1268	1163	// Override enter key handler (using event delegation)
		@@ -1269,12 +1164,9 @@
1269	1164	$(document).on('keypress', '.chat-input', function(e) {
1270	1165	if (e.which == 13 && !e.shiftKey) {
1271	1166	e.preventDefault();
1272	1167	var botId = getBotIdFromElement(this);
1273		- var modeIndicator = getElementDOM(botId, 'chat-mode-indicator');
1274		- if (!(modeIndicator && modeIndicator.textContent === 'Live Agent')) {
1275		- disableChatInput(botId);
1276		- }
	1168	+ disableChatInput(botId);
1277	1169	sendMessage(botId);
1278	1170	}
1279	1171	});
1280	1172
		@@ -1317,12 +1209,17 @@
1317	1209	'margin-bottom': '1em'
1318	1210	});
1319	1211	}
1320	1212
1321		- // Process the message content - always run linkify to convert markdown
1322		- // links and format text. linkify() handles existing HTML safely via
1323		- // negative lookaheads that skip URLs already inside <a> tags.
1324		- let fullMessage = linkify(messageText);
	1213	+ // Process the message content based on sender
	1214	+ let fullMessage;
	1215	+ if (sender === "user") {
	1216	+ // For user messages, apply linkify after sanitization
	1217	+ fullMessage = linkify(messageText);
	1218	+ } else {
	1219	+ // For bot/agent messages, preserve HTML
	1220	+ fullMessage = messageText;
	1221	+ }
1325	1222
1326	1223	// Add images if provided
1327	1224	if (images && images.length > 0) {
1328	1225	fullMessage += '<div class="image-gallery" dir="auto">';
		@@ -1457,12 +1354,26 @@
1457	1354	bgColor = botMessageBgColor;
1458	1355	fontColor = botMessageFontColor;
1459	1356	}
1460	1357
1461		- // Always run linkify to convert markdown links and format text.
1462		- // linkify() already handles existing HTML (its URL patterns use negative lookaheads
1463		- // to avoid double-processing URLs that are already inside <a> tags).
1464		- var fullMessage = linkify(responseText);
	1358	+ // FIXED: Only linkify if response doesn't already contain HTML links or tags
	1359	+ // This prevents double-processing of URLs that are already formatted as HTML
	1360	+ var fullMessage;
	1361	+ if (sender === "user") {
	1362	+ // Always linkify user messages (they're plain text)
	1363	+ fullMessage = linkify(responseText);
	1364	+ } else {
	1365	+ // For bot/agent messages, check if HTML already exists
	1366	+ if (responseText.includes('<a href=') || responseText.includes('</a>') ||
	1367	+ responseText.includes('<img') || responseText.includes('<div') ||
	1368	+ responseText.includes('<p>') || responseText.includes('<br>')) {
	1369	+ // Response already has HTML, don't process it
	1370	+ fullMessage = responseText;
	1371	+ } else {
	1372	+ // Plain text response, apply linkify
	1373	+ fullMessage = linkify(responseText);
	1374	+ }
	1375	+ }
1465	1376
1466	1377	if (responseHtml) {
1467	1378	// Only add line breaks if there's actual text content before the HTML
1468	1379	if (fullMessage && fullMessage.trim()) {
		@@ -1529,15 +1440,8 @@
1529	1440
1530	1441
1531	1442	function appendThinkingMessage(botId) {
1532	1443	botId = botId || 'default';
1533		-
1534		- // Don't show thinking dots in live agent mode - message is just forwarded to a human
1535		- var indicator = getElementDOM(botId, 'chat-mode-indicator');
1536		- if (indicator && indicator.textContent === 'Live Agent') {
1537		- return;
1538		- }
1539		-
1540	1444	var $chatBox = getElement(botId, 'chat-box');
1541	1445
1542	1446	// Remove any existing thinking dots in this bot's chat first
1543	1447	$chatBox.find('.thinking-dots').remove();
		@@ -1559,9 +1463,9 @@
1559	1463	'</div>' +
1560	1464	'</div>';
1561	1465
1562	1466	// Append the thinking dots to this bot's chat container - skip inline colors if AI theme is active
1563		- var messageStyle = skipColors ? '' : ' style="background-color: ' + botMessageBgColor + '; color: ' + botMessageFontColor + ';"';
	1467	+ var messageStyle = skipColors ? '' : ' style="background-color: ' + botMessageBgColor + ';"';
1564	1468	$chatBox.append('<div class="bot-message temporary-message"' + messageStyle + '>' + thinkingHtml + '</div>');
1565	1469	scrollToBottom(botId);
1566	1470	}
1567	1471
		@@ -1567,11 +1471,9 @@
1567	1471
1568	1472	function removeThinkingDots(botId) {
1569	1473	botId = botId || 'default';
1570	1474	var $chatBox = getElement(botId, 'chat-box');
1571		- // Remove by temporary-message class first, then fall back to any bot-message containing thinking dots
1572	1475	$chatBox.find('.thinking-dots').closest('.temporary-message').remove();
1573		- $chatBox.find('.bot-message .thinking-dots').closest('.bot-message').remove();
1574	1476	}
1575	1477
1576	1478	// ====================================
1577	1479	// TEXT FORMATTING & PROCESSING
		@@ -1605,12 +1507,9 @@
1605	1507	processedText = formatTextStyling(processedText);
1606	1508
1607	1509	// Process code blocks BEFORE processing links
1608	1510	processedText = formatCodeBlocks(processedText);
1609		-
1610		- // Process markdown tables BEFORE converting newlines to paragraphs
1611		- processedText = formatMarkdownTables(processedText);
1612		-
	1511	+
1613	1512	// NOW convert to paragraphs
1614	1513	processedText = convertNewlinesToBreaks(processedText);
1615	1514
1616	1515	// IMPORTANT: Handle citation-style brackets FIRST [URL]
		@@ -1623,63 +1522,37 @@
1623	1522	// Return as a proper link without the brackets
1624	1523	return `<a href="${safeUrl}" target="${linkTarget}">${cleanUrl}</a>`;
1625	1524	});
1626	1525
1627		- // Process markdown links: [text](url) and [](url)
1628		- // Uses balanced parenthesis matching to handle URLs containing parens
1629		- // (e.g. PDF filenames with dates like (2025-08-28).pdf)
1630		- processedText = (function(input) {
1631		- var result = '';
1632		- var i = 0;
1633		- while (i < input.length) {
1634		- // Look for [ at current position
1635		- if (input[i] === '[') {
1636		- // Find closing ]
1637		- var closeBracket = input.indexOf(']', i + 1);
1638		- if (closeBracket === -1 || closeBracket + 1 >= input.length || input[closeBracket + 1] !== '(') {
1639		- result += input[i];
1640		- i++;
1641		- continue;
1642		- }
1643		- var linkText = input.substring(i + 1, closeBracket);
1644		- // Check if URL starts with http
1645		- var urlStart = closeBracket + 2;
1646		- if (!input.substring(urlStart).match(/^https?:\/\//)) {
1647		- result += input[i];
1648		- i++;
1649		- continue;
1650		- }
1651		- // Find balanced closing paren
1652		- var depth = 1;
1653		- var j = urlStart;
1654		- while (j < input.length && depth > 0) {
1655		- if (input[j] === '(') depth++;
1656		- else if (input[j] === ')') depth--;
1657		- if (depth > 0) j++;
1658		- }
1659		- if (depth !== 0) {
1660		- result += input[i];
1661		- i++;
1662		- continue;
1663		- }
1664		- var url = input.substring(urlStart, j);
1665		- var cleanUrl = url.replace(/[\].,;!?]+$/, '');
1666		- var encodedUrl = safeEncodeUrl(cleanUrl);
1667		- if (!linkText || !linkText.trim()) {
1668		- result += '<a href="' + encodedUrl + '" target="' + linkTarget + '">' + cleanUrl + '</a>';
1669		- } else {
1670		- var safeText = sanitizeUserInput(linkText);
1671		- result += '<a href="' + encodedUrl + '" target="' + linkTarget + '">' + safeText + '</a>';
1672		- }
1673		- i = j + 1; // Skip past the closing )
1674		- } else {
1675		- result += input[i];
1676		- i++;
1677		- }
	1526	+ // Process proper markdown links with text: [text](url)
	1527	+ // This MUST have non-empty text in the first brackets
	1528	+ const markdownLinkPattern = /\[([^\]]+)\]\((https?:\/\/[^\s)]+)\)/g;
	1529	+ processedText = processedText.replace(markdownLinkPattern, (match, text, url) => {
	1530	+ // Make sure we have actual text (not just whitespace)
	1531	+ if (!text || !text.trim()) {
	1532	+ // If no text, treat the URL as the text
	1533	+ let cleanUrl = url.replace(/[.,;!?]+$/, '');
	1534	+ const safeUrl = safeEncodeUrl(cleanUrl);
	1535	+ return `<a href="${safeUrl}" target="${linkTarget}">${cleanUrl}</a>`;
1678	1536	}
1679		- return result;
1680		- })(processedText);
	1537	+
	1538	+ // Clean the URL
	1539	+ let cleanUrl = url.replace(/[\].,;!?]+$/, '');
	1540	+ const safeUrl = safeEncodeUrl(cleanUrl);
	1541	+ const safeText = sanitizeUserInput(text);
	1542	+ return `<a href="${safeUrl}" target="${linkTarget}">${safeText}</a>`;
	1543	+ });
1681	1544
	1545	+ // Handle empty markdown links: [](url)
	1546	+ // This is a specific case where there's no text
	1547	+ const emptyMarkdownPattern = /\[\]\((https?:\/\/[^\s)]+)\)/g;
	1548	+ processedText = processedText.replace(emptyMarkdownPattern, (match, url) => {
	1549	+ let cleanUrl = url.replace(/[.,;!?]+$/, '');
	1550	+ const safeUrl = safeEncodeUrl(cleanUrl);
	1551	+ // Use the URL itself as the link text
	1552	+ return `<a href="${safeUrl}" target="${linkTarget}">${cleanUrl}</a>`;
	1553	+ });
	1554	+
1682	1555	// Process phone numbers: [text](tel:number)
1683	1556	const phonePattern = /\[([^\]]+)\]\((tel:[\d+\-\s()]+)\)/g;
1684	1557	processedText = processedText.replace(phonePattern, (match, text, phone) => {
1685	1558	const safePhone = safeEncodeUrl(phone);
		@@ -1831,78 +1704,9 @@
1831	1704	});
1832	1705
1833	1706	return text;
1834	1707	}
1835		-
1836		- function formatMarkdownTables(text) {
1837		- var lines = text.split('\n');
1838		- var result = [];
1839		- var i = 0;
1840		-
1841		- while (i < lines.length) {
1842		- // Check for a table: current line has pipes AND next line is a separator row
1843		- if (i + 1 < lines.length &&
1844		- lines[i].indexOf('|') !== -1 &&
1845		- /^\s*\|?[\s\-:]+(\|[\s\-:]+)+\|?\s*$/.test(lines[i + 1])) {
1846		-
1847		- var tableLines = [];
1848		- var headerLine = lines[i];
1849		- var separatorLine = lines[i + 1];
1850		- tableLines.push(headerLine);
1851		- tableLines.push(separatorLine);
1852		-
1853		- // Collect remaining table rows
1854		- var j = i + 2;
1855		- while (j < lines.length && lines[j].indexOf('|') !== -1 && lines[j].trim() !== '') {
1856		- tableLines.push(lines[j]);
1857		- j++;
1858		- }
1859		-
1860		- // Parse alignment from separator row
1861		- var sepCells = separatorLine.split('|').filter(function(c) { return c.trim() !== ''; });
1862		- var alignments = sepCells.map(function(cell) {
1863		- var trimmed = cell.trim();
1864		- if (trimmed.charAt(0) === ':' && trimmed.charAt(trimmed.length - 1) === ':') return 'center';
1865		- if (trimmed.charAt(trimmed.length - 1) === ':') return 'right';
1866		- return 'left';
1867		- });
1868		-
1869		- // Build HTML table
1870		- var html = '<div class="mxchat-table-wrapper"><table class="mxchat-table">';
1871		-
1872		- // Header row
1873		- var headerCells = tableLines[0].split('|').filter(function(c) { return c.trim() !== ''; });
1874		- html += '<thead><tr>';
1875		- headerCells.forEach(function(cell, idx) {
1876		- var align = alignments[idx] || 'left';
1877		- html += '<th style="text-align:' + align + '">' + cell.trim() + '</th>';
1878		- });
1879		- html += '</tr></thead>';
1880		-
1881		- // Body rows
1882		- html += '<tbody>';
1883		- for (var r = 2; r < tableLines.length; r++) {
1884		- var rowCells = tableLines[r].split('|').filter(function(c) { return c.trim() !== ''; });
1885		- html += '<tr>';
1886		- rowCells.forEach(function(cell, idx) {
1887		- var align = alignments[idx] || 'left';
1888		- html += '<td style="text-align:' + align + '">' + cell.trim() + '</td>';
1889		- });
1890		- html += '</tr>';
1891		- }
1892		- html += '</tbody></table></div>';
1893		-
1894		- result.push(html);
1895		- i = j;
1896		- } else {
1897		- result.push(lines[i]);
1898		- i++;
1899		- }
1900		- }
1901		-
1902		- return result.join('\n');
1903		- }
1904		-
	1708	+
1905	1709	function sanitizeUserInput(text) {
1906	1710	const div = document.createElement('div');
1907	1711	div.textContent = text;
1908	1712	return div.innerHTML;
		@@ -2123,12 +1927,15 @@
2123	1927	// LIVE AGENT FUNCTIONALITY
2124	1928	// ====================================
2125	1929
2126	1930	function startPolling(botId) {
	1931	+ console.log('[MxChat] startPolling called for botId:', botId);
2127	1932	botId = botId || 'default';
2128	1933	var instance = MxChatInstances.get(botId);
2129	1934	// Clear any existing interval first
2130	1935	stopPolling(botId);
	1936	+ // Start new polling interval
	1937	+ console.log('[MxChat] Starting polling interval (5s) for botId:', botId);
2131	1938	instance.pollingInterval = setInterval(function() {
2132	1939	checkForAgentMessages(botId);
2133	1940	}, 5000);
2134	1941	}
		@@ -2133,17 +1940,20 @@
2133	1940	}, 5000);
2134	1941	}
2135	1942
2136	1943	function stopPolling(botId) {
	1944	+ console.log('[MxChat] stopPolling called for botId:', botId);
2137	1945	botId = botId || 'default';
2138	1946	var instance = MxChatInstances.get(botId);
2139	1947	if (instance.pollingInterval) {
2140	1948	clearInterval(instance.pollingInterval);
2141	1949	instance.pollingInterval = null;
	1950	+ console.log('[MxChat] Polling stopped for botId:', botId);
2142	1951	}
2143	1952	}
2144	1953
2145	1954	function checkForAgentMessages(botId) {
	1955	+ console.log('[MxChat] checkForAgentMessages called for botId:', botId);
2146	1956	botId = botId || 'default';
2147	1957	var instance = MxChatInstances.get(botId);
2148	1958	const sessionId = getChatSession(botId);
2149	1959	$.ajax({
		@@ -2169,12 +1979,8 @@
2169	1979	instance.processedMessageIds.add(message.id);
2170	1980	}
2171	1981	});
2172	1982
2173		- if (hasNewMessage) {
2174		- enableChatInput(botId);
2175		- }
2176		-
2177	1983	var $floatingChatbot = getElement(botId, 'floating-chatbot');
2178	1984	if (hasNewMessage && $floatingChatbot.hasClass('hidden')) {
2179	1985	showNotification(botId);
2180	1986	}
		@@ -2180,13 +1986,8 @@
2180	1986	}
2181	1987
2182	1988	scrollToBottom(botId, true);
2183	1989	}
2184		-
2185		- // Handle chat mode transitions (e.g. agent ended chat via !endchat)
2186		- if (response.success && response.data?.chat_mode) {
2187		- updateChatModeIndicator(response.data.chat_mode, botId);
2188		- }
2189	1990	},
2190	1991	error: function (xhr, status, error) {
2191	1992	// Polling error - silently continue
2192	1993	}
		@@ -2196,29 +1997,20 @@
2196	1997	// ====================================
2197	1998	// CHAT HISTORY & PERSISTENCE
2198	1999	// ====================================
2199	2000
2200		-function loadChatHistory(botId, onComplete) {
	2001	+function loadChatHistory(botId) {
2201	2002	botId = botId || 'default';
2202	2003	var instance = MxChatInstances.get(botId);
2203	2004
2204	2005	// Prevent duplicate loading
2205	2006	if (instance.chatHistoryLoaded) {
2206		- if (onComplete) onComplete();
2207	2007	return;
2208	2008	}
2209	2009
2210		- // Use getChatSession which returns null if no session exists (does NOT create one)
2211	2010	var sessionId = getChatSession(botId);
2212	2011	var chatPersistenceEnabled = mxchatChat.chat_persistence_toggle === 'on';
2213	2012
2214		- // No session yet — nothing to load. History will load after first message via ensureSession.
2215		- if (!sessionId) {
2216		- instance.chatHistoryLoaded = true;
2217		- if (onComplete) onComplete();
2218		- return;
2219		- }
2220		-
2221	2013	if (chatPersistenceEnabled && sessionId) {
2222	2014	$.ajax({
2223	2015	url: mxchatChat.ajax_url,
2224	2016	type: 'POST',
		@@ -2229,12 +2021,11 @@
2229	2021	},
2230	2022	success: function(response) {
2231	2023	// Handle session reset (IP changed while user was away)
2232	2024	if (response.success === false && response.data && response.data.action === 'reset_session') {
2233		- // Silent reset — new session but don't clear UI
2234		- MxChatInstances.silentResetSession(botId);
	2025	+ // Silently reset session - user will start fresh
	2026	+ resetChatSession(botId);
2235	2027	instance.chatHistoryLoaded = true; // Prevent retry loop
2236		- if (onComplete) onComplete();
2237	2028	return;
2238	2029	}
2239	2030
2240	2031	// Check if the response indicates success
		@@ -2290,19 +2081,9 @@
2290	2081	var content = message.content;
2291	2082	content = content.replace(/\\'/g, "'").replace(/\\"/g, '"');
2292	2083	content = decodeHTMLEntities(content);
2293	2084
2294		- // Skip linkify for messages containing structured HTML
2295		- // (forms, product cards, galleries, etc.) to avoid
2296		- // markdown formatting corrupting HTML attributes
2297		- // (e.g. underscores in name="field_name" becoming <em> tags)
2298		- if (content.includes("mxchat-product-card") ||
2299		- content.includes("mxchat-image-gallery") ||
2300		- content.includes("mxchat-featured-products") ||
2301		- content.includes("<form") ||
2302		- content.includes("<input") ||
2303		- content.includes("<select") ||
2304		- content.includes("<textarea")) {
	2085	+ if (content.includes("mxchat-product-card") || content.includes("mxchat-image-gallery")) {
2305	2086	messageElement.html(content);
2306	2087	} else {
2307	2088	var formattedContent = linkify(content);
2308	2089	messageElement.html(formattedContent);
		@@ -2342,17 +2123,13 @@
2342	2123	instance.chatHistoryLoaded = true;
2343	2124	}
2344	2125	}
2345	2126	}
2346		- if (onComplete) onComplete();
2347	2127	},
2348	2128	error: function(xhr, status, error) {
2349	2129	// Error loading chat history - silently continue
2350		- if (onComplete) onComplete();
2351	2130	}
2352	2131	});
2353		- } else {
2354		- if (onComplete) onComplete();
2355	2132	}
2356	2133	}
2357	2134
2358	2135
		@@ -2528,35 +2305,45 @@
2528	2305	// ====================================
2529	2306
2530	2307	function checkPreChatDismissal(botId) {
2531	2308	botId = botId || 'default';
2532		- try {
2533		- var dismissedAt = localStorage.getItem('mxchat_pre_chat_dismissed_' + botId);
2534		- if (dismissedAt) {
2535		- // Re-show after 24 hours
2536		- var elapsed = Date.now() - parseInt(dismissedAt, 10);
2537		- if (elapsed < 86400000) {
	2309	+ $.ajax({
	2310	+ url: mxchatChat.ajax_url,
	2311	+ type: 'POST',
	2312	+ data: {
	2313	+ action: 'mxchat_check_pre_chat_message_status',
	2314	+ _ajax_nonce: mxchatChat.nonce
	2315	+ },
	2316	+ success: function(response) {
	2317	+ if (response.success && !response.data.dismissed) {
	2318	+ getElement(botId, 'pre-chat-message').fadeIn(250);
	2319	+ } else {
2538	2320	getElement(botId, 'pre-chat-message').hide();
2539		- return;
2540	2321	}
2541		- // Expired — clear and show again
2542		- localStorage.removeItem('mxchat_pre_chat_dismissed_' + botId);
	2322	+ },
	2323	+ error: function() {
	2324	+ // Error checking pre-chat dismissal - silently continue
2543	2325	}
2544		- getElement(botId, 'pre-chat-message').fadeIn(250);
2545		- } catch (e) {
2546		- // localStorage unavailable — show the message
2547		- getElement(botId, 'pre-chat-message').fadeIn(250);
2548		- }
	2326	+ });
2549	2327	}
2550	2328
2551	2329	function handlePreChatDismissal(botId) {
2552	2330	botId = botId || 'default';
2553	2331	getElement(botId, 'pre-chat-message').fadeOut(200);
2554		- try {
2555		- localStorage.setItem('mxchat_pre_chat_dismissed_' + botId, String(Date.now()));
2556		- } catch (e) {
2557		- // localStorage unavailable — dismissal won't persist
2558		- }
	2332	+ $.ajax({
	2333	+ url: mxchatChat.ajax_url,
	2334	+ type: 'POST',
	2335	+ data: {
	2336	+ action: 'mxchat_dismiss_pre_chat_message',
	2337	+ _ajax_nonce: mxchatChat.nonce
	2338	+ },
	2339	+ success: function() {
	2340	+ $('#pre-chat-message').hide();
	2341	+ },
	2342	+ error: function() {
	2343	+ // Error dismissing pre-chat message - silently continue
	2344	+ }
	2345	+ });
2559	2346	}
2560	2347
2561	2348
2562	2349	// ====================================
		@@ -2623,26 +2410,8 @@
2623	2410	$(this).addClass('hidden');
2624	2411	$badge.hide(); // Hide notification when opening chat
2625	2412	disableScroll();
2626	2413	$preChat.fadeOut(250);
2627		-
2628		- // Load chat history for returning visitors (persistence)
2629		- var chatPersistenceEnabled = typeof mxchatChat !== 'undefined' && mxchatChat.chat_persistence_toggle === 'on';
2630		- if (chatPersistenceEnabled) {
2631		- MxChatInstances.ensureSession(botId);
2632		- }
2633		-
2634		- // Deferred email check — only on first widget open
2635		- var emailBlocker = getElementDOM(botId, 'email-blocker');
2636		- var instance = MxChatInstances.get(botId);
2637		- if (emailBlocker && !instance.emailCheckDone) {
2638		- instance.emailCheckDone = true;
2639		- resolveEmailState(botId);
2640		- } else if (!emailBlocker) {
2641		- // No email collection — still route through showChatContainerForBot
2642		- // so the loader is shown while chat history loads
2643		- showChatContainerForBot(botId);
2644		- }
2645	2414	} else {
2646	2415	$chatbot.removeClass('visible').addClass('hidden');
2647	2416	$(this).removeClass('hidden');
2648	2417	enableScroll();
		@@ -2660,9 +2429,11 @@
2660	2429
2661	2430	$(document).on('click', '.close-pre-chat-message', function(e) {
2662	2431	e.stopPropagation(); // Prevent triggering the parent .pre-chat-message click
2663	2432	var botId = getBotIdFromElement(this);
2664		- handlePreChatDismissal(botId);
	2433	+ getElement(botId, 'pre-chat-message').fadeOut(200, function() {
	2434	+ $(this).remove();
	2435	+ });
2665	2436	});
2666	2437
2667	2438
2668	2439	// PDF upload button handlers - use class selector
		@@ -2863,59 +2634,8 @@
2863	2634	});
2864	2635
2865	2636
2866	2637	// ====================================
2867		-// INIT LOADER & CHAT CONTAINER HELPERS
2868		-// ====================================
2869		-// These must be outside the email collection block so they're always available
2870		-// (used by persistence loading even when email collection is off)
2871		-
2872		-function showInitLoader(botId) {
2873		- var loader = getElementDOM(botId, 'mxchat-init-loader');
2874		- if (loader) loader.style.display = 'flex';
2875		-}
2876		-
2877		-function hideInitLoader(botId) {
2878		- var loader = getElementDOM(botId, 'mxchat-init-loader');
2879		- if (loader) loader.style.display = 'none';
2880		-}
2881		-
2882		-function showEmailFormForBot(botId) {
2883		- hideInitLoader(botId);
2884		- var emailBlocker = getElementDOM(botId, 'email-blocker');
2885		- var chatContainer = getElementDOM(botId, 'chat-container');
2886		- if (emailBlocker) emailBlocker.style.display = 'flex';
2887		- if (chatContainer) chatContainer.style.display = 'none';
2888		-}
2889		-
2890		-function showChatContainerForBot(botId) {
2891		- var emailBlocker = getElementDOM(botId, 'email-blocker');
2892		- var chatContainer = getElementDOM(botId, 'chat-container');
2893		- if (emailBlocker) emailBlocker.style.display = 'none';
2894		-
2895		- var instance = MxChatInstances.get(botId);
2896		- var chatPersistenceEnabled = mxchatChat.chat_persistence_toggle === 'on';
2897		-
2898		- // If persistence is on and history hasn't loaded yet, show loader
2899		- // while history loads to prevent flash of empty chat
2900		- if (chatPersistenceEnabled && !instance.chatHistoryLoaded) {
2901		- if (chatContainer) chatContainer.style.display = 'none';
2902		- showInitLoader(botId);
2903		- loadChatHistory(botId, function() {
2904		- hideInitLoader(botId);
2905		- if (chatContainer) chatContainer.style.display = 'flex';
2906		- scrollToBottom(botId, true);
2907		- });
2908		- } else {
2909		- hideInitLoader(botId);
2910		- if (chatContainer) chatContainer.style.display = 'flex';
2911		- if (typeof loadChatHistory === 'function') {
2912		- loadChatHistory(botId);
2913		- }
2914		- }
2915		-}
2916		-
2917		-// ====================================
2918	2638	// EMAIL COLLECTION SETUP - MULTI-INSTANCE VERSION
2919	2639	// ====================================
2920	2640	// Only run email collection setup if it's enabled
2921	2641	if (mxchatChat && mxchatChat.email_collection_enabled === 'on') {
		@@ -2951,8 +2671,28 @@
2951	2671	`;
2952	2672	document.head.appendChild(style);
2953	2673	}
2954	2674
	2675	+ // Helper functions for email collection (multi-instance aware)
	2676	+ function showEmailFormForBot(botId) {
	2677	+ var emailBlocker = getElementDOM(botId, 'email-blocker');
	2678	+ var chatContainer = getElementDOM(botId, 'chat-container');
	2679	+ if (emailBlocker) emailBlocker.style.display = 'flex';
	2680	+ if (chatContainer) chatContainer.style.display = 'none';
	2681	+ }
	2682	+
	2683	+ function showChatContainerForBot(botId) {
	2684	+ var emailBlocker = getElementDOM(botId, 'email-blocker');
	2685	+ var chatContainer = getElementDOM(botId, 'chat-container');
	2686	+ if (emailBlocker) emailBlocker.style.display = 'none';
	2687	+ if (chatContainer) chatContainer.style.display = 'flex';
	2688	+
	2689	+ // Load chat history for this bot
	2690	+ if (typeof loadChatHistory === 'function') {
	2691	+ loadChatHistory(botId);
	2692	+ }
	2693	+ }
	2694	+
2955	2695	function isValidEmailAddress(email) {
2956	2696	const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
2957	2697	return emailRegex.test(email.trim()) && email.length <= 254;
2958	2698	}
		@@ -2960,41 +2700,8 @@
2960	2700	function isValidNameInput(name) {
2961	2701	return name && name.trim().length >= 2 && name.trim().length <= 100;
2962	2702	}
2963	2703
2964		- /**
2965		- * Replace {visitor_name} placeholder in intro message with actual visitor name
2966		- * @param {string} botId - The bot instance ID
2967		- * @param {string} visitorName - The visitor's name to insert
2968		- */
2969		- function replaceVisitorNamePlaceholder(botId, visitorName) {
2970		- var chatBox = getElementDOM(botId, 'chat-box');
2971		- if (!chatBox) return;
2972		-
2973		- // Find the first bot message (intro message)
2974		- var introMessage = chatBox.querySelector('.bot-message');
2975		- if (!introMessage) return;
2976		-
2977		- var messageContent = introMessage.querySelector('div[dir="auto"]');
2978		- if (!messageContent) return;
2979		-
2980		- var html = messageContent.innerHTML;
2981		-
2982		- // Replace {visitor_name} placeholder (case-insensitive)
2983		- if (visitorName && visitorName.trim()) {
2984		- // Escape HTML to prevent XSS
2985		- var safeName = $('<div>').text(visitorName.trim()).html();
2986		- html = html.replace(/\{visitor_name\}/gi, safeName);
2987		- } else {
2988		- // Remove placeholder and clean up spacing if no name provided
2989		- html = html.replace(/\{visitor_name\}/gi, '');
2990		- // Clean up any double spaces that might result
2991		- html = html.replace(/\s{2,}/g, ' ').trim();
2992		- }
2993		-
2994		- messageContent.innerHTML = html;
2995		- }
2996		-
2997	2704	function setEmailSubmissionState(botId, loading) {
2998	2705	var submitButton = getElementDOM(botId, 'email-submit-button');
2999	2706	var emailInput = getElementDOM(botId, 'user-email');
3000	2707	var nameInput = getElementDOM(botId, 'user-name');
		@@ -3074,31 +2781,11 @@
3074	2781	existingErrors.forEach(error => error.remove());
3075	2782	}
3076	2783	}
3077	2784
3078		- // Resolve email state using server-side data when available, AJAX fallback otherwise
3079		- function resolveEmailState(botId) {
3080		- if (mxchatChat.skip_email_check && mxchatChat.initial_email_state) {
3081		- if (mxchatChat.initial_email_state.show_email_form) {
3082		- showEmailFormForBot(botId);
3083		- } else {
3084		- showChatContainerForBot(botId);
3085		- }
3086		- } else {
3087		- checkSessionAndEmailForBot(botId);
3088		- }
3089		- }
3090		-
3091	2785	function checkSessionAndEmailForBot(botId) {
3092		- const sessionId = MxChatInstances.ensureSession(botId);
	2786	+ const sessionId = getChatSession(botId);
3093	2787
3094		- // Hide both panels while we check — show loader instead
3095		- var emailBlocker = getElementDOM(botId, 'email-blocker');
3096		- var chatContainer = getElementDOM(botId, 'chat-container');
3097		- if (emailBlocker) emailBlocker.style.display = 'none';
3098		- if (chatContainer) chatContainer.style.display = 'none';
3099		- showInitLoader(botId);
3100		-
3101	2788	fetch(mxchatChat.ajax_url, {
3102	2789	method: 'POST',
3103	2790	headers: {
3104	2791	'Content-Type': 'application/x-www-form-urlencoded',
		@@ -3146,9 +2833,9 @@
3146	2833	var emailInput = getElementDOM(botId, 'user-email');
3147	2834	var nameInput = getElementDOM(botId, 'user-name');
3148	2835	var userEmail = emailInput ? emailInput.value.trim() : '';
3149	2836	var userName = nameInput ? nameInput.value.trim() : '';
3150		- var sessionId = MxChatInstances.ensureSession(botId);
	2837	+ var sessionId = getChatSession(botId);
3151	2838
3152	2839	// Validate email
3153	2840	if (!userEmail) {
3154	2841	showEmailError(botId, 'Please enter your email address.');
		@@ -3199,16 +2886,8 @@
3199	2886
3200	2887	if (data.success) {
3201	2888	showChatContainerForBot(botId);
3202	2889
3203		- // Replace {visitor_name} placeholder in intro message with actual name
3204		- if (userName) {
3205		- replaceVisitorNamePlaceholder(botId, userName);
3206		- } else {
3207		- // Remove placeholder if no name provided
3208		- replaceVisitorNamePlaceholder(botId, '');
3209		- }
3210		-
3211	2890	if (data.message && typeof appendMessage === 'function') {
3212	2891	setTimeout(() => {
3213	2892	appendMessage('bot', data.message, '', [], false, botId);
3214	2893	if (typeof scrollToBottom === 'function') {
		@@ -3271,27 +2950,25 @@
3271	2950	}
3272	2951	});
3273	2952
3274	2953	// Initialize email check for all bot instances
3275		- // For floating bots: defer until widget is opened (zero passive AJAX)
3276		- // For embedded bots: check immediately since the form is visible
3277	2954	$('.mxchat-chatbot-wrapper').each(function() {
3278	2955	var botId = $(this).data('bot-id') || 'default';
3279	2956	var emailBlocker = getElementDOM(botId, 'email-blocker');
3280	2957
	2958	+ // Only check if email blocker exists for this bot
3281	2959	if (emailBlocker) {
3282		- if (isEmbeddedBot(botId)) {
3283		- // Embedded bots are always visible — check now
3284		- resolveEmailState(botId);
	2960	+ if (mxchatChat.skip_email_check && mxchatChat.initial_email_state) {
	2961	+ if (mxchatChat.initial_email_state.show_email_form) {
	2962	+ showEmailFormForBot(botId);
	2963	+ } else {
	2964	+ showChatContainerForBot(botId);
	2965	+ }
	2966	+ } else {
	2967	+ setTimeout(function() {
	2968	+ checkSessionAndEmailForBot(botId);
	2969	+ }, 100);
3285	2970	}
3286		- // Floating bots: handled in the widget open handler
3287		- } else if (isEmbeddedBot(botId)) {
3288		- // Embedded bot, no email collection — load history with loader
3289		- var chatPersistenceEnabled = typeof mxchatChat !== 'undefined' && mxchatChat.chat_persistence_toggle === 'on';
3290		- if (chatPersistenceEnabled) {
3291		- MxChatInstances.ensureSession(botId);
3292		- showChatContainerForBot(botId);
3293		- }
3294	2971	}
3295	2972	});
3296	2973	}
3297	2974
		@@ -3301,32 +2978,39 @@
3301	2978	var $chatbot = getElement(botId, 'floating-chatbot');
3302	2979	if ($chatbot.hasClass('hidden')) {
3303	2980	$chatbot.removeClass('hidden').addClass('visible');
3304	2981	getElement(botId, 'floating-chatbot-button').addClass('hidden');
3305		- handlePreChatDismissal(botId);
	2982	+ $(this).fadeOut(250); // Hide pre-chat message
3306	2983	disableScroll(); // Disable scroll when chatbot opens
	2984	+ }
	2985	+ });
3307	2986
3308		- // Load chat history for returning visitors (persistence)
3309		- var chatPersistenceEnabled = typeof mxchatChat !== 'undefined' && mxchatChat.chat_persistence_toggle === 'on';
3310		- if (chatPersistenceEnabled) {
3311		- MxChatInstances.ensureSession(botId);
3312		- }
	2987	+ // Dismiss pre-chat message via close button - handled by event delegation above at line ~2376
	2988	+ // This is a fallback for legacy support
	2989	+ $(document).on('click', '.close-pre-chat-message', function() {
	2990	+ var botId = getBotIdFromElement(this);
	2991	+ var $preChat = getElement(botId, 'pre-chat-message');
	2992	+ $preChat.fadeOut(200); // Hide the message
3313	2993
3314		- // Deferred email check — only on first widget open
3315		- var emailBlocker = getElementDOM(botId, 'email-blocker');
3316		- var instance = MxChatInstances.get(botId);
3317		- if (emailBlocker && !instance.emailCheckDone) {
3318		- instance.emailCheckDone = true;
3319		- resolveEmailState(botId);
3320		- } else if (!emailBlocker) {
3321		- showChatContainerForBot(botId);
	2994	+ // Send an AJAX request to set the transient flag for 24 hours
	2995	+ $.ajax({
	2996	+ url: mxchatChat.ajax_url,
	2997	+ type: 'POST',
	2998	+ data: {
	2999	+ action: 'mxchat_dismiss_pre_chat_message',
	3000	+ _ajax_nonce: mxchatChat.nonce
	3001	+ },
	3002	+ success: function() {
	3003	+ // Ensure the message is hidden after dismissal
	3004	+ $preChat.hide();
	3005	+ },
	3006	+ error: function() {
	3007	+ // Error dismissing pre-chat message - silently continue
3322	3008	}
3323		- }
	3009	+ });
3324	3010	});
3325	3011
3326		- // Legacy duplicate close handler removed — handled by single event delegation above
3327	3012
3328		-
3329	3013	function hasQuickQuestions(botId) {
3330	3014	botId = botId || 'default';
3331	3015	var questionsContainer = getElementDOM(botId, 'mxchat-popular-questions');
3332	3016	if (!questionsContainer) return false;
		@@ -3462,11 +3146,18 @@
3462	3146	});
3463	3147
3464	3148	// Initialize when document is ready
3465	3149	setFullHeight();
	3150	+ trackOriginatingPage();
3466	3151
3467		- // Note: trackOriginatingPage() and loadChatHistory() are now deferred
3468		- // until the user's first interaction via MxChatInstances.ensureSession()
	3152	+ // Only load chat history if email collection is disabled
	3153	+ if (mxchatChat.email_collection_enabled !== 'on') {
	3154	+ // Load history for all instances
	3155	+ $('.mxchat-chatbot-wrapper').each(function() {
	3156	+ var botId = $(this).data('bot-id') || 'default';
	3157	+ loadChatHistory(botId);
	3158	+ });
	3159	+ }
3469	3160
3470	3161	// Initialize chat visibility for all instances
3471	3162	$('.mxchat-chatbot-wrapper').each(function() {
3472	3163	var botId = $(this).data('bot-id') || 'default';