@gitkraken/core-gitlens 0.5.110 → 0.5.112

package/dist/plus/ai/providers/ollamaProvider.js

@@ -1,4 +1,5 @@
 import { uuid } from '../../../utils/crypto.js';
+import { Logger } from '../../../utils/logger.js';
 import { ollamaProviderDescriptor as provider } from '../constants.js';
 import { OpenAICompatibleProviderBase } from './openAICompatibleProviderBase.js';
 const defaultBaseUrl = 'http://localhost:11434';
@@ -90,13 +91,17 @@ export class OllamaProvider extends OpenAICompatibleProviderBase {
         const url = this.getBaseUrl();
         return url ? `${url}/api/chat` : undefined;
     }
+    // Ollama < 0.5.0 rejects a schema-valued `format` (accepts only 'json')
+    isResponseFormatRejection(status, body) {
+        return status === 400 && /format/i.test(body);
+    }
     getHeaders(_action, _apiKey, _model, _url) {
         return {
             Accept: 'application/json',
             'Content-Type': 'application/json',
         };
     }
-    async fetch(action, model, apiKey, messages, modelOptions, signal) {
+    async fetch(action, model, apiKey, messages, modelOptions, responseFormat, signal) {
         let retries = 0;
         let maxInputTokens = model.maxTokens.input;
         while (true) {
@@ -109,19 +114,48 @@ export class OllamaProvider extends OpenAICompatibleProviderBase {
             }));
             // Ensure temperature is within valid range for Ollama (0.0-1.0)
             const temperature = Math.min(Math.max(modelOptions?.temperature ?? 0.7, 0), 1);
+            const format = responseFormat != null &&
+                !this.isResponseFormatSessionRejected(model, responseFormat) &&
+                this.supportsResponseFormat(model)
+                ? responseFormat.schema
+                : undefined;
             const request = {
                 model: model.id,
                 messages: ollamaMessages,
                 stream: false,
+                // Ollama takes the bare JSON schema (grammar-constrained sampling, any model)
+                format: format,
                 options: {
                     temperature: temperature,
                     // Add num_predict if outputTokens is specified
                     ...(modelOptions?.outputTokens ? { num_predict: modelOptions.outputTokens } : {}),
                 },
             };
-            const rsp = await this.fetchCore(action, model, apiKey, request, signal);
+            let rsp = await this.fetchCore(action, model, apiKey, request, signal);
+            let errorBody;
+            if (!rsp.ok && rsp.status === 400 && request.format != null) {
+                // If the schema-valued format was rejected (Ollama < 0.5.0 accepts only 'json'),
+                // resend the same request without it — the prompt still describes the JSON
+                // Leave it `undefined` (not '') when the read fails, so `handleFetchFailure` falls
+                // back to reading the still-unconsumed response instead of parsing an empty string
+                errorBody = await rsp
+                    .clone()
+                    .text()
+                    .catch(() => undefined);
+                if (this.isResponseFormatRejection(rsp.status, errorBody ?? '')) {
+                    Logger.warn(`(${this.name}) ${model.id}: native response format was rejected (${rsp.status}); retrying without it`);
+                    const rejected = responseFormat;
+                    responseFormat = undefined;
+                    delete request.format;
+                    rsp = await this.fetchCore(action, model, apiKey, request, signal);
+                    errorBody = undefined;
+                    if (rsp.ok && rejected != null) {
+                        this.rememberResponseFormatRejection(model, rejected);
+                    }
+                }
+            }
             if (!rsp.ok) {
-                const result = await this.handleFetchFailure(rsp, action, model, retries, maxInputTokens);
+                const result = await this.handleFetchFailure(rsp, action, model, retries, maxInputTokens, errorBody);
                 if (result.retry) {
                     maxInputTokens = result.maxInputTokens;
                     retries++;
@@ -137,6 +171,7 @@ export class OllamaProvider extends OpenAICompatibleProviderBase {
                 return {
                     id: uuid(),
                     content: data.message.content,
+                    finishReason: data.done_reason === 'length' ? 'length' : undefined,
                     model: model,
                     usage: {
                         promptTokens: data.prompt_eval_count ?? 0,

package/dist/plus/ai/providers/ollamaProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ollamaProvider.js","sourceRoot":"","sources":["../../../../src/plus/ai/providers/ollamaProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ollamaProvider.js","sourceRoot":"","sources":["../../../../src/plus/ai/providers/ollamaProvider.ts"],"names":[],"mappings":"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"}

package/dist/plus/ai/providers/openAICompatibleProvider.d.ts

@@ -11,6 +11,7 @@ export declare class OpenAICompatibleProvider extends OpenAICompatibleProviderBa
     };
     getModels(): Promise<readonly AIModel<typeof provider.id>[]>;
     protected getUrl(_model?: AIModel<typeof provider.id>): string | undefined;
+    protected supportsResponseFormat(_model: AIModel<typeof provider.id>): boolean;
     private getOrPromptBaseUrl;
     configured(silent: boolean): Promise<boolean>;
 }

package/dist/plus/ai/providers/openAICompatibleProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openAICompatibleProvider.d.ts","sourceRoot":"","sources":["../../../../src/plus/ai/providers/openAICompatibleProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGlD,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAKjF,qBAAa,wBAAyB,SAAQ,4BAA4B,CAAC,OAAO,QAAQ,CAAC,EAAE,CAAC;IAC7F,QAAQ,CAAC,EAAE,qBAAe;IAC1B,QAAQ,CAAC,IAAI,SAAiB;IAC9B,SAAS,CAAC,QAAQ,CAAC,UAAU,wEAAY;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM;QACxB,MAAM;QACN,YAAY;MACX;IAEF,SAAS,IAAI,OAAO,CAAC,SAAS,OAAO,CAAC,OAAO,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAE3D;IAED,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,OAAO,QAAQ,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,SAAS,CAKzE;YAEa,kBAAkB;IAqBjB,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAO3D;CACD"}
+{"version":3,"file":"openAICompatibleProvider.d.ts","sourceRoot":"","sources":["../../../../src/plus/ai/providers/openAICompatibleProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGlD,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAKjF,qBAAa,wBAAyB,SAAQ,4BAA4B,CAAC,OAAO,QAAQ,CAAC,EAAE,CAAC;IAC7F,QAAQ,CAAC,EAAE,qBAAe;IAC1B,QAAQ,CAAC,IAAI,SAAiB;IAC9B,SAAS,CAAC,QAAQ,CAAC,UAAU,wEAAY;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM;QACxB,MAAM;QACN,YAAY;MACX;IAEF,SAAS,IAAI,OAAO,CAAC,SAAS,OAAO,CAAC,OAAO,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAE3D;IAED,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,OAAO,QAAQ,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,SAAS,CAKzE;IAGD,UAAmB,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,QAAQ,CAAC,EAAE,CAAC,GAAG,OAAO,CAEtF;YAEa,kBAAkB;IAqBjB,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAO3D;CACD"}

package/dist/plus/ai/providers/openAICompatibleProvider.js

@@ -20,6 +20,10 @@ export class OpenAICompatibleProvider extends OpenAICompatibleProviderBase {
             return undefined;
         return cfg.url || undefined;
     }
+    // Unknown user-configured backend — fall back to prompt-described JSON
+    supportsResponseFormat(_model) {
+        return false;
+    }
     async getOrPromptBaseUrl(silent, hasApiKey) {
         const orgConf = this.context.getProviderConfig(this.id);
         if (!orgConf.enabled)

package/dist/plus/ai/providers/openAICompatibleProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"openAICompatibleProvider.js","sourceRoot":"","sources":["../../../../src/plus/ai/providers/openAICompatibleProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF,MAAM,MAAM,GAA4B,YAAY,CAAC,QAAQ,CAAC,CAAC;AAE/D,MAAM,OAAO,wBAAyB,SAAQ,4BAAgD;IACpF,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;IACjB,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IACX,UAAU,GAAG,QAAQ,CAAC;IACtB,MAAM,GAAG;QAC3B,MAAM,EAAE,SAAS;QACjB,YAAY,EAAE,0BAA0B;KACxC,CAAC;IAEF,SAAS;QACR,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAES,MAAM,CAAC,MAAoC;QACpD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,GAAG,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAEnC,OAAO,GAAG,CAAC,GAAG,IAAI,SAAS,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,MAAe,EAAE,SAAkB;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QACvC,IAAI,OAAO,CAAC,GAAG;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC;QAEpC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAE1B,IAAI,MAAM,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,SAAS,CAAC;YAAE,OAAO,GAAG,CAAC;QAErD,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CACjC,IAAI,CAAC,EAAE,EACP;YACC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,uCAAuC;YAC9C,WAAW,EAAE,sDAAsD;YACnE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uCAAuC,CAAC,CAAC,CAAC,SAAS,CAAC;SACrF,EACD,MAAM,CACN,CAAC;IACH,CAAC;IAEQ,KAAK,CAAC,UAAU,CAAC,MAAe;QACxC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QAE1C,OAAO,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;CACD"}
+{"version":3,"file":"openAICompatibleProvider.js","sourceRoot":"","sources":["../../../../src/plus/ai/providers/openAICompatibleProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF,MAAM,MAAM,GAA4B,YAAY,CAAC,QAAQ,CAAC,CAAC;AAE/D,MAAM,OAAO,wBAAyB,SAAQ,4BAAgD;IACpF,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;IACjB,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IACX,UAAU,GAAG,QAAQ,CAAC;IACtB,MAAM,GAAG;QAC3B,MAAM,EAAE,SAAS;QACjB,YAAY,EAAE,0BAA0B;KACxC,CAAC;IAEF,SAAS;QACR,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAES,MAAM,CAAC,MAAoC;QACpD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,GAAG,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAEnC,OAAO,GAAG,CAAC,GAAG,IAAI,SAAS,CAAC;IAC7B,CAAC;IAED,uEAAuE;IACpD,sBAAsB,CAAC,MAAmC;QAC5E,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,MAAe,EAAE,SAAkB;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QACvC,IAAI,OAAO,CAAC,GAAG;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC;QAEpC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAE1B,IAAI,MAAM,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,SAAS,CAAC;YAAE,OAAO,GAAG,CAAC;QAErD,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CACjC,IAAI,CAAC,EAAE,EACP;YACC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,uCAAuC;YAC9C,WAAW,EAAE,sDAAsD;YACnE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uCAAuC,CAAC,CAAC,CAAC,SAAS,CAAC;SACrF,EACD,MAAM,CACN,CAAC;IACH,CAAC;IAEQ,KAAK,CAAC,UAAU,CAAC,MAAe;QACxC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QAE1C,OAAO,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;CACD"}

package/dist/plus/ai/providers/openAICompatibleProviderBase.d.ts

@@ -1,6 +1,6 @@
 import type { AIProviders } from '../constants.js';
 import type { AIActionType, AIModel, AIProviderDescriptor } from '../models/model.js';
-import type { AIChatMessage, AIChatMessageRole, AIProvider, AIProviderResponse } from '../models/provider.js';
+import type { AIChatMessage, AIChatMessageRole, AIFinishReason, AIProvider, AIProviderResponse, AIResponseFormat, AIToolCall, AIToolDefinition, JSONSchema } from '../models/provider.js';
 import type { AIProviderContext } from './context.js';
 export declare abstract class OpenAICompatibleProviderBase<T extends AIProviders> implements AIProvider<T> {
     protected readonly context: AIProviderContext;
@@ -17,20 +17,24 @@ export declare abstract class OpenAICompatibleProviderBase<T extends AIProviders
     configured(silent: boolean): Promise<boolean>;
     getApiKey(silent: boolean): Promise<string | undefined>;
     abstract getModels(): Promise<readonly AIModel<T>[]>;
+    protected isResponseFormatSessionRejected(model: AIModel<T>, responseFormat: AIResponseFormat): boolean;
+    protected rememberResponseFormatRejection(model: AIModel<T>, responseFormat: AIResponseFormat): void;
     protected abstract getUrl(_model: AIModel<T>): string | undefined;
     protected getHeaders<TAction extends AIActionType>(_action: TAction, apiKey: string, _model: AIModel<T>, _url: string, _conversationId?: string): Record<string, string> | Promise<Record<string, string>>;
-    sendRequest<TAction extends AIActionType>(action: TAction, model: AIModel<T>, apiKey: string, getMessages: (maxInputTokens: number, retries: number) => Promise<AIChatMessage[]>, options: {
+    sendRequest<TAction extends AIActionType>(action: TAction, model: AIModel<T>, apiKey: string, getMessages: (maxInputTokens: number, retries: number) => Promise<AIChatMessage<AIChatMessageRole>[]>, options: {
         signal: AbortSignal;
         modelOptions?: {
             outputTokens?: number;
             temperature?: number;
         };
         conversationId?: string;
+        responseFormat?: AIResponseFormat;
+        tools?: readonly AIToolDefinition[];
     }): Promise<AIProviderResponse<void> | undefined>;
-    protected fetch<TAction extends AIActionType>(action: TAction, model: AIModel<T>, apiKey: string, messages: (maxInputTokens: number, retries: number) => Promise<AIChatMessage[]>, modelOptions?: {
+    protected fetch<TAction extends AIActionType>(action: TAction, model: AIModel<T>, apiKey: string, messages: (maxInputTokens: number, retries: number) => Promise<AIChatMessage<AIChatMessageRole>[]>, modelOptions?: {
         outputTokens?: number;
         temperature?: number;
-    }, signal?: AbortSignal, conversationId?: string): Promise<AIProviderResponse<void>>;
+    }, responseFormat?: AIResponseFormat, signal?: AbortSignal, conversationId?: string, tools?: readonly AIToolDefinition[]): Promise<AIProviderResponse<void>>;
     /**
      * 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
@@ -40,10 +44,155 @@ export declare abstract class OpenAICompatibleProviderBase<T extends AIProviders
         messages: AIChatMessage<AIChatMessageRole>[];
         system?: string;
     };
-    protected handleFetchFailure<TAction extends AIActionType>(rsp: Response, _action: TAction, model: AIModel<T>, retries: number, maxInputTokens: number): Promise<{
+    /** Whether the given model accepts a native response-format/schema field; when false the
+     *  prompt's JSON description is the only format control (the request is unchanged).
+     *  Dynamic-catalog providers (GitKraken, OpenRouter) populate
+     *  {@link AIModel.supportsStructuredOutputs}; static providers override with id-based gates */
+    protected supportsResponseFormat(model: AIModel<T>): boolean;
+    /**
+     * Whether a failed response reads as a rejection of the `tools` field rather than a problem with the
+     * prompt — the trigger for one retry without tools, so a tool-using feature degrades to single-shot
+     * instead of failing outright.
+     *
+     * Providers that wrap upstream rejections in their own envelope (e.g. GitKraken) must override this:
+     * the wrapper's prose names neither "tool" nor "function", so the text match here cannot see through
+     * it and the fallback would never fire.
+     */
+    protected isToolsRejection(status: number, message: string | undefined): boolean;
+    /** Whether a failed response means the native response format itself was rejected — the
+     *  trigger for stripping it and retrying via the prompt-described JSON. Providers that wrap
+     *  upstream rejections in their own envelope (e.g. GitKraken) extend this */
+    protected isResponseFormatRejection(status: number, body: string): boolean;
+    /** Translates the canonical response format onto the request; called only when
+     *  {@link supportsResponseFormat} allows it. Base emits the OpenAI `response_format.json_schema`
+     *  envelope. Overrides must REPLACE this for providers with a different native field
+     *  (e.g. Anthropic `output_config`) — never leave both on the request. */
+    protected applyResponseFormat(request: ChatCompletionRequest, _model: AIModel<T>, responseFormat: AIResponseFormat): void;
+    protected extractContent(data: ChatCompletionResponse): string;
+    /** Normalizes abnormal completion signals (all arrive as HTTP 200) so consumers can
+     *  distinguish truncated/filtered/refused output from a malformed-but-complete reply */
+    protected extractFinishReason(data: ChatCompletionResponse): AIFinishReason | undefined;
+    /**
+     * Maps messages onto the provider's wire shape. The default is OpenAI Chat Completions: assistant
+     * tool calls go in `tool_calls` with `arguments` JSON-stringified, and tool results are `tool`-role
+     * entries keyed by `tool_call_id`. Providers with a different tool encoding (e.g. Anthropic's
+     * content blocks) override this.
+     */
+    protected serializeMessages(messages: AIChatMessage<AIChatMessageRole>[]): unknown[];
+    /** Returns the tool-related request fields. The default is the OpenAI `function` envelope. */
+    protected serializeTools(tools: readonly AIToolDefinition[]): {
+        tools: unknown[];
+    };
+    /**
+     * Extracts tool calls from a response, handling both the OpenAI shape
+     * (`choices[].message.tool_calls`, whose `arguments` is a JSON string) and the Anthropic shape
+     * (`content[]` blocks of type `tool_use`) — mirroring how {@link fetch} already reads content
+     * from both.
+     */
+    protected parseToolCalls(data: ChatCompletionResponse): AIToolCall[] | undefined;
+    protected handleFetchFailure<TAction extends AIActionType>(rsp: Response, _action: TAction, model: AIModel<T>, retries: number, maxInputTokens: number, 
+    /** The already-read error body, when the caller had to read it (avoids a second decode) */
+    body?: string, sentTools?: boolean): Promise<{
         retry: true;
         maxInputTokens: number;
+        withoutTools?: boolean;
     }>;
     protected fetchCore<TAction extends AIActionType>(action: TAction, model: AIModel<T>, apiKey: string, request: object, signal: AbortSignal | undefined, conversationId?: string): Promise<Response>;
 }
+export interface ChatCompletionRequest {
+    model: string;
+    /** Provider-shaped messages from {@link OpenAICompatibleProviderBase.serializeMessages} */
+    messages: unknown[];
+    /** Anthropic carries the initial system prompt here instead of as a `system`-role message */
+    system?: string;
+    /** Tool definitions, shaped by {@link OpenAICompatibleProviderBase.serializeTools} */
+    tools?: unknown[];
+    /** @deprecated but used by Anthropic & Gemini */
+    max_tokens?: number;
+    /** Currently can't be used for Anthropic & Gemini */
+    max_completion_tokens?: number;
+    metadata?: Record<string, string>;
+    stream?: boolean;
+    temperature?: number;
+    top_p?: number;
+    /** Not supported by many models/providers */
+    reasoning_effort?: 'low' | 'medium' | 'high';
+    /** OpenAI-compatible structured output (set via {@link OpenAICompatibleProviderBase.applyResponseFormat}) */
+    response_format?: {
+        type: 'json_schema';
+        json_schema: {
+            name: string;
+            strict: boolean;
+            schema: JSONSchema;
+        };
+    };
+    /** Anthropic-native structured output (set only by the Anthropic override) */
+    output_config?: {
+        format: {
+            type: 'json_schema';
+            schema: JSONSchema;
+        };
+    };
+    /** OpenRouter-only routing constraint (set only by the OpenRouter override) */
+    provider?: {
+        require_parameters: boolean;
+    };
+}
+export interface ChatCompletionResponse {
+    id: string;
+    model: string;
+    /** OpenAI compatible output */
+    choices?: {
+        index: number;
+        message: {
+            role: string;
+            content: string | null;
+            /** OpenAI-only; most OpenAI-compatible servers omit it entirely */
+            refusal?: string | null;
+            tool_calls?: {
+                id: string;
+                type: string;
+                function: {
+                    name: string;
+                    arguments: string;
+                };
+                /** GitKraken proxy only — an opaque provider reasoning token to round-trip */
+                thought_signature?: string;
+            }[];
+        };
+        finish_reason: string;
+    }[];
+    /** Anthropic output (non-text blocks, e.g. thinking, carry no text). `tool_use` blocks add the
+     *  call fields, which is why `id`/`name` are optional here — {@link parseToolCalls} narrows on
+     *  `type` and then checks them. */
+    content?: {
+        type: string;
+        text?: string;
+        id?: string;
+        name?: string;
+        input?: Record<string, unknown>;
+    }[];
+    /** Error envelope some providers/proxies return with an OK status (e.g. OpenRouter upstream failures) */
+    error?: {
+        message?: string;
+        code?: number | string;
+    } | null;
+    /** Anthropic stop reason */
+    stop_reason?: string;
+    usage: {
+        /** OpenAI compatible */
+        prompt_tokens?: number;
+        completion_tokens?: number;
+        total_tokens?: number;
+        /** Anthropic */
+        input_tokens?: number;
+        output_tokens?: number;
+        /** GitKraken */
+        gk: {
+            used: number;
+            limit: number;
+            resets_on: string;
+        };
+    };
+}
 //# sourceMappingURL=openAICompatibleProviderBase.d.ts.map

package/dist/plus/ai/providers/openAICompatibleProviderBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openAICompatibleProviderBase.d.ts","sourceRoot":"","sources":["../../../../src/plus/ai/providers/openAICompatibleProviderBase.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openAICompatibleProviderBase.d.ts","sourceRoot":"","sources":["../../../../src/plus/ai/providers/openAICompatibleProviderBase.ts"],"names":[],"mappings":"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"}