| @@ -2,9 +2,9 @@ | ||
| 2 | 2 | /** |
| 3 | 3 | * Plugin Name: MxChat |
| 4 | 4 | * Plugin URI: https://mxchat.ai/ |
| 5 | 5 | * Description: AI chatbot for WordPress with OpenAI, Claude, xAI, DeepSeek, live agent, PDF uploads, WooCommerce, and training on website data. |
| 6 | - * Version: 3.2.17 | |
| 6 | + * Version: 3.2.25 | |
| 7 | 7 | * Author: MxChat |
| 8 | 8 | * Author URI: https://mxchat.ai |
| 9 | 9 | * License: GPLv2 or later |
| 10 | 10 | * License URI: https://www.gnu.org/licenses/gpl-2.0.html |
| @@ -38,8 +38,77 @@ | ||
| 38 | 38 | define('MXCHAT_VERSION', $version); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | + * Toolbar items API level (plan-mxchat-20260916-65c9b6). Defined only by cores | |
| 43 | + * that apply the `mxchat_chat_toolbar_items` filter while rendering the chat | |
| 44 | + * toolbar and fire the `mxchat:toolbar-ready` / `mxchat:opened` document events. | |
| 45 | + * Add-ons test `defined('MXCHAT_TOOLBAR_ITEMS_API')` and fall back to their | |
| 46 | + * older DOM-injection path on cores without it, so a button is never rendered | |
| 47 | + * twice. Bump the value only if the item shape (id / html / order) changes. | |
| 48 | + */ | |
| 49 | +if (!defined('MXCHAT_TOOLBAR_ITEMS_API')) { | |
| 50 | + define('MXCHAT_TOOLBAR_ITEMS_API', 1); | |
| 51 | +} | |
| 52 | + | |
| 53 | +/** | |
| 54 | + * Default confidence floor for the in-chat YouTube card, as a percentage | |
| 55 | + * (plan-mxchat-20260813-f52492). Higher than the site-wide Similarity | |
| 56 | + * Threshold default of 35 by design — see MxChat_Utils::video_embed_threshold(). | |
| 57 | + * Declared here so the gate, the admin field and the tests all read ONE number. | |
| 58 | + */ | |
| 59 | +if (!defined('MXCHAT_VIDEO_EMBED_THRESHOLD_DEFAULT')) { | |
| 60 | + define('MXCHAT_VIDEO_EMBED_THRESHOLD_DEFAULT', 55); | |
| 61 | +} | |
| 62 | + | |
| 63 | +/** | |
| 64 | + * One-time install stamp: records the plain version this site first ran, so | |
| 65 | + * behavior defaults can differ between fresh installs and upgrades without | |
| 66 | + * touching anyone's stored settings. Mirrors mxchat-mcp's 1.0.7 stamp shape | |
| 67 | + * (plan 7b578e); first consumer is the "Strip unapproved links" default | |
| 68 | + * (plan 58f8b4). Runs at init priority 1 — BEFORE initialize_default_options | |
| 69 | + * (init 20) writes mxchat_options on a fresh site's first request, because | |
| 70 | + * that option's pre-existing presence is how an upgrade is recognized. | |
| 71 | + */ | |
| 72 | +function mxchat_stamp_install_version() { | |
| 73 | + if (get_option('mxchat_installed_at_version', '') !== '') { | |
| 74 | + return; | |
| 75 | + } | |
| 76 | + $existing = get_option('mxchat_options', false) !== false; | |
| 77 | + $version = defined('MXCHAT_BASE_VERSION') ? MXCHAT_BASE_VERSION : '0.0.0'; | |
| 78 | + update_option('mxchat_installed_at_version', $existing ? 'legacy' : $version, false); | |
| 79 | +} | |
| 80 | +add_action('init', 'mxchat_stamp_install_version', 1); | |
| 81 | + | |
| 82 | +/** | |
| 83 | + * Stamp-derived default for the "Strip unapproved links" toggle (plan 58f8b4, | |
| 84 | + * option-c split of the old Citation Links conflation): 'on' only for installs | |
| 85 | + * born at 3.2.20+. A missing or 'legacy' stamp means the site predates the | |
| 86 | + * setting — keep 'off' so no existing site's links start vanishing on update. | |
| 87 | + */ | |
| 88 | +function mxchat_strip_unapproved_links_default() { | |
| 89 | + $stamp = get_option('mxchat_installed_at_version', ''); | |
| 90 | + if ($stamp === '' || $stamp === 'legacy') { | |
| 91 | + return 'off'; | |
| 92 | + } | |
| 93 | + return version_compare($stamp, '3.2.20', '>=') ? 'on' : 'off'; | |
| 94 | +} | |
| 95 | + | |
| 96 | +/** | |
| 97 | + * Effective state of "Strip unapproved links": an explicitly saved option | |
| 98 | + * always wins; until one exists the install-stamp default governs. Read via | |
| 99 | + * a fresh get_option on purpose — the response URL guard runs late in the | |
| 100 | + * request and must see a value saved moments earlier. | |
| 101 | + */ | |
| 102 | +function mxchat_strip_unapproved_links_enabled() { | |
| 103 | + $opts = get_option('mxchat_options', array()); | |
| 104 | + if (is_array($opts) && isset($opts['strip_unapproved_links_toggle'])) { | |
| 105 | + return $opts['strip_unapproved_links_toggle'] === 'on'; | |
| 106 | + } | |
| 107 | + return mxchat_strip_unapproved_links_default() === 'on'; | |
| 108 | +} | |
| 109 | + | |
| 110 | +/** | |
| 42 | 111 | * Honest, versioned User-Agent for MXChat remote-content ingestion fetches |
| 43 | 112 | * (Knowledge Base PDF import, URL import, sitemap / website crawl). |
| 44 | 113 | * |
| 45 | 114 | * WAF rulesets (SiteGround/ModSecurity, Wordfence, Cloudflare managed rules) |
| @@ -410,13 +479,18 @@ | ||
| 410 | 479 | // Include classes with error handling |
| 411 | 480 | function mxchat_include_classes() { |
| 412 | 481 | $class_files = array( |
| 413 | 482 | 'includes/class-mxchat-model-catalog.php', |
| 483 | + 'includes/class-mxchat-model-liveness.php', | |
| 484 | + 'includes/class-mxchat-license-check.php', | |
| 485 | + 'includes/class-mxchat-session-store.php', | |
| 414 | 486 | 'includes/class-mxchat-live-agent-schedule.php', |
| 415 | 487 | 'includes/class-mxchat-tool-registry.php', |
| 416 | 488 | 'includes/class-mxchat-integrator.php', |
| 417 | 489 | 'includes/class-mxchat-admin.php', |
| 418 | 490 | 'includes/class-mxchat-public.php', |
| 491 | + 'includes/class-mxchat-block.php', | |
| 492 | + 'includes/class-mxchat-elementor.php', | |
| 419 | 493 | 'includes/class-mxchat-utils.php', |
| 420 | 494 | 'includes/class-mxchat-user.php', |
| 421 | 495 | 'includes/class-mxchat-privacy.php', |
| 422 | 496 | 'includes/class-mxchat-meta-box.php', |
| @@ -427,9 +501,11 @@ | ||
| 427 | 501 | 'includes/class-mxchat-editor-assistant.php', |
| 428 | 502 | 'includes/class-rest-api.php', |
| 429 | 503 | 'admin/class-ajax-handler.php', |
| 430 | 504 | 'admin/class-pinecone-manager.php', |
| 431 | - 'admin/class-knowledge-manager.php' | |
| 505 | + 'admin/class-pinecone-documents.php', | |
| 506 | + 'admin/class-knowledge-manager.php', | |
| 507 | + 'admin/class-vectorstore-manager.php' | |
| 432 | 508 | ); |
| 433 | 509 | |
| 434 | 510 | foreach ($class_files as $file) { |
| 435 | 511 | $file_path = plugin_dir_path(__FILE__) . $file; |
| @@ -449,8 +525,41 @@ | ||
| 449 | 525 | if (class_exists('MxChat_Privacy')) { |
| 450 | 526 | MxChat_Privacy::init(); |
| 451 | 527 | } |
| 452 | 528 | |
| 529 | + // Per-session state store: retention cron + the cron-independent | |
| 530 | + // migration drain off admin_init (b64b77). | |
| 531 | + if (class_exists('MxChat_Session_Store')) { | |
| 532 | + MxChat_Session_Store::init(); | |
| 533 | + } | |
| 534 | + | |
| 535 | + // Daily model-liveness check + its warning notice (b65e8d). Read-only and | |
| 536 | + // fail-open: one listing request per in-use provider per day, none at all | |
| 537 | + // when no key is stored. | |
| 538 | + if (class_exists('MxChat_Model_Liveness')) { | |
| 539 | + MxChat_Model_Liveness::init(); | |
| 540 | + } | |
| 541 | + | |
| 542 | + // Licence domain check (c93ede): once a day asks mxchat.ai whether this | |
| 543 | + // site's domain is still switched on for its key, honours an explicit | |
| 544 | + // "off" after a three-day grace period, and fails open on everything else. | |
| 545 | + if (class_exists('MxChat_License_Check')) { | |
| 546 | + MxChat_License_Check::init(); | |
| 547 | + } | |
| 548 | + | |
| 549 | + // Gutenberg chatbot block (plan-95dd1e): a click-to-place wrapper over the | |
| 550 | + // [mxchat_chatbot] shortcode. Registers on init; no-op below WP 5.0. | |
| 551 | + if (class_exists('MxChat_Block')) { | |
| 552 | + MxChat_Block::init(); | |
| 553 | + } | |
| 554 | + | |
| 555 | + // Elementor chatbot widget (plan-95dd1e part 2): registered ONLY inside | |
| 556 | + // elementor/widgets/register (Elementor >= 3.5) — with Elementor absent or | |
| 557 | + // older, the hook never fires and nothing further loads. | |
| 558 | + if (class_exists('MxChat_Elementor')) { | |
| 559 | + MxChat_Elementor::init(); | |
| 560 | + } | |
| 561 | + | |
| 453 | 562 | // Editor Assistant — free, OFF-by-default block-editor AI actions (plan-8cb0cb). |
| 454 | 563 | // init() wires REST + streaming AJAX + sidebar enqueue ONLY when the |
| 455 | 564 | // mxchat_editor_assistant_enabled option is 'on'; otherwise zero footprint. |
| 456 | 565 | if (class_exists('MxChat_Editor_Assistant')) { |
| @@ -456,8 +565,16 @@ | ||
| 456 | 565 | if (class_exists('MxChat_Editor_Assistant')) { |
| 457 | 566 | MxChat_Editor_Assistant::init(); |
| 458 | 567 | } |
| 459 | 568 | |
| 569 | + // OpenAI Vector Store write path (plan-15b5c6): import/sync AJAX, the | |
| 570 | + // import cron tick, the pending-delete sweeper, and the WP-CLI command | |
| 571 | + // all register in the constructor. The sync itself only runs when the | |
| 572 | + // sync toggle + store ID + OpenAI key are all present. | |
| 573 | + if (class_exists('MxChat_Vectorstore_Manager')) { | |
| 574 | + MxChat_Vectorstore_Manager::get_instance(); | |
| 575 | + } | |
| 576 | + | |
| 460 | 577 | // Admin pages that aren't classes (procedural include). |
| 461 | 578 | if (is_admin()) { |
| 462 | 579 | $admin_api_page = plugin_dir_path(__FILE__) . 'includes/admin-api-page.php'; |
| 463 | 580 | if (file_exists($admin_api_page)) { |
| @@ -519,8 +636,26 @@ | ||
| 519 | 636 | dbDelta($sql); |
| 520 | 637 | } |
| 521 | 638 | |
| 522 | 639 | /** |
| 640 | + * Create the per-session state table (b64b77). | |
| 641 | + * | |
| 642 | + * Callable from the activation hook, which can run before plugins_loaded has | |
| 643 | + * included the class files — so it loads the class itself when needed. | |
| 644 | + */ | |
| 645 | +function mxchat_create_sessions_table() { | |
| 646 | + if (!class_exists('MxChat_Session_Store')) { | |
| 647 | + $path = plugin_dir_path(__FILE__) . 'includes/class-mxchat-session-store.php'; | |
| 648 | + if (!file_exists($path)) { | |
| 649 | + return false; | |
| 650 | + } | |
| 651 | + require_once $path; | |
| 652 | + } | |
| 653 | + | |
| 654 | + return MxChat_Session_Store::create_table(); | |
| 655 | +} | |
| 656 | + | |
| 657 | +/** | |
| 523 | 658 | * FIXED: Robust table creation and column management |
| 524 | 659 | */ |
| 525 | 660 | function mxchat_create_chat_transcripts_table() { |
| 526 | 661 | global $wpdb; |
| @@ -831,8 +966,66 @@ | ||
| 831 | 966 | } |
| 832 | 967 | } |
| 833 | 968 | |
| 834 | 969 | /** |
| 970 | + * 3.2.20: One-time backfill of the caee10 catalog usage-hint defaults | |
| 971 | + * (plan 64c1ad). persist() writes usage_hint for EVERY shown tool on every | |
| 972 | + * autosave — as '' when the box is untouched — and resolve_tool_setting() | |
| 973 | + * seeds a catalog default_hint ONLY onto an ABSENT key. So any install that | |
| 974 | + * saved the AI Tools screen before 3.2.20 holds '' everywhere and the shipped | |
| 975 | + * defaults can never reach it. On an upgrade from < 3.2.20 an empty stored | |
| 976 | + * hint cannot be a deliberate clear of a rendered default (those builds never | |
| 977 | + * rendered one), so seeding is safe. From 3.2.20 on, empty means the owner | |
| 978 | + * cleared a visible default and is respected — this never runs again (version | |
| 979 | + * gate + its own marker, deliberately not caee10's flag). | |
| 980 | + * | |
| 981 | + * Never touched: entries with owner text, legacy bare-bool entries and | |
| 982 | + * absent-key entries (both already resolve to the default at read time), and | |
| 983 | + * tools whose catalog entry ships no default_hint. | |
| 984 | + */ | |
| 985 | +function mxchat_backfill_tool_hint_defaults() { | |
| 986 | + if (get_option('mxchat_tool_hint_backfill_64c1ad') === '1') { | |
| 987 | + return; | |
| 988 | + } | |
| 989 | + | |
| 990 | + if (class_exists('MxChat_Tool_Registry')) { | |
| 991 | + $map = get_option('mxchat_function_calling_tools', array()); | |
| 992 | + if (is_array($map) && !empty($map)) { | |
| 993 | + $defaults = array(); | |
| 994 | + foreach (MxChat_Tool_Registry::core_tool_catalog() as $fn => $meta) { | |
| 995 | + if (!empty($meta['default_hint'])) { | |
| 996 | + $defaults[$fn] = (string) $meta['default_hint']; | |
| 997 | + } | |
| 998 | + } | |
| 999 | + | |
| 1000 | + $changed = false; | |
| 1001 | + foreach ($map as $fn => $entry) { | |
| 1002 | + if (!isset($defaults[$fn])) { | |
| 1003 | + continue; // no catalog default — nothing to seed | |
| 1004 | + } | |
| 1005 | + if (!is_array($entry)) { | |
| 1006 | + continue; // legacy bare bool: key absent, resolves to the default already | |
| 1007 | + } | |
| 1008 | + if (!array_key_exists('usage_hint', $entry)) { | |
| 1009 | + continue; // absent key gets the default at read time — must stay absent | |
| 1010 | + } | |
| 1011 | + if (trim((string) $entry['usage_hint']) !== '') { | |
| 1012 | + continue; // owner text — never touch | |
| 1013 | + } | |
| 1014 | + $map[$fn]['usage_hint'] = $defaults[$fn]; | |
| 1015 | + $changed = true; | |
| 1016 | + } | |
| 1017 | + | |
| 1018 | + if ($changed) { | |
| 1019 | + update_option('mxchat_function_calling_tools', $map); | |
| 1020 | + } | |
| 1021 | + } | |
| 1022 | + } | |
| 1023 | + | |
| 1024 | + update_option('mxchat_tool_hint_backfill_64c1ad', '1', false); | |
| 1025 | +} | |
| 1026 | + | |
| 1027 | +/** | |
| 835 | 1028 | * 2.5.2: Create queue processing tables for reliable background processing |
| 836 | 1029 | */ |
| 837 | 1030 | function mxchat_create_queue_tables() { |
| 838 | 1031 | global $wpdb; |
| @@ -930,8 +1123,41 @@ | ||
| 930 | 1123 | dbDelta($sql); |
| 931 | 1124 | } |
| 932 | 1125 | |
| 933 | 1126 | /** |
| 1127 | + * Create the OpenAI Vector Store file-mapping table (v3.2.20, plan 15b5c6). | |
| 1128 | + * One row per mirrored KB entry: which store, which bot, which OpenAI file id, | |
| 1129 | + * and a hash of the uploaded body for change detection. Vector store files are | |
| 1130 | + * not patchable in place — without this mapping an update cannot find its | |
| 1131 | + * predecessor, and the store silently accumulates stale duplicates. | |
| 1132 | + * status: 'live' (serving) or 'pending_delete' (condemned, swept later). | |
| 1133 | + */ | |
| 1134 | +function mxchat_create_vectorstore_files_table() { | |
| 1135 | + global $wpdb; | |
| 1136 | + $charset_collate = $wpdb->get_charset_collate(); | |
| 1137 | + | |
| 1138 | + $table_name = $wpdb->prefix . 'mxchat_vectorstore_files'; | |
| 1139 | + $sql = "CREATE TABLE $table_name ( | |
| 1140 | + id bigint(20) unsigned NOT NULL AUTO_INCREMENT, | |
| 1141 | + store_id varchar(64) NOT NULL, | |
| 1142 | + bot_id varchar(64) NOT NULL DEFAULT 'default', | |
| 1143 | + entry_key char(32) NOT NULL, | |
| 1144 | + source_url text, | |
| 1145 | + file_id varchar(64) NOT NULL, | |
| 1146 | + content_hash char(32) NOT NULL DEFAULT '', | |
| 1147 | + status varchar(20) NOT NULL DEFAULT 'live', | |
| 1148 | + last_error text, | |
| 1149 | + updated_at datetime DEFAULT NULL, | |
| 1150 | + PRIMARY KEY (id), | |
| 1151 | + KEY store_entry (store_id, bot_id, entry_key, status), | |
| 1152 | + KEY status (status) | |
| 1153 | + ) $charset_collate;"; | |
| 1154 | + | |
| 1155 | + require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); | |
| 1156 | + dbDelta($sql); | |
| 1157 | +} | |
| 1158 | + | |
| 1159 | +/** | |
| 934 | 1160 | * 2.5.2: Fix URL column size to support long URLs (especially with UTF-8 encoding) |
| 935 | 1161 | * This fixes "url, source_url. The supplied values may be too long" errors |
| 936 | 1162 | */ |
| 937 | 1163 | function mxchat_fix_url_column_size() { |
| @@ -975,93 +1201,47 @@ | ||
| 975 | 1201 | if (!isset($options['model'])) { |
| 976 | 1202 | return; |
| 977 | 1203 | } |
| 978 | 1204 | |
| 979 | - $current_model = $options['model']; | |
| 980 | - | |
| 981 | - // Migrate deprecated Claude models to Claude Opus 4.6 (recommended replacement per Anthropic) | |
| 982 | - $deprecated_claude_models = array( | |
| 983 | - 'claude-3-5-sonnet-20240620', // Retired Oct 28, 2025 | |
| 984 | - 'claude-3-5-sonnet-20241022', // Retired Oct 28, 2025 | |
| 985 | - 'claude-3-7-sonnet-20250219', // Retiring Feb 19, 2026 | |
| 986 | - 'claude-3-opus-20240229', // Retired Jan 5, 2026 | |
| 987 | - 'claude-3-sonnet-20240229', // Legacy | |
| 988 | - 'claude-3-haiku-20240307', // Legacy | |
| 989 | - ); | |
| 990 | - if (in_array($current_model, $deprecated_claude_models, true)) { | |
| 991 | - $options['model'] = 'claude-opus-4-6'; | |
| 992 | - $migrated = true; | |
| 993 | - $migration_message = sprintf( | |
| 994 | - 'Your chatbot model has been automatically updated from %s to Claude Opus 4.6 due to Anthropic deprecating older Claude models.', | |
| 995 | - $current_model | |
| 996 | - ); | |
| 1205 | + // The retired-id → replacement mapping lives in ONE place: | |
| 1206 | + // MxChat_Model_Catalog::retired_model_map() (plan 202df5). This function | |
| 1207 | + // and every add-on that stores model ids consume that map — do not add a | |
| 1208 | + // deprecation list here again. | |
| 1209 | + if (!class_exists('MxChat_Model_Catalog') || !method_exists('MxChat_Model_Catalog', 'retired_model_map')) { | |
| 1210 | + return; // catalog not loaded (defensive) — the next admin load retries | |
| 997 | 1211 | } |
| 1212 | + $map = MxChat_Model_Catalog::retired_model_map(); | |
| 998 | 1213 | |
| 999 | - // Migrate deprecated Claude Haiku 3.5 to Claude Haiku 4.5 | |
| 1000 | - if ($current_model === 'claude-3-5-haiku-20241022') { | |
| 1001 | - $options['model'] = 'claude-haiku-4-5-20251001'; | |
| 1214 | + $current_model = $options['model']; | |
| 1215 | + if (isset($map[$current_model])) { | |
| 1216 | + $entry = $map[$current_model]; | |
| 1217 | + $options['model'] = $entry['to']; | |
| 1002 | 1218 | $migrated = true; |
| 1003 | - $migration_message = 'Your chatbot model has been automatically updated from Claude Haiku 3.5 to Claude Haiku 4.5 due to Anthropic deprecating the older model.'; | |
| 1004 | - } | |
| 1005 | - | |
| 1006 | - // Migrate deprecated GPT-4 series and GPT-3.5 Turbo to GPT-5.6 Sol. | |
| 1007 | - // (Previous target gpt-5.1-chat-latest itself retires 2026-08-10 — never | |
| 1008 | - // migrate onto a model that is already on a deprecation list.) | |
| 1009 | - if (in_array($current_model, array('gpt-4o', 'gpt-4.1-2025-04-14', 'gpt-4-turbo', 'gpt-4', 'gpt-3.5-turbo'), true)) { | |
| 1010 | - $options['model'] = 'gpt-5.6-sol'; | |
| 1011 | - $migrated = true; | |
| 1012 | 1219 | $migration_message = sprintf( |
| 1013 | - 'Your chatbot model has been automatically updated from %s to GPT-5.6 Sol due to OpenAI deprecating older models.', | |
| 1014 | - $current_model | |
| 1220 | + 'Your chatbot model has been automatically updated from %s to %s %s.', | |
| 1221 | + $current_model, | |
| 1222 | + $entry['label'], | |
| 1223 | + $entry['reason'] | |
| 1015 | 1224 | ); |
| 1016 | 1225 | } |
| 1017 | 1226 | |
| 1018 | - // Migrate the gpt-5.x-chat-latest aliases OpenAI retires on August 10, 2026. | |
| 1019 | - // Replacement per OpenAI's deprecations page: gpt-5.6-sol (plan e46b8f). | |
| 1020 | - if (in_array($current_model, array('gpt-5.1-chat-latest', 'gpt-5.3-chat-latest'), true)) { | |
| 1021 | - $options['model'] = 'gpt-5.6-sol'; | |
| 1022 | - $migrated = true; | |
| 1023 | - $migration_message = sprintf( | |
| 1024 | - 'Your chatbot model has been automatically updated from %s to GPT-5.6 Sol because OpenAI retires the GPT-5.x Chat Latest models on August 10, 2026.', | |
| 1025 | - $current_model | |
| 1026 | - ); | |
| 1027 | - } | |
| 1028 | - | |
| 1029 | - // The content generator has its own model option — same retirement applies. | |
| 1030 | - if (isset($options['content_model']) | |
| 1031 | - && in_array($options['content_model'], array('gpt-5.1-chat-latest', 'gpt-5.3-chat-latest'), true)) { | |
| 1227 | + // The content generator has its own model option — the same map applies. | |
| 1228 | + // (Pre-202df5 this branch covered only the two gpt-5.x-chat-latest aliases; | |
| 1229 | + // it now covers every retired id, so e.g. a content model stranded on a | |
| 1230 | + // retired Claude id is rescued the same way the chat model is.) | |
| 1231 | + if (isset($options['content_model']) && isset($map[$options['content_model']])) { | |
| 1032 | 1232 | $old_content_model = $options['content_model']; |
| 1033 | - $options['content_model'] = 'gpt-5.6-sol'; | |
| 1233 | + $entry = $map[$old_content_model]; | |
| 1234 | + $options['content_model'] = $entry['to']; | |
| 1034 | 1235 | $migrated = true; |
| 1035 | 1236 | $migration_message = trim($migration_message . ' ' . sprintf( |
| 1036 | - 'Your content generation model has also been updated from %s to GPT-5.6 Sol for the same OpenAI retirement.', | |
| 1037 | - $old_content_model | |
| 1237 | + 'Your content generation model has also been automatically updated from %s to %s %s.', | |
| 1238 | + $old_content_model, | |
| 1239 | + $entry['label'], | |
| 1240 | + $entry['reason'] | |
| 1038 | 1241 | )); |
| 1039 | 1242 | } |
| 1040 | 1243 | |
| 1041 | - // Migrate deprecated GPT-4o Mini and GPT-4.1 Mini to GPT-5 Mini | |
| 1042 | - if (in_array($current_model, array('gpt-4o-mini', 'gpt-4.1-mini'), true)) { | |
| 1043 | - $options['model'] = 'gpt-5-mini'; | |
| 1044 | - $migrated = true; | |
| 1045 | - $migration_message = sprintf( | |
| 1046 | - 'Your chatbot model has been automatically updated from %s to GPT-5 Mini due to OpenAI deprecating GPT-4 series models.', | |
| 1047 | - $current_model | |
| 1048 | - ); | |
| 1049 | - } | |
| 1050 | - | |
| 1051 | - // Migrate retired DeepSeek ids to DeepSeek V4 Flash — the vendor removed | |
| 1052 | - // deepseek-chat and deepseek-reasoner on 2026-07-24 (hard cutoff, every | |
| 1053 | - // request 400s). V4 Flash is DeepSeek's designated successor for the | |
| 1054 | - // legacy deepseek-chat alias. | |
| 1055 | - if (in_array($current_model, array('deepseek-chat', 'deepseek-reasoner'), true)) { | |
| 1056 | - $options['model'] = 'deepseek-v4-flash'; | |
| 1057 | - $migrated = true; | |
| 1058 | - $migration_message = sprintf( | |
| 1059 | - 'Your chatbot model has been automatically updated from %s to DeepSeek V4 Flash because DeepSeek retired its older API models on July 24, 2026.', | |
| 1060 | - $current_model | |
| 1061 | - ); | |
| 1062 | - } | |
| 1063 | - | |
| 1064 | 1244 | if ($migrated) { |
| 1065 | 1245 | update_option('mxchat_options', $options); |
| 1066 | 1246 | update_option('mxchat_model_migrated_notice', true); |
| 1067 | 1247 | update_option('mxchat_model_migration_message', $migration_message); |
| @@ -1087,8 +1267,62 @@ | ||
| 1087 | 1267 | } |
| 1088 | 1268 | } |
| 1089 | 1269 | |
| 1090 | 1270 | /** |
| 1271 | + * One-time recommendation on EXISTING installs (stamp 'legacy') that the new | |
| 1272 | + * "Strip unapproved links" guard exists and is worth turning on (plan 58f8b4). | |
| 1273 | + * Fresh 3.2.20+ installs default it on and never see this. Shown only on | |
| 1274 | + * MxChat admin pages, gone for good once dismissed or once the site saves an | |
| 1275 | + * explicit value for the toggle either way. | |
| 1276 | + */ | |
| 1277 | +function mxchat_show_strip_links_notice() { | |
| 1278 | + if (!current_user_can('manage_options')) { | |
| 1279 | + return; | |
| 1280 | + } | |
| 1281 | + $page = isset($_GET['page']) ? sanitize_key($_GET['page']) : ''; | |
| 1282 | + if (strpos($page, 'mxchat') !== 0) { | |
| 1283 | + return; | |
| 1284 | + } | |
| 1285 | + if (get_option('mxchat_strip_links_notice_dismissed', '') === '1') { | |
| 1286 | + return; | |
| 1287 | + } | |
| 1288 | + if (get_option('mxchat_installed_at_version', '') !== 'legacy') { | |
| 1289 | + return; | |
| 1290 | + } | |
| 1291 | + $opts = get_option('mxchat_options', array()); | |
| 1292 | + if (is_array($opts) && isset($opts['strip_unapproved_links_toggle'])) { | |
| 1293 | + return; // The site already made its choice — stop recommending. | |
| 1294 | + } | |
| 1295 | + $dismiss_url = wp_nonce_url( | |
| 1296 | + admin_url('admin-post.php?action=mxchat_dismiss_strip_links_notice'), | |
| 1297 | + 'mxchat_dismiss_strip_links_notice' | |
| 1298 | + ); | |
| 1299 | + ?> | |
| 1300 | + <div class="notice notice-info"> | |
| 1301 | + <p> | |
| 1302 | + <strong><?php esc_html_e('MxChat: new link protection available', 'mxchat'); ?></strong><br> | |
| 1303 | + <?php esc_html_e('The new "Strip Unapproved Links" setting removes links the AI invents from its answers even when Citation Links is off — links to real pages on your site and links your integrations return are always kept. It is off on existing sites so nothing changes without you; we recommend turning it on under MxChat → Settings → Chatbot Behavior.', 'mxchat'); ?> | |
| 1304 | + <a href="<?php echo esc_url($dismiss_url); ?>"><?php esc_html_e('Dismiss', 'mxchat'); ?></a> | |
| 1305 | + </p> | |
| 1306 | + </div> | |
| 1307 | + <?php | |
| 1308 | +} | |
| 1309 | +add_action('admin_notices', 'mxchat_show_strip_links_notice'); | |
| 1310 | + | |
| 1311 | +/** Dismiss handler for the strip-links recommendation notice (plan 58f8b4). */ | |
| 1312 | +function mxchat_dismiss_strip_links_notice() { | |
| 1313 | + if (!current_user_can('manage_options')) { | |
| 1314 | + wp_die(esc_html__('Insufficient permissions.', 'mxchat'), '', array('response' => 403)); | |
| 1315 | + } | |
| 1316 | + check_admin_referer('mxchat_dismiss_strip_links_notice'); | |
| 1317 | + update_option('mxchat_strip_links_notice_dismissed', '1', false); | |
| 1318 | + $referer = wp_get_referer(); | |
| 1319 | + wp_safe_redirect($referer ? $referer : admin_url('admin.php?page=mxchat-max')); | |
| 1320 | + exit; | |
| 1321 | +} | |
| 1322 | +add_action('admin_post_mxchat_dismiss_strip_links_notice', 'mxchat_dismiss_strip_links_notice'); | |
| 1323 | + | |
| 1324 | +/** | |
| 1091 | 1325 | * Persistent admin notice when the provider rejected the configured model |
| 1092 | 1326 | * (model_not_found / no access). Set by mxchat_friendly_chat_error() in the |
| 1093 | 1327 | * integrator whenever a chat request fails on a model-access error — including |
| 1094 | 1328 | * requests from anonymous visitors, which is the case that otherwise stays |
| @@ -1133,8 +1367,12 @@ | ||
| 1133 | 1367 | |
| 1134 | 1368 | // Create chat transcripts table with improved function |
| 1135 | 1369 | mxchat_create_chat_transcripts_table(); |
| 1136 | 1370 | |
| 1371 | + // Per-session state table (b64b77). Activation can run before | |
| 1372 | + // plugins_loaded has included the class files, so require it directly. | |
| 1373 | + mxchat_create_sessions_table(); | |
| 1374 | + | |
| 1137 | 1375 | // System Prompt Content Table - UPDATED: Use TEXT for url and source_url columns |
| 1138 | 1376 | $system_prompt_table = $wpdb->prefix . 'mxchat_system_prompt_content'; |
| 1139 | 1377 | $sql_system_prompt = "CREATE TABLE $system_prompt_table ( |
| 1140 | 1378 | id MEDIUMINT(9) NOT NULL AUTO_INCREMENT, |
| @@ -1141,8 +1379,9 @@ | ||
| 1141 | 1379 | url TEXT NOT NULL, |
| 1142 | 1380 | article_content LONGTEXT NOT NULL, |
| 1143 | 1381 | embedding_vector LONGTEXT, |
| 1144 | 1382 | source_url TEXT DEFAULT NULL, |
| 1383 | + title VARCHAR(255) DEFAULT NULL, | |
| 1145 | 1384 | role_restriction VARCHAR(50) DEFAULT 'public', |
| 1146 | 1385 | content_type VARCHAR(50) DEFAULT 'content', |
| 1147 | 1386 | timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL, |
| 1148 | 1387 | PRIMARY KEY (id), |
| @@ -1196,8 +1435,11 @@ | ||
| 1196 | 1435 | |
| 1197 | 1436 | // Create per-session satisfaction ratings table (v3.2.6) |
| 1198 | 1437 | mxchat_create_session_ratings_table(); |
| 1199 | 1438 | |
| 1439 | + // Create Vector Store file-mapping table (v3.2.20, plan 15b5c6) | |
| 1440 | + mxchat_create_vectorstore_files_table(); | |
| 1441 | + | |
| 1200 | 1442 | // Ensure additional columns in system prompt table |
| 1201 | 1443 | $existing_system_columns = $wpdb->get_results("SHOW COLUMNS FROM $system_prompt_table"); |
| 1202 | 1444 | if (!empty($existing_system_columns)) { |
| 1203 | 1445 | $existing_system_column_names = array_column($existing_system_columns, 'Field'); |
| @@ -1210,8 +1452,13 @@ | ||
| 1210 | 1452 | } |
| 1211 | 1453 | if (!in_array('role_restriction', $existing_system_column_names)) { |
| 1212 | 1454 | $wpdb->query("ALTER TABLE $system_prompt_table ADD COLUMN role_restriction VARCHAR(50) DEFAULT 'public' AFTER source_url"); |
| 1213 | 1455 | } |
| 1456 | + // Page title captured at import time (3.2.23, plan d9ee66) - read by | |
| 1457 | + // add-ons that name a source, e.g. AI Search's source cards. | |
| 1458 | + if (!in_array('title', $existing_system_column_names)) { | |
| 1459 | + $wpdb->query("ALTER TABLE $system_prompt_table ADD COLUMN title VARCHAR(255) DEFAULT NULL AFTER source_url"); | |
| 1460 | + } | |
| 1214 | 1461 | } |
| 1215 | 1462 | |
| 1216 | 1463 | // Set default thresholds for existing intents |
| 1217 | 1464 | $wpdb->query("UPDATE {$intents_table} SET similarity_threshold = 0.85 WHERE similarity_threshold IS NULL"); |
| @@ -1309,9 +1556,11 @@ | ||
| 1309 | 1556 | // Clear scheduled cron jobs |
| 1310 | 1557 | wp_clear_scheduled_hook('mxchat_reset_rate_limits'); |
| 1311 | 1558 | wp_clear_scheduled_hook('mxchat_cleanup_old_transcripts'); |
| 1312 | 1559 | wp_clear_scheduled_hook('mxchat_send_delayed_transcript'); |
| 1313 | - | |
| 1560 | + wp_clear_scheduled_hook('mxchat_model_liveness_check'); | |
| 1561 | + wp_clear_scheduled_hook('mxchat_license_check'); | |
| 1562 | + | |
| 1314 | 1563 | // Clear fallback options |
| 1315 | 1564 | delete_option('mxchat_use_fallback_rate_limits'); |
| 1316 | 1565 | delete_option('mxchat_next_rate_limit_check'); |
| 1317 | 1566 | delete_option('mxchat_fallback_check_interval'); |
| @@ -1367,12 +1616,16 @@ | ||
| 1367 | 1616 | // This handles manual table deletion or fresh installs |
| 1368 | 1617 | $chat_table = $wpdb->prefix . 'mxchat_chat_transcripts'; |
| 1369 | 1618 | $queue_table = $wpdb->prefix . 'mxchat_processing_queue'; |
| 1370 | 1619 | |
| 1620 | + $sessions_table = $wpdb->prefix . 'mxchat_sessions'; | |
| 1621 | + | |
| 1371 | 1622 | $chat_exists = $wpdb->get_var("SHOW TABLES LIKE '$chat_table'") === $chat_table; |
| 1372 | 1623 | $queue_exists = $wpdb->get_var("SHOW TABLES LIKE '$queue_table'") === $queue_table; |
| 1373 | - | |
| 1374 | - if (!$chat_exists || !$queue_exists) { | |
| 1624 | + $sessions_exists = get_option('mxchat_session_store_ready') === '1' | |
| 1625 | + || $wpdb->get_var("SHOW TABLES LIKE '$sessions_table'") === $sessions_table; | |
| 1626 | + | |
| 1627 | + if (!$chat_exists || !$queue_exists || !$sessions_exists) { | |
| 1375 | 1628 | //error_log("MxChat: Critical tables missing, running activation"); |
| 1376 | 1629 | mxchat_activate(); |
| 1377 | 1630 | } |
| 1378 | 1631 | |
| @@ -1465,8 +1718,31 @@ | ||
| 1465 | 1718 | mxchat_fix_credential_option_autoload(); |
| 1466 | 1719 | mxchat_migrate_acf_pdf_extraction_option(); |
| 1467 | 1720 | } |
| 1468 | 1721 | |
| 1722 | + // 3.2.19: Claude Opus 4.1 retired Aug 5, 2026 — auto-move stranded | |
| 1723 | + // sites (and the older tiers on the migration's lists) per the | |
| 1724 | + // changelog's promise. Idempotent — only rewrites models on the | |
| 1725 | + // deprecation lists. Without a gate at this release's version, | |
| 1726 | + // nothing calls the migration for 3.2.18 upgraders (plan a5a598; | |
| 1727 | + // the gate value must equal the version this block ships in). | |
| 1728 | + if (version_compare($current_version, '3.2.19', '<')) { | |
| 1729 | + mxchat_migrate_deprecated_models(); | |
| 1730 | + } | |
| 1731 | + | |
| 1732 | + // 3.2.20: Seed the caee10 usage-hint defaults onto tool entries a | |
| 1733 | + // pre-3.2.20 autosave stamped with '' (plan 64c1ad). The gate value | |
| 1734 | + // equals the version this block ships in (a5a598 rule); the | |
| 1735 | + // function carries its own one-time marker on top. | |
| 1736 | + // Also re-run the deprecated-models migration: 202df5 widened it to | |
| 1737 | + // rescue a content_model stranded on ANY retired id (previously | |
| 1738 | + // only the two gpt-5.x-chat-latest aliases). Idempotent — only | |
| 1739 | + // rewrites models on the catalog's retired_model_map(). | |
| 1740 | + if (version_compare($current_version, '3.2.20', '<')) { | |
| 1741 | + mxchat_backfill_tool_hint_defaults(); | |
| 1742 | + mxchat_migrate_deprecated_models(); | |
| 1743 | + } | |
| 1744 | + | |
| 1469 | 1745 | // Run full activation to ensure everything is up to date |
| 1470 | 1746 | mxchat_activate(); |
| 1471 | 1747 | |
| 1472 | 1748 | // Run migration functions |
| @@ -1471,12 +1747,11 @@ | ||
| 1471 | 1747 | |
| 1472 | 1748 | // Run migration functions |
| 1473 | 1749 | mxchat_migrate_live_agent_status(); |
| 1474 | 1750 | |
| 1475 | - // Add the cleanup function for version 2.1.8 | |
| 1476 | - if (version_compare($current_version, '2.1.8', '<')) { | |
| 1477 | - $deleted = mxchat_cleanup_orphaned_chat_history(); | |
| 1478 | - } | |
| 1751 | + // (The 2.1.8 orphaned-history reconciliation sweep is gone — | |
| 1752 | + // 3.2.19's mxchat_history_backlog_* drain supersedes it, and it | |
| 1753 | + // self-arms without a version gate: plan 839c4c.) | |
| 1479 | 1754 | |
| 1480 | 1755 | // Update version LAST |
| 1481 | 1756 | update_option('mxchat_plugin_version', $plugin_version); |
| 1482 | 1757 | |
| @@ -1548,8 +1823,111 @@ | ||
| 1548 | 1823 | } |
| 1549 | 1824 | } |
| 1550 | 1825 | |
| 1551 | 1826 | /** |
| 1827 | + * One-time migration of mxchat_acf_excluded_fields from field NAMES to field | |
| 1828 | + * KEYS (plan 30e81f). Names are not unique across ACF groups, so two fields | |
| 1829 | + * named the same in different groups shared one toggle, one saved state, and | |
| 1830 | + * one exclusion — and the save-on-exit beacon could revert a save through the | |
| 1831 | + * twin. Keys are unique; everything now runs on them. | |
| 1832 | + * | |
| 1833 | + * MIGRATION DIRECTION IS DELIBERATE: one stored name can match several keys — | |
| 1834 | + * exclude EVERY one of them. The UI describes these as "sensitive or | |
| 1835 | + * irrelevant fields"; an under-migration would silently start feeding a | |
| 1836 | + * previously-excluded sensitive field into embeddings sent to a third-party | |
| 1837 | + * provider. Over-excluding is visible in the UI and costs some retrieval | |
| 1838 | + * quality; under-excluding is a silent privacy regression. | |
| 1839 | + * | |
| 1840 | + * Self-arming on acf/init (NOT the version-gated upgrade block): resolving | |
| 1841 | + * names needs ACF fully booted with local JSON/PHP groups registered, and if | |
| 1842 | + * ACF is deactivated at upgrade time the migration simply waits for the next | |
| 1843 | + * load with ACF active. Until it runs, stored names keep working — every | |
| 1844 | + * exclusion read site honors legacy name entries alongside keys. A name that | |
| 1845 | + * matches no current key is KEPT (its group may be temporarily inactive), and | |
| 1846 | + * the per-field include path lazily converts it if it ever resolves again. | |
| 1847 | + */ | |
| 1848 | +function mxchat_migrate_acf_exclusions_to_keys() { | |
| 1849 | + if (get_option('mxchat_acf_exclusions_migrated', '') === '1') { | |
| 1850 | + return; | |
| 1851 | + } | |
| 1852 | + $stored = get_option('mxchat_acf_excluded_fields', array()); | |
| 1853 | + if (!is_array($stored) || empty($stored)) { | |
| 1854 | + update_option('mxchat_acf_exclusions_migrated', '1', false); | |
| 1855 | + return; | |
| 1856 | + } | |
| 1857 | + if (!function_exists('acf_get_field_groups') || !function_exists('acf_get_fields')) { | |
| 1858 | + return; // acf/init fired without the API? Bail; retry next load. | |
| 1859 | + } | |
| 1860 | + | |
| 1861 | + // Map every current top-level field: name => [keys], and the set of keys. | |
| 1862 | + $name_to_keys = array(); | |
| 1863 | + $current_keys = array(); | |
| 1864 | + foreach (acf_get_field_groups() as $group) { | |
| 1865 | + $group_fields = acf_get_fields($group['key']); | |
| 1866 | + if (empty($group_fields)) { | |
| 1867 | + continue; | |
| 1868 | + } | |
| 1869 | + foreach ($group_fields as $field) { | |
| 1870 | + if (empty($field['key']) || !isset($field['name'])) { | |
| 1871 | + continue; | |
| 1872 | + } | |
| 1873 | + $current_keys[$field['key']] = true; | |
| 1874 | + $name_to_keys[$field['name']][] = $field['key']; | |
| 1875 | + } | |
| 1876 | + } | |
| 1877 | + | |
| 1878 | + $migrated = array(); | |
| 1879 | + $converted = 0; | |
| 1880 | + foreach ($stored as $entry) { | |
| 1881 | + if (!is_string($entry) || $entry === '') { | |
| 1882 | + continue; | |
| 1883 | + } | |
| 1884 | + if (isset($current_keys[$entry])) { | |
| 1885 | + $migrated[] = $entry; // already a live key | |
| 1886 | + } elseif (isset($name_to_keys[$entry])) { | |
| 1887 | + foreach ($name_to_keys[$entry] as $key) { | |
| 1888 | + $migrated[] = $key; // every key wearing this name — fail toward more exclusion | |
| 1889 | + } | |
| 1890 | + $converted++; | |
| 1891 | + } else { | |
| 1892 | + $migrated[] = $entry; // unresolved — keep; still honored by name everywhere | |
| 1893 | + } | |
| 1894 | + } | |
| 1895 | + $migrated = array_values(array_unique($migrated)); | |
| 1896 | + | |
| 1897 | + update_option('mxchat_acf_excluded_fields', $migrated); | |
| 1898 | + update_option('mxchat_acf_exclusions_migrated', '1', false); | |
| 1899 | + if ($converted > 0) { | |
| 1900 | + update_option('mxchat_acf_exclusions_migrated_notice', '1', false); | |
| 1901 | + } | |
| 1902 | +} | |
| 1903 | +add_action('acf/init', 'mxchat_migrate_acf_exclusions_to_keys', 20); | |
| 1904 | + | |
| 1905 | +/** | |
| 1906 | + * One-time notice after the ACF exclusion migration actually converted | |
| 1907 | + * name entries — the settings are worth a review, especially where one name | |
| 1908 | + * fanned out to several fields (every match is now excluded, on purpose). | |
| 1909 | + */ | |
| 1910 | +function mxchat_show_acf_exclusions_migrated_notice() { | |
| 1911 | + if (!current_user_can('manage_options')) { | |
| 1912 | + return; | |
| 1913 | + } | |
| 1914 | + if (get_option('mxchat_acf_exclusions_migrated_notice', '') !== '1') { | |
| 1915 | + return; | |
| 1916 | + } | |
| 1917 | + ?> | |
| 1918 | + <div class="notice notice-info is-dismissible"> | |
| 1919 | + <p> | |
| 1920 | + <strong><?php esc_html_e('MxChat: ACF field exclusions updated', 'mxchat'); ?></strong><br> | |
| 1921 | + <?php esc_html_e('Your ACF field exclusion settings were migrated to identify fields precisely, so same-named fields in different groups no longer share one toggle. Where a saved exclusion matched several fields, all of them are now excluded — please review the toggles under MxChat → Knowledge → ACF Field Settings.', 'mxchat'); ?> | |
| 1922 | + </p> | |
| 1923 | + </div> | |
| 1924 | + <?php | |
| 1925 | + delete_option('mxchat_acf_exclusions_migrated_notice'); | |
| 1926 | +} | |
| 1927 | +add_action('admin_notices', 'mxchat_show_acf_exclusions_migrated_notice'); | |
| 1928 | + | |
| 1929 | +/** | |
| 1552 | 1930 | * Ensure tables exist on every admin load for fresh installations |
| 1553 | 1931 | * This is a safety net for cases where activation hook doesn't fire |
| 1554 | 1932 | */ |
| 1555 | 1933 | function mxchat_ensure_tables_exist() { |
| @@ -1569,12 +1947,16 @@ | ||
| 1569 | 1947 | |
| 1570 | 1948 | $table_name = $wpdb->prefix . 'mxchat_chat_transcripts'; |
| 1571 | 1949 | $queue_table = $wpdb->prefix . 'mxchat_processing_queue'; |
| 1572 | 1950 | |
| 1951 | + $sessions_table = $wpdb->prefix . 'mxchat_sessions'; | |
| 1952 | + | |
| 1573 | 1953 | $chat_exists = $wpdb->get_var("SHOW TABLES LIKE '$table_name'") === $table_name; |
| 1574 | 1954 | $queue_exists = $wpdb->get_var("SHOW TABLES LIKE '$queue_table'") === $queue_table; |
| 1575 | - | |
| 1576 | - if (!$chat_exists || !$queue_exists) { | |
| 1955 | + $sessions_exists = get_option('mxchat_session_store_ready') !== false | |
| 1956 | + || $wpdb->get_var("SHOW TABLES LIKE '$sessions_table'") === $sessions_table; | |
| 1957 | + | |
| 1958 | + if (!$chat_exists || !$queue_exists || !$sessions_exists) { | |
| 1577 | 1959 | //error_log("MxChat: Tables missing on admin load, running activation"); |
| 1578 | 1960 | mxchat_activate(); |
| 1579 | 1961 | } |
| 1580 | 1962 | } |
| @@ -1579,49 +1961,116 @@ | ||
| 1579 | 1961 | } |
| 1580 | 1962 | } |
| 1581 | 1963 | |
| 1582 | 1964 | /** |
| 1583 | - * Clean up orphaned chat history options from the wp_options table | |
| 1584 | - * @return int Number of options deleted | |
| 1965 | + * One-shot cleanup of legacy mxchat_history_<sid> option rows (plan 839c4c). | |
| 1966 | + * | |
| 1967 | + * 3.2.19 deduplicated per-session chat history into the transcripts table | |
| 1968 | + * (which already held a superset of every option copy measured), so nothing | |
| 1969 | + * writes these options any more — but an upgraded install still carries one | |
| 1970 | + * per session, at up to 64 KB a row (462 rows measured on one production | |
| 1971 | + * install). This drain replaces the old mxchat_cleanup_orphaned_chat_history() | |
| 1972 | + * reconciliation sweep, which existed only because there were two copies to | |
| 1973 | + * reconcile. | |
| 1974 | + * | |
| 1975 | + * b64b77 pattern throughout: an option_id bookmark that only moves forward | |
| 1976 | + * (a crash mid-batch re-processes at most one batch), delete_option() per row | |
| 1977 | + * so the object + notoptions caches stay coherent, batches drained off | |
| 1978 | + * non-AJAX admin_init plus the session-store maintenance cron. Once the | |
| 1979 | + * backlog is gone the state marks done and every later call is one cached | |
| 1980 | + * option read. | |
| 1585 | 1981 | */ |
| 1586 | -function mxchat_cleanup_orphaned_chat_history() { | |
| 1982 | +function mxchat_history_backlog_state() { | |
| 1983 | + // The state option name MUST NOT start with 'mxchat_history_' — the drain | |
| 1984 | + // deletes everything matching that prefix, and a state option inside the | |
| 1985 | + // pattern gets eaten by its own drain (caught by the 839c4c rig: batches | |
| 1986 | + // ran 2,2,2,1 instead of 2,2,1 because the bookmark row was being deleted | |
| 1987 | + // and re-created every pass). | |
| 1988 | + $state = get_option('mxchat_legacy_history_cleanup', array()); | |
| 1989 | + if (!is_array($state)) { | |
| 1990 | + $state = array(); | |
| 1991 | + } | |
| 1992 | + | |
| 1993 | + return wp_parse_args($state, array( | |
| 1994 | + 'done' => false, | |
| 1995 | + 'last_option_id' => 0, | |
| 1996 | + 'deleted' => 0, | |
| 1997 | + )); | |
| 1998 | +} | |
| 1999 | + | |
| 2000 | +/** | |
| 2001 | + * Delete one batch of legacy history options. | |
| 2002 | + * | |
| 2003 | + * @param int $batch Rows per pass — capped small; these can be 64 KB rows. | |
| 2004 | + * @return int Option rows deleted in this pass. | |
| 2005 | + */ | |
| 2006 | +function mxchat_history_backlog_batch($batch = 200) { | |
| 1587 | 2007 | global $wpdb; |
| 1588 | - $count = 0; | |
| 1589 | 2008 | |
| 1590 | - // Get all option keys that match our pattern | |
| 1591 | - $history_options = $wpdb->get_results( | |
| 1592 | - "SELECT option_name FROM {$wpdb->options} | |
| 1593 | - WHERE option_name LIKE 'mxchat_history_%'" | |
| 2009 | + $state = mxchat_history_backlog_state(); | |
| 2010 | + if (!empty($state['done'])) { | |
| 2011 | + return 0; | |
| 2012 | + } | |
| 2013 | + | |
| 2014 | + $batch = max(1, (int) $batch); | |
| 2015 | + | |
| 2016 | + $rows = $wpdb->get_results( | |
| 2017 | + $wpdb->prepare( | |
| 2018 | + "SELECT option_id, option_name FROM {$wpdb->options} | |
| 2019 | + WHERE option_id > %d AND option_name LIKE %s | |
| 2020 | + ORDER BY option_id ASC LIMIT %d", | |
| 2021 | + (int) $state['last_option_id'], | |
| 2022 | + $wpdb->esc_like('mxchat_history_') . '%', | |
| 2023 | + $batch | |
| 2024 | + ), | |
| 2025 | + ARRAY_A | |
| 1594 | 2026 | ); |
| 1595 | 2027 | |
| 1596 | - if (!empty($history_options)) { | |
| 1597 | - foreach ($history_options as $option) { | |
| 1598 | - // Extract the session ID from the option name | |
| 1599 | - $session_id = str_replace('mxchat_history_', '', $option->option_name); | |
| 2028 | + if (empty($rows)) { | |
| 2029 | + $state['done'] = true; | |
| 2030 | + update_option('mxchat_legacy_history_cleanup', $state, 'no'); | |
| 2031 | + return 0; | |
| 2032 | + } | |
| 1600 | 2033 | |
| 1601 | - // Check if this session still exists in the custom table | |
| 1602 | - $table_name = $wpdb->prefix . 'mxchat_chat_transcripts'; | |
| 1603 | - $exists = $wpdb->get_var( | |
| 1604 | - $wpdb->prepare( | |
| 1605 | - "SELECT COUNT(*) FROM {$table_name} WHERE session_id = %s", | |
| 1606 | - $session_id | |
| 1607 | - ) | |
| 1608 | - ); | |
| 2034 | + foreach ($rows as $row) { | |
| 2035 | + $state['last_option_id'] = max((int) $state['last_option_id'], (int) $row['option_id']); | |
| 2036 | + delete_option($row['option_name']); | |
| 2037 | + $state['deleted'] = (int) $state['deleted'] + 1; | |
| 2038 | + } | |
| 1609 | 2039 | |
| 1610 | - // If session doesn't exist in the main table, delete the option | |
| 1611 | - if ($exists == 0) { | |
| 1612 | - delete_option($option->option_name); | |
| 1613 | - // Also delete related metadata | |
| 1614 | - delete_option("mxchat_email_{$session_id}"); | |
| 1615 | - delete_option("mxchat_name_{$session_id}"); | |
| 1616 | - delete_option("mxchat_agent_name_{$session_id}"); | |
| 1617 | - $count++; | |
| 1618 | - } | |
| 2040 | + if (count($rows) < $batch) { | |
| 2041 | + $state['done'] = true; | |
| 2042 | + } | |
| 2043 | + | |
| 2044 | + update_option('mxchat_legacy_history_cleanup', $state, 'no'); | |
| 2045 | + | |
| 2046 | + return count($rows); | |
| 2047 | +} | |
| 2048 | + | |
| 2049 | +/** One batch per admin page load until drained. */ | |
| 2050 | +function mxchat_history_backlog_drain() { | |
| 2051 | + mxchat_history_backlog_batch(); | |
| 2052 | +} | |
| 2053 | + | |
| 2054 | +/** Cron leg: drain faster, same cap per batch. */ | |
| 2055 | +function mxchat_history_backlog_drain_cron() { | |
| 2056 | + for ($i = 0; $i < 10; $i++) { | |
| 2057 | + if (mxchat_history_backlog_batch() === 0) { | |
| 2058 | + break; | |
| 1619 | 2059 | } |
| 1620 | 2060 | } |
| 2061 | +} | |
| 1621 | 2062 | |
| 1622 | - return $count; | |
| 2063 | +// wp_doing_ajax() guard is load-bearing, not defensive (b64b77's shipped-and- | |
| 2064 | +// caught defect): admin-ajax.php fires admin_init too, and the chat widget's | |
| 2065 | +// message endpoint is an admin-ajax action — without the guard an anonymous | |
| 2066 | +// visitor would pay for a delete batch inside their own chat request. | |
| 2067 | +if (!wp_doing_ajax()) { | |
| 2068 | + add_action('admin_init', 'mxchat_history_backlog_drain', 21); | |
| 1623 | 2069 | } |
| 2070 | +// Belt for installs whose admin is rarely visited: ride the session store's | |
| 2071 | +// existing daily maintenance event rather than scheduling another. | |
| 2072 | +add_action('mxchat_session_store_maintenance', 'mxchat_history_backlog_drain_cron'); | |
| 1624 | 2073 | |
| 1625 | 2074 | function mxchat_migrate_live_agent_status() { |
| 1626 | 2075 | $options = get_option('mxchat_options', []); |
| 1627 | 2076 | |
