| @@ -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.3 | |
| 6 | + * Version: 3.2.21 | |
| 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 |
| @@ -23,8 +23,16 @@ | ||
| 23 | 23 | |
| 24 | 24 | if (!defined('MXCHAT_VERSION')) { |
| 25 | 25 | $plugin_data = get_file_data(__FILE__, array('Version' => 'Version'), 'plugin'); |
| 26 | 26 | $version = $plugin_data['Version']; |
| 27 | + // MXCHAT_BASE_VERSION: the plain header version, stable across requests even in | |
| 28 | + // dev mode. Use it for anything PERSISTED or COMPARED (the stored | |
| 29 | + // mxchat_plugin_version option and the migration gate in | |
| 30 | + // mxchat_check_for_update). MXCHAT_VERSION keeps the time() suffix in dev for | |
| 31 | + // ASSET cache-busting only — persisting the suffixed value made the version | |
| 32 | + // comparison churn every request, re-running the full activation/migration | |
| 33 | + // suite per page load on dev installs. | |
| 34 | + define('MXCHAT_BASE_VERSION', $version); | |
| 27 | 35 | if (MXCHAT_DEV_MODE) { |
| 28 | 36 | $version .= '.' . time(); |
| 29 | 37 | } |
| 30 | 38 | define('MXCHAT_VERSION', $version); |
| @@ -29,8 +37,84 @@ | ||
| 29 | 37 | } |
| 30 | 38 | define('MXCHAT_VERSION', $version); |
| 31 | 39 | } |
| 32 | 40 | |
| 41 | +/** | |
| 42 | + * Default confidence floor for the in-chat YouTube card, as a percentage | |
| 43 | + * (plan-mxchat-20260813-f52492). Higher than the site-wide Similarity | |
| 44 | + * Threshold default of 35 by design — see MxChat_Utils::video_embed_threshold(). | |
| 45 | + * Declared here so the gate, the admin field and the tests all read ONE number. | |
| 46 | + */ | |
| 47 | +if (!defined('MXCHAT_VIDEO_EMBED_THRESHOLD_DEFAULT')) { | |
| 48 | + define('MXCHAT_VIDEO_EMBED_THRESHOLD_DEFAULT', 55); | |
| 49 | +} | |
| 50 | + | |
| 51 | +/** | |
| 52 | + * One-time install stamp: records the plain version this site first ran, so | |
| 53 | + * behavior defaults can differ between fresh installs and upgrades without | |
| 54 | + * touching anyone's stored settings. Mirrors mxchat-mcp's 1.0.7 stamp shape | |
| 55 | + * (plan 7b578e); first consumer is the "Strip unapproved links" default | |
| 56 | + * (plan 58f8b4). Runs at init priority 1 — BEFORE initialize_default_options | |
| 57 | + * (init 20) writes mxchat_options on a fresh site's first request, because | |
| 58 | + * that option's pre-existing presence is how an upgrade is recognized. | |
| 59 | + */ | |
| 60 | +function mxchat_stamp_install_version() { | |
| 61 | + if (get_option('mxchat_installed_at_version', '') !== '') { | |
| 62 | + return; | |
| 63 | + } | |
| 64 | + $existing = get_option('mxchat_options', false) !== false; | |
| 65 | + $version = defined('MXCHAT_BASE_VERSION') ? MXCHAT_BASE_VERSION : '0.0.0'; | |
| 66 | + update_option('mxchat_installed_at_version', $existing ? 'legacy' : $version, false); | |
| 67 | +} | |
| 68 | +add_action('init', 'mxchat_stamp_install_version', 1); | |
| 69 | + | |
| 70 | +/** | |
| 71 | + * Stamp-derived default for the "Strip unapproved links" toggle (plan 58f8b4, | |
| 72 | + * option-c split of the old Citation Links conflation): 'on' only for installs | |
| 73 | + * born at 3.2.20+. A missing or 'legacy' stamp means the site predates the | |
| 74 | + * setting — keep 'off' so no existing site's links start vanishing on update. | |
| 75 | + */ | |
| 76 | +function mxchat_strip_unapproved_links_default() { | |
| 77 | + $stamp = get_option('mxchat_installed_at_version', ''); | |
| 78 | + if ($stamp === '' || $stamp === 'legacy') { | |
| 79 | + return 'off'; | |
| 80 | + } | |
| 81 | + return version_compare($stamp, '3.2.20', '>=') ? 'on' : 'off'; | |
| 82 | +} | |
| 83 | + | |
| 84 | +/** | |
| 85 | + * Effective state of "Strip unapproved links": an explicitly saved option | |
| 86 | + * always wins; until one exists the install-stamp default governs. Read via | |
| 87 | + * a fresh get_option on purpose — the response URL guard runs late in the | |
| 88 | + * request and must see a value saved moments earlier. | |
| 89 | + */ | |
| 90 | +function mxchat_strip_unapproved_links_enabled() { | |
| 91 | + $opts = get_option('mxchat_options', array()); | |
| 92 | + if (is_array($opts) && isset($opts['strip_unapproved_links_toggle'])) { | |
| 93 | + return $opts['strip_unapproved_links_toggle'] === 'on'; | |
| 94 | + } | |
| 95 | + return mxchat_strip_unapproved_links_default() === 'on'; | |
| 96 | +} | |
| 97 | + | |
| 98 | +/** | |
| 99 | + * Honest, versioned User-Agent for MXChat remote-content ingestion fetches | |
| 100 | + * (Knowledge Base PDF import, URL import, sitemap / website crawl). | |
| 101 | + * | |
| 102 | + * WAF rulesets (SiteGround/ModSecurity, Wordfence, Cloudflare managed rules) | |
| 103 | + * flag stale spoofed-browser UAs as scrapers and return 403 — which silently | |
| 104 | + * broke the single most common KB source: self-hosted media on the site's own | |
| 105 | + * domain. A truthful crawler identifier is the industry norm for well-behaved | |
| 106 | + * bots and lets a site owner allowlist "MXChatBot" in their WAF. Filterable so | |
| 107 | + * a locked-down host can supply a different string without a code change. | |
| 108 | + */ | |
| 109 | +if (!function_exists('mxchat_ingest_user_agent')) { | |
| 110 | + function mxchat_ingest_user_agent() { | |
| 111 | + $version = defined('MXCHAT_VERSION') ? MXCHAT_VERSION : '1.0'; | |
| 112 | + $ua = 'MXChatBot/' . $version . ' (+https://mxchat.ai/bot)'; | |
| 113 | + return apply_filters('mxchat_ingest_user_agent', $ua); | |
| 114 | + } | |
| 115 | +} | |
| 116 | + | |
| 33 | 117 | function mxchat_load_textdomain() { |
| 34 | 118 | $domain = 'mxchat'; |
| 35 | 119 | $locale = determine_locale(); |
| 36 | 120 | |
| @@ -46,8 +130,84 @@ | ||
| 46 | 130 | } |
| 47 | 131 | add_action('init', 'mxchat_load_textdomain'); |
| 48 | 132 | |
| 49 | 133 | /** |
| 134 | + * One-time migration: gemini-3-pro-preview was shut down by Google on March 9, 2026. | |
| 135 | + * Existing installs with the dead ID get auto-remapped to gemini-3.1-pro-preview | |
| 136 | + * (Google's official migration target) the first time admin_init fires after update. | |
| 137 | + */ | |
| 138 | +add_action('admin_init', function () { | |
| 139 | + if (get_option('mxchat_gemini_3_remap_done')) { | |
| 140 | + return; | |
| 141 | + } | |
| 142 | + $opts = get_option('mxchat_options'); | |
| 143 | + if (is_array($opts) && isset($opts['model']) && $opts['model'] === 'gemini-3-pro-preview') { | |
| 144 | + $opts['model'] = 'gemini-3.1-pro-preview'; | |
| 145 | + update_option('mxchat_options', $opts); | |
| 146 | + } | |
| 147 | + if (is_array($opts) && isset($opts['content_model']) && $opts['content_model'] === 'gemini-3-pro-preview') { | |
| 148 | + $opts['content_model'] = 'gemini-3.1-pro-preview'; | |
| 149 | + update_option('mxchat_options', $opts); | |
| 150 | + } | |
| 151 | + update_option('mxchat_gemini_3_remap_done', 1); | |
| 152 | +}); | |
| 153 | + | |
| 154 | +/** | |
| 155 | + * One-time migration: the Grok 2 family was retired by xAI (grok-2, grok-2-1212, | |
| 156 | + * grok-2-latest, grok-2-vision-1212 all return 400 "Model not found"). Existing | |
| 157 | + * installs with the dead ID get auto-remapped to grok-4-1-fast-non-reasoning | |
| 158 | + * (modern, fast, broadly available) the first time admin_init fires after update. | |
| 159 | + */ | |
| 160 | +add_action('admin_init', function () { | |
| 161 | + if (get_option('mxchat_grok_2_remap_done')) { | |
| 162 | + return; | |
| 163 | + } | |
| 164 | + $opts = get_option('mxchat_options'); | |
| 165 | + if (is_array($opts) && isset($opts['model']) && $opts['model'] === 'grok-2') { | |
| 166 | + $opts['model'] = 'grok-4-1-fast-non-reasoning'; | |
| 167 | + update_option('mxchat_options', $opts); | |
| 168 | + } | |
| 169 | + if (is_array($opts) && isset($opts['content_model']) && $opts['content_model'] === 'grok-2') { | |
| 170 | + $opts['content_model'] = 'grok-4-1-fast-non-reasoning'; | |
| 171 | + update_option('mxchat_options', $opts); | |
| 172 | + } | |
| 173 | + update_option('mxchat_grok_2_remap_done', 1); | |
| 174 | +}); | |
| 175 | + | |
| 176 | +/** | |
| 177 | + * One-time migration: Anthropic retired the Claude 4 (2025-05-14) snapshots on | |
| 178 | + * June 15, 2026 — claude-opus-4-20250514 and claude-sonnet-4-20250514 now return | |
| 179 | + * an API error. Existing installs with a dead ID get auto-remapped to the current | |
| 180 | + * equivalents Anthropic recommends (Opus 4.8 / Sonnet 4.6) the first time admin_init | |
| 181 | + * fires after update. Mirrors the gemini-3-pro-preview / grok-2 rescues above. | |
| 182 | + */ | |
| 183 | +add_action('admin_init', function () { | |
| 184 | + if (get_option('mxchat_claude_4_retire_remap_done')) { | |
| 185 | + return; | |
| 186 | + } | |
| 187 | + $map = array( | |
| 188 | + 'claude-opus-4-20250514' => 'claude-opus-4-8', | |
| 189 | + 'claude-sonnet-4-20250514' => 'claude-sonnet-4-6', | |
| 190 | + ); | |
| 191 | + $opts = get_option('mxchat_options'); | |
| 192 | + if (is_array($opts)) { | |
| 193 | + $changed = false; | |
| 194 | + if (isset($opts['model']) && isset($map[$opts['model']])) { | |
| 195 | + $opts['model'] = $map[$opts['model']]; | |
| 196 | + $changed = true; | |
| 197 | + } | |
| 198 | + if (isset($opts['content_model']) && isset($map[$opts['content_model']])) { | |
| 199 | + $opts['content_model'] = $map[$opts['content_model']]; | |
| 200 | + $changed = true; | |
| 201 | + } | |
| 202 | + if ($changed) { | |
| 203 | + update_option('mxchat_options', $opts); | |
| 204 | + } | |
| 205 | + } | |
| 206 | + update_option('mxchat_claude_4_retire_remap_done', 1); | |
| 207 | +}); | |
| 208 | + | |
| 209 | +/** | |
| 50 | 210 | * Exclude MxChat assets from caching plugin optimizations |
| 51 | 211 | * |
| 52 | 212 | * This prevents issues with WP Rocket, LiteSpeed Cache, Autoptimize, WP Super Cache, |
| 53 | 213 | * W3 Total Cache, SG Optimizer, and similar plugins that may break the chatbot by |
| @@ -250,23 +410,88 @@ | ||
| 250 | 410 | $rejected[] = 'wp-admin/admin-ajax.php'; |
| 251 | 411 | return $rejected; |
| 252 | 412 | }); |
| 253 | 413 | |
| 414 | +// ── Page-cache bypass for chat AJAX (companion to the 3.2.6 nonce-race hotfix) | |
| 415 | +// Each cache plugin gets its own filter export so that visitors hitting an | |
| 416 | +// edge-cached page never receive cached chat-AJAX responses. The chat send / | |
| 417 | +// stream send / file upload all POST to /wp-admin/admin-ajax.php with | |
| 418 | +// `action=mxchat_*`. Without these exports, a cache plugin can stale a response | |
| 419 | +// and break the per-session nonce flow on the first message. | |
| 420 | + | |
| 421 | +// WP Rocket — `rocket_cache_reject_uri` takes a flat array of regex strings. | |
| 422 | +add_filter('rocket_cache_reject_uri', function($uris) { | |
| 423 | + if (!is_array($uris)) $uris = array(); | |
| 424 | + $uris[] = '/wp-admin/admin-ajax\.php\?action=mxchat_.*'; | |
| 425 | + return $uris; | |
| 426 | +}); | |
| 427 | + | |
| 428 | +// LiteSpeed Cache — `litespeed_cache_no_cache_for_request` short-circuits | |
| 429 | +// caching when the request matches our chat-AJAX pattern. | |
| 430 | +add_filter('litespeed_cache_no_cache_for_request', function($no_cache) { | |
| 431 | + if ($no_cache) return $no_cache; | |
| 432 | + if (!empty($_SERVER['REQUEST_URI']) && | |
| 433 | + strpos($_SERVER['REQUEST_URI'], '/wp-admin/admin-ajax.php') !== false && | |
| 434 | + !empty($_REQUEST['action']) && | |
| 435 | + strpos((string) $_REQUEST['action'], 'mxchat_') === 0) { | |
| 436 | + return true; | |
| 437 | + } | |
| 438 | + return $no_cache; | |
| 439 | +}); | |
| 440 | + | |
| 441 | +// W3 Total Cache — `w3tc_pgcache_request_skip_uri` flips page-cache off when | |
| 442 | +// the URI matches. | |
| 443 | +add_filter('w3tc_pgcache_request_skip_uri', function($skip) { | |
| 444 | + if ($skip) return $skip; | |
| 445 | + if (!empty($_SERVER['REQUEST_URI']) && | |
| 446 | + strpos($_SERVER['REQUEST_URI'], '/wp-admin/admin-ajax.php') !== false && | |
| 447 | + !empty($_REQUEST['action']) && | |
| 448 | + strpos((string) $_REQUEST['action'], 'mxchat_') === 0) { | |
| 449 | + return true; | |
| 450 | + } | |
| 451 | + return $skip; | |
| 452 | +}); | |
| 453 | + | |
| 454 | +// FlyingPress — `flying_press_cacheable` takes a boolean and is run per | |
| 455 | +// request. Same pattern as LiteSpeed / W3TC. | |
| 456 | +add_filter('flying_press_cacheable', function($cacheable) { | |
| 457 | + if (!$cacheable) return $cacheable; | |
| 458 | + if (!empty($_SERVER['REQUEST_URI']) && | |
| 459 | + strpos($_SERVER['REQUEST_URI'], '/wp-admin/admin-ajax.php') !== false && | |
| 460 | + !empty($_REQUEST['action']) && | |
| 461 | + strpos((string) $_REQUEST['action'], 'mxchat_') === 0) { | |
| 462 | + return false; | |
| 463 | + } | |
| 464 | + return $cacheable; | |
| 465 | +}); | |
| 466 | + | |
| 254 | 467 | // Include classes with error handling |
| 255 | 468 | function mxchat_include_classes() { |
| 256 | 469 | $class_files = array( |
| 470 | + 'includes/class-mxchat-model-catalog.php', | |
| 471 | + 'includes/class-mxchat-model-liveness.php', | |
| 472 | + 'includes/class-mxchat-session-store.php', | |
| 473 | + 'includes/class-mxchat-live-agent-schedule.php', | |
| 474 | + 'includes/class-mxchat-tool-registry.php', | |
| 257 | 475 | 'includes/class-mxchat-integrator.php', |
| 258 | 476 | 'includes/class-mxchat-admin.php', |
| 259 | 477 | 'includes/class-mxchat-public.php', |
| 478 | + 'includes/class-mxchat-block.php', | |
| 479 | + 'includes/class-mxchat-elementor.php', | |
| 260 | 480 | 'includes/class-mxchat-utils.php', |
| 261 | 481 | 'includes/class-mxchat-user.php', |
| 482 | + 'includes/class-mxchat-privacy.php', | |
| 262 | 483 | 'includes/class-mxchat-meta-box.php', |
| 263 | 484 | 'includes/class-mxchat-chunker.php', |
| 264 | 485 | 'includes/class-mxchat-word-handler.php', |
| 265 | 486 | 'includes/class-mxchat-content-generator.php', |
| 487 | + 'includes/class-mxchat-cache-purge.php', | |
| 488 | + 'includes/class-mxchat-editor-assistant.php', | |
| 489 | + 'includes/class-rest-api.php', | |
| 266 | 490 | 'admin/class-ajax-handler.php', |
| 267 | 491 | 'admin/class-pinecone-manager.php', |
| 268 | - 'admin/class-knowledge-manager.php' | |
| 492 | + 'admin/class-knowledge-manager.php', | |
| 493 | + 'admin/class-vectorstore-manager.php' | |
| 269 | 494 | ); |
| 270 | 495 | |
| 271 | 496 | foreach ($class_files as $file) { |
| 272 | 497 | $file_path = plugin_dir_path(__FILE__) . $file; |
| @@ -275,8 +500,77 @@ | ||
| 275 | 500 | } else { |
| 276 | 501 | //error_log('MxChat: Missing class file - ' . $file); |
| 277 | 502 | } |
| 278 | 503 | } |
| 504 | + | |
| 505 | + // Register the native function-calling admin-post save handler (a41dee). | |
| 506 | + if (class_exists('MxChat_Tool_Registry')) { | |
| 507 | + MxChat_Tool_Registry::init(); | |
| 508 | + } | |
| 509 | + | |
| 510 | + // GDPR: register with WP's personal-data export/erase tools (b81e42). | |
| 511 | + if (class_exists('MxChat_Privacy')) { | |
| 512 | + MxChat_Privacy::init(); | |
| 513 | + } | |
| 514 | + | |
| 515 | + // Per-session state store: retention cron + the cron-independent | |
| 516 | + // migration drain off admin_init (b64b77). | |
| 517 | + if (class_exists('MxChat_Session_Store')) { | |
| 518 | + MxChat_Session_Store::init(); | |
| 519 | + } | |
| 520 | + | |
| 521 | + // Daily model-liveness check + its warning notice (b65e8d). Read-only and | |
| 522 | + // fail-open: one listing request per in-use provider per day, none at all | |
| 523 | + // when no key is stored. | |
| 524 | + if (class_exists('MxChat_Model_Liveness')) { | |
| 525 | + MxChat_Model_Liveness::init(); | |
| 526 | + } | |
| 527 | + | |
| 528 | + // Gutenberg chatbot block (plan-95dd1e): a click-to-place wrapper over the | |
| 529 | + // [mxchat_chatbot] shortcode. Registers on init; no-op below WP 5.0. | |
| 530 | + if (class_exists('MxChat_Block')) { | |
| 531 | + MxChat_Block::init(); | |
| 532 | + } | |
| 533 | + | |
| 534 | + // Elementor chatbot widget (plan-95dd1e part 2): registered ONLY inside | |
| 535 | + // elementor/widgets/register (Elementor >= 3.5) — with Elementor absent or | |
| 536 | + // older, the hook never fires and nothing further loads. | |
| 537 | + if (class_exists('MxChat_Elementor')) { | |
| 538 | + MxChat_Elementor::init(); | |
| 539 | + } | |
| 540 | + | |
| 541 | + // Editor Assistant — free, OFF-by-default block-editor AI actions (plan-8cb0cb). | |
| 542 | + // init() wires REST + streaming AJAX + sidebar enqueue ONLY when the | |
| 543 | + // mxchat_editor_assistant_enabled option is 'on'; otherwise zero footprint. | |
| 544 | + if (class_exists('MxChat_Editor_Assistant')) { | |
| 545 | + MxChat_Editor_Assistant::init(); | |
| 546 | + } | |
| 547 | + | |
| 548 | + // OpenAI Vector Store write path (plan-15b5c6): import/sync AJAX, the | |
| 549 | + // import cron tick, the pending-delete sweeper, and the WP-CLI command | |
| 550 | + // all register in the constructor. The sync itself only runs when the | |
| 551 | + // sync toggle + store ID + OpenAI key are all present. | |
| 552 | + if (class_exists('MxChat_Vectorstore_Manager')) { | |
| 553 | + MxChat_Vectorstore_Manager::get_instance(); | |
| 554 | + } | |
| 555 | + | |
| 556 | + // Admin pages that aren't classes (procedural include). | |
| 557 | + if (is_admin()) { | |
| 558 | + $admin_api_page = plugin_dir_path(__FILE__) . 'includes/admin-api-page.php'; | |
| 559 | + if (file_exists($admin_api_page)) { | |
| 560 | + require_once $admin_api_page; | |
| 561 | + } | |
| 562 | + // f7c7d4 renamed this file admin-dashboard-page.php → admin-onboarding-page.php. | |
| 563 | + // The require MUST live here (admin bootstrap) and not just inside | |
| 564 | + // mxchat_add_plugin_page() on the admin_menu hook — admin_menu does NOT | |
| 565 | + // fire on admin-ajax.php requests, so the wizard's AJAX handlers | |
| 566 | + // (plan-905439: mxchat_onboarding_kb_status / save_step / mark_step / | |
| 567 | + // auto_graduate + the f7c7d4 dismiss handler) would never register. | |
| 568 | + $admin_onboarding_page = plugin_dir_path(__FILE__) . 'includes/admin-onboarding-page.php'; | |
| 569 | + if (file_exists($admin_onboarding_page)) { | |
| 570 | + require_once $admin_onboarding_page; | |
| 571 | + } | |
| 572 | + } | |
| 279 | 573 | } |
| 280 | 574 | |
| 281 | 575 | /** |
| 282 | 576 | * Lazy-load the PDF parser library only when needed. |
| @@ -321,8 +615,26 @@ | ||
| 321 | 615 | dbDelta($sql); |
| 322 | 616 | } |
| 323 | 617 | |
| 324 | 618 | /** |
| 619 | + * Create the per-session state table (b64b77). | |
| 620 | + * | |
| 621 | + * Callable from the activation hook, which can run before plugins_loaded has | |
| 622 | + * included the class files — so it loads the class itself when needed. | |
| 623 | + */ | |
| 624 | +function mxchat_create_sessions_table() { | |
| 625 | + if (!class_exists('MxChat_Session_Store')) { | |
| 626 | + $path = plugin_dir_path(__FILE__) . 'includes/class-mxchat-session-store.php'; | |
| 627 | + if (!file_exists($path)) { | |
| 628 | + return false; | |
| 629 | + } | |
| 630 | + require_once $path; | |
| 631 | + } | |
| 632 | + | |
| 633 | + return MxChat_Session_Store::create_table(); | |
| 634 | +} | |
| 635 | + | |
| 636 | +/** | |
| 325 | 637 | * FIXED: Robust table creation and column management |
| 326 | 638 | */ |
| 327 | 639 | function mxchat_create_chat_transcripts_table() { |
| 328 | 640 | global $wpdb; |
| @@ -608,51 +920,88 @@ | ||
| 608 | 920 | update_option('mxchat_content_type_migration_version', '2.5.6'); |
| 609 | 921 | } |
| 610 | 922 | |
| 611 | 923 | /** |
| 612 | - * 3.2.3: Add embedding_model column to KB and intent tables so we can detect | |
| 613 | - * when the active embedding model is changed while content is already embedded. | |
| 924 | + * 3.2.4: Backfill the active embedding model option for installs that already | |
| 925 | + * have KB content but no stamped model. The mismatch warning compares this | |
| 926 | + * against the user's currently selected model — no per-row column needed. | |
| 614 | 927 | */ |
| 615 | -function mxchat_add_embedding_model_columns() { | |
| 928 | +function mxchat_backfill_active_embedding_model() { | |
| 616 | 929 | global $wpdb; |
| 617 | 930 | |
| 618 | - $migration_version = get_option('mxchat_embedding_model_migration_version', '0'); | |
| 619 | - if (version_compare($migration_version, '3.2.3', '>=')) { | |
| 931 | + if (get_option('mxchat_active_embedding_model', '') !== '') { | |
| 620 | 932 | return; |
| 621 | 933 | } |
| 622 | 934 | |
| 623 | - $tables = array( | |
| 624 | - $wpdb->prefix . 'mxchat_system_prompt_content', | |
| 625 | - $wpdb->prefix . 'mxchat_intents', | |
| 626 | - $wpdb->prefix . 'mxchat_intent_phrases', | |
| 627 | - ); | |
| 935 | + $kb_table = $wpdb->prefix . 'mxchat_system_prompt_content'; | |
| 936 | + if ($wpdb->get_var("SHOW TABLES LIKE '{$kb_table}'") !== $kb_table) { | |
| 937 | + return; | |
| 938 | + } | |
| 628 | 939 | |
| 629 | - foreach ($tables as $table) { | |
| 630 | - if ($wpdb->get_var("SHOW TABLES LIKE '{$table}'") !== $table) { | |
| 631 | - continue; | |
| 632 | - } | |
| 633 | - $col_exists = $wpdb->get_results("SHOW COLUMNS FROM {$table} LIKE 'embedding_model'"); | |
| 634 | - if (empty($col_exists)) { | |
| 635 | - $wpdb->query("ALTER TABLE {$table} ADD COLUMN embedding_model VARCHAR(64) DEFAULT NULL"); | |
| 636 | - } | |
| 940 | + $kb_count = (int) $wpdb->get_var("SELECT COUNT(*) FROM {$kb_table}"); | |
| 941 | + if ($kb_count > 0) { | |
| 942 | + $options = get_option('mxchat_options', array()); | |
| 943 | + $current_model = $options['embedding_model'] ?? 'text-embedding-ada-002'; | |
| 944 | + update_option('mxchat_active_embedding_model', $current_model, false); | |
| 637 | 945 | } |
| 946 | +} | |
| 638 | 947 | |
| 639 | - // Best-effort backfill: if any existing content lacks a stamped model, assume | |
| 640 | - // it was embedded with whatever model is currently selected. This is the | |
| 641 | - // safest assumption for installations upgrading to 3.2.3 — if it was wrong | |
| 642 | - // already, the mismatch detection will surface it on the next switch. | |
| 643 | - $options = get_option('mxchat_options', array()); | |
| 644 | - $current_model = $options['embedding_model'] ?? 'text-embedding-ada-002'; | |
| 948 | +/** | |
| 949 | + * 3.2.20: One-time backfill of the caee10 catalog usage-hint defaults | |
| 950 | + * (plan 64c1ad). persist() writes usage_hint for EVERY shown tool on every | |
| 951 | + * autosave — as '' when the box is untouched — and resolve_tool_setting() | |
| 952 | + * seeds a catalog default_hint ONLY onto an ABSENT key. So any install that | |
| 953 | + * saved the AI Tools screen before 3.2.20 holds '' everywhere and the shipped | |
| 954 | + * defaults can never reach it. On an upgrade from < 3.2.20 an empty stored | |
| 955 | + * hint cannot be a deliberate clear of a rendered default (those builds never | |
| 956 | + * rendered one), so seeding is safe. From 3.2.20 on, empty means the owner | |
| 957 | + * cleared a visible default and is respected — this never runs again (version | |
| 958 | + * gate + its own marker, deliberately not caee10's flag). | |
| 959 | + * | |
| 960 | + * Never touched: entries with owner text, legacy bare-bool entries and | |
| 961 | + * absent-key entries (both already resolve to the default at read time), and | |
| 962 | + * tools whose catalog entry ships no default_hint. | |
| 963 | + */ | |
| 964 | +function mxchat_backfill_tool_hint_defaults() { | |
| 965 | + if (get_option('mxchat_tool_hint_backfill_64c1ad') === '1') { | |
| 966 | + return; | |
| 967 | + } | |
| 645 | 968 | |
| 646 | - if (get_option('mxchat_active_embedding_model', '') === '') { | |
| 647 | - $kb_table = $wpdb->prefix . 'mxchat_system_prompt_content'; | |
| 648 | - $kb_count = (int) $wpdb->get_var("SELECT COUNT(*) FROM {$kb_table}"); | |
| 649 | - if ($kb_count > 0) { | |
| 650 | - update_option('mxchat_active_embedding_model', $current_model, false); | |
| 969 | + if (class_exists('MxChat_Tool_Registry')) { | |
| 970 | + $map = get_option('mxchat_function_calling_tools', array()); | |
| 971 | + if (is_array($map) && !empty($map)) { | |
| 972 | + $defaults = array(); | |
| 973 | + foreach (MxChat_Tool_Registry::core_tool_catalog() as $fn => $meta) { | |
| 974 | + if (!empty($meta['default_hint'])) { | |
| 975 | + $defaults[$fn] = (string) $meta['default_hint']; | |
| 976 | + } | |
| 977 | + } | |
| 978 | + | |
| 979 | + $changed = false; | |
| 980 | + foreach ($map as $fn => $entry) { | |
| 981 | + if (!isset($defaults[$fn])) { | |
| 982 | + continue; // no catalog default — nothing to seed | |
| 983 | + } | |
| 984 | + if (!is_array($entry)) { | |
| 985 | + continue; // legacy bare bool: key absent, resolves to the default already | |
| 986 | + } | |
| 987 | + if (!array_key_exists('usage_hint', $entry)) { | |
| 988 | + continue; // absent key gets the default at read time — must stay absent | |
| 989 | + } | |
| 990 | + if (trim((string) $entry['usage_hint']) !== '') { | |
| 991 | + continue; // owner text — never touch | |
| 992 | + } | |
| 993 | + $map[$fn]['usage_hint'] = $defaults[$fn]; | |
| 994 | + $changed = true; | |
| 995 | + } | |
| 996 | + | |
| 997 | + if ($changed) { | |
| 998 | + update_option('mxchat_function_calling_tools', $map); | |
| 999 | + } | |
| 651 | 1000 | } |
| 652 | 1001 | } |
| 653 | 1002 | |
| 654 | - update_option('mxchat_embedding_model_migration_version', '3.2.3'); | |
| 1003 | + update_option('mxchat_tool_hint_backfill_64c1ad', '1', false); | |
| 655 | 1004 | } |
| 656 | 1005 | |
| 657 | 1006 | /** |
| 658 | 1007 | * 2.5.2: Create queue processing tables for reliable background processing |
| @@ -727,8 +1076,67 @@ | ||
| 727 | 1076 | dbDelta($sql); |
| 728 | 1077 | } |
| 729 | 1078 | |
| 730 | 1079 | /** |
| 1080 | + * Create per-session satisfaction ratings table (v3.2.6) | |
| 1081 | + * Stores one 👍/👎 rating + optional feedback per chat session. | |
| 1082 | + */ | |
| 1083 | +function mxchat_create_session_ratings_table() { | |
| 1084 | + global $wpdb; | |
| 1085 | + $charset_collate = $wpdb->get_charset_collate(); | |
| 1086 | + | |
| 1087 | + $table_name = $wpdb->prefix . 'mxchat_session_ratings'; | |
| 1088 | + $sql = "CREATE TABLE $table_name ( | |
| 1089 | + id bigint(20) unsigned NOT NULL AUTO_INCREMENT, | |
| 1090 | + session_id varchar(255) NOT NULL, | |
| 1091 | + bot_id varchar(50) NOT NULL DEFAULT 'default', | |
| 1092 | + rating_value tinyint(1) NOT NULL, | |
| 1093 | + rating_feedback text DEFAULT NULL, | |
| 1094 | + created_at datetime NOT NULL, | |
| 1095 | + PRIMARY KEY (id), | |
| 1096 | + UNIQUE KEY session_id (session_id), | |
| 1097 | + KEY bot_id (bot_id), | |
| 1098 | + KEY created_at (created_at) | |
| 1099 | + ) $charset_collate;"; | |
| 1100 | + | |
| 1101 | + require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); | |
| 1102 | + dbDelta($sql); | |
| 1103 | +} | |
| 1104 | + | |
| 1105 | +/** | |
| 1106 | + * Create the OpenAI Vector Store file-mapping table (v3.2.20, plan 15b5c6). | |
| 1107 | + * One row per mirrored KB entry: which store, which bot, which OpenAI file id, | |
| 1108 | + * and a hash of the uploaded body for change detection. Vector store files are | |
| 1109 | + * not patchable in place — without this mapping an update cannot find its | |
| 1110 | + * predecessor, and the store silently accumulates stale duplicates. | |
| 1111 | + * status: 'live' (serving) or 'pending_delete' (condemned, swept later). | |
| 1112 | + */ | |
| 1113 | +function mxchat_create_vectorstore_files_table() { | |
| 1114 | + global $wpdb; | |
| 1115 | + $charset_collate = $wpdb->get_charset_collate(); | |
| 1116 | + | |
| 1117 | + $table_name = $wpdb->prefix . 'mxchat_vectorstore_files'; | |
| 1118 | + $sql = "CREATE TABLE $table_name ( | |
| 1119 | + id bigint(20) unsigned NOT NULL AUTO_INCREMENT, | |
| 1120 | + store_id varchar(64) NOT NULL, | |
| 1121 | + bot_id varchar(64) NOT NULL DEFAULT 'default', | |
| 1122 | + entry_key char(32) NOT NULL, | |
| 1123 | + source_url text, | |
| 1124 | + file_id varchar(64) NOT NULL, | |
| 1125 | + content_hash char(32) NOT NULL DEFAULT '', | |
| 1126 | + status varchar(20) NOT NULL DEFAULT 'live', | |
| 1127 | + last_error text, | |
| 1128 | + updated_at datetime DEFAULT NULL, | |
| 1129 | + PRIMARY KEY (id), | |
| 1130 | + KEY store_entry (store_id, bot_id, entry_key, status), | |
| 1131 | + KEY status (status) | |
| 1132 | + ) $charset_collate;"; | |
| 1133 | + | |
| 1134 | + require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); | |
| 1135 | + dbDelta($sql); | |
| 1136 | +} | |
| 1137 | + | |
| 1138 | +/** | |
| 731 | 1139 | * 2.5.2: Fix URL column size to support long URLs (especially with UTF-8 encoding) |
| 732 | 1140 | * This fixes "url, source_url. The supplied values may be too long" errors |
| 733 | 1141 | */ |
| 734 | 1142 | function mxchat_fix_url_column_size() { |
| @@ -772,53 +1180,45 @@ | ||
| 772 | 1180 | if (!isset($options['model'])) { |
| 773 | 1181 | return; |
| 774 | 1182 | } |
| 775 | 1183 | |
| 776 | - $current_model = $options['model']; | |
| 777 | - | |
| 778 | - // Migrate deprecated Claude models to Claude Opus 4.6 (recommended replacement per Anthropic) | |
| 779 | - $deprecated_claude_models = array( | |
| 780 | - 'claude-3-5-sonnet-20240620', // Retired Oct 28, 2025 | |
| 781 | - 'claude-3-5-sonnet-20241022', // Retired Oct 28, 2025 | |
| 782 | - 'claude-3-7-sonnet-20250219', // Retiring Feb 19, 2026 | |
| 783 | - 'claude-3-opus-20240229', // Retired Jan 5, 2026 | |
| 784 | - 'claude-3-sonnet-20240229', // Legacy | |
| 785 | - 'claude-3-haiku-20240307', // Legacy | |
| 786 | - ); | |
| 787 | - if (in_array($current_model, $deprecated_claude_models, true)) { | |
| 788 | - $options['model'] = 'claude-opus-4-6'; | |
| 789 | - $migrated = true; | |
| 790 | - $migration_message = sprintf( | |
| 791 | - 'Your chatbot model has been automatically updated from %s to Claude Opus 4.6 due to Anthropic deprecating older Claude models.', | |
| 792 | - $current_model | |
| 793 | - ); | |
| 1184 | + // The retired-id → replacement mapping lives in ONE place: | |
| 1185 | + // MxChat_Model_Catalog::retired_model_map() (plan 202df5). This function | |
| 1186 | + // and every add-on that stores model ids consume that map — do not add a | |
| 1187 | + // deprecation list here again. | |
| 1188 | + if (!class_exists('MxChat_Model_Catalog') || !method_exists('MxChat_Model_Catalog', 'retired_model_map')) { | |
| 1189 | + return; // catalog not loaded (defensive) — the next admin load retries | |
| 794 | 1190 | } |
| 1191 | + $map = MxChat_Model_Catalog::retired_model_map(); | |
| 795 | 1192 | |
| 796 | - // Migrate deprecated Claude Haiku 3.5 to Claude Haiku 4.5 | |
| 797 | - if ($current_model === 'claude-3-5-haiku-20241022') { | |
| 798 | - $options['model'] = 'claude-haiku-4-5-20251001'; | |
| 1193 | + $current_model = $options['model']; | |
| 1194 | + if (isset($map[$current_model])) { | |
| 1195 | + $entry = $map[$current_model]; | |
| 1196 | + $options['model'] = $entry['to']; | |
| 799 | 1197 | $migrated = true; |
| 800 | - $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.'; | |
| 801 | - } | |
| 802 | - | |
| 803 | - // Migrate deprecated GPT-4 series and GPT-3.5 Turbo to GPT-5.1 Chat Latest | |
| 804 | - if (in_array($current_model, array('gpt-4o', 'gpt-4.1-2025-04-14', 'gpt-4-turbo', 'gpt-4', 'gpt-3.5-turbo'), true)) { | |
| 805 | - $options['model'] = 'gpt-5.1-chat-latest'; | |
| 806 | - $migrated = true; | |
| 807 | 1198 | $migration_message = sprintf( |
| 808 | - 'Your chatbot model has been automatically updated from %s to GPT-5.1 Chat Latest due to OpenAI deprecating older models.', | |
| 809 | - $current_model | |
| 1199 | + 'Your chatbot model has been automatically updated from %s to %s %s.', | |
| 1200 | + $current_model, | |
| 1201 | + $entry['label'], | |
| 1202 | + $entry['reason'] | |
| 810 | 1203 | ); |
| 811 | 1204 | } |
| 812 | 1205 | |
| 813 | - // Migrate deprecated GPT-4o Mini and GPT-4.1 Mini to GPT-5 Mini | |
| 814 | - if (in_array($current_model, array('gpt-4o-mini', 'gpt-4.1-mini'), true)) { | |
| 815 | - $options['model'] = 'gpt-5-mini'; | |
| 1206 | + // The content generator has its own model option — the same map applies. | |
| 1207 | + // (Pre-202df5 this branch covered only the two gpt-5.x-chat-latest aliases; | |
| 1208 | + // it now covers every retired id, so e.g. a content model stranded on a | |
| 1209 | + // retired Claude id is rescued the same way the chat model is.) | |
| 1210 | + if (isset($options['content_model']) && isset($map[$options['content_model']])) { | |
| 1211 | + $old_content_model = $options['content_model']; | |
| 1212 | + $entry = $map[$old_content_model]; | |
| 1213 | + $options['content_model'] = $entry['to']; | |
| 816 | 1214 | $migrated = true; |
| 817 | - $migration_message = sprintf( | |
| 818 | - 'Your chatbot model has been automatically updated from %s to GPT-5 Mini due to OpenAI deprecating GPT-4 series models.', | |
| 819 | - $current_model | |
| 820 | - ); | |
| 1215 | + $migration_message = trim($migration_message . ' ' . sprintf( | |
| 1216 | + 'Your content generation model has also been automatically updated from %s to %s %s.', | |
| 1217 | + $old_content_model, | |
| 1218 | + $entry['label'], | |
| 1219 | + $entry['reason'] | |
| 1220 | + )); | |
| 821 | 1221 | } |
| 822 | 1222 | |
| 823 | 1223 | if ($migrated) { |
| 824 | 1224 | update_option('mxchat_options', $options); |
| @@ -845,8 +1245,100 @@ | ||
| 845 | 1245 | delete_option('mxchat_model_migration_message'); |
| 846 | 1246 | } |
| 847 | 1247 | } |
| 848 | 1248 | |
| 1249 | +/** | |
| 1250 | + * One-time recommendation on EXISTING installs (stamp 'legacy') that the new | |
| 1251 | + * "Strip unapproved links" guard exists and is worth turning on (plan 58f8b4). | |
| 1252 | + * Fresh 3.2.20+ installs default it on and never see this. Shown only on | |
| 1253 | + * MxChat admin pages, gone for good once dismissed or once the site saves an | |
| 1254 | + * explicit value for the toggle either way. | |
| 1255 | + */ | |
| 1256 | +function mxchat_show_strip_links_notice() { | |
| 1257 | + if (!current_user_can('manage_options')) { | |
| 1258 | + return; | |
| 1259 | + } | |
| 1260 | + $page = isset($_GET['page']) ? sanitize_key($_GET['page']) : ''; | |
| 1261 | + if (strpos($page, 'mxchat') !== 0) { | |
| 1262 | + return; | |
| 1263 | + } | |
| 1264 | + if (get_option('mxchat_strip_links_notice_dismissed', '') === '1') { | |
| 1265 | + return; | |
| 1266 | + } | |
| 1267 | + if (get_option('mxchat_installed_at_version', '') !== 'legacy') { | |
| 1268 | + return; | |
| 1269 | + } | |
| 1270 | + $opts = get_option('mxchat_options', array()); | |
| 1271 | + if (is_array($opts) && isset($opts['strip_unapproved_links_toggle'])) { | |
| 1272 | + return; // The site already made its choice — stop recommending. | |
| 1273 | + } | |
| 1274 | + $dismiss_url = wp_nonce_url( | |
| 1275 | + admin_url('admin-post.php?action=mxchat_dismiss_strip_links_notice'), | |
| 1276 | + 'mxchat_dismiss_strip_links_notice' | |
| 1277 | + ); | |
| 1278 | + ?> | |
| 1279 | + <div class="notice notice-info"> | |
| 1280 | + <p> | |
| 1281 | + <strong><?php esc_html_e('MxChat: new link protection available', 'mxchat'); ?></strong><br> | |
| 1282 | + <?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'); ?> | |
| 1283 | + <a href="<?php echo esc_url($dismiss_url); ?>"><?php esc_html_e('Dismiss', 'mxchat'); ?></a> | |
| 1284 | + </p> | |
| 1285 | + </div> | |
| 1286 | + <?php | |
| 1287 | +} | |
| 1288 | +add_action('admin_notices', 'mxchat_show_strip_links_notice'); | |
| 1289 | + | |
| 1290 | +/** Dismiss handler for the strip-links recommendation notice (plan 58f8b4). */ | |
| 1291 | +function mxchat_dismiss_strip_links_notice() { | |
| 1292 | + if (!current_user_can('manage_options')) { | |
| 1293 | + wp_die(esc_html__('Insufficient permissions.', 'mxchat'), '', array('response' => 403)); | |
| 1294 | + } | |
| 1295 | + check_admin_referer('mxchat_dismiss_strip_links_notice'); | |
| 1296 | + update_option('mxchat_strip_links_notice_dismissed', '1', false); | |
| 1297 | + $referer = wp_get_referer(); | |
| 1298 | + wp_safe_redirect($referer ? $referer : admin_url('admin.php?page=mxchat-max')); | |
| 1299 | + exit; | |
| 1300 | +} | |
| 1301 | +add_action('admin_post_mxchat_dismiss_strip_links_notice', 'mxchat_dismiss_strip_links_notice'); | |
| 1302 | + | |
| 1303 | +/** | |
| 1304 | + * Persistent admin notice when the provider rejected the configured model | |
| 1305 | + * (model_not_found / no access). Set by mxchat_friendly_chat_error() in the | |
| 1306 | + * integrator whenever a chat request fails on a model-access error — including | |
| 1307 | + * requests from anonymous visitors, which is the case that otherwise stays | |
| 1308 | + * invisible to the site owner for weeks (plan e46b8f). | |
| 1309 | + * | |
| 1310 | + * Deleted after render so it re-arms on the next failed chat: the notice keeps | |
| 1311 | + * reappearing until the model is fixed, then stops on its own. | |
| 1312 | + */ | |
| 1313 | +function mxchat_show_model_access_notice() { | |
| 1314 | + if (!current_user_can('manage_options')) { | |
| 1315 | + return; | |
| 1316 | + } | |
| 1317 | + $notice = get_option('mxchat_model_access_notice'); | |
| 1318 | + if (!is_array($notice) || empty($notice['model'])) { | |
| 1319 | + return; | |
| 1320 | + } | |
| 1321 | + $settings_url = admin_url('admin.php?page=mxchat-max'); | |
| 1322 | + ?> | |
| 1323 | + <div class="notice notice-error is-dismissible"> | |
| 1324 | + <p> | |
| 1325 | + <strong><?php esc_html_e('MxChat: your AI model is being rejected by the provider', 'mxchat'); ?></strong><br> | |
| 1326 | + <?php | |
| 1327 | + printf( | |
| 1328 | + /* translators: 1: model id, 2: provider name */ | |
| 1329 | + esc_html__('Chat requests using the model "%1$s" are failing because %2$s reports it as unavailable on your API key (it may have been retired). Visitors may be seeing errors instead of replies.', 'mxchat'), | |
| 1330 | + esc_html($notice['model']), | |
| 1331 | + esc_html(!empty($notice['provider']) ? $notice['provider'] : __('the AI provider', 'mxchat')) | |
| 1332 | + ); | |
| 1333 | + ?> | |
| 1334 | + <a href="<?php echo esc_url($settings_url); ?>"><?php esc_html_e('Choose a different model in MxChat Settings', 'mxchat'); ?></a> | |
| 1335 | + </p> | |
| 1336 | + </div> | |
| 1337 | + <?php | |
| 1338 | + delete_option('mxchat_model_access_notice'); | |
| 1339 | +} | |
| 1340 | + | |
| 849 | 1341 | function mxchat_activate() { |
| 850 | 1342 | global $wpdb; |
| 851 | 1343 | $charset_collate = $wpdb->get_charset_collate(); |
| 852 | 1344 | |
| @@ -854,8 +1346,12 @@ | ||
| 854 | 1346 | |
| 855 | 1347 | // Create chat transcripts table with improved function |
| 856 | 1348 | mxchat_create_chat_transcripts_table(); |
| 857 | 1349 | |
| 1350 | + // Per-session state table (b64b77). Activation can run before | |
| 1351 | + // plugins_loaded has included the class files, so require it directly. | |
| 1352 | + mxchat_create_sessions_table(); | |
| 1353 | + | |
| 858 | 1354 | // System Prompt Content Table - UPDATED: Use TEXT for url and source_url columns |
| 859 | 1355 | $system_prompt_table = $wpdb->prefix . 'mxchat_system_prompt_content'; |
| 860 | 1356 | $sql_system_prompt = "CREATE TABLE $system_prompt_table ( |
| 861 | 1357 | id MEDIUMINT(9) NOT NULL AUTO_INCREMENT, |
| @@ -864,9 +1360,8 @@ | ||
| 864 | 1360 | embedding_vector LONGTEXT, |
| 865 | 1361 | source_url TEXT DEFAULT NULL, |
| 866 | 1362 | role_restriction VARCHAR(50) DEFAULT 'public', |
| 867 | 1363 | content_type VARCHAR(50) DEFAULT 'content', |
| 868 | - embedding_model VARCHAR(64) DEFAULT NULL, | |
| 869 | 1364 | timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL, |
| 870 | 1365 | PRIMARY KEY (id), |
| 871 | 1366 | KEY content_type (content_type) |
| 872 | 1367 | ) $charset_collate;"; |
| @@ -881,9 +1376,8 @@ | ||
| 881 | 1376 | callback_function VARCHAR(255) NOT NULL, |
| 882 | 1377 | similarity_threshold FLOAT DEFAULT 0.85, |
| 883 | 1378 | enabled TINYINT(1) NOT NULL DEFAULT 1, |
| 884 | 1379 | enabled_bots LONGTEXT DEFAULT NULL, |
| 885 | - embedding_model VARCHAR(64) DEFAULT NULL, | |
| 886 | 1380 | PRIMARY KEY (id) |
| 887 | 1381 | ) $charset_collate;"; |
| 888 | 1382 | |
| 889 | 1383 | // Individual Intent Phrases Table - each phrase gets its own embedding vector |
| @@ -892,9 +1386,8 @@ | ||
| 892 | 1386 | id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, |
| 893 | 1387 | intent_id BIGINT(20) UNSIGNED NOT NULL, |
| 894 | 1388 | phrase TEXT NOT NULL, |
| 895 | 1389 | embedding_vector LONGTEXT NOT NULL, |
| 896 | - embedding_model VARCHAR(64) DEFAULT NULL, | |
| 897 | 1390 | created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL, |
| 898 | 1391 | PRIMARY KEY (id), |
| 899 | 1392 | KEY intent_id (intent_id) |
| 900 | 1393 | ) $charset_collate;"; |
| @@ -917,8 +1410,14 @@ | ||
| 917 | 1410 | |
| 918 | 1411 | // Create transcript translations table |
| 919 | 1412 | mxchat_create_translations_table(); |
| 920 | 1413 | |
| 1414 | + // Create per-session satisfaction ratings table (v3.2.6) | |
| 1415 | + mxchat_create_session_ratings_table(); | |
| 1416 | + | |
| 1417 | + // Create Vector Store file-mapping table (v3.2.20, plan 15b5c6) | |
| 1418 | + mxchat_create_vectorstore_files_table(); | |
| 1419 | + | |
| 921 | 1420 | // Ensure additional columns in system prompt table |
| 922 | 1421 | $existing_system_columns = $wpdb->get_results("SHOW COLUMNS FROM $system_prompt_table"); |
| 923 | 1422 | if (!empty($existing_system_columns)) { |
| 924 | 1423 | $existing_system_column_names = array_column($existing_system_columns, 'Field'); |
| @@ -961,16 +1460,17 @@ | ||
| 961 | 1460 | |
| 962 | 1461 | // Run migration for existing installations |
| 963 | 1462 | mxchat_migrate_pinecone_roles_add_bot_id(); |
| 964 | 1463 | |
| 965 | - // 3.2.3: Add embedding_model column to KB and intent tables | |
| 966 | - mxchat_add_embedding_model_columns(); | |
| 1464 | + // 3.2.4: Backfill active embedding model option (replaces 3.2.3 column-based tracking) | |
| 1465 | + mxchat_backfill_active_embedding_model(); | |
| 967 | 1466 | |
| 968 | 1467 | // Setup cron jobs |
| 969 | 1468 | mxchat_setup_cron_jobs(); |
| 970 | 1469 | |
| 971 | - // Update version | |
| 972 | - update_option('mxchat_plugin_version', MXCHAT_VERSION); | |
| 1470 | + // Update version (stable base version — never the dev time()-suffixed one, | |
| 1471 | + // or the check_for_update comparison would churn every request) | |
| 1472 | + update_option('mxchat_plugin_version', MXCHAT_BASE_VERSION); | |
| 973 | 1473 | |
| 974 | 1474 | //error_log("MxChat: Activation function completed"); |
| 975 | 1475 | } |
| 976 | 1476 | |
| @@ -985,28 +1485,35 @@ | ||
| 985 | 1485 | if (defined('DISABLE_WP_CRON') && DISABLE_WP_CRON) { |
| 986 | 1486 | // Set flag to use fallback system |
| 987 | 1487 | update_option('mxchat_use_fallback_rate_limits', true); |
| 988 | 1488 | update_option('mxchat_next_rate_limit_check', time() + 3600); |
| 989 | - return; | |
| 990 | - } | |
| 991 | - | |
| 992 | - // Schedule the rate limit reset cron job | |
| 993 | - $result = wp_schedule_event(time() + 300, 'hourly', 'mxchat_reset_rate_limits'); | |
| 994 | - | |
| 995 | - if ($result === false) { | |
| 996 | - // Fallback if scheduling fails | |
| 997 | - update_option('mxchat_use_fallback_rate_limits', true); | |
| 998 | - update_option('mxchat_next_rate_limit_check', time() + 3600); | |
| 1489 | + // Deliberately NO early return (plan-bc08a6): transcript cleanup below | |
| 1490 | + // must still be scheduled. DISABLE_WP_CRON only changes HOW cron events | |
| 1491 | + // execute (a server-side runner hitting wp-cron.php instead of loopback | |
| 1492 | + // spawns) — scheduling still just writes the cron option. The old early | |
| 1493 | + // return here meant a deactivate/reactivate cycle on a DISABLE_WP_CRON | |
| 1494 | + // site permanently lost the transcript cleanup event while the retention | |
| 1495 | + // setting still claimed to be active. | |
| 999 | 1496 | } else { |
| 1000 | - // Clear fallback flags if cron scheduling succeeded | |
| 1001 | - delete_option('mxchat_use_fallback_rate_limits'); | |
| 1497 | + // Schedule the rate limit reset cron job | |
| 1498 | + $result = wp_schedule_event(time() + 300, 'hourly', 'mxchat_reset_rate_limits'); | |
| 1499 | + | |
| 1500 | + if ($result === false) { | |
| 1501 | + // Fallback if scheduling fails | |
| 1502 | + update_option('mxchat_use_fallback_rate_limits', true); | |
| 1503 | + update_option('mxchat_next_rate_limit_check', time() + 3600); | |
| 1504 | + } else { | |
| 1505 | + // Clear fallback flags if cron scheduling succeeded | |
| 1506 | + delete_option('mxchat_use_fallback_rate_limits'); | |
| 1507 | + } | |
| 1002 | 1508 | } |
| 1003 | - | |
| 1004 | - // Schedule transcript cleanup if configured | |
| 1509 | + | |
| 1510 | + // Schedule transcript cleanup if configured (bucket dropdown OR custom retention-days > 0) | |
| 1005 | 1511 | $transcript_options = get_option('mxchat_transcripts_options', array()); |
| 1006 | 1512 | $cleanup_interval = isset($transcript_options['mxchat_auto_delete_transcripts']) ? $transcript_options['mxchat_auto_delete_transcripts'] : 'never'; |
| 1007 | - | |
| 1008 | - if ($cleanup_interval !== 'never') { | |
| 1513 | + $custom_retention = isset($transcript_options['mxchat_retention_days']) ? (int) $transcript_options['mxchat_retention_days'] : 0; | |
| 1514 | + | |
| 1515 | + if ($cleanup_interval !== 'never' || $custom_retention > 0) { | |
| 1009 | 1516 | // Check if not already scheduled |
| 1010 | 1517 | if (!wp_next_scheduled('mxchat_cleanup_old_transcripts')) { |
| 1011 | 1518 | // Schedule to run daily at 3 AM |
| 1012 | 1519 | $next_run = strtotime('tomorrow 3:00 AM'); |
| @@ -1022,8 +1529,9 @@ | ||
| 1022 | 1529 | // Clear scheduled cron jobs |
| 1023 | 1530 | wp_clear_scheduled_hook('mxchat_reset_rate_limits'); |
| 1024 | 1531 | wp_clear_scheduled_hook('mxchat_cleanup_old_transcripts'); |
| 1025 | 1532 | wp_clear_scheduled_hook('mxchat_send_delayed_transcript'); |
| 1533 | + wp_clear_scheduled_hook('mxchat_model_liveness_check'); | |
| 1026 | 1534 | |
| 1027 | 1535 | // Clear fallback options |
| 1028 | 1536 | delete_option('mxchat_use_fallback_rate_limits'); |
| 1029 | 1537 | delete_option('mxchat_next_rate_limit_check'); |
| @@ -1043,17 +1551,25 @@ | ||
| 1043 | 1551 | return; |
| 1044 | 1552 | } |
| 1045 | 1553 | |
| 1046 | 1554 | $next_check = get_option('mxchat_next_rate_limit_check', 0); |
| 1047 | - | |
| 1555 | + | |
| 1048 | 1556 | if (time() >= $next_check) { |
| 1049 | - // Only run reset if the MxChat_Integrator class exists | |
| 1050 | - if (class_exists('MxChat_Integrator')) { | |
| 1051 | - $integrator = new MxChat_Integrator(); | |
| 1052 | - if (method_exists($integrator, 'mxchat_reset_rate_limits')) { | |
| 1053 | - $integrator->mxchat_reset_rate_limits(); | |
| 1054 | - update_option('mxchat_next_rate_limit_check', time() + 3600); | |
| 1055 | - } | |
| 1557 | + // Reuse the bootstrap's integrator — mxchat_init() creates the global on | |
| 1558 | + // plugins_loaded (before this init-priority-5 callback), so it's always set | |
| 1559 | + // here. Constructing a second MxChat_Integrator just to call one method | |
| 1560 | + // re-registers every hook the plugin has (ajax pairs, wp_footer loader, | |
| 1561 | + // rest_api_init, admin_init guard) on a duplicate instance for the rest of | |
| 1562 | + // the request. Defensive construction only if the global is somehow unset. | |
| 1563 | + // NOTE: MxChat_Integrator::check_fallback_rate_limits() is a second | |
| 1564 | + // implementation of this same check — if either changes, change both. | |
| 1565 | + global $mxchat_integrator; | |
| 1566 | + $integrator = ($mxchat_integrator instanceof MxChat_Integrator) | |
| 1567 | + ? $mxchat_integrator | |
| 1568 | + : (class_exists('MxChat_Integrator') ? new MxChat_Integrator() : null); | |
| 1569 | + if ($integrator && method_exists($integrator, 'mxchat_reset_rate_limits')) { | |
| 1570 | + $integrator->mxchat_reset_rate_limits(); | |
| 1571 | + update_option('mxchat_next_rate_limit_check', time() + 3600); | |
| 1056 | 1572 | } |
| 1057 | 1573 | } |
| 1058 | 1574 | } |
| 1059 | 1575 | |
| @@ -1065,9 +1581,9 @@ | ||
| 1065 | 1581 | global $wpdb; |
| 1066 | 1582 | |
| 1067 | 1583 | try { |
| 1068 | 1584 | $current_version = get_option('mxchat_plugin_version', '0.0.0'); |
| 1069 | - $plugin_version = MXCHAT_VERSION; | |
| 1585 | + $plugin_version = MXCHAT_BASE_VERSION; | |
| 1070 | 1586 | |
| 1071 | 1587 | // Always ensure critical tables exist (even if version matches) |
| 1072 | 1588 | // This handles manual table deletion or fresh installs |
| 1073 | 1589 | $chat_table = $wpdb->prefix . 'mxchat_chat_transcripts'; |
| @@ -1072,12 +1588,16 @@ | ||
| 1072 | 1588 | // This handles manual table deletion or fresh installs |
| 1073 | 1589 | $chat_table = $wpdb->prefix . 'mxchat_chat_transcripts'; |
| 1074 | 1590 | $queue_table = $wpdb->prefix . 'mxchat_processing_queue'; |
| 1075 | 1591 | |
| 1592 | + $sessions_table = $wpdb->prefix . 'mxchat_sessions'; | |
| 1593 | + | |
| 1076 | 1594 | $chat_exists = $wpdb->get_var("SHOW TABLES LIKE '$chat_table'") === $chat_table; |
| 1077 | 1595 | $queue_exists = $wpdb->get_var("SHOW TABLES LIKE '$queue_table'") === $queue_table; |
| 1078 | - | |
| 1079 | - if (!$chat_exists || !$queue_exists) { | |
| 1596 | + $sessions_exists = get_option('mxchat_session_store_ready') === '1' | |
| 1597 | + || $wpdb->get_var("SHOW TABLES LIKE '$sessions_table'") === $sessions_table; | |
| 1598 | + | |
| 1599 | + if (!$chat_exists || !$queue_exists || !$sessions_exists) { | |
| 1080 | 1600 | //error_log("MxChat: Critical tables missing, running activation"); |
| 1081 | 1601 | mxchat_activate(); |
| 1082 | 1602 | } |
| 1083 | 1603 | |
| @@ -1140,13 +1660,61 @@ | ||
| 1140 | 1660 | delete_option('mxchat_email_null'); |
| 1141 | 1661 | delete_option('mxchat_name_null'); |
| 1142 | 1662 | } |
| 1143 | 1663 | |
| 1144 | - // 3.2.3: Add embedding_model tracking columns and backfill active model | |
| 1145 | - if (version_compare($current_version, '3.2.3', '<')) { | |
| 1146 | - mxchat_add_embedding_model_columns(); | |
| 1664 | + // 3.2.4: Backfill active embedding model option for the warning UI | |
| 1665 | + // (replaces the per-row column tracking from 3.2.3, which was reverted) | |
| 1666 | + if (version_compare($current_version, '3.2.4', '<')) { | |
| 1667 | + mxchat_backfill_active_embedding_model(); | |
| 1147 | 1668 | } |
| 1148 | 1669 | |
| 1670 | + // 3.2.15: Migrate retired DeepSeek ids (deepseek-chat / deepseek-reasoner | |
| 1671 | + // were shut off at the vendor on 2026-07-24). The function is idempotent — | |
| 1672 | + // it only rewrites models on its deprecation lists. | |
| 1673 | + if (version_compare($current_version, '3.2.15', '<')) { | |
| 1674 | + mxchat_migrate_deprecated_models(); | |
| 1675 | + } | |
| 1676 | + | |
| 1677 | + // 3.2.16: Migrate OpenAI ids retiring 2026-08-10 (gpt-5.1-chat-latest / | |
| 1678 | + // gpt-5.3-chat-latest → gpt-5.6-sol per OpenAI's deprecations page). | |
| 1679 | + // Idempotent — only rewrites models on the deprecation lists (e46b8f). | |
| 1680 | + if (version_compare($current_version, '3.2.16', '<')) { | |
| 1681 | + mxchat_migrate_deprecated_models(); | |
| 1682 | + } | |
| 1683 | + | |
| 1684 | + // 3.2.17: Credential options must not autoload (af2400) — the two | |
| 1685 | + // Pinecone-secret-holding rows were in alloptions, i.e. read into | |
| 1686 | + // memory on every request including anonymous page views. Idempotent. | |
| 1687 | + // Also carry the import modal's remembered ACF→PDF checkbox state | |
| 1688 | + // into the new install-level option (11720c). | |
| 1689 | + if (version_compare($current_version, '3.2.17', '<')) { | |
| 1690 | + mxchat_fix_credential_option_autoload(); | |
| 1691 | + mxchat_migrate_acf_pdf_extraction_option(); | |
| 1692 | + } | |
| 1693 | + | |
| 1694 | + // 3.2.19: Claude Opus 4.1 retired Aug 5, 2026 — auto-move stranded | |
| 1695 | + // sites (and the older tiers on the migration's lists) per the | |
| 1696 | + // changelog's promise. Idempotent — only rewrites models on the | |
| 1697 | + // deprecation lists. Without a gate at this release's version, | |
| 1698 | + // nothing calls the migration for 3.2.18 upgraders (plan a5a598; | |
| 1699 | + // the gate value must equal the version this block ships in). | |
| 1700 | + if (version_compare($current_version, '3.2.19', '<')) { | |
| 1701 | + mxchat_migrate_deprecated_models(); | |
| 1702 | + } | |
| 1703 | + | |
| 1704 | + // 3.2.20: Seed the caee10 usage-hint defaults onto tool entries a | |
| 1705 | + // pre-3.2.20 autosave stamped with '' (plan 64c1ad). The gate value | |
| 1706 | + // equals the version this block ships in (a5a598 rule); the | |
| 1707 | + // function carries its own one-time marker on top. | |
| 1708 | + // Also re-run the deprecated-models migration: 202df5 widened it to | |
| 1709 | + // rescue a content_model stranded on ANY retired id (previously | |
| 1710 | + // only the two gpt-5.x-chat-latest aliases). Idempotent — only | |
| 1711 | + // rewrites models on the catalog's retired_model_map(). | |
| 1712 | + if (version_compare($current_version, '3.2.20', '<')) { | |
| 1713 | + mxchat_backfill_tool_hint_defaults(); | |
| 1714 | + mxchat_migrate_deprecated_models(); | |
| 1715 | + } | |
| 1716 | + | |
| 1149 | 1717 | // Run full activation to ensure everything is up to date |
| 1150 | 1718 | mxchat_activate(); |
| 1151 | 1719 | |
| 1152 | 1720 | // Run migration functions |
| @@ -1151,12 +1719,11 @@ | ||
| 1151 | 1719 | |
| 1152 | 1720 | // Run migration functions |
| 1153 | 1721 | mxchat_migrate_live_agent_status(); |
| 1154 | 1722 | |
| 1155 | - // Add the cleanup function for version 2.1.8 | |
| 1156 | - if (version_compare($current_version, '2.1.8', '<')) { | |
| 1157 | - $deleted = mxchat_cleanup_orphaned_chat_history(); | |
| 1158 | - } | |
| 1723 | + // (The 2.1.8 orphaned-history reconciliation sweep is gone — | |
| 1724 | + // 3.2.19's mxchat_history_backlog_* drain supersedes it, and it | |
| 1725 | + // self-arms without a version gate: plan 839c4c.) | |
| 1159 | 1726 | |
| 1160 | 1727 | // Update version LAST |
| 1161 | 1728 | update_option('mxchat_plugin_version', $plugin_version); |
| 1162 | 1729 | |
| @@ -1169,8 +1736,170 @@ | ||
| 1169 | 1736 | } |
| 1170 | 1737 | } |
| 1171 | 1738 | |
| 1172 | 1739 | /** |
| 1740 | + * Credential options must never enter the autoloaded alloptions set. | |
| 1741 | + * mxchat_prompts_options and mxchat_pinecone_addon_options can hold the | |
| 1742 | + * Pinecone API secret; mxchat_options already stores its keys with autoload | |
| 1743 | + * off and these two must match it. The filter covers every future | |
| 1744 | + * add_option()/update_option() that creates the row — Settings API saves | |
| 1745 | + * through options.php and WP-CLI included — on WP 6.6+; older cores are | |
| 1746 | + * covered by the explicit autoload arguments at the plugin's own write | |
| 1747 | + * sites plus the one-time migration below. | |
| 1748 | + */ | |
| 1749 | +add_filter('wp_default_autoload_value', 'mxchat_credential_option_autoload_value', 10, 2); | |
| 1750 | +function mxchat_credential_option_autoload_value($autoload, $option) { | |
| 1751 | + if (in_array($option, array('mxchat_prompts_options', 'mxchat_pinecone_addon_options'), true)) { | |
| 1752 | + return false; | |
| 1753 | + } | |
| 1754 | + return $autoload; | |
| 1755 | +} | |
| 1756 | + | |
| 1757 | +/** | |
| 1758 | + * One-time upgrade migration: flip the autoload flag on credential option | |
| 1759 | + * rows that existing installs are already carrying autoloaded. Includes | |
| 1760 | + * mxchat_adv_api_token (Advanced Content bearer token) — harmless no-op | |
| 1761 | + * when that add-on is not installed, since missing rows simply don't match. | |
| 1762 | + */ | |
| 1763 | +function mxchat_fix_credential_option_autoload() { | |
| 1764 | + $keys = array('mxchat_prompts_options', 'mxchat_pinecone_addon_options', 'mxchat_adv_api_token'); | |
| 1765 | + if (function_exists('wp_set_option_autoload_values')) { | |
| 1766 | + wp_set_option_autoload_values(array_fill_keys($keys, false)); | |
| 1767 | + return; | |
| 1768 | + } | |
| 1769 | + // Pre-WP-6.4 fallback: direct flip + cache invalidation. | |
| 1770 | + global $wpdb; | |
| 1771 | + $placeholders = implode(',', array_fill(0, count($keys), '%s')); | |
| 1772 | + $wpdb->query($wpdb->prepare("UPDATE {$wpdb->options} SET autoload = 'no' WHERE option_name IN ($placeholders)", $keys)); | |
| 1773 | + wp_cache_delete('alloptions', 'options'); | |
| 1774 | + foreach ($keys as $key) { | |
| 1775 | + wp_cache_delete($key, 'options'); | |
| 1776 | + } | |
| 1777 | +} | |
| 1778 | + | |
| 1779 | +/** | |
| 1780 | + * One-time carry of the import modal's remembered ACF→PDF checkbox state | |
| 1781 | + * (mxchat_options['acf_pdf_extract_default'], written per-import until 3.2.16) | |
| 1782 | + * into the new install-level option mxchat_acf_pdf_extraction (plan 11720c). | |
| 1783 | + * Fresh installs and installs that never touched the checkbox default OFF, | |
| 1784 | + * matching the setting's own "recommended only if…" guidance. | |
| 1785 | + */ | |
| 1786 | +function mxchat_migrate_acf_pdf_extraction_option() { | |
| 1787 | + if (get_option('mxchat_acf_pdf_extraction', null) !== null) { | |
| 1788 | + return; // already set — never overwrite an owner's choice | |
| 1789 | + } | |
| 1790 | + $mxchat_options = get_option('mxchat_options', array()); | |
| 1791 | + if (is_array($mxchat_options) && array_key_exists('acf_pdf_extract_default', $mxchat_options)) { | |
| 1792 | + update_option('mxchat_acf_pdf_extraction', !empty($mxchat_options['acf_pdf_extract_default']) ? '1' : '0', false); | |
| 1793 | + unset($mxchat_options['acf_pdf_extract_default']); | |
| 1794 | + update_option('mxchat_options', $mxchat_options); | |
| 1795 | + } | |
| 1796 | +} | |
| 1797 | + | |
| 1798 | +/** | |
| 1799 | + * One-time migration of mxchat_acf_excluded_fields from field NAMES to field | |
| 1800 | + * KEYS (plan 30e81f). Names are not unique across ACF groups, so two fields | |
| 1801 | + * named the same in different groups shared one toggle, one saved state, and | |
| 1802 | + * one exclusion — and the save-on-exit beacon could revert a save through the | |
| 1803 | + * twin. Keys are unique; everything now runs on them. | |
| 1804 | + * | |
| 1805 | + * MIGRATION DIRECTION IS DELIBERATE: one stored name can match several keys — | |
| 1806 | + * exclude EVERY one of them. The UI describes these as "sensitive or | |
| 1807 | + * irrelevant fields"; an under-migration would silently start feeding a | |
| 1808 | + * previously-excluded sensitive field into embeddings sent to a third-party | |
| 1809 | + * provider. Over-excluding is visible in the UI and costs some retrieval | |
| 1810 | + * quality; under-excluding is a silent privacy regression. | |
| 1811 | + * | |
| 1812 | + * Self-arming on acf/init (NOT the version-gated upgrade block): resolving | |
| 1813 | + * names needs ACF fully booted with local JSON/PHP groups registered, and if | |
| 1814 | + * ACF is deactivated at upgrade time the migration simply waits for the next | |
| 1815 | + * load with ACF active. Until it runs, stored names keep working — every | |
| 1816 | + * exclusion read site honors legacy name entries alongside keys. A name that | |
| 1817 | + * matches no current key is KEPT (its group may be temporarily inactive), and | |
| 1818 | + * the per-field include path lazily converts it if it ever resolves again. | |
| 1819 | + */ | |
| 1820 | +function mxchat_migrate_acf_exclusions_to_keys() { | |
| 1821 | + if (get_option('mxchat_acf_exclusions_migrated', '') === '1') { | |
| 1822 | + return; | |
| 1823 | + } | |
| 1824 | + $stored = get_option('mxchat_acf_excluded_fields', array()); | |
| 1825 | + if (!is_array($stored) || empty($stored)) { | |
| 1826 | + update_option('mxchat_acf_exclusions_migrated', '1', false); | |
| 1827 | + return; | |
| 1828 | + } | |
| 1829 | + if (!function_exists('acf_get_field_groups') || !function_exists('acf_get_fields')) { | |
| 1830 | + return; // acf/init fired without the API? Bail; retry next load. | |
| 1831 | + } | |
| 1832 | + | |
| 1833 | + // Map every current top-level field: name => [keys], and the set of keys. | |
| 1834 | + $name_to_keys = array(); | |
| 1835 | + $current_keys = array(); | |
| 1836 | + foreach (acf_get_field_groups() as $group) { | |
| 1837 | + $group_fields = acf_get_fields($group['key']); | |
| 1838 | + if (empty($group_fields)) { | |
| 1839 | + continue; | |
| 1840 | + } | |
| 1841 | + foreach ($group_fields as $field) { | |
| 1842 | + if (empty($field['key']) || !isset($field['name'])) { | |
| 1843 | + continue; | |
| 1844 | + } | |
| 1845 | + $current_keys[$field['key']] = true; | |
| 1846 | + $name_to_keys[$field['name']][] = $field['key']; | |
| 1847 | + } | |
| 1848 | + } | |
| 1849 | + | |
| 1850 | + $migrated = array(); | |
| 1851 | + $converted = 0; | |
| 1852 | + foreach ($stored as $entry) { | |
| 1853 | + if (!is_string($entry) || $entry === '') { | |
| 1854 | + continue; | |
| 1855 | + } | |
| 1856 | + if (isset($current_keys[$entry])) { | |
| 1857 | + $migrated[] = $entry; // already a live key | |
| 1858 | + } elseif (isset($name_to_keys[$entry])) { | |
| 1859 | + foreach ($name_to_keys[$entry] as $key) { | |
| 1860 | + $migrated[] = $key; // every key wearing this name — fail toward more exclusion | |
| 1861 | + } | |
| 1862 | + $converted++; | |
| 1863 | + } else { | |
| 1864 | + $migrated[] = $entry; // unresolved — keep; still honored by name everywhere | |
| 1865 | + } | |
| 1866 | + } | |
| 1867 | + $migrated = array_values(array_unique($migrated)); | |
| 1868 | + | |
| 1869 | + update_option('mxchat_acf_excluded_fields', $migrated); | |
| 1870 | + update_option('mxchat_acf_exclusions_migrated', '1', false); | |
| 1871 | + if ($converted > 0) { | |
| 1872 | + update_option('mxchat_acf_exclusions_migrated_notice', '1', false); | |
| 1873 | + } | |
| 1874 | +} | |
| 1875 | +add_action('acf/init', 'mxchat_migrate_acf_exclusions_to_keys', 20); | |
| 1876 | + | |
| 1877 | +/** | |
| 1878 | + * One-time notice after the ACF exclusion migration actually converted | |
| 1879 | + * name entries — the settings are worth a review, especially where one name | |
| 1880 | + * fanned out to several fields (every match is now excluded, on purpose). | |
| 1881 | + */ | |
| 1882 | +function mxchat_show_acf_exclusions_migrated_notice() { | |
| 1883 | + if (!current_user_can('manage_options')) { | |
| 1884 | + return; | |
| 1885 | + } | |
| 1886 | + if (get_option('mxchat_acf_exclusions_migrated_notice', '') !== '1') { | |
| 1887 | + return; | |
| 1888 | + } | |
| 1889 | + ?> | |
| 1890 | + <div class="notice notice-info is-dismissible"> | |
| 1891 | + <p> | |
| 1892 | + <strong><?php esc_html_e('MxChat: ACF field exclusions updated', 'mxchat'); ?></strong><br> | |
| 1893 | + <?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'); ?> | |
| 1894 | + </p> | |
| 1895 | + </div> | |
| 1896 | + <?php | |
| 1897 | + delete_option('mxchat_acf_exclusions_migrated_notice'); | |
| 1898 | +} | |
| 1899 | +add_action('admin_notices', 'mxchat_show_acf_exclusions_migrated_notice'); | |
| 1900 | + | |
| 1901 | +/** | |
| 1173 | 1902 | * Ensure tables exist on every admin load for fresh installations |
| 1174 | 1903 | * This is a safety net for cases where activation hook doesn't fire |
| 1175 | 1904 | */ |
| 1176 | 1905 | function mxchat_ensure_tables_exist() { |
| @@ -1190,12 +1919,16 @@ | ||
| 1190 | 1919 | |
| 1191 | 1920 | $table_name = $wpdb->prefix . 'mxchat_chat_transcripts'; |
| 1192 | 1921 | $queue_table = $wpdb->prefix . 'mxchat_processing_queue'; |
| 1193 | 1922 | |
| 1923 | + $sessions_table = $wpdb->prefix . 'mxchat_sessions'; | |
| 1924 | + | |
| 1194 | 1925 | $chat_exists = $wpdb->get_var("SHOW TABLES LIKE '$table_name'") === $table_name; |
| 1195 | 1926 | $queue_exists = $wpdb->get_var("SHOW TABLES LIKE '$queue_table'") === $queue_table; |
| 1196 | - | |
| 1197 | - if (!$chat_exists || !$queue_exists) { | |
| 1927 | + $sessions_exists = get_option('mxchat_session_store_ready') !== false | |
| 1928 | + || $wpdb->get_var("SHOW TABLES LIKE '$sessions_table'") === $sessions_table; | |
| 1929 | + | |
| 1930 | + if (!$chat_exists || !$queue_exists || !$sessions_exists) { | |
| 1198 | 1931 | //error_log("MxChat: Tables missing on admin load, running activation"); |
| 1199 | 1932 | mxchat_activate(); |
| 1200 | 1933 | } |
| 1201 | 1934 | } |
| @@ -1200,49 +1933,116 @@ | ||
| 1200 | 1933 | } |
| 1201 | 1934 | } |
| 1202 | 1935 | |
| 1203 | 1936 | /** |
| 1204 | - * Clean up orphaned chat history options from the wp_options table | |
| 1205 | - * @return int Number of options deleted | |
| 1937 | + * One-shot cleanup of legacy mxchat_history_<sid> option rows (plan 839c4c). | |
| 1938 | + * | |
| 1939 | + * 3.2.19 deduplicated per-session chat history into the transcripts table | |
| 1940 | + * (which already held a superset of every option copy measured), so nothing | |
| 1941 | + * writes these options any more — but an upgraded install still carries one | |
| 1942 | + * per session, at up to 64 KB a row (462 rows measured on one production | |
| 1943 | + * install). This drain replaces the old mxchat_cleanup_orphaned_chat_history() | |
| 1944 | + * reconciliation sweep, which existed only because there were two copies to | |
| 1945 | + * reconcile. | |
| 1946 | + * | |
| 1947 | + * b64b77 pattern throughout: an option_id bookmark that only moves forward | |
| 1948 | + * (a crash mid-batch re-processes at most one batch), delete_option() per row | |
| 1949 | + * so the object + notoptions caches stay coherent, batches drained off | |
| 1950 | + * non-AJAX admin_init plus the session-store maintenance cron. Once the | |
| 1951 | + * backlog is gone the state marks done and every later call is one cached | |
| 1952 | + * option read. | |
| 1206 | 1953 | */ |
| 1207 | -function mxchat_cleanup_orphaned_chat_history() { | |
| 1954 | +function mxchat_history_backlog_state() { | |
| 1955 | + // The state option name MUST NOT start with 'mxchat_history_' — the drain | |
| 1956 | + // deletes everything matching that prefix, and a state option inside the | |
| 1957 | + // pattern gets eaten by its own drain (caught by the 839c4c rig: batches | |
| 1958 | + // ran 2,2,2,1 instead of 2,2,1 because the bookmark row was being deleted | |
| 1959 | + // and re-created every pass). | |
| 1960 | + $state = get_option('mxchat_legacy_history_cleanup', array()); | |
| 1961 | + if (!is_array($state)) { | |
| 1962 | + $state = array(); | |
| 1963 | + } | |
| 1964 | + | |
| 1965 | + return wp_parse_args($state, array( | |
| 1966 | + 'done' => false, | |
| 1967 | + 'last_option_id' => 0, | |
| 1968 | + 'deleted' => 0, | |
| 1969 | + )); | |
| 1970 | +} | |
| 1971 | + | |
| 1972 | +/** | |
| 1973 | + * Delete one batch of legacy history options. | |
| 1974 | + * | |
| 1975 | + * @param int $batch Rows per pass — capped small; these can be 64 KB rows. | |
| 1976 | + * @return int Option rows deleted in this pass. | |
| 1977 | + */ | |
| 1978 | +function mxchat_history_backlog_batch($batch = 200) { | |
| 1208 | 1979 | global $wpdb; |
| 1209 | - $count = 0; | |
| 1210 | 1980 | |
| 1211 | - // Get all option keys that match our pattern | |
| 1212 | - $history_options = $wpdb->get_results( | |
| 1213 | - "SELECT option_name FROM {$wpdb->options} | |
| 1214 | - WHERE option_name LIKE 'mxchat_history_%'" | |
| 1981 | + $state = mxchat_history_backlog_state(); | |
| 1982 | + if (!empty($state['done'])) { | |
| 1983 | + return 0; | |
| 1984 | + } | |
| 1985 | + | |
| 1986 | + $batch = max(1, (int) $batch); | |
| 1987 | + | |
| 1988 | + $rows = $wpdb->get_results( | |
| 1989 | + $wpdb->prepare( | |
| 1990 | + "SELECT option_id, option_name FROM {$wpdb->options} | |
| 1991 | + WHERE option_id > %d AND option_name LIKE %s | |
| 1992 | + ORDER BY option_id ASC LIMIT %d", | |
| 1993 | + (int) $state['last_option_id'], | |
| 1994 | + $wpdb->esc_like('mxchat_history_') . '%', | |
| 1995 | + $batch | |
| 1996 | + ), | |
| 1997 | + ARRAY_A | |
| 1215 | 1998 | ); |
| 1216 | 1999 | |
| 1217 | - if (!empty($history_options)) { | |
| 1218 | - foreach ($history_options as $option) { | |
| 1219 | - // Extract the session ID from the option name | |
| 1220 | - $session_id = str_replace('mxchat_history_', '', $option->option_name); | |
| 2000 | + if (empty($rows)) { | |
| 2001 | + $state['done'] = true; | |
| 2002 | + update_option('mxchat_legacy_history_cleanup', $state, 'no'); | |
| 2003 | + return 0; | |
| 2004 | + } | |
| 1221 | 2005 | |
| 1222 | - // Check if this session still exists in the custom table | |
| 1223 | - $table_name = $wpdb->prefix . 'mxchat_chat_transcripts'; | |
| 1224 | - $exists = $wpdb->get_var( | |
| 1225 | - $wpdb->prepare( | |
| 1226 | - "SELECT COUNT(*) FROM {$table_name} WHERE session_id = %s", | |
| 1227 | - $session_id | |
| 1228 | - ) | |
| 1229 | - ); | |
| 2006 | + foreach ($rows as $row) { | |
| 2007 | + $state['last_option_id'] = max((int) $state['last_option_id'], (int) $row['option_id']); | |
| 2008 | + delete_option($row['option_name']); | |
| 2009 | + $state['deleted'] = (int) $state['deleted'] + 1; | |
| 2010 | + } | |
| 1230 | 2011 | |
| 1231 | - // If session doesn't exist in the main table, delete the option | |
| 1232 | - if ($exists == 0) { | |
| 1233 | - delete_option($option->option_name); | |
| 1234 | - // Also delete related metadata | |
| 1235 | - delete_option("mxchat_email_{$session_id}"); | |
| 1236 | - delete_option("mxchat_name_{$session_id}"); | |
| 1237 | - delete_option("mxchat_agent_name_{$session_id}"); | |
| 1238 | - $count++; | |
| 1239 | - } | |
| 2012 | + if (count($rows) < $batch) { | |
| 2013 | + $state['done'] = true; | |
| 2014 | + } | |
| 2015 | + | |
| 2016 | + update_option('mxchat_legacy_history_cleanup', $state, 'no'); | |
| 2017 | + | |
| 2018 | + return count($rows); | |
| 2019 | +} | |
| 2020 | + | |
| 2021 | +/** One batch per admin page load until drained. */ | |
| 2022 | +function mxchat_history_backlog_drain() { | |
| 2023 | + mxchat_history_backlog_batch(); | |
| 2024 | +} | |
| 2025 | + | |
| 2026 | +/** Cron leg: drain faster, same cap per batch. */ | |
| 2027 | +function mxchat_history_backlog_drain_cron() { | |
| 2028 | + for ($i = 0; $i < 10; $i++) { | |
| 2029 | + if (mxchat_history_backlog_batch() === 0) { | |
| 2030 | + break; | |
| 1240 | 2031 | } |
| 1241 | 2032 | } |
| 2033 | +} | |
| 1242 | 2034 | |
| 1243 | - return $count; | |
| 2035 | +// wp_doing_ajax() guard is load-bearing, not defensive (b64b77's shipped-and- | |
| 2036 | +// caught defect): admin-ajax.php fires admin_init too, and the chat widget's | |
| 2037 | +// message endpoint is an admin-ajax action — without the guard an anonymous | |
| 2038 | +// visitor would pay for a delete batch inside their own chat request. | |
| 2039 | +if (!wp_doing_ajax()) { | |
| 2040 | + add_action('admin_init', 'mxchat_history_backlog_drain', 21); | |
| 1244 | 2041 | } |
| 2042 | +// Belt for installs whose admin is rarely visited: ride the session store's | |
| 2043 | +// existing daily maintenance event rather than scheduling another. | |
| 2044 | +add_action('mxchat_session_store_maintenance', 'mxchat_history_backlog_drain_cron'); | |
| 1245 | 2045 | |
| 1246 | 2046 | function mxchat_migrate_live_agent_status() { |
| 1247 | 2047 | $options = get_option('mxchat_options', []); |
| 1248 | 2048 | |
| @@ -1345,8 +2145,9 @@ | ||
| 1345 | 2145 | add_action('init', 'mxchat_check_fallback_rate_limits', 5); |
| 1346 | 2146 | |
| 1347 | 2147 | // Add migration notice hook |
| 1348 | 2148 | add_action('admin_notices', 'mxchat_show_migration_notice'); |
| 2149 | + add_action('admin_notices', 'mxchat_show_model_access_notice'); | |
| 1349 | 2150 | |
| 1350 | 2151 | // Initialize classes with error handling |
| 1351 | 2152 | try { |
| 1352 | 2153 | // Initialize admin classes |
| @@ -1371,8 +2172,23 @@ | ||
| 1371 | 2172 | if (class_exists('MxChat_Content_Generator')) { |
| 1372 | 2173 | new MxChat_Content_Generator(); |
| 1373 | 2174 | } |
| 1374 | 2175 | |
| 2176 | + // Initialize cache purge globally — settings writes can happen on any | |
| 2177 | + // request type (admin screens, admin-ajax autosave, wp-cli), and the | |
| 2178 | + // deferred-purge cron event fires on front-end requests. | |
| 2179 | + if (class_exists('MxChat_Cache_Purge')) { | |
| 2180 | + MxChat_Cache_Purge::init(); | |
| 2181 | + } | |
| 2182 | + | |
| 2183 | + // Initialize REST API globally — endpoints must be registered on | |
| 2184 | + // every request (admin and frontend) so they're reachable via /wp-json/. | |
| 2185 | + // Endpoints are auth-gated and locked until the site owner generates | |
| 2186 | + // a token in MxChat → API Access. | |
| 2187 | + if (class_exists('MxChat_Rest_Api')) { | |
| 2188 | + new MxChat_Rest_Api(); | |
| 2189 | + } | |
| 2190 | + | |
| 1375 | 2191 | // Initialize public classes |
| 1376 | 2192 | if (class_exists('MxChat_Public')) { |
| 1377 | 2193 | $mxchat_public = new MxChat_Public(); |
| 1378 | 2194 | } |
| @@ -1417,11 +2233,25 @@ | ||
| 1417 | 2233 | |
| 1418 | 2234 | mxchat_migrate_pinecone_roles_add_bot_id(); |
| 1419 | 2235 | mxchat_migrate_add_content_type_column(); |
| 1420 | 2236 | mxchat_migrate_add_translations_table(); |
| 2237 | + mxchat_migrate_add_session_ratings_table(); | |
| 1421 | 2238 | } |
| 1422 | 2239 | |
| 1423 | 2240 | /** |
| 2241 | + * Migration: Create per-session satisfaction ratings table (v3.2.6) | |
| 2242 | + * For users upgrading from versions before 3.2.6 | |
| 2243 | + */ | |
| 2244 | +function mxchat_migrate_add_session_ratings_table() { | |
| 2245 | + $migration_key = 'mxchat_session_ratings_table_created'; | |
| 2246 | + if (get_option($migration_key)) { | |
| 2247 | + return; | |
| 2248 | + } | |
| 2249 | + mxchat_create_session_ratings_table(); | |
| 2250 | + update_option($migration_key, '3.2.6'); | |
| 2251 | +} | |
| 2252 | + | |
| 2253 | +/** | |
| 1424 | 2254 | * Migration: Create transcript translations table (v3.0.4) |
| 1425 | 2255 | * For users upgrading from versions before 3.0.4 |
| 1426 | 2256 | */ |
| 1427 | 2257 | function mxchat_migrate_add_translations_table() { |
| @@ -1464,5 +2294,67 @@ | ||
| 1464 | 2294 | return $schedules; |
| 1465 | 2295 | }); |
| 1466 | 2296 | |
| 1467 | 2297 | // Register deactivation hook |
| 1468 | -register_deactivation_hook(__FILE__, 'mxchat_deactivate'); | |
| 2298 | +register_deactivation_hook(__FILE__, 'mxchat_deactivate'); | |
| 2299 | + | |
| 2300 | +/** | |
| 2301 | + * Per-session satisfaction rating: AJAX save handler (v3.2.6). | |
| 2302 | + * Records one 👍/👎 + optional feedback per chat session. The UNIQUE KEY on | |
| 2303 | + * session_id makes this naturally idempotent — only the first rating per | |
| 2304 | + * session is stored; duplicate POSTs are silent no-ops. | |
| 2305 | + */ | |
| 2306 | +function mxchat_save_session_rating() { | |
| 2307 | + global $wpdb; | |
| 2308 | + | |
| 2309 | + $session_id = isset($_POST['session_id']) ? MxChat_Utils::sanitize_session_id(wp_unslash($_POST['session_id'])) : ''; | |
| 2310 | + $bot_id = isset($_POST['bot_id']) ? sanitize_text_field(wp_unslash($_POST['bot_id'])) : 'default'; | |
| 2311 | + $rating_raw = isset($_POST['rating']) ? (int) $_POST['rating'] : 0; | |
| 2312 | + $feedback = isset($_POST['feedback']) ? sanitize_textarea_field(wp_unslash($_POST['feedback'])) : ''; | |
| 2313 | + | |
| 2314 | + if ($session_id === '' || ($rating_raw !== 1 && $rating_raw !== -1)) { | |
| 2315 | + wp_send_json_error(array('message' => 'invalid_input'), 400); | |
| 2316 | + } | |
| 2317 | + | |
| 2318 | + if (strlen($feedback) > 1000) { | |
| 2319 | + $feedback = substr($feedback, 0, 1000); | |
| 2320 | + } | |
| 2321 | + | |
| 2322 | + $table_name = $wpdb->prefix . 'mxchat_session_ratings'; | |
| 2323 | + $existing = $wpdb->get_var($wpdb->prepare( | |
| 2324 | + "SELECT id FROM $table_name WHERE session_id = %s LIMIT 1", | |
| 2325 | + $session_id | |
| 2326 | + )); | |
| 2327 | + | |
| 2328 | + if ($existing) { | |
| 2329 | + if ($feedback !== '') { | |
| 2330 | + $wpdb->update( | |
| 2331 | + $table_name, | |
| 2332 | + array('rating_feedback' => $feedback), | |
| 2333 | + array('id' => (int) $existing), | |
| 2334 | + array('%s'), | |
| 2335 | + array('%d') | |
| 2336 | + ); | |
| 2337 | + } | |
| 2338 | + wp_send_json_success(array('updated' => true)); | |
| 2339 | + } | |
| 2340 | + | |
| 2341 | + $inserted = $wpdb->insert( | |
| 2342 | + $table_name, | |
| 2343 | + array( | |
| 2344 | + 'session_id' => $session_id, | |
| 2345 | + 'bot_id' => $bot_id !== '' ? $bot_id : 'default', | |
| 2346 | + 'rating_value' => $rating_raw, | |
| 2347 | + 'rating_feedback' => $feedback !== '' ? $feedback : null, | |
| 2348 | + 'created_at' => current_time('mysql'), | |
| 2349 | + ), | |
| 2350 | + array('%s', '%s', '%d', '%s', '%s') | |
| 2351 | + ); | |
| 2352 | + | |
| 2353 | + if ($inserted === false) { | |
| 2354 | + wp_send_json_error(array('message' => 'db_insert_failed'), 500); | |
| 2355 | + } | |
| 2356 | + | |
| 2357 | + wp_send_json_success(array('saved' => true)); | |
| 2358 | +} | |
| 2359 | +add_action('wp_ajax_mxchat_save_rating', 'mxchat_save_session_rating'); | |
| 2360 | +add_action('wp_ajax_nopriv_mxchat_save_rating', 'mxchat_save_session_rating'); | |
