@gitkraken/core-gitlens 0.4.0 → 0.4.101

package/src/plus/ai/models/model.ts

@@ -13,6 +13,8 @@ export interface AIModel<Provider extends AIProviders = AIProviders, Model exten
 	readonly hidden?: boolean;
 
 	readonly temperature?: number | null;
+
+	readonly consumptionRateLabel?: string;
 }
 
 export interface AIModelDescriptor<Provider extends AIProviders = AIProviders, Model extends string = string> {
@@ -26,7 +28,7 @@ export type AIActionType =
 	| 'generate-commitMessage'
 	| 'generate-stashMessage'
 	| 'generate-changelog'
-	| `generate-create-${'cloudPatch' | 'codeSuggestion' | 'pullRequest'}`
+	| `generate-create-${'cloudPatch' | 'pullRequest'}`
 	| 'generate-commits'
 	| 'conflict-resolution'
 	| 'generate-searchQuery';
@@ -48,11 +50,51 @@ export interface AIProviderDescriptorWithConfiguration<
 }
 
 export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDescriptor<T>): AIModel<T>[] => [
+	{
+		id: 'gpt-5.5',
+		name: 'GPT-5.5',
+		maxTokens: { input: 400000, output: 128000 },
+		provider: provider,
+	},
+	{
+		id: 'gpt-5.5-pro',
+		name: 'GPT-5.5 Pro',
+		maxTokens: { input: 400000, output: 272000 },
+		provider: provider,
+		hidden: true,
+	},
+	{
+		id: 'gpt-5.4',
+		name: 'GPT-5.4',
+		maxTokens: { input: 400000, output: 128000 },
+		provider: provider,
+	},
+	{
+		id: 'gpt-5.4-mini',
+		name: 'GPT-5.4 mini',
+		maxTokens: { input: 400000, output: 128000 },
+		provider: provider,
+		default: true,
+	},
+	{
+		id: 'gpt-5.4-nano',
+		name: 'GPT-5.4 nano',
+		maxTokens: { input: 400000, output: 128000 },
+		provider: provider,
+	},
+	{
+		id: 'gpt-5.3-codex',
+		name: 'GPT-5.3 Codex',
+		maxTokens: { input: 400000, output: 128000 },
+		provider: provider,
+		hidden: true,
+	},
 	{
 		id: 'gpt-5.2',
 		name: 'GPT-5.2',
 		maxTokens: { input: 400000, output: 128000 },
 		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'gpt-5.2-2025-12-11',
@@ -66,6 +108,7 @@ export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDesc
 		name: 'GPT-5.1',
 		maxTokens: { input: 400000, output: 128000 },
 		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'gpt-5.1-2025-11-13',
@@ -79,6 +122,7 @@ export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDesc
 		name: 'GPT-5',
 		maxTokens: { input: 400000, output: 128000 },
 		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'gpt-5-2025-08-07',
@@ -92,7 +136,7 @@ export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDesc
 		name: 'GPT-5 mini',
 		maxTokens: { input: 400000, output: 128000 },
 		provider: provider,
-		default: true,
+		hidden: true,
 	},
 	{
 		id: 'gpt-5-mini-2025-08-07',
@@ -106,6 +150,7 @@ export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDesc
 		name: 'GPT-5 nano',
 		maxTokens: { input: 400000, output: 128000 },
 		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'gpt-5-nano-2025-08-07',
@@ -133,6 +178,7 @@ export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDesc
 		name: 'GPT-4.1',
 		maxTokens: { input: 1047576, output: 32768 },
 		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'gpt-4.1-2025-04-14',
@@ -175,6 +221,7 @@ export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDesc
 		maxTokens: { input: 200000, output: 100000 },
 		provider: provider,
 		temperature: null,
+		hidden: true,
 	},
 	{
 		id: 'o4-mini-2025-04-16',
@@ -206,6 +253,7 @@ export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDesc
 		maxTokens: { input: 200000, output: 100000 },
 		provider: provider,
 		temperature: null,
+		hidden: true,
 	},
 	{
 		id: 'o3-2025-04-16',
@@ -221,6 +269,7 @@ export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDesc
 		maxTokens: { input: 200000, output: 100000 },
 		provider: provider,
 		temperature: null,
+		hidden: true,
 	},
 	{
 		id: 'o3-mini',
@@ -228,6 +277,7 @@ export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDesc
 		maxTokens: { input: 200000, output: 100000 },
 		provider: provider,
 		temperature: null,
+		hidden: true,
 	},
 	{
 		id: 'o3-mini-2025-01-31',
@@ -290,6 +340,7 @@ export const openAIModels = <T extends OpenAIProviders>(provider: AIProviderDesc
 		name: 'GPT-4o',
 		maxTokens: { input: 128000, output: 16384 },
 		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'gpt-4o-2024-11-20',

package/src/plus/ai/models/promptTemplates.ts

@@ -101,6 +101,10 @@ interface ReviewDetailPromptTemplateContext {
 	instructions?: string;
 }
 
+interface ReviewRefinePromptTemplateContext {
+	instructions: string;
+}
+
 interface AddressReviewFindingsPromptTemplateContext {
 	reviewMarkdown: string;
 	scopeLabel: string;
@@ -117,13 +121,14 @@ export type PromptTemplateType =
 	| 'generate-commitMessage'
 	| 'generate-stashMessage'
 	| 'generate-changelog'
-	| `generate-create-${'cloudPatch' | 'codeSuggestion' | 'pullRequest'}`
+	| `generate-create-${'cloudPatch' | 'pullRequest'}`
 	| 'generate-commits'
 	| 'generate-searchQuery'
 	| 'explain-changes'
 	| 'review-changes'
 	| 'review-overview'
 	| 'review-detail'
+	| 'review-refine'
 	| 'address-review-findings'
 	| 'start-review-pullRequest'
 	| 'start-work-issue';
@@ -137,7 +142,7 @@ export type PromptTemplateContext<T extends PromptTemplateType> = T extends 'gen
 	? CommitMessagePromptTemplateContext
 	: T extends 'generate-stashMessage'
 	? StashMessagePromptTemplateContext
-	: T extends 'generate-create-cloudPatch' | 'generate-create-codeSuggestion'
+	: T extends 'generate-create-cloudPatch'
 	? CreateDraftPromptTemplateContext
 	: T extends 'generate-create-pullRequest'
 	? CreatePullRequestPromptTemplateContext
@@ -155,6 +160,8 @@ export type PromptTemplateContext<T extends PromptTemplateType> = T extends 'gen
 	? ReviewOverviewPromptTemplateContext
 	: T extends 'review-detail'
 	? ReviewDetailPromptTemplateContext
+	: T extends 'review-refine'
+	? ReviewRefinePromptTemplateContext
 	: T extends 'address-review-findings'
 	? AddressReviewFindingsPromptTemplateContext
 	: T extends 'start-review-pullRequest'

package/src/plus/ai/prompts.ts

@@ -187,54 +187,6 @@ Example output structure:
 Based on the provided code diff and any additional context, create a concise but meaningful title and description following the instructions above`,
 };
 
-export const generateCreateCodeSuggest: PromptTemplate<'generate-create-codeSuggestion'> = {
-	id: 'generate-create-codeSuggestion_v2',
-	variables: ['diff', 'context', 'instructions'],
-	template: `You are an advanced AI programming assistant and are tasked with summarizing code changes into a concise and meaningful code review title and description. You will be provided with a code diff and optional additional context. Your goal is to analyze the changes and create a clear, informative code review title and description that accurately represents the modifications made to the code
-
-First, examine the following code changes provided in Git diff format:
-<~~diff~~>
-\${diff}
-</~~diff~~>
-
-Now, if provided, use this context to understand the motivation behind the changes and any relevant background information:
-<~~additional-context~~>
-\${context}
-</~~additional-context~~>
-
-To create an effective title and description, follow these steps:
-
-1. Carefully analyze the diff and context, focusing on:
-   - The purpose and rationale of the changes
-   - Any problems addressed or benefits introduced
-   - Any significant logic changes or algorithmic improvements
-2. Ensure the following when composing the title and description:
-   - Emphasize the 'why' of the change, its benefits, or the problem it addresses
-   - Use an informal yet professional tone
-   - Use a future-oriented manner, third-person singular present tense (e.g., 'Fixes', 'Updates', 'Improves', 'Adds', 'Removes')
-   - Be clear and concise
-   - Synthesize only meaningful information from the diff and context
-   - Avoid outputting code, specific code identifiers, names, or file names unless crucial for understanding
-   - Avoid repeating information, broad generalities, and unnecessary phrases like "this", "this commit", or "this change"
-3. Summarize the main purpose of the changes in a single, concise sentence, which will be the title
-4. Provide a detailed explanation of the changes, which will be the description
-   - Add line breaks for readability and to separate independent ideas
-   - Focus on the "why" rather than the "what" of the changes
-
-Write your title inside <summary> tags and your description inside <body> tags and include no other text
-Example output structure:
-<summary>
-[code-suggestion-title-goes-here]
-</summary>
-<body>
-[code-suggestion-description-goes-here]
-</body>
-
-\${instructions}
-
-Based on the provided code diff and any additional context, create a concise but meaningful code review title and description following the instructions above`,
-};
-
 export const explainChanges: PromptTemplate<'explain-changes'> = {
 	id: 'explain-changes',
 	variables: ['diff', 'message', 'instructions'],
@@ -623,6 +575,22 @@ Guidelines:
 Assess the changes and produce the structured XML output above.`,
 };
 
+export const reviewRefine: PromptTemplate<'review-refine'> = {
+	id: 'review-refine',
+	variables: ['instructions'],
+	template: `The user has follow-up guidance for the review you produced above. Produce an updated review that incorporates it:
+- Keep prior findings that remain valid — do not drop them just because the guidance doesn't mention them
+- Update or remove findings the guidance invalidates or de-prioritizes
+- Add any new findings the guidance surfaces
+- Return the COMPLETE updated review, not just the changes
+
+<~~instructions~~>
+\${instructions}
+</~~instructions~~>
+
+Produce the full updated review in the same structured XML format as your previous response (<overview> + <focus-areas>). Include ONLY the XML tags — no other text.`,
+};
+
 export const addressReviewFindings: PromptTemplate<'address-review-findings'> = {
 	id: 'address-review-findings',
 	variables: ['reviewMarkdown', 'scopeLabel', 'granularity', 'instructions'],

package/src/plus/ai/providers/anthropicProvider.ts

@@ -1,11 +1,26 @@
 import { anthropicProviderDescriptor as provider } from '../constants.js';
 import { AIError, AIErrorReason } from '../errors.js';
 import type { AIActionType, AIModel } from '../models/model.js';
+import type { AIChatMessage, AIChatMessageRole } from '../models/provider.js';
 import { getReducedMaxInputTokens } from '../utils/ai.utils.js';
 import { OpenAICompatibleProviderBase } from './openAICompatibleProviderBase.js';
 
 type AnthropicModel = AIModel<typeof provider.id>;
 const models: AnthropicModel[] = [
+	{
+		id: 'claude-opus-4-8',
+		name: 'Claude Opus 4.8',
+		maxTokens: { input: 1048576, output: 128000 },
+		provider: provider,
+		temperature: null, // Sampling params removed on Opus 4.7+/Sonnet 5 (rejected with 400)
+	},
+	{
+		id: 'claude-sonnet-5',
+		name: 'Claude Sonnet 5',
+		maxTokens: { input: 1048576, output: 128000 },
+		provider: provider,
+		temperature: null, // Sampling params removed on Opus 4.7+/Sonnet 5 (rejected with 400)
+	},
 	{
 		id: 'claude-haiku-4-5',
 		name: 'Claude Haiku 4.5',
@@ -20,16 +35,23 @@ const models: AnthropicModel[] = [
 		provider: provider,
 		hidden: true,
 	},
+	{
+		id: 'claude-opus-4-7',
+		name: 'Claude Opus 4.7',
+		maxTokens: { input: 1048576, output: 128000 },
+		provider: provider,
+		temperature: null, // Sampling params removed on Opus 4.7+/Sonnet 5 (rejected with 400)
+	},
 	{
 		id: 'claude-sonnet-4-6',
 		name: 'Claude Sonnet 4.6',
-		maxTokens: { input: 204800, output: 64000 },
+		maxTokens: { input: 1048576, output: 64000 },
 		provider: provider,
 	},
 	{
 		id: 'claude-opus-4-6',
 		name: 'Claude Opus 4.6',
-		maxTokens: { input: 204800, output: 128000 },
+		maxTokens: { input: 1048576, output: 128000 },
 		provider: provider,
 	},
 	{
@@ -37,6 +59,7 @@ const models: AnthropicModel[] = [
 		name: 'Claude Sonnet 4.5',
 		maxTokens: { input: 204800, output: 64000 },
 		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'claude-sonnet-4-5-20250929',
@@ -50,6 +73,7 @@ const models: AnthropicModel[] = [
 		name: 'Claude Opus 4.5',
 		maxTokens: { input: 204800, output: 32000 },
 		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'claude-opus-4-5-20251101',
@@ -91,6 +115,7 @@ const models: AnthropicModel[] = [
 		name: 'Claude Sonnet 4',
 		maxTokens: { input: 204800, output: 64000 },
 		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'claude-sonnet-4-20250514',
@@ -245,6 +270,21 @@ export class AnthropicProvider extends OpenAICompatibleProviderBase<typeof provi
 		return super.fetchCore(action, model, apiKey, request, signal);
 	}
 
+	protected override extractSystemPrompt(messages: AIChatMessage<AIChatMessageRole>[]): {
+		messages: AIChatMessage<AIChatMessageRole>[];
+		system?: string;
+	} {
+		// Anthropic's Messages API rejects `system`-role entries in `messages` and requires the initial
+		// system prompt in the top-level `system` field, so pull any such messages out.
+		const systemMessages = messages.filter(m => m.role === 'system');
+		if (!systemMessages.length) return { messages: messages };
+
+		return {
+			system: systemMessages.map(m => m.content).join('\n\n'),
+			messages: messages.filter(m => m.role !== 'system'),
+		};
+	}
+
 	protected override async handleFetchFailure<TAction extends AIActionType>(
 		rsp: Response,
 		action: TAction,
@@ -255,7 +295,9 @@ export class AnthropicProvider extends OpenAICompatibleProviderBase<typeof provi
 		if (rsp.status !== 404 && rsp.status !== 429) {
 			let json;
 			try {
-				json = (await rsp.json()) as AnthropicError | undefined;
+				// Read from a clone so the body stays available for `super.handleFetchFailure` below;
+				// otherwise it re-reads the consumed body, loses Anthropic's error, and falls back to statusText.
+				json = (await rsp.clone().json()) as AnthropicError | undefined;
 			} catch {}
 
 			debugger;

package/src/plus/ai/providers/deepSeekProvider.ts

@@ -4,12 +4,27 @@ import { OpenAICompatibleProviderBase } from './openAICompatibleProviderBase.js'
 
 type DeepSeekModel = AIModel<typeof provider.id>;
 const models: DeepSeekModel[] = [
+	{
+		id: 'deepseek-v4-flash',
+		name: 'DeepSeek V4 Flash',
+		maxTokens: { input: 1000000, output: 65536 },
+		provider: provider,
+		default: true,
+		temperature: 0.0, // Recommended for Coding/Math
+	},
+	{
+		id: 'deepseek-v4-pro',
+		name: 'DeepSeek V4 Pro',
+		maxTokens: { input: 1000000, output: 65536 },
+		provider: provider,
+		temperature: 0.0, // Recommended for Coding/Math
+	},
 	{
 		id: 'deepseek-chat',
 		name: 'DeepSeek-V3',
 		maxTokens: { input: 65536, output: 8192 },
 		provider: provider,
-		default: true,
+		hidden: true,
 		temperature: 0.0, // Recommended for Coding/Math
 	},
 	{
@@ -17,6 +32,7 @@ const models: DeepSeekModel[] = [
 		name: 'DeepSeek-R1',
 		maxTokens: { input: 65536, output: 8192 },
 		provider: provider,
+		hidden: true,
 		temperature: 0.0, // Recommended for Coding/Math
 	},
 ];

package/src/plus/ai/providers/geminiProvider.ts

@@ -5,22 +5,39 @@ import { OpenAICompatibleProviderBase } from './openAICompatibleProviderBase.js'
 type GeminiModel = AIModel<typeof provider.id>;
 const models: GeminiModel[] = [
 	{
-		id: 'gemini-3.1-pro-preview',
-		name: 'Gemini 3.1 Pro Preview',
+		id: 'gemini-3.6-flash',
+		name: 'Gemini 3.6 Flash',
 		maxTokens: { input: 1048576, output: 65536 },
 		provider: provider,
+		temperature: null, // Gemini 3.x reasoning is tuned for its default temperature; don't override
 	},
 	{
-		id: 'gemini-3.1-flash-lite-preview',
-		name: 'Gemini 3.1 Flash-Lite Preview',
+		id: 'gemini-3.5-flash',
+		name: 'Gemini 3.5 Flash',
 		maxTokens: { input: 1048576, output: 65536 },
 		provider: provider,
+		temperature: null, // Gemini 3.x reasoning is tuned for its default temperature; don't override
 	},
 	{
-		id: 'gemini-3-pro-preview',
-		name: 'Gemini 3 Pro Preview',
+		id: 'gemini-3.5-flash-lite',
+		name: 'Gemini 3.5 Flash-Lite',
 		maxTokens: { input: 1048576, output: 65536 },
 		provider: provider,
+		temperature: null, // Gemini 3.x reasoning is tuned for its default temperature; don't override
+	},
+	{
+		id: 'gemini-3.1-pro-preview',
+		name: 'Gemini 3.1 Pro Preview',
+		maxTokens: { input: 1048576, output: 65536 },
+		provider: provider,
+		temperature: null, // Gemini 3.x reasoning is tuned for its default temperature; don't override
+	},
+	{
+		id: 'gemini-3.1-flash-lite',
+		name: 'Gemini 3.1 Flash-Lite',
+		maxTokens: { input: 1048576, output: 65536 },
+		provider: provider,
+		temperature: null, // Gemini 3.x reasoning is tuned for its default temperature; don't override
 	},
 	{
 		id: 'gemini-3-flash-preview',
@@ -28,12 +45,14 @@ const models: GeminiModel[] = [
 		maxTokens: { input: 1048576, output: 65536 },
 		provider: provider,
 		default: true,
+		temperature: null, // Gemini 3.x reasoning is tuned for its default temperature; don't override
 	},
 	{
 		id: 'gemini-2.5-pro',
 		name: 'Gemini 2.5 Pro',
 		maxTokens: { input: 1048576, output: 65536 },
 		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'gemini-2.5-flash',

package/src/plus/ai/providers/gitkrakenProvider.ts

@@ -47,6 +47,7 @@ export class GitKrakenProvider extends OpenAICompatibleProviderBase<typeof provi
 					preferred: boolean;
 					maxInputTokens: number;
 					maxOutputTokens: number;
+					consumptionRateLabel?: string;
 				}[];
 				error?: null;
 			}
@@ -65,6 +66,7 @@ export class GitKrakenProvider extends OpenAICompatibleProviderBase<typeof provi
 						provider: provider,
 						default: m.preferred,
 						temperature: null,
+						consumptionRateLabel: m.consumptionRateLabel,
 					}) satisfies GitKrakenModel,
 			);
 			return models;

package/src/plus/ai/providers/huggingFaceProvider.ts

@@ -14,38 +14,45 @@ export class HuggingFaceProvider extends OpenAICompatibleProviderBase<typeof pro
 	};
 
 	async getModels(): Promise<readonly AIModel<typeof provider.id>[]> {
-		const query = new URLSearchParams({
-			filter: 'text-generation,conversational',
-			inference: 'warm',
-			sort: 'trendingScore',
-			limit: '30',
-		});
-		const rsp = await this.context.fetch(`https://huggingface.co/api/models?${query.toString()}`, {
+		// Hugging Face Inference Providers OpenAI-compatible model list (router replaced the retired serverless API)
+		const url = 'https://router.huggingface.co/v1/models';
+		const rsp = await this.context.fetch(url, {
 			headers: {
 				Accept: 'application/json',
 				'Content-Type': 'application/json',
 			},
 			method: 'GET',
 		});
+		if (!rsp.ok) {
+			throw new Error(`Getting models (${url}) failed: ${rsp.status} (${rsp.statusText})`);
+		}
 
-		type ModelsResponse = { id: string }[];
+		type ModelsResponse = {
+			data: {
+				id: string;
+				architecture?: { output_modalities?: string[] };
+				providers?: { status?: string; context_length?: number }[];
+			}[];
+		};
 
-		const results = (await rsp.json()) as ModelsResponse;
-		const models = results.map<HuggingFaceModel>(
-			r =>
-				({
-					id: r.id,
-					name: r.id.split('/').pop()!,
-					maxTokens: { input: 4096, output: 4096 },
+		const result = (await rsp.json()) as ModelsResponse;
+		return result.data
+			.filter(
+				m => m.architecture?.output_modalities?.includes('text') && m.providers?.some(p => p.status === 'live'),
+			)
+			.map<HuggingFaceModel>(m => {
+				const contextLength = m.providers?.find(p => p.status === 'live')?.context_length;
+				return {
+					id: m.id,
+					name: m.id,
+					maxTokens: { input: contextLength || 8192, output: 4096 },
 					provider: provider,
 					temperature: null,
-				}) satisfies HuggingFaceModel,
-		);
-
-		return models;
+				} satisfies HuggingFaceModel;
+			});
 	}
 
-	protected getUrl(model: AIModel<typeof provider.id>): string {
-		return `https://api-inference.huggingface.co/models/${model.id}/v1/chat/completions`;
+	protected getUrl(_model: AIModel<typeof provider.id>): string {
+		return 'https://router.huggingface.co/v1/chat/completions';
 	}
 }

package/src/plus/ai/providers/openAICompatibleProviderBase.ts

@@ -127,7 +127,7 @@ export abstract class OpenAICompatibleProviderBase<T extends AIProviders> implem
 		while (true) {
 			const request: ChatCompletionRequest = {
 				model: model.id,
-				messages: await messages(maxInputTokens, retries),
+				...this.extractSystemPrompt(await messages(maxInputTokens, retries)),
 				stream: false,
 				max_completion_tokens: model.maxTokens.output
 					? Math.min(modelOptions?.outputTokens ?? Infinity, model.maxTokens.output)
@@ -173,6 +173,18 @@ export abstract class OpenAICompatibleProviderBase<T extends AIProviders> implem
 		}
 	}
 
+	/**
+	 * Returns the message-related request fields. The default sends every message inline (OpenAI
+	 * Chat Completions semantics); providers whose API carries the initial system prompt separately
+	 * (e.g. Anthropic's top-level `system`) override this to extract it from the messages.
+	 */
+	protected extractSystemPrompt(messages: AIChatMessage<AIChatMessageRole>[]): {
+		messages: AIChatMessage<AIChatMessageRole>[];
+		system?: string;
+	} {
+		return { messages: messages };
+	}
+
 	protected async handleFetchFailure<TAction extends AIActionType>(
 		rsp: Response,
 		_action: TAction,
@@ -248,6 +260,9 @@ interface ChatCompletionRequest {
 	model: string;
 	messages: AIChatMessage<AIChatMessageRole>[];
 
+	/** Anthropic carries the initial system prompt here instead of as a `system`-role message */
+	system?: string;
+
 	/** @deprecated but used by Anthropic & Gemini */
 	max_tokens?: number;
 	/** Currently can't be used for Anthropic & Gemini */

package/src/plus/ai/providers/xaiProvider.ts

@@ -4,12 +4,25 @@ import { OpenAICompatibleProviderBase } from './openAICompatibleProviderBase.js'
 
 type XAIModel = AIModel<typeof provider.id>;
 const models: XAIModel[] = [
+	{
+		id: 'grok-4.5',
+		name: 'Grok 4.5',
+		maxTokens: { input: 500000, output: 65536 },
+		provider: provider,
+	},
+	{
+		id: 'grok-4.3',
+		name: 'Grok 4.3',
+		maxTokens: { input: 1048576, output: 65536 },
+		provider: provider,
+		default: true,
+	},
 	{
 		id: 'grok-beta',
 		name: 'Grok Beta',
 		maxTokens: { input: 131072, output: 4096 },
 		provider: provider,
-		default: true,
+		hidden: true,
 	},
 ];
 

package/src/plus/ai/utils/ai.utils.ts

@@ -14,8 +14,6 @@ export function getActionName(action: AIActionType): string {
 			return 'Generate Changelog';
 		case 'generate-create-cloudPatch':
 			return 'Create Cloud Patch Details';
-		case 'generate-create-codeSuggestion':
-			return 'Create Code Suggestion Details';
 		case 'generate-create-pullRequest':
 			return 'Create Pull Request Details';
 		case 'generate-commits':

package/src/plus/ai/utils/results.utils.ts

@@ -141,6 +141,38 @@ export function parseReviewResult(result: string, mode: 'single-pass' | 'two-pas
 	return { overview: overview, focusAreas: focusAreas, mode: mode };
 }
 
+function serializeAttrValue(value: string): string {
+	// parseAttr's regex can't cope with embedded double-quotes
+	return value.replaceAll('"', "'");
+}
+
+function serializeFinding(finding: AIReviewFinding): string {
+	const attrs = [`severity="${finding.severity}"`];
+	if (finding.filePath) {
+		attrs.push(`file="${serializeAttrValue(finding.filePath)}"`);
+	}
+	if (finding.lineRange != null) {
+		attrs.push(`lines="${finding.lineRange.start}-${finding.lineRange.end}"`);
+	}
+	return `<finding ${attrs.join(' ')}>\n<title>${finding.title}</title>\n<description>${finding.description}</description>\n</finding>`;
+}
+
+/** Inverse of {@link parseReviewResult} — emits the same XML the review prompt templates instruct,
+ *  so a prior result can be replayed as an assistant turn in a follow-up conversation. */
+export function serializeReviewResult(result: AIReviewResult): string {
+	const areas = result.focusAreas.map(area => {
+		const parts = [`<label>${area.label}</label>`, `<rationale>${area.rationale}</rationale>`];
+		if (area.findings != null) {
+			parts.push(`<findings>\n${area.findings.map(serializeFinding).join('\n')}\n</findings>`);
+		}
+		return `<area severity="${area.severity}" files="${serializeAttrValue(area.files.join(','))}">\n${parts.join(
+			'\n',
+		)}\n</area>`;
+	});
+
+	return `<overview>\n${result.overview}\n</overview>\n<focus-areas>\n${areas.join('\n')}\n</focus-areas>`;
+}
+
 export function parseReviewDetailResult(result: string, focusAreaId: string): AIReviewDetailResult {
 	result = result.trim();
 

package/src/plus/ai/utils/truncation.utils.ts

@@ -50,7 +50,6 @@ type DiffTemplateType =
 	| 'generate-commitMessage'
 	| 'generate-stashMessage'
 	| 'generate-create-cloudPatch'
-	| 'generate-create-codeSuggestion'
 	| 'generate-create-pullRequest'
 	| 'explain-changes'
 	| 'review-changes'