← All changes | includes/class-mxchat-content-generator.php +38 -7 3.2.19 → 3.2.25 View file →

		@@ -2242,8 +2242,22 @@
2242	2242
2243	2243	/**
2244	2244	* Call the configured content model
2245	2245	*/
	2246	+ /**
	2247	+ * Provider slugs (MxChat_Model_Catalog keys) that call_content_model() can
	2248	+ * dispatch to. MUST mirror the if/elseif chain below — the Content Model
	2249	+ * picker derives its provider set from this list (plan ccb751), so a
	2250	+ * provider added to the dispatch without updating this is never offered,
	2251	+ * and one added here without dispatch support would break generation.
	2252	+ * OpenRouter and the custom OpenAI-compatible provider are absent on
	2253	+ * purpose: their pseudo-model ids would fall through to the OpenAI default
	2254	+ * branch with the wrong key and endpoint.
	2255	+ */
	2256	+ public static function supported_content_providers() {
	2257	+ return array('openai', 'claude', 'gemini', 'xai', 'deepseek');
	2258	+ }
	2259	+
2246	2260	private function call_content_model($system_prompt, $messages, $max_tokens = 4096) {
2247	2261	$options = get_option('mxchat_options', array());
2248	2262	$model = $options['content_model'] ?? $options['model'] ?? 'gpt-5.6-sol';
2249	2263
		@@ -2270,13 +2284,14 @@
2270	2284	* used only when the core model catalog is unavailable. Byte-identical to the
2271	2285	* old inline if/elseif at the call site.
2272	2286	*/
2273	2287	private function mxchat_cg_reasoning_effort_fallback($model) {
2274		- if (strpos($model, 'gpt-5') !== 0) return null;
	2288	+ if (strpos($model, 'gpt-5') !== 0 && strpos($model, 'gpt-6') !== 0) return null; // gpt-6 too (plan 45c22d)
2275	2289	if ($model === 'gpt-5.2' || $model === 'gpt-5.1-chat-latest') return null;
2276	2290	if ($model === 'gpt-5.1-2025-11-13') return 'low';
2277	2291	if ($model === 'gpt-5.5') return 'low';
2278	2292	if ($model === 'gpt-5.4') return 'low';
	2293	+ if (in_array($model, array('gpt-6-astra', 'gpt-6-sol', 'gpt-6-luna'), true)) return 'low'; // plan 45c22d
2279	2294	if (in_array($model, array('gpt-5.6-sol', 'gpt-5.6-terra', 'gpt-5.6-luna'), true)) return 'low';
2280	2295	return 'minimal';
2281	2296	}
2282	2297
		@@ -2297,9 +2312,9 @@
2297	2312	// GPT-5.x models require max_completion_tokens and only support temperature=1.
2298	2313	// Token key, temperature gate, and reasoning_effort are sourced from the
2299	2314	// core model catalog (plan-dcb71c); frozen fallbacks preserve exact
2300	2315	// pre-dcb71c behavior if the catalog class is unavailable.
2301		- $is_gpt5 = strpos($model, 'gpt-5') === 0;
	2316	+ $is_gpt5 = strpos($model, 'gpt-5') === 0 || strpos($model, 'gpt-6') === 0; // gpt-6 too (plan 45c22d)
2302	2317	$catalog = class_exists('MxChat_Model_Catalog');
2303	2318	$token_key = ($catalog && method_exists('MxChat_Model_Catalog', 'openai_token_param'))
2304	2319	? MxChat_Model_Catalog::openai_token_param($model)
2305	2320	: ($is_gpt5 ? 'max_completion_tokens' : 'max_tokens');
		@@ -2398,11 +2413,10 @@
2398	2413	* Call Claude (Anthropic) API
2399	2414	*/
2400	2415	private function call_claude($model, $api_key, $system_prompt, $messages, $max_tokens) {
2401	2416	// Anthropic retired claude-opus-4-20250514 / claude-sonnet-4-20250514 on 2026-06-15.
2402		- // Read-time rescue: remap a saved dead ID to the current equivalent before the API call.
2403		- if ($model === 'claude-opus-4-20250514') { $model = 'claude-opus-4-8'; }
2404		- elseif ($model === 'claude-sonnet-4-20250514') { $model = 'claude-sonnet-4-6'; }
	2417	+ // Read-time rescue: a saved retired id is remapped to the catalog's replacement before the API call.
	2418	+ $model = MxChat_Model_Catalog::resolve_retired($model); // plan 8c4eb4: the catalog's one map
2405	2419	if (empty($api_key)) {
2406	2420	return new WP_Error('no_api_key', __('Claude API key not configured.', 'mxchat'));
2407	2421	}
2408	2422
		@@ -2541,12 +2555,29 @@
2541	2555	$error_msg = $decoded['error']['message'] ?? __('Gemini API error ', 'mxchat') . $status_code;
2542	2556	return new WP_Error('gemini_error', $error_msg);
2543	2557	}
2544	2558
2545		- if (isset($decoded['candidates'][0]['content']['parts'][0]['text'])) {
2546		- return trim($decoded['candidates'][0]['content']['parts'][0]['text']);
	2559	+ // plan 781afd: join every text part (skip thought parts), not only parts[0].
	2560	+ $text = '';
	2561	+ if (isset($decoded['candidates'][0]['content']['parts']) && is_array($decoded['candidates'][0]['content']['parts'])) {
	2562	+ foreach ($decoded['candidates'][0]['content']['parts'] as $part) {
	2563	+ if (is_array($part) && isset($part['text']) && is_string($part['text']) && empty($part['thought'])) {
	2564	+ $text .= $part['text'];
	2565	+ }
	2566	+ }
2547	2567	}
	2568	+ $text = trim($text);
	2569	+ if ($text !== '') {
	2570	+ return $text;
	2571	+ }
2548	2572
	2573	+ $no_text_reason = isset($decoded['candidates'][0]['finishReason']) && is_string($decoded['candidates'][0]['finishReason'])
	2574	+ ? $decoded['candidates'][0]['finishReason']
	2575	+ : (isset($decoded['promptFeedback']['blockReason']) && is_string($decoded['promptFeedback']['blockReason']) ? $decoded['promptFeedback']['blockReason'] : '');
	2576	+ if ($no_text_reason !== '') {
	2577	+ /* translators: %s: Gemini's finish or block reason, e.g. SAFETY */
	2578	+ return new WP_Error('gemini_no_text', sprintf(__('Gemini returned no text (%s).', 'mxchat'), $no_text_reason));
	2579	+ }
2549	2580	return new WP_Error('unexpected_response', __('Unexpected Gemini response format.', 'mxchat'));
2550	2581	}
2551	2582
2552	2583	// ─── Model Detection Helpers ────────────────────────────────────────