@qduc/term2 0.2.0 → 0.3.1

package/dist/providers/common/openai-compatible-messages.js

@@ -0,0 +1,356 @@
+import { isAnthropicModel } from './openai-compatible-utils.js';
+const noOpLogger = {
+    debug: () => { },
+    error: () => { },
+    info: () => { },
+    warn: () => { },
+    security: () => { },
+    setCorrelationId: () => { },
+    getCorrelationId: () => undefined,
+    clearCorrelationId: () => { },
+};
+function convertAgentItemToOpenAICompatibleMessage(item, loggingService) {
+    if (!item) {
+        return null;
+    }
+    const rawItem = item.rawItem || item;
+    if (rawItem.type === 'input_text' && typeof rawItem.text === 'string') {
+        return { role: 'user', content: rawItem.text };
+    }
+    if (rawItem.role === 'assistant' && rawItem.type === 'message') {
+        const message = { role: 'assistant' };
+        if (Array.isArray(rawItem.content)) {
+            const textContent = rawItem.content
+                .filter((c) => c?.type === 'output_text' && c?.text)
+                .map((c) => c.text)
+                .join('');
+            if (textContent) {
+                message.content = textContent;
+            }
+        }
+        const providerData = rawItem.providerData ?? item.providerData;
+        const reasoning = rawItem.reasoning ?? item.reasoning ?? providerData?.reasoning;
+        if (typeof reasoning === 'string') {
+            message.reasoning = reasoning;
+        }
+        const reasoningContent = rawItem.reasoning_content ?? item.reasoning_content ?? providerData?.reasoning_content;
+        if (typeof reasoningContent === 'string') {
+            message.reasoning_content = reasoningContent;
+        }
+        const reasoningDetails = rawItem.reasoning_details ?? item.reasoning_details ?? providerData?.reasoning_details;
+        if (reasoningDetails != null) {
+            loggingService.debug('convertAgentItemToOpenAICompatibleMessage: reasoning_details', reasoningDetails);
+            message.reasoning_details = reasoningDetails;
+        }
+        const toolCalls = rawItem.tool_calls ?? item.tool_calls;
+        if (toolCalls != null) {
+            message.tool_calls = toolCalls;
+        }
+        return message;
+    }
+    if (rawItem.role === 'user' && rawItem.type === 'message') {
+        if (typeof rawItem.content === 'string') {
+            return { role: 'user', content: rawItem.content };
+        }
+        if (Array.isArray(rawItem.content)) {
+            const content = rawItem.content.flatMap((c) => {
+                if ((c?.type === 'input_text' || c?.type === 'output_text') && typeof c?.text === 'string') {
+                    return [{ type: 'text', text: c.text }];
+                }
+                const imageUrl = typeof c?.image === 'string' ? c.image : typeof c?.image_url === 'string' ? c.image_url : null;
+                if (c?.type === 'input_image' && imageUrl) {
+                    return [{ type: 'image_url', image_url: { url: imageUrl } }];
+                }
+                return [];
+            });
+            if (content.length === 1 && content[0].type === 'text') {
+                return { role: 'user', content: content[0].text };
+            }
+            if (content.length > 0) {
+                return { role: 'user', content };
+            }
+        }
+    }
+    if (rawItem?.type === 'function_call') {
+        const providerData = rawItem.providerData ?? item.providerData;
+        const reasoning = rawItem.reasoning ?? item.reasoning ?? providerData?.reasoning;
+        const reasoningContent = rawItem.reasoning_content ?? item.reasoning_content ?? providerData?.reasoning_content;
+        const reasoningDetails = rawItem.reasoning_details ?? item.reasoning_details ?? providerData?.reasoning_details;
+        return {
+            role: 'assistant',
+            content: null,
+            tool_calls: [
+                {
+                    id: rawItem.callId || rawItem.id,
+                    type: 'function',
+                    function: {
+                        name: rawItem.name,
+                        arguments: rawItem.arguments ?? (rawItem.args ? JSON.stringify(rawItem.args) : ''),
+                    },
+                },
+            ],
+            ...(typeof reasoning === 'string' ? { reasoning } : {}),
+            ...(typeof reasoningContent === 'string' ? { reasoning_content: reasoningContent } : {}),
+            ...(reasoningDetails != null ? { reasoning_details: reasoningDetails } : {}),
+        };
+    }
+    if (rawItem?.type === 'function_call_output' ||
+        rawItem?.type === 'function_call_result' ||
+        rawItem?.type === 'function_call_output_result') {
+        let outputContent = '';
+        if (typeof rawItem.output === 'string') {
+            outputContent = rawItem.output;
+        }
+        else if (rawItem.output && typeof rawItem.output === 'object') {
+            outputContent = JSON.stringify(rawItem.output);
+        }
+        return {
+            role: 'tool',
+            tool_call_id: rawItem.callId || rawItem.id,
+            content: outputContent,
+        };
+    }
+    return null;
+}
+export function addCacheControlToLastUserMessage(messages) {
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const msg = messages[i];
+        if (msg.role === 'user') {
+            if (typeof msg.content === 'string') {
+                msg.content = [
+                    {
+                        type: 'text',
+                        text: msg.content,
+                        cache_control: { type: 'ephemeral' },
+                    },
+                ];
+            }
+            else if (Array.isArray(msg.content) && msg.content.length > 0) {
+                for (let j = msg.content.length - 1; j >= 0; j--) {
+                    const item = msg.content[j];
+                    if (item.type === 'text') {
+                        item.cache_control = { type: 'ephemeral' };
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+    }
+}
+export function addCacheControlToLastToolMessage(messages) {
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const msg = messages[i];
+        if (msg.role === 'tool') {
+            if (typeof msg.content === 'string') {
+                msg.content = [
+                    {
+                        type: 'text',
+                        text: msg.content,
+                        cache_control: { type: 'ephemeral' },
+                    },
+                ];
+            }
+            else if (Array.isArray(msg.content) && msg.content.length > 0) {
+                for (let j = msg.content.length - 1; j >= 0; j--) {
+                    const item = msg.content[j];
+                    if (item.type === 'text') {
+                        item.cache_control = { type: 'ephemeral' };
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+    }
+}
+function appendOpenAICompatibleContent(existing, incoming) {
+    const toParts = (content) => {
+        if (content == null) {
+            return [];
+        }
+        if (typeof content === 'string') {
+            return [{ type: 'text', text: content }];
+        }
+        if (Array.isArray(content)) {
+            return content;
+        }
+        return [{ type: 'text', text: String(content) }];
+    };
+    if (typeof existing === 'string' && typeof incoming === 'string') {
+        return `${existing}\n${incoming}`;
+    }
+    return [...toParts(existing), ...toParts(incoming)];
+}
+export function buildMessagesFromRequest(req, modelId, loggingService) {
+    const messages = [];
+    let pendingReasoningDetails = [];
+    const logger = loggingService || noOpLogger;
+    logger.debug('buildMessagesFromRequest: req.input', {
+        inputType: typeof req.input,
+        isArray: Array.isArray(req.input),
+        inputLength: Array.isArray(req.input) ? req.input.length : typeof req.input === 'string' ? req.input.length : 'N/A',
+        inputPreview: Array.isArray(req.input)
+            ? req.input.map((item) => ({
+                role: item?.role || item?.rawItem?.role,
+                type: item?.type || item?.rawItem?.type,
+            }))
+            : typeof req.input === 'string'
+                ? req.input.substring(0, 100)
+                : 'non-string, non-array',
+    });
+    if (req.systemInstructions && req.systemInstructions.trim().length > 0) {
+        if (modelId && isAnthropicModel(modelId)) {
+            messages.push({
+                role: 'system',
+                content: [
+                    {
+                        type: 'text',
+                        text: req.systemInstructions,
+                        cache_control: { type: 'ephemeral' },
+                    },
+                ],
+            });
+        }
+        else {
+            messages.push({ role: 'system', content: req.systemInstructions });
+        }
+    }
+    if (typeof req.input === 'string') {
+        const userMessage = { role: 'user', content: req.input };
+        messages.push(userMessage);
+    }
+    else if (Array.isArray(req.input)) {
+        for (const item of req.input) {
+            const raw = item?.rawItem ?? item;
+            if (raw?.type === 'reasoning') {
+                const detail = raw?.providerData ?? item?.providerData;
+                if (detail && typeof detail === 'object') {
+                    pendingReasoningDetails.push(detail);
+                }
+                continue;
+            }
+            const converted = convertAgentItemToOpenAICompatibleMessage(item, loggingService || noOpLogger);
+            if (converted) {
+                if (pendingReasoningDetails.length > 0 &&
+                    converted.role === 'assistant' &&
+                    converted.reasoning_details == null) {
+                    converted.reasoning_details = pendingReasoningDetails;
+                    pendingReasoningDetails = [];
+                }
+                const lastMessage = messages[messages.length - 1];
+                if (lastMessage && lastMessage.role === converted.role) {
+                    if (converted.role === 'assistant') {
+                        if (converted.content != null) {
+                            if (lastMessage.content == null) {
+                                lastMessage.content = converted.content;
+                            }
+                            else {
+                                lastMessage.content = String(lastMessage.content) + '\n' + String(converted.content);
+                            }
+                        }
+                        if (converted.tool_calls) {
+                            if (!lastMessage.tool_calls) {
+                                lastMessage.tool_calls = [];
+                            }
+                            lastMessage.tool_calls.push(...converted.tool_calls);
+                        }
+                        if (converted.reasoning != null) {
+                            if (!lastMessage.reasoning) {
+                                lastMessage.reasoning = converted.reasoning;
+                            }
+                            else {
+                                lastMessage.reasoning += converted.reasoning;
+                            }
+                        }
+                        if (converted.reasoning_content != null) {
+                            if (!lastMessage.reasoning_content) {
+                                lastMessage.reasoning_content = converted.reasoning_content;
+                            }
+                            else {
+                                lastMessage.reasoning_content += converted.reasoning_content;
+                            }
+                        }
+                        if (converted.reasoning_details) {
+                            if (!lastMessage.reasoning_details) {
+                                lastMessage.reasoning_details = [];
+                            }
+                            lastMessage.reasoning_details.push(...(Array.isArray(converted.reasoning_details)
+                                ? converted.reasoning_details
+                                : [converted.reasoning_details]));
+                        }
+                        continue;
+                    }
+                    if (converted.role === 'user') {
+                        if (converted.content != null) {
+                            if (lastMessage.content == null) {
+                                lastMessage.content = converted.content;
+                            }
+                            else {
+                                lastMessage.content = appendOpenAICompatibleContent(lastMessage.content, converted.content);
+                            }
+                        }
+                        continue;
+                    }
+                }
+                messages.push(converted);
+            }
+        }
+    }
+    if (modelId && isAnthropicModel(modelId)) {
+        addCacheControlToLastUserMessage(messages);
+        addCacheControlToLastToolMessage(messages);
+    }
+    return messages;
+}
+export function extractFunctionToolsFromRequest(req) {
+    if (!req.tools || req.tools.length === 0) {
+        return [];
+    }
+    const functionTools = [];
+    for (const tool of req.tools) {
+        if (tool.type === 'function') {
+            functionTools.push({
+                type: 'function',
+                function: {
+                    name: tool.name,
+                    description: tool.description,
+                    parameters: tool.parameters,
+                    strict: tool.strict,
+                },
+            });
+        }
+    }
+    return functionTools;
+}
+export function extractModelSettingsForRequest(settings) {
+    const body = {};
+    if (settings) {
+        if (settings.temperature != null)
+            body.temperature = settings.temperature;
+        if (settings.topP != null)
+            body.top_p = settings.topP;
+        if (settings.maxTokens != null)
+            body.max_tokens = settings.maxTokens;
+        if (settings.topK != null)
+            body.top_k = settings.topK;
+        if (settings.frequencyPenalty != null)
+            body.frequency_penalty = settings.frequencyPenalty;
+        if (settings.presencePenalty != null)
+            body.presence_penalty = settings.presencePenalty;
+        const hasReasoningObj = settings.reasoning && typeof settings.reasoning === 'object';
+        if (hasReasoningObj) {
+            body.reasoning = { ...settings.reasoning };
+        }
+        const reasoningEffort = settings.reasoningEffort ?? settings.reasoning?.effort;
+        const normalizedEffort = reasoningEffort === 'default' ? 'medium' : reasoningEffort;
+        if (normalizedEffort && normalizedEffort !== 'none') {
+            body.reasoning = {
+                ...(body.reasoning ?? {}),
+                effort: normalizedEffort,
+            };
+        }
+    }
+    return body;
+}
+//# sourceMappingURL=openai-compatible-messages.js.map

package/dist/providers/common/openai-compatible-messages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-compatible-messages.js","sourceRoot":"","sources":["../../../source/providers/common/openai-compatible-messages.ts"],"names":[],"mappings":"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"}

package/dist/providers/common/openai-compatible-messages.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=openai-compatible-messages.test.d.ts.map

package/dist/providers/common/openai-compatible-messages.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-compatible-messages.test.d.ts","sourceRoot":"","sources":["../../../source/providers/common/openai-compatible-messages.test.ts"],"names":[],"mappings":""}

package/dist/providers/common/openai-compatible-messages.test.js

@@ -0,0 +1,26 @@
+import test from 'ava';
+import { buildMessagesFromRequest } from './openai-compatible-messages.js';
+test('buildMessagesFromRequest() preserves user text and image content', (t) => {
+    const messages = buildMessagesFromRequest({
+        input: [
+            {
+                role: 'user',
+                type: 'message',
+                content: [
+                    { type: 'input_text', text: 'Describe this' },
+                    { type: 'input_image', image: 'data:image/png;base64,abc123', detail: 'auto' },
+                ],
+            },
+        ],
+    });
+    t.deepEqual(messages, [
+        {
+            role: 'user',
+            content: [
+                { type: 'text', text: 'Describe this' },
+                { type: 'image_url', image_url: { url: 'data:image/png;base64,abc123' } },
+            ],
+        },
+    ]);
+});
+//# sourceMappingURL=openai-compatible-messages.test.js.map

package/dist/providers/common/openai-compatible-messages.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-compatible-messages.test.js","sourceRoot":"","sources":["../../../source/providers/common/openai-compatible-messages.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAE3E,IAAI,CAAC,kEAAkE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7E,MAAM,QAAQ,GAAG,wBAAwB,CAAC;QACxC,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE;oBACP,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE;oBAC7C,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,8BAA8B,EAAE,MAAM,EAAE,MAAM,EAAE;iBAC/E;aACF;SACF;KACK,CAAC,CAAC;IAEV,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE;QACpB;YACE,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE;gBACP,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE;gBACvC,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,8BAA8B,EAAE,EAAE;aAC1E;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/providers/common/openai-compatible-utils.d.ts

@@ -0,0 +1,11 @@
+export declare function decodeHtmlEntities(text: string): string;
+export declare function normalizeToolCallName(name: unknown): string;
+export declare function normalizeUsage(openRouterUsage: any): {
+    inputTokens: number;
+    outputTokens: number;
+    totalTokens: number;
+};
+export declare function isAnthropicModel(modelId: string): boolean;
+export declare function normalizeBaseUrl(baseUrl: string): string;
+export declare function buildOpenAICompatibleUrl(baseUrl: string, path: string): string;
+//# sourceMappingURL=openai-compatible-utils.d.ts.map

package/dist/providers/common/openai-compatible-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-compatible-utils.d.ts","sourceRoot":"","sources":["../../../source/providers/common/openai-compatible-utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQvD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAE3D;AAED,wBAAgB,cAAc,CAAC,eAAe,EAAE,GAAG,GAAG;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB,CAMA;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGzD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGxD;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAI9E"}

package/dist/providers/common/openai-compatible-utils.js

@@ -0,0 +1,33 @@
+export function decodeHtmlEntities(text) {
+    return text
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&amp;/g, '&')
+        .replace(/&quot;/g, '"')
+        .replace(/&#39;/g, "'")
+        .replace(/&apos;/g, "'");
+}
+export function normalizeToolCallName(name) {
+    return typeof name === 'string' ? name.trim() : '';
+}
+export function normalizeUsage(openRouterUsage) {
+    return {
+        inputTokens: openRouterUsage?.prompt_tokens ?? 0,
+        outputTokens: openRouterUsage?.completion_tokens ?? 0,
+        totalTokens: openRouterUsage?.total_tokens ?? 0,
+    };
+}
+export function isAnthropicModel(modelId) {
+    const lowerModelId = modelId.toLowerCase();
+    return lowerModelId.includes('anthropic') || lowerModelId.includes('claude');
+}
+export function normalizeBaseUrl(baseUrl) {
+    const trimmed = String(baseUrl || '').trim();
+    return trimmed.replace(/\/+$/g, '');
+}
+export function buildOpenAICompatibleUrl(baseUrl, path) {
+    const normalized = normalizeBaseUrl(baseUrl);
+    const normalizedPath = path.startsWith('/') ? path : `/${path}`;
+    return `${normalized}${normalizedPath}`;
+}
+//# sourceMappingURL=openai-compatible-utils.js.map

package/dist/providers/common/openai-compatible-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-compatible-utils.js","sourceRoot":"","sources":["../../../source/providers/common/openai-compatible-utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,IAAI;SACR,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAa;IACjD,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,eAAoB;IAKjD,OAAO;QACL,WAAW,EAAE,eAAe,EAAE,aAAa,IAAI,CAAC;QAChD,YAAY,EAAE,eAAe,EAAE,iBAAiB,IAAI,CAAC;QACrD,WAAW,EAAE,eAAe,EAAE,YAAY,IAAI,CAAC;KAChD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAC3C,OAAO,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAe,EAAE,IAAY;IACpE,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;IAChE,OAAO,GAAG,UAAU,GAAG,cAAc,EAAE,CAAC;AAC1C,CAAC"}

package/dist/providers/common/provider-errors.d.ts

@@ -0,0 +1,13 @@
+export declare class OpenRouterError extends Error {
+    status: number;
+    headers: Record<string, string>;
+    responseBody?: string;
+    constructor(message: string, status: number, headers: Record<string, string>, responseBody?: string);
+}
+export declare class OpenAICompatibleError extends Error {
+    status: number;
+    headers: Record<string, string>;
+    responseBody?: string;
+    constructor(message: string, status: number, headers: Record<string, string>, responseBody?: string);
+}
+//# sourceMappingURL=provider-errors.d.ts.map

package/dist/providers/common/provider-errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-errors.d.ts","sourceRoot":"","sources":["../../../source/providers/common/provider-errors.ts"],"names":[],"mappings":"AAAA,qBAAa,eAAgB,SAAQ,KAAK;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;gBAEV,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,CAAC,EAAE,MAAM;CAOpG;AAED,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;gBAEV,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,CAAC,EAAE,MAAM;CAOpG"}

package/dist/providers/common/provider-errors.js

@@ -0,0 +1,25 @@
+export class OpenRouterError extends Error {
+    status;
+    headers;
+    responseBody;
+    constructor(message, status, headers, responseBody) {
+        super(message);
+        this.name = 'OpenRouterError';
+        this.status = status;
+        this.headers = headers;
+        this.responseBody = responseBody;
+    }
+}
+export class OpenAICompatibleError extends Error {
+    status;
+    headers;
+    responseBody;
+    constructor(message, status, headers, responseBody) {
+        super(message);
+        this.name = 'OpenAICompatibleError';
+        this.status = status;
+        this.headers = headers;
+        this.responseBody = responseBody;
+    }
+}
+//# sourceMappingURL=provider-errors.js.map

package/dist/providers/common/provider-errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-errors.js","sourceRoot":"","sources":["../../../source/providers/common/provider-errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACxC,MAAM,CAAS;IACf,OAAO,CAAyB;IAChC,YAAY,CAAU;IAEtB,YAAY,OAAe,EAAE,MAAc,EAAE,OAA+B,EAAE,YAAqB;QACjG,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IAC9C,MAAM,CAAS;IACf,OAAO,CAAyB;IAChC,YAAY,CAAU;IAEtB,YAAY,OAAe,EAAE,MAAc,EAAE,OAA+B,EAAE,YAAqB;QACjG,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;CACF"}

package/dist/providers/openai-compatible.provider.createRunner.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=openai-compatible.provider.createRunner.test.d.ts.map

package/dist/providers/openai-compatible.provider.createRunner.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-compatible.provider.createRunner.test.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.createRunner.test.ts"],"names":[],"mappings":""}

package/dist/providers/openai-compatible.provider.createRunner.test.js

@@ -0,0 +1,39 @@
+import test from 'ava';
+import { createOpenAICompatibleProviderDefinition } from './openai-compatible.provider.js';
+test('runtime openai-compatible createRunner returns a runner', (t) => {
+    const provider = createOpenAICompatibleProviderDefinition({
+        name: 'local-test',
+        baseUrl: 'http://localhost:11434',
+    });
+    const deps = {
+        settingsService: {
+            get: (key) => {
+                const values = {
+                    'agent.model': 'test-model',
+                    providers: [
+                        {
+                            name: 'local-test',
+                            baseUrl: 'http://localhost:11434',
+                            apiKey: 'local-key',
+                        },
+                    ],
+                };
+                return values[key];
+            },
+            set: () => { },
+        },
+        loggingService: {
+            info: () => { },
+            warn: () => { },
+            error: () => { },
+            debug: () => { },
+            security: () => { },
+            setCorrelationId: () => { },
+            getCorrelationId: () => undefined,
+            clearCorrelationId: () => { },
+        },
+    };
+    const runner = provider.createRunner(deps);
+    t.truthy(runner);
+});
+//# sourceMappingURL=openai-compatible.provider.createRunner.test.js.map

package/dist/providers/openai-compatible.provider.createRunner.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-compatible.provider.createRunner.test.js","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.createRunner.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,wCAAwC,EAAE,MAAM,iCAAiC,CAAC;AAG3F,IAAI,CAAC,yDAAyD,EAAE,CAAC,CAAC,EAAE,EAAE;IACpE,MAAM,QAAQ,GAAG,wCAAwC,CAAC;QACxD,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,wBAAwB;KAClC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAiB;QACzB,eAAe,EAAE;YACf,GAAG,EAAE,CAAU,GAAW,EAAE,EAAE;gBAC5B,MAAM,MAAM,GAAwB;oBAClC,aAAa,EAAE,YAAY;oBAC3B,SAAS,EAAE;wBACT;4BACE,IAAI,EAAE,YAAY;4BAClB,OAAO,EAAE,wBAAwB;4BACjC,MAAM,EAAE,WAAW;yBACpB;qBACF;iBACF,CAAC;gBACF,OAAO,MAAM,CAAC,GAAG,CAAM,CAAC;YAC1B,CAAC;YACD,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;SACd;QACD,cAAc,EAAE;YACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;YACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;YACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;YACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;YACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;YAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;YAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;YACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;SAC7B;KACF,CAAC;IAEF,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAa,CAAC,IAAI,CAAC,CAAC;IAE5C,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACnB,CAAC,CAAC,CAAC"}

package/dist/providers/openai-compatible.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-compatible.provider.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAA+B,MAAM,eAAe,CAAC;AAIrF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAmBF,wBAAgB,wCAAwC,CAAC,MAAM,EAAE,oBAAoB,GAAG,kBAAkB,CA2DzG"}
+{"version":3,"file":"openai-compatible.provider.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAA+B,MAAM,eAAe,CAAC;AAIrF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAmBF,wBAAgB,wCAAwC,CAAC,MAAM,EAAE,oBAAoB,GAAG,kBAAkB,CAwEzG"}

package/dist/providers/openai-compatible.provider.js

@@ -1,6 +1,6 @@
 import { Runner } from '@openai/agents';
-import { OpenAICompatibleProvider } from './openai-compatible/provider.js';
-import { buildOpenAICompatibleUrl, normalizeBaseUrl } from './openai-compatible/utils.js';
+import { AiSdkOpenAICompatibleProvider } from './ai-sdk-openai-compatible.provider.js';
+import { buildOpenAICompatibleUrl, normalizeBaseUrl } from './common/openai-compatible-utils.js';
 function findConfigFromSettings(settingsService, providerId) {
     const list = settingsService?.get?.('providers');
     if (!Array.isArray(list))
@@ -24,14 +24,24 @@ export function createOpenAICompatibleProviderDefinition(config) {
         id: providerId,
         label,
         isRuntimeDefined: true,
-        createRunner: ({ settingsService, loggingService }) => {
+        createRunner: ({ settingsService }) => {
             // baseUrl/apiKey can change only with restart, but we re-resolve from
             // settings at runner creation time to respect precedence.
             return new Runner({
-                modelProvider: new OpenAICompatibleProvider({
-                    settingsService,
-                    loggingService,
-                    providerId,
+                modelProvider: new AiSdkOpenAICompatibleProvider({
+                    label,
+                    defaultModel: settingsService.get('agent.model') || '',
+                    resolveConfig: () => {
+                        const resolved = findConfigFromSettings(settingsService, providerId);
+                        if (!resolved) {
+                            throw new Error(`Custom provider '${providerId}' is not configured. ` +
+                                `Please add it to settings.json under \"providers\".`);
+                        }
+                        return {
+                            baseURL: normalizeBaseUrl(resolved.baseUrl),
+                            apiKey: resolved.apiKey,
+                        };
+                    },
                 }),
             });
         },
@@ -41,7 +51,7 @@ export function createOpenAICompatibleProviderDefinition(config) {
                 throw new Error(`Custom provider '${providerId}' is not configured in settings.json`);
             }
             const baseUrl = normalizeBaseUrl(resolved.baseUrl);
-            const url = buildOpenAICompatibleUrl(baseUrl, '/v1/models');
+            const url = buildOpenAICompatibleUrl(baseUrl, '/models');
             const headers = {
                 'Content-Type': 'application/json',
             };