@gitkraken/core-gitlens 0.5.109 → 0.5.111

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

@@ -1,232 +1,270 @@
 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 type { AIChatMessage, AIChatMessageRole, AIResponseFormat, AIToolDefinition } from '../models/provider.js';
 import { getReducedMaxInputTokens } from '../utils/ai.utils.js';
+import type { ChatCompletionRequest } from './openAICompatibleProviderBase.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 },
+		id: 'claude-opus-5',
+		name: 'Claude Opus 5',
+		maxTokens: { input: 1000000, 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 },
+		id: 'claude-fable-5',
+		name: 'Claude Fable 5',
+		maxTokens: { input: 1000000, output: 128000 },
 		provider: provider,
+		// Requires 30-day data retention; ZDR orgs get a 400 on every request
 		temperature: null, // Sampling params removed on Opus 4.7+/Sonnet 5 (rejected with 400)
 	},
 	{
-		id: 'claude-haiku-4-5',
-		name: 'Claude Haiku 4.5',
-		maxTokens: { input: 204800, output: 32000 },
+		id: 'claude-sonnet-5',
+		name: 'Claude Sonnet 5',
+		maxTokens: { input: 1000000, output: 128000 },
 		provider: provider,
-		default: true,
+		temperature: null, // Sampling params removed on Opus 4.7+/Sonnet 5 (rejected with 400)
 	},
 	{
-		id: 'claude-haiku-4-5-20251001',
-		name: 'Claude Haiku 4.5',
-		maxTokens: { input: 204800, output: 32000 },
+		id: 'claude-opus-4-8',
+		name: 'Claude Opus 4.8',
+		maxTokens: { input: 1000000, output: 128000 },
 		provider: provider,
-		hidden: true,
+		temperature: null, // Sampling params removed on Opus 4.7+/Sonnet 5 (rejected with 400)
 	},
 	{
 		id: 'claude-opus-4-7',
 		name: 'Claude Opus 4.7',
-		maxTokens: { input: 1048576, output: 128000 },
+		maxTokens: { input: 1000000, 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: 1048576, output: 64000 },
+		maxTokens: { input: 1000000, output: 128000 },
 		provider: provider,
 	},
 	{
 		id: 'claude-opus-4-6',
 		name: 'Claude Opus 4.6',
-		maxTokens: { input: 1048576, output: 128000 },
+		maxTokens: { input: 1000000, output: 128000 },
+		provider: provider,
+	},
+	{
+		id: 'claude-haiku-4-5',
+		name: 'Claude Haiku 4.5',
+		maxTokens: { input: 200000, output: 64000 },
 		provider: provider,
+		default: true,
+	},
+	{
+		id: 'claude-haiku-4-5-20251001',
+		name: 'Claude Haiku 4.5',
+		maxTokens: { input: 200000, output: 64000 },
+		provider: provider,
+		hidden: true,
 	},
 	{
 		id: 'claude-sonnet-4-5',
 		name: 'Claude Sonnet 4.5',
-		maxTokens: { input: 204800, output: 64000 },
+		maxTokens: { input: 200000, output: 64000 },
 		provider: provider,
 		hidden: true,
 	},
 	{
 		id: 'claude-sonnet-4-5-20250929',
 		name: 'Claude Sonnet 4.5',
-		maxTokens: { input: 204800, output: 64000 },
+		maxTokens: { input: 200000, output: 64000 },
 		provider: provider,
 		hidden: true,
 	},
 	{
 		id: 'claude-opus-4-5',
 		name: 'Claude Opus 4.5',
-		maxTokens: { input: 204800, output: 32000 },
+		maxTokens: { input: 200000, output: 64000 },
 		provider: provider,
 		hidden: true,
 	},
 	{
 		id: 'claude-opus-4-5-20251101',
 		name: 'Claude Opus 4.5',
-		maxTokens: { input: 204800, output: 32000 },
+		maxTokens: { input: 200000, output: 64000 },
 		provider: provider,
 		hidden: true,
 	},
 	{
 		id: 'claude-opus-4-1',
 		name: 'Claude Opus 4.1',
-		maxTokens: { input: 204800, output: 32000 },
+		maxTokens: { input: 200000, output: 32000 },
 		provider: provider,
 		hidden: true,
+		// Structured outputs require the 4.5 generation or newer (this and every entry below)
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-opus-4-1-20250805',
 		name: 'Claude Opus 4.1',
-		maxTokens: { input: 204800, output: 32000 },
+		maxTokens: { input: 200000, output: 32000 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-opus-4-0',
 		name: 'Claude Opus 4',
-		maxTokens: { input: 204800, output: 32000 },
+		maxTokens: { input: 200000, output: 32000 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-opus-4-20250514',
 		name: 'Claude Opus 4',
-		maxTokens: { input: 204800, output: 32000 },
+		maxTokens: { input: 200000, output: 32000 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-sonnet-4-0',
 		name: 'Claude Sonnet 4',
-		maxTokens: { input: 204800, output: 64000 },
+		maxTokens: { input: 200000, output: 64000 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-sonnet-4-20250514',
 		name: 'Claude Sonnet 4',
-		maxTokens: { input: 204800, output: 64000 },
+		maxTokens: { input: 200000, output: 64000 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-7-sonnet-latest',
 		name: 'Claude Sonnet 3.7',
-		maxTokens: { input: 204800, output: 64000 },
+		maxTokens: { input: 200000, output: 64000 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-7-sonnet-20250219',
 		name: 'Claude Sonnet 3.7',
-		maxTokens: { input: 204800, output: 64000 },
+		maxTokens: { input: 200000, output: 64000 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-5-sonnet-latest',
 		name: 'Claude Sonnet 3.5',
-		maxTokens: { input: 204800, output: 8192 },
+		maxTokens: { input: 200000, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-5-sonnet-20241022',
 		name: 'Claude Sonnet 3.5',
-		maxTokens: { input: 204800, output: 8192 },
+		maxTokens: { input: 200000, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-5-sonnet-20240620',
 		name: 'Claude Sonnet 3.5',
-		maxTokens: { input: 204800, output: 8192 },
+		maxTokens: { input: 200000, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-5-haiku-latest',
 		name: 'Claude Haiku 3.5',
-		maxTokens: { input: 204800, output: 8192 },
+		maxTokens: { input: 200000, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-5-haiku-20241022',
 		name: 'Claude Haiku 3.5',
-		maxTokens: { input: 204800, output: 8192 },
+		maxTokens: { input: 200000, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-opus-latest',
 		name: 'Claude Opus 3',
-		maxTokens: { input: 204800, output: 4096 },
+		maxTokens: { input: 200000, output: 4096 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-opus-20240229',
 		name: 'Claude Opus 3',
-		maxTokens: { input: 204800, output: 4096 },
+		maxTokens: { input: 200000, output: 4096 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-sonnet-latest',
 		name: 'Claude Sonnet 3',
-		maxTokens: { input: 204800, output: 4096 },
+		maxTokens: { input: 200000, output: 4096 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-sonnet-20240229',
 		name: 'Claude Sonnet 3',
-		maxTokens: { input: 204800, output: 4096 },
+		maxTokens: { input: 200000, output: 4096 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-haiku-latest',
 		name: 'Claude Haiku 3',
-		maxTokens: { input: 204800, output: 4096 },
+		maxTokens: { input: 200000, output: 4096 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-3-haiku-20240307',
 		name: 'Claude Haiku 3',
-		maxTokens: { input: 204800, output: 4096 },
+		maxTokens: { input: 200000, output: 4096 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'claude-2.1',
 		name: 'Claude 2.1',
-		maxTokens: { input: 204800, output: 4096 },
+		maxTokens: { input: 200000, output: 4096 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 ];
 
 export class AnthropicProvider extends OpenAICompatibleProviderBase<typeof provider.id> {
 	readonly id = provider.id;
 	readonly name = provider.name;
+	readonly supportsTools = true;
 	protected readonly descriptor = provider;
 	protected readonly config = {
 		keyUrl: 'https://console.anthropic.com/account/keys',
@@ -241,6 +279,16 @@ export class AnthropicProvider extends OpenAICompatibleProviderBase<typeof provi
 		return 'https://api.anthropic.com/v1/messages';
 	}
 
+	// Anthropic uses `output_config.format` (no name/strict — enforcement is unconditional) and
+	// rejects unknown fields, so this must fully replace the base's `response_format` translation
+	protected override applyResponseFormat(
+		request: ChatCompletionRequest,
+		_model: AIModel<typeof provider.id>,
+		responseFormat: AIResponseFormat,
+	): void {
+		request.output_config = { format: { type: 'json_schema', schema: responseFormat.schema } };
+	}
+
 	protected override getHeaders<TAction extends AIActionType>(
 		_action: TAction,
 		apiKey: string,
@@ -291,13 +339,19 @@ export class AnthropicProvider extends OpenAICompatibleProviderBase<typeof provi
 		model: AIModel<typeof provider.id>,
 		retries: number,
 		maxInputTokens: number,
-	): Promise<{ retry: true; maxInputTokens: number }> {
+		body?: string,
+		sentTools?: boolean,
+	): Promise<{ retry: true; maxInputTokens: number; withoutTools?: boolean }> {
 		if (rsp.status !== 404 && rsp.status !== 429) {
+			// Read into `body` (not the response) so `super.handleFetchFailure` below can still
+			// use it; consuming the response here would lose Anthropic's error for the fallback.
+			body ??= await rsp
+				.clone()
+				.text()
+				.catch(() => undefined);
 			let json;
 			try {
-				// 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;
+				json = (body != null ? JSON.parse(body) : undefined) as AnthropicError | undefined;
 			} catch {}
 
 			debugger;
@@ -330,10 +384,64 @@ export class AnthropicProvider extends OpenAICompatibleProviderBase<typeof provi
 			}
 		}
 
-		return super.handleFetchFailure(rsp, action, model, retries, maxInputTokens);
+		return super.handleFetchFailure(rsp, action, model, retries, maxInputTokens, body, sentTools);
+	}
+
+	protected override serializeTools(tools: readonly AIToolDefinition[]): { tools: unknown[] } {
+		// Anthropic names the schema field `input_schema` and has no `function` envelope.
+		return {
+			tools: tools.map(t => ({ name: t.name, description: t.description, input_schema: t.parameters })),
+		};
+	}
+
+	protected override serializeMessages(messages: AIChatMessage<AIChatMessageRole>[]): unknown[] {
+		const out: unknown[] = [];
+
+		for (const m of messages) {
+			// Anthropic carries tool results as `tool_result` blocks on a *user* message, not a
+			// `tool`-role message. Consecutive results are batched into one user turn, matching how the
+			// API expects a multi-tool-call round to be answered.
+			if (m.role === 'tool') {
+				// See the base provider: a result with no call id can't be addressed, so it goes as plain
+				// text instead of a `tool_use_id: undefined` block the API rejects.
+				if (m.toolCallId == null) {
+					out.push({ role: 'user', content: m.content });
+					continue;
+				}
+
+				const block = { type: 'tool_result', tool_use_id: m.toolCallId, content: m.content };
+				const last = out.at(-1) as { role?: string; content?: unknown[] } | undefined;
+				if (last?.role === 'user' && Array.isArray(last.content) && isToolResultBlocks(last.content)) {
+					last.content.push(block);
+				} else {
+					out.push({ role: 'user', content: [block] });
+				}
+				continue;
+			}
+
+			if (m.role === 'assistant' && m.toolCalls?.length) {
+				out.push({
+					role: 'assistant',
+					content: [
+						...(m.content ? [{ type: 'text', text: m.content }] : []),
+						...m.toolCalls.map(c => ({ type: 'tool_use', id: c.id, name: c.name, input: c.args })),
+					],
+				});
+				continue;
+			}
+
+			out.push({ role: m.role, content: m.content });
+		}
+
+		return out;
 	}
 }
 
+/** Whether an assembled user message's content is a batch of `tool_result` blocks we can append to. */
+function isToolResultBlocks(content: unknown[]): content is { type: string }[] {
+	return content.every(b => (b as { type?: string })?.type === 'tool_result');
+}
+
 interface AnthropicError {
 	type: 'error';
 	error: {

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

@@ -4,35 +4,19 @@ 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 },
+		maxTokens: { input: 1000000, output: 384000 }, // DeepSeek publishes "384K" only; decimal reading avoids overstating
 		provider: provider,
-		hidden: true,
 		temperature: 0.0, // Recommended for Coding/Math
 	},
 	{
-		id: 'deepseek-reasoner',
-		name: 'DeepSeek-R1',
-		maxTokens: { input: 65536, output: 8192 },
+		id: 'deepseek-v4-flash',
+		name: 'DeepSeek V4 Flash',
+		maxTokens: { input: 1000000, output: 384000 },
 		provider: provider,
-		hidden: true,
+		default: true,
 		temperature: 0.0, // Recommended for Coding/Math
 	},
 ];
@@ -40,6 +24,7 @@ const models: DeepSeekModel[] = [
 export class DeepSeekProvider extends OpenAICompatibleProviderBase<typeof provider.id> {
 	readonly id = provider.id;
 	readonly name = provider.name;
+	readonly supportsTools = true;
 	protected readonly descriptor = provider;
 	protected readonly config = {
 		keyUrl: 'https://platform.deepseek.com/api_keys',
@@ -53,4 +38,9 @@ export class DeepSeekProvider extends OpenAICompatibleProviderBase<typeof provid
 	protected getUrl(_model: AIModel<typeof provider.id>): string {
 		return 'https://api.deepseek.com/v1/chat/completions';
 	}
+
+	// DeepSeek's response_format only accepts text|json_object — json_schema is rejected outright
+	protected override supportsResponseFormat(_model: AIModel<typeof provider.id>): boolean {
+		return false;
+	}
 }

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

@@ -4,6 +4,13 @@ import { OpenAICompatibleProviderBase } from './openAICompatibleProviderBase.js'
 
 type GeminiModel = AIModel<typeof provider.id>;
 const models: GeminiModel[] = [
+	{
+		id: 'gemini-3.7-flash',
+		name: 'Gemini 3.7 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.6-flash',
 		name: 'Gemini 3.6 Flash',
@@ -142,6 +149,10 @@ const models: GeminiModel[] = [
 		maxTokens: { input: 2097152, output: 8192 },
 		provider: provider,
 		hidden: true,
+		// The OpenAI-compat endpoint's `response_format: json_schema` postdates these frozen
+		// pre-GA snapshots and the 1.5 generation (this and every entry below); GA 2.x+ models
+		// stay on by default and rely on strip-and-retry for the shapes its converter rejects
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'gemini-2.0-flash-thinking-exp-01-21',
@@ -149,6 +160,7 @@ const models: GeminiModel[] = [
 		maxTokens: { input: 1048576, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'gemini-2.0-flash-exp',
@@ -156,6 +168,7 @@ const models: GeminiModel[] = [
 		maxTokens: { input: 1048576, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'gemini-exp-1206',
@@ -163,6 +176,7 @@ const models: GeminiModel[] = [
 		maxTokens: { input: 2097152, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'gemini-exp-1121',
@@ -170,6 +184,7 @@ const models: GeminiModel[] = [
 		maxTokens: { input: 2097152, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'gemini-1.5-pro',
@@ -177,6 +192,7 @@ const models: GeminiModel[] = [
 		maxTokens: { input: 2097152, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'gemini-1.5-flash',
@@ -184,6 +200,7 @@ const models: GeminiModel[] = [
 		maxTokens: { input: 1048576, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 	{
 		id: 'gemini-1.5-flash-8b',
@@ -191,12 +208,14 @@ const models: GeminiModel[] = [
 		maxTokens: { input: 1048576, output: 8192 },
 		provider: provider,
 		hidden: true,
+		supportsStructuredOutputs: false,
 	},
 ];
 
 export class GeminiProvider extends OpenAICompatibleProviderBase<typeof provider.id> {
 	readonly id = provider.id;
 	readonly name = provider.name;
+	readonly supportsTools = true;
 	protected readonly descriptor = provider;
 	protected readonly config = {
 		keyUrl: 'https://aistudio.google.com/app/apikey',