@terminai/core 0.21.0 → 0.25.0

package/dist/src/core/loggingContentGenerator.test.js

@@ -19,6 +19,7 @@ vi.mock('../telemetry/trace.js', () => ({
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { LoggingContentGenerator } from './loggingContentGenerator.js';
 import { ApiRequestEvent } from '../telemetry/types.js';
+import { LlmProviderId } from './providerTypes.js';
 describe('LoggingContentGenerator', () => {
     let wrapped;
     let config;
@@ -33,6 +34,9 @@ describe('LoggingContentGenerator', () => {
         config = {
             getGoogleAIConfig: vi.fn(),
             getVertexAIConfig: vi.fn(),
+            getProviderConfig: vi
+                .fn()
+                .mockReturnValue({ provider: LlmProviderId.GEMINI }),
             getContentGeneratorConfig: vi.fn().mockReturnValue({
                 authType: 'API_KEY',
             }),
@@ -75,6 +79,35 @@ describe('LoggingContentGenerator', () => {
             const responseEvent = vi.mocked(logApiResponse).mock.calls[0][1];
             expect(responseEvent.duration_ms).toBe(1000);
         });
+        it('should attribute server details for OpenAI-compatible providers', async () => {
+            vi.mocked(config.getProviderConfig).mockReturnValue({
+                provider: LlmProviderId.OPENAI_COMPATIBLE,
+                baseUrl: 'https://openrouter.ai/api/v1',
+                model: 'gpt-4o-mini',
+            });
+            const req = {
+                contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
+                model: 'gpt-4o-mini',
+            };
+            const userPromptId = 'prompt-123';
+            const response = {
+                candidates: [],
+                usageMetadata: undefined,
+                text: undefined,
+                functionCalls: undefined,
+                executableCode: undefined,
+                codeExecutionResult: undefined,
+                data: undefined,
+            };
+            vi.mocked(wrapped.generateContent).mockResolvedValue(response);
+            await loggingContentGenerator.generateContent(req, userPromptId);
+            const requestEvent = vi.mocked(logApiRequest).mock.calls[0][1];
+            expect(requestEvent).toBeInstanceOf(ApiRequestEvent);
+            expect(requestEvent.prompt.server).toEqual({
+                address: 'openrouter.ai',
+                port: 443,
+            });
+        });
         it('should log error on failure', async () => {
             const req = {
                 contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
@@ -124,6 +157,35 @@ describe('LoggingContentGenerator', () => {
             const responseEvent = vi.mocked(logApiResponse).mock.calls[0][1];
             expect(responseEvent.duration_ms).toBe(1000);
         });
+        it('should attribute server details for OpenAI-compatible streaming calls', async () => {
+            vi.mocked(config.getProviderConfig).mockReturnValue({
+                provider: LlmProviderId.OPENAI_COMPATIBLE,
+                baseUrl: 'http://localhost:1234/v1',
+                model: 'gpt-4o-mini',
+            });
+            const req = {
+                contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
+                model: 'gpt-4o-mini',
+            };
+            const userPromptId = 'prompt-123';
+            const response = {
+                candidates: [],
+                usageMetadata: undefined,
+            };
+            async function* createAsyncGenerator() {
+                yield response;
+            }
+            vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
+            const stream = await loggingContentGenerator.generateContentStream(req, userPromptId);
+            for await (const _ of stream) {
+                // consume stream
+            }
+            const requestEvent = vi.mocked(logApiRequest).mock.calls[0][1];
+            expect(requestEvent.prompt.server).toEqual({
+                address: 'localhost',
+                port: 1234,
+            });
+        });
         it('should log error on failure', async () => {
             const req = {
                 contents: [{ role: 'user', parts: [{ text: 'hello' }] }],

package/dist/src/core/loggingContentGenerator.test.js.map

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

package/dist/src/core/openaiContentGenerator.d.ts

@@ -11,9 +11,13 @@ import type { Config } from '../config/config.js';
 export declare class OpenAIContentGenerator implements ContentGenerator {
     private readonly config;
     private readonly globalConfig;
+    private toolNameMap;
     constructor(config: OpenAICompatibleConfig, globalConfig: Config);
     private hasUnsupportedModalities;
     private partUnionToText;
+    private isPlainObject;
+    private getParametersJsonSchema;
+    private parseToolArguments;
     private contentUnionToText;
     private normalizeTools;
     generateContent(request: GenerateContentParameters, _userPromptId: string): Promise<GenerateContentResponse>;
@@ -22,6 +26,18 @@ export declare class OpenAIContentGenerator implements ContentGenerator {
     embedContent(_request: EmbedContentParameters): Promise<EmbedContentResponse>;
     private fetchOpenAI;
     private convertTools;
+    /**
+     * Sanitizes tool names for OpenAI function calling compatibility.
+     * OpenAI spec only allows: ^[a-zA-Z0-9_-]+$ (no dots, must not start with number)
+     * This converts names like "ui.click" → "ui_click" at the adapter level,
+     * keeping Gemini tool names unchanged in the core codebase.
+     * Records the mapping so we can reverse it when parsing model responses.
+     */
+    private sanitizeToolName;
+    /**
+     * Reverses tool name sanitization to get original Gemini name.
+     */
+    private unsanitizeToolName;
     private convertSchemaToOpenAI;
     private convertContentsToOpenAIMessages;
     private convertOpenAIResponseToGemini;

package/dist/src/core/openaiContentGenerator.js

@@ -11,6 +11,9 @@ import { estimateTokenCountSync } from '../utils/tokenCalculation.js';
 export class OpenAIContentGenerator {
     config;
     globalConfig;
+    // Maps sanitized OpenAI tool names back to original Gemini names
+    // e.g., "ui_click" → "ui.click"
+    toolNameMap = new Map();
     constructor(config, globalConfig) {
         this.config = config;
         this.globalConfig = globalConfig;
@@ -41,6 +44,32 @@ export class OpenAIContentGenerator {
         }
         return '';
     }
+    isPlainObject(value) {
+        return typeof value === 'object' && value !== null && !Array.isArray(value);
+    }
+    getParametersJsonSchema(fn) {
+        if (!this.isPlainObject(fn)) {
+            return null;
+        }
+        const parametersJsonSchema = fn['parametersJsonSchema'];
+        return this.isPlainObject(parametersJsonSchema)
+            ? parametersJsonSchema
+            : null;
+    }
+    parseToolArguments(value) {
+        if (value === undefined || value === null) {
+            return null;
+        }
+        if (typeof value === 'string') {
+            const trimmed = value.trim();
+            if (!trimmed) {
+                return null;
+            }
+            const parsed = JSON.parse(trimmed);
+            return this.isPlainObject(parsed) ? parsed : {};
+        }
+        return this.isPlainObject(value) ? value : null;
+    }
     contentUnionToText(content) {
         if (!content) {
             return '';
@@ -69,7 +98,7 @@ export class OpenAIContentGenerator {
     async generateContent(request, _userPromptId) {
         const contents = toContents(request.contents);
         if (this.hasUnsupportedModalities(contents)) {
-            throw new Error('This provider is configured for text-only. Images and files are not supported.');
+            throw new Error('The OpenAI provider currently only supports text. To use images or other files, please switch to the Gemini provider.');
         }
         const messages = this.convertContentsToOpenAIMessages(contents);
         const systemText = this.contentUnionToText(request.config?.systemInstruction);
@@ -92,6 +121,21 @@ export class OpenAIContentGenerator {
         if (request.config?.temperature !== undefined) {
             body['temperature'] = request.config.temperature;
         }
+        if (request.config?.topP !== undefined) {
+            body['top_p'] = request.config.topP;
+        }
+        if (request.config?.presencePenalty !== undefined) {
+            body['presence_penalty'] = request.config.presencePenalty;
+        }
+        if (request.config?.frequencyPenalty !== undefined) {
+            body['frequency_penalty'] = request.config.frequencyPenalty;
+        }
+        if (request.config?.seed !== undefined) {
+            body['seed'] = request.config.seed;
+        }
+        if (request.config?.stopSequences) {
+            body['stop'] = request.config.stopSequences;
+        }
         const response = await this.fetchOpenAI('/chat/completions', body, request.config?.abortSignal);
         const data = (await response.json());
         return this.convertOpenAIResponseToGemini(data);
@@ -99,7 +143,7 @@ export class OpenAIContentGenerator {
     async generateContentStream(request, _userPromptId) {
         const contents = toContents(request.contents);
         if (this.hasUnsupportedModalities(contents)) {
-            throw new Error('This provider is configured for text-only. Images and files are not supported.');
+            throw new Error('The OpenAI provider currently only supports text. To use images or other files, please switch to the Gemini provider.');
         }
         const messages = this.convertContentsToOpenAIMessages(contents);
         const systemText = this.contentUnionToText(request.config?.systemInstruction);
@@ -121,15 +165,30 @@ export class OpenAIContentGenerator {
             body['max_tokens'] = request.config.maxOutputTokens;
         if (request.config?.temperature !== undefined)
             body['temperature'] = request.config.temperature;
+        if (request.config?.topP !== undefined)
+            body['top_p'] = request.config.topP;
+        if (request.config?.presencePenalty !== undefined)
+            body['presence_penalty'] = request.config.presencePenalty;
+        if (request.config?.frequencyPenalty !== undefined)
+            body['frequency_penalty'] = request.config.frequencyPenalty;
+        if (request.config?.seed !== undefined)
+            body['seed'] = request.config.seed;
+        if (request.config?.stopSequences)
+            body['stop'] = request.config.stopSequences;
+        // Request usage implementation for streaming
+        body['stream_options'] = { include_usage: true };
         const response = await this.fetchOpenAI('/chat/completions', body, request.config?.abortSignal);
         if (!response.body) {
             throw new Error('No response body from OpenAI stream');
         }
         const debugMode = this.globalConfig.getDebugMode();
+        const toolNameMap = this.toolNameMap;
+        const parseToolArguments = (value) => this.parseToolArguments(value);
         return (async function* () {
             const reader = response.body.getReader();
             const decoder = new TextDecoder();
             let buffer = '';
+            let hasYieldedAnyText = false;
             // Buffer for streaming tool calls
             const pendingToolCalls = {};
             try {
@@ -147,20 +206,23 @@ export class OpenAIContentGenerator {
                         if (trimmed.startsWith('data: ')) {
                             try {
                                 const data = JSON.parse(trimmed.slice(6));
-                                const delta = data.choices?.[0]?.delta;
-                                const finishReason = data.choices?.[0]?.finish_reason?.toUpperCase();
+                                const choice = data.choices?.[0];
+                                const delta = choice?.delta;
+                                const message = choice?.message;
+                                const finishReason = choice?.finish_reason?.toUpperCase();
                                 // 1. Handle Text Content
                                 if (delta?.content) {
-                                    yield {
-                                        candidates: [
-                                            {
-                                                content: {
-                                                    role: 'model',
-                                                    parts: [{ text: delta.content }],
-                                                },
+                                    hasYieldedAnyText = true;
+                                    const resp = new GenerateContentResponse();
+                                    resp.candidates = [
+                                        {
+                                            content: {
+                                                role: 'model',
+                                                parts: [{ text: delta.content }],
                                             },
-                                        ],
-                                    };
+                                        },
+                                    ];
+                                    yield resp;
                                 }
                                 // 2. Accumulate Tool Calls
                                 if (delta?.tool_calls) {
@@ -172,14 +234,21 @@ export class OpenAIContentGenerator {
                                                 type: 'function',
                                                 function: {
                                                     name: tc.function?.name || '',
-                                                    arguments: tc.function?.arguments || '',
+                                                    arguments: typeof tc.function?.arguments === 'string'
+                                                        ? tc.function.arguments
+                                                        : '',
                                                 },
                                             };
                                         }
                                         else {
+                                            if (tc.id && !pendingToolCalls[index].id) {
+                                                pendingToolCalls[index].id = tc.id;
+                                            }
                                             if (tc.function?.arguments) {
-                                                pendingToolCalls[index].function.arguments +=
-                                                    tc.function.arguments;
+                                                if (typeof tc.function.arguments === 'string') {
+                                                    pendingToolCalls[index].function.arguments +=
+                                                        tc.function.arguments;
+                                                }
                                             }
                                             if (tc.function?.name) {
                                                 pendingToolCalls[index].function.name +=
@@ -188,10 +257,28 @@ export class OpenAIContentGenerator {
                                         }
                                     }
                                 }
-                                // 3. Handle Finish
+                                // 3. Handle Usage Metadata (streaming)
+                                if (data.usage) {
+                                    const usage = data.usage;
+                                    const resp = new GenerateContentResponse();
+                                    resp.usageMetadata = {
+                                        promptTokenCount: usage.prompt_tokens,
+                                        candidatesTokenCount: usage.completion_tokens,
+                                        totalTokenCount: usage.total_tokens,
+                                    };
+                                    // If usage comes in a separate chunk without content, we must yield it
+                                    // Often it's the last chunk.
+                                    yield resp;
+                                }
+                                // 4. Handle Finish
                                 if (finishReason) {
                                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                                     const parts = [];
+                                    if (!hasYieldedAnyText &&
+                                        typeof message?.content === 'string') {
+                                        parts.push({ text: message.content });
+                                    }
+                                    let hasEmittedToolCall = false;
                                     // If we have buffered tool calls, finalize them now
                                     const toolIndices = Object.keys(pendingToolCalls)
                                         .map(Number)
@@ -199,13 +286,18 @@ export class OpenAIContentGenerator {
                                     for (const index of toolIndices) {
                                         const tc = pendingToolCalls[index];
                                         try {
-                                            const args = JSON.parse(tc.function.arguments);
+                                            const parsedArgs = parseToolArguments(tc.function.arguments);
+                                            const args = parsedArgs ?? {};
+                                            // Unsanitize tool name back to original Gemini format
+                                            const originalName = toolNameMap.get(tc.function.name) || tc.function.name;
                                             parts.push({
                                                 functionCall: {
-                                                    name: tc.function.name,
+                                                    ...(tc.id ? { id: tc.id } : {}),
+                                                    name: originalName,
                                                     args,
                                                 },
                                             });
+                                            hasEmittedToolCall = true;
                                         }
                                         catch (e) {
                                             if (debugMode) {
@@ -213,17 +305,39 @@ export class OpenAIContentGenerator {
                                             }
                                         }
                                     }
-                                    yield {
-                                        candidates: [
-                                            {
-                                                content: {
-                                                    role: 'model',
-                                                    parts,
-                                                },
-                                                finishReason: finishReason,
+                                    if (!hasEmittedToolCall && message?.tool_calls) {
+                                        for (const tc of message.tool_calls) {
+                                            try {
+                                                const parsedArgs = parseToolArguments(tc.function.arguments);
+                                                const args = parsedArgs ?? {};
+                                                parts.push({
+                                                    functionCall: {
+                                                        ...(tc.id ? { id: tc.id } : {}),
+                                                        name: toolNameMap.get(tc.function.name || '') ||
+                                                            tc.function.name ||
+                                                            '',
+                                                        args,
+                                                    },
+                                                });
+                                            }
+                                            catch (e) {
+                                                if (debugMode) {
+                                                    console.error('[OpenAI Provider] Failed to parse message tool arguments:', e);
+                                                }
+                                            }
+                                        }
+                                    }
+                                    const resp = new GenerateContentResponse();
+                                    resp.candidates = [
+                                        {
+                                            content: {
+                                                role: 'model',
+                                                parts,
                                             },
-                                        ],
-                                    };
+                                            finishReason: finishReason,
+                                        },
+                                    ];
+                                    yield resp;
                                 }
                             }
                             catch (e) {
@@ -258,7 +372,14 @@ export class OpenAIContentGenerator {
         throw new Error('Embeddings not supported for OpenAI-compatible provider yet.');
     }
     async fetchOpenAI(endpoint, body, signal) {
-        const url = `${this.config.baseUrl.replace(/\/$/, '')}${endpoint}`;
+        const baseUrl = this.config.baseUrl.trim();
+        if (baseUrl.length === 0) {
+            throw new Error('OpenAI-compatible baseUrl is missing. Set llm.openaiCompatible.baseUrl (or run /auth wizard) and try again.');
+        }
+        if (!/^https?:\/\//i.test(baseUrl)) {
+            throw new Error(`OpenAI-compatible baseUrl must start with http:// or https:// (got "${this.config.baseUrl}").`);
+        }
+        const url = `${baseUrl.replace(/\/+$/, '')}${endpoint}`;
         const headers = {
             'Content-Type': 'application/json',
             ...this.config.headers,
@@ -287,26 +408,55 @@ export class OpenAIContentGenerator {
         if (proxy) {
             options.dispatcher = new ProxyAgent(proxy);
         }
-        const response = await fetch(url, options);
-        if (!response.ok) {
-            const text = await response.text();
-            throw new Error(`OpenAI Provider Error (${response.status}): ${text}`);
+        let attempt = 0;
+        while (true) {
+            attempt++;
+            try {
+                const response = await fetch(url, options);
+                if (response.ok) {
+                    return response;
+                }
+                // Check for retryable errors (429, 503)
+                if (attempt < 3 &&
+                    (response.status === 429 || response.status >= 500)) {
+                    const delay = Math.pow(2, attempt) * 1000 + Math.random() * 500;
+                    if (this.globalConfig.getDebugMode()) {
+                        console.warn(`[OpenAI] Request failed with ${response.status}. Retrying in ${Math.round(delay)}ms (attempt ${attempt}/3)`);
+                    }
+                    await new Promise((resolve) => setTimeout(resolve, delay));
+                    continue;
+                }
+                const text = await response.text().catch(() => '');
+                throw new Error(`OpenAI compatible backend error (${response.status}): ${text}`);
+            }
+            catch (error) {
+                if (attempt < 3) {
+                    const delay = Math.pow(2, attempt) * 1000 + Math.random() * 500;
+                    if (this.globalConfig.getDebugMode()) {
+                        console.warn(`[OpenAI] Network error. Retrying in ${Math.round(delay)}ms (attempt ${attempt}/3)`, error);
+                    }
+                    await new Promise((resolve) => setTimeout(resolve, delay));
+                    continue;
+                }
+                throw error;
+            }
         }
-        return response;
     }
     convertTools(tools) {
         const openAITools = [];
         for (const tool of tools) {
             if (tool.functionDeclarations) {
                 for (const fn of tool.functionDeclarations) {
+                    const parametersFromJsonSchema = this.getParametersJsonSchema(fn);
                     openAITools.push({
                         type: 'function',
                         function: {
-                            name: fn.name || 'unknown_tool',
+                            name: this.sanitizeToolName(fn.name || 'unknown_tool'),
                             description: fn.description,
-                            parameters: fn.parameters
-                                ? this.convertSchemaToOpenAI(fn.parameters)
-                                : undefined,
+                            parameters: parametersFromJsonSchema ??
+                                (fn.parameters
+                                    ? this.convertSchemaToOpenAI(fn.parameters)
+                                    : undefined),
                         },
                     });
                 }
@@ -314,6 +464,32 @@ export class OpenAIContentGenerator {
         }
         return openAITools;
     }
+    /**
+     * Sanitizes tool names for OpenAI function calling compatibility.
+     * OpenAI spec only allows: ^[a-zA-Z0-9_-]+$ (no dots, must not start with number)
+     * This converts names like "ui.click" → "ui_click" at the adapter level,
+     * keeping Gemini tool names unchanged in the core codebase.
+     * Records the mapping so we can reverse it when parsing model responses.
+     */
+    sanitizeToolName(name) {
+        // Replace dots and other invalid characters with underscores
+        let sanitized = name.replace(/[^a-zA-Z0-9_-]/g, '_');
+        // Ensure name doesn't start with a number
+        if (/^[0-9]/.test(sanitized)) {
+            sanitized = '_' + sanitized;
+        }
+        // Record mapping for reverse lookup
+        if (sanitized !== name) {
+            this.toolNameMap.set(sanitized, name);
+        }
+        return sanitized;
+    }
+    /**
+     * Reverses tool name sanitization to get original Gemini name.
+     */
+    unsanitizeToolName(sanitizedName) {
+        return this.toolNameMap.get(sanitizedName) || sanitizedName;
+    }
     convertSchemaToOpenAI(schema) {
         // Convert Gemini Schema to JSON Schema format
         // Gemini uses Type enum (OBJECT, STRING, etc.) while JSON Schema uses lowercase strings
@@ -424,9 +600,10 @@ export class OpenAIContentGenerator {
                     if (part.functionCall) {
                         const name = part.functionCall.name;
                         if (name) {
-                            const id = `call_${name}_${Date.now()}_${Math.random()
-                                .toString(36)
-                                .slice(2, 7)}`;
+                            const id = part.functionCall.id ||
+                                `call_${name}_${Date.now()}_${Math.random()
+                                    .toString(36)
+                                    .slice(2, 7)}`;
                             if (!toolCallIdStack[name])
                                 toolCallIdStack[name] = [];
                             toolCallIdStack[name].push(id);
@@ -434,7 +611,7 @@ export class OpenAIContentGenerator {
                                 id,
                                 type: 'function',
                                 function: {
-                                    name,
+                                    name: this.sanitizeToolName(name),
                                     arguments: JSON.stringify(part.functionCall.args),
                                 },
                             });
@@ -452,8 +629,15 @@ export class OpenAIContentGenerator {
             }
             // Standard text message
             const textParts = (content.parts || [])
-                .filter((p) => p.text)
-                .map((p) => p.text)
+                .map((p) => {
+                if ('thought' in p && p.thought) {
+                    return `[Thought: ${p.thought}]\n`;
+                }
+                if ('text' in p && p.text) {
+                    return p.text;
+                }
+                return '';
+            })
                 .join('');
             messages.push({
                 role,
@@ -473,21 +657,29 @@ export class OpenAIContentGenerator {
         if (message?.tool_calls) {
             for (const toolCall of message.tool_calls) {
                 if (toolCall.type === 'function') {
-                    let args = {};
                     try {
-                        args = JSON.parse(toolCall.function.arguments || '{}');
+                        const parsedArgs = this.parseToolArguments(toolCall.function.arguments);
+                        const args = parsedArgs ?? {};
+                        parts.push({
+                            functionCall: {
+                                id: toolCall.id,
+                                name: this.unsanitizeToolName(toolCall.function.name || ''),
+                                args,
+                            },
+                        });
                     }
                     catch (e) {
                         if (this.globalConfig.getDebugMode()) {
                             console.error('[OpenAI Provider] Failed to parse function arguments:', e);
                         }
+                        parts.push({
+                            functionCall: {
+                                id: toolCall.id,
+                                name: this.unsanitizeToolName(toolCall.function.name || ''),
+                                args: {},
+                            },
+                        });
                     }
-                    parts.push({
-                        functionCall: {
-                            name: toolCall.function.name || '',
-                            args,
-                        },
-                    });
                 }
             }
         }
@@ -501,6 +693,13 @@ export class OpenAIContentGenerator {
         };
         const response = new GenerateContentResponse();
         response.candidates = [candidate];
+        if (data.usage) {
+            response.usageMetadata = {
+                promptTokenCount: data.usage.prompt_tokens,
+                candidatesTokenCount: data.usage.completion_tokens,
+                totalTokenCount: data.usage.total_tokens,
+            };
+        }
         return response;
     }
 }