@qduc/term2 0.3.0 → 0.4.0

package/dist/providers/ai-sdk-message-normalizer.js

@@ -0,0 +1,115 @@
+import { wrapLanguageModel } from 'ai';
+function hasContent(content) {
+    return content !== null && content !== undefined && content !== '';
+}
+function hasAssistantPayload(message) {
+    if (message?.role !== 'assistant') {
+        return true;
+    }
+    if (Array.isArray(message.tool_calls) && message.tool_calls.length > 0) {
+        return true;
+    }
+    if (!Array.isArray(message.content)) {
+        return hasContent(message.content);
+    }
+    return message.content.some((part) => part?.type !== 'reasoning');
+}
+function contentToParts(content) {
+    if (!hasContent(content)) {
+        return [];
+    }
+    if (Array.isArray(content)) {
+        return content;
+    }
+    return [{ type: 'text', text: String(content) }];
+}
+function mergeAssistantContent(existing, incoming) {
+    if (!hasContent(existing)) {
+        return incoming;
+    }
+    if (!hasContent(incoming)) {
+        return existing;
+    }
+    if (typeof existing === 'string' && typeof incoming === 'string') {
+        return `${existing}\n${incoming}`;
+    }
+    return [...contentToParts(existing), ...contentToParts(incoming)];
+}
+function appendStringField(message, field, value) {
+    if (typeof value !== 'string') {
+        return;
+    }
+    message[field] = typeof message[field] === 'string' ? `${message[field]}${value}` : value;
+}
+function appendArrayLikeField(message, field, value) {
+    if (value == null) {
+        return;
+    }
+    const values = Array.isArray(value) ? value : [value];
+    if (values.length === 0) {
+        return;
+    }
+    message[field] = [...(Array.isArray(message[field]) ? message[field] : []), ...values];
+}
+function mergeAssistantMessagePair(existing, incoming) {
+    const merged = {
+        ...existing,
+        ...incoming,
+        role: 'assistant',
+        content: mergeAssistantContent(existing.content, incoming.content),
+        tool_calls: undefined,
+        reasoning: undefined,
+        reasoning_content: undefined,
+        reasoning_details: undefined,
+    };
+    appendArrayLikeField(merged, 'tool_calls', existing.tool_calls);
+    appendArrayLikeField(merged, 'tool_calls', incoming.tool_calls);
+    appendStringField(merged, 'reasoning', existing.reasoning);
+    appendStringField(merged, 'reasoning', incoming.reasoning);
+    appendStringField(merged, 'reasoning_content', existing.reasoning_content);
+    appendStringField(merged, 'reasoning_content', incoming.reasoning_content);
+    appendArrayLikeField(merged, 'reasoning_details', existing.reasoning_details);
+    appendArrayLikeField(merged, 'reasoning_details', incoming.reasoning_details);
+    for (const field of ['tool_calls', 'reasoning', 'reasoning_content', 'reasoning_details']) {
+        if (merged[field] === undefined) {
+            delete merged[field];
+        }
+    }
+    if (merged.content === undefined) {
+        delete merged.content;
+    }
+    return merged;
+}
+export function mergeAssistantMessages(messages) {
+    const merged = [];
+    for (const message of messages) {
+        const previous = merged[merged.length - 1];
+        if (previous?.role === 'assistant' && message?.role === 'assistant') {
+            merged[merged.length - 1] = mergeAssistantMessagePair(previous, message);
+            continue;
+        }
+        merged.push(message);
+    }
+    return merged.filter(hasAssistantPayload);
+}
+function normalizeMessageOptions(options) {
+    if (!Array.isArray(options?.prompt) && !Array.isArray(options?.messages)) {
+        return options;
+    }
+    return {
+        ...options,
+        ...(Array.isArray(options.prompt) ? { prompt: mergeAssistantMessages(options.prompt) } : {}),
+        ...(Array.isArray(options.messages) ? { messages: mergeAssistantMessages(options.messages) } : {}),
+    };
+}
+const mergeAssistantMessagesMiddleware = {
+    specificationVersion: 'v3',
+    transformParams: ({ params }) => normalizeMessageOptions(params),
+};
+export function withMergedAssistantMessages(model) {
+    return wrapLanguageModel({
+        model: model,
+        middleware: mergeAssistantMessagesMiddleware,
+    });
+}
+//# sourceMappingURL=ai-sdk-message-normalizer.js.map

package/dist/providers/ai-sdk-message-normalizer.js.map

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

package/dist/providers/ai-sdk-message-normalizer.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ai-sdk-message-normalizer.test.d.ts.map

package/dist/providers/ai-sdk-message-normalizer.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ai-sdk-message-normalizer.test.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-message-normalizer.test.ts"],"names":[],"mappings":""}

package/dist/providers/ai-sdk-message-normalizer.test.js

@@ -0,0 +1,435 @@
+import test from 'ava';
+import { mergeAssistantMessages, withMergedAssistantMessages } from './ai-sdk-message-normalizer.js';
+test('mergeAssistantMessages folds assistant reasoning into following assistant tool call', (t) => {
+    const messages = [
+        { role: 'user', content: 'what time is it?' },
+        {
+            role: 'assistant',
+            content: '',
+            reasoning_content: 'Need to use the shell for the exact time.',
+        },
+        {
+            role: 'assistant',
+            content: null,
+            tool_calls: [
+                {
+                    id: 'shell:0',
+                    type: 'function',
+                    function: {
+                        name: 'shell',
+                        arguments: '{"command":"date"}',
+                    },
+                },
+            ],
+        },
+    ];
+    t.deepEqual(mergeAssistantMessages(messages), [
+        { role: 'user', content: 'what time is it?' },
+        {
+            role: 'assistant',
+            content: null,
+            reasoning_content: 'Need to use the shell for the exact time.',
+            tool_calls: [
+                {
+                    id: 'shell:0',
+                    type: 'function',
+                    function: {
+                        name: 'shell',
+                        arguments: '{"command":"date"}',
+                    },
+                },
+            ],
+        },
+    ]);
+});
+test('mergeAssistantMessages drops reasoning-only assistant messages with no content or tool calls', (t) => {
+    const messages = [
+        { role: 'user', content: 'show package json' },
+        {
+            role: 'assistant',
+            content: '',
+            reasoning_content: 'I should inspect the file.',
+            reasoning_details: [{ type: 'reasoning.text', text: 'I should inspect the file.' }],
+        },
+        { role: 'user', content: 'retry after failed hallucinated tool call' },
+    ];
+    t.deepEqual(mergeAssistantMessages(messages), [
+        { role: 'user', content: 'show package json' },
+        { role: 'user', content: 'retry after failed hallucinated tool call' },
+    ]);
+});
+test('mergeAssistantMessages folds AI SDK reasoning content part into following assistant tool call', (t) => {
+    const messages = [
+        {
+            role: 'assistant',
+            content: [
+                {
+                    type: 'reasoning',
+                    text: 'Need to use the shell for the exact time.',
+                    providerOptions: {},
+                },
+            ],
+            providerOptions: {},
+        },
+        {
+            role: 'assistant',
+            content: [
+                {
+                    type: 'tool-call',
+                    toolCallId: 'shell:0',
+                    toolName: 'shell',
+                    input: {
+                        command: 'date',
+                    },
+                    providerOptions: {},
+                },
+            ],
+            providerOptions: {},
+        },
+    ];
+    t.deepEqual(mergeAssistantMessages(messages), [
+        {
+            role: 'assistant',
+            content: [
+                {
+                    type: 'reasoning',
+                    text: 'Need to use the shell for the exact time.',
+                    providerOptions: {},
+                },
+                {
+                    type: 'tool-call',
+                    toolCallId: 'shell:0',
+                    toolName: 'shell',
+                    input: {
+                        command: 'date',
+                    },
+                    providerOptions: {},
+                },
+            ],
+            providerOptions: {},
+        },
+    ]);
+});
+test('mergeAssistantMessages preserves assistant messages separated by non-assistant messages', (t) => {
+    const messages = [
+        {
+            role: 'assistant',
+            content: 'visible text',
+            reasoning_content: 'internal reasoning',
+        },
+        {
+            role: 'tool',
+            tool_call_id: 'call:0',
+            content: 'result',
+        },
+        {
+            role: 'assistant',
+            content: 'after tool',
+        },
+    ];
+    t.deepEqual(mergeAssistantMessages(messages), messages);
+});
+test('mergeAssistantMessages merges contiguous assistant messages', (t) => {
+    const messages = [
+        { role: 'user', content: 'start' },
+        { role: 'assistant', content: 'first' },
+        { role: 'assistant', content: 'second', reasoning_content: 'reasoning-a' },
+        { role: 'assistant', content: null, tool_calls: [{ id: 'call:0' }] },
+        { role: 'tool', tool_call_id: 'call:0', content: 'result' },
+        { role: 'assistant', content: 'after tool' },
+    ];
+    t.deepEqual(mergeAssistantMessages(messages), [
+        { role: 'user', content: 'start' },
+        {
+            role: 'assistant',
+            content: 'first\nsecond',
+            reasoning_content: 'reasoning-a',
+            tool_calls: [{ id: 'call:0' }],
+        },
+        { role: 'tool', tool_call_id: 'call:0', content: 'result' },
+        { role: 'assistant', content: 'after tool' },
+    ]);
+});
+test('mergeAssistantMessages merges contiguous AI SDK assistant content parts', (t) => {
+    const messages = [
+        {
+            role: 'assistant',
+            content: [{ type: 'text', text: 'first' }],
+        },
+        {
+            role: 'assistant',
+            content: [{ type: 'tool-call', toolCallId: 'call:0', toolName: 'shell', input: {} }],
+        },
+        {
+            role: 'assistant',
+            content: [{ type: 'text', text: 'second' }],
+        },
+    ];
+    t.deepEqual(mergeAssistantMessages(messages), [
+        {
+            role: 'assistant',
+            content: [
+                { type: 'text', text: 'first' },
+                { type: 'tool-call', toolCallId: 'call:0', toolName: 'shell', input: {} },
+                { type: 'text', text: 'second' },
+            ],
+        },
+    ]);
+});
+test('mergeAssistantMessages merges real-world split assistant turns before tool results', (t) => {
+    const messages = [
+        {
+            role: 'system',
+            content: [{ type: 'text', text: 'You are a lightweight terminal assistant fo...' }],
+        },
+        {
+            role: 'user',
+            content: 'Help me test if the grep tool in this enviro...',
+        },
+        {
+            role: 'assistant',
+            content: '',
+            reasoning: 'The user wants me to test if the grep tool...',
+            reasoning_details: [
+                {
+                    type: 'reasoning.text',
+                    text: 'The user wants me to test if the grep tool...',
+                    format: 'unknown',
+                    index: 0,
+                },
+            ],
+        },
+        {
+            role: 'assistant',
+            content: "I'll test the `grep` tool by running the sa...",
+        },
+        {
+            role: 'assistant',
+            content: '',
+            tool_calls: [
+                {
+                    id: 'chatcmpl-tool-b7beee18ac56f10c',
+                    type: 'function',
+                    function: {
+                        name: 'shell',
+                        arguments: '{"command":"ls -la"}',
+                    },
+                },
+            ],
+            reasoning_details: [],
+        },
+        {
+            role: 'tool',
+            tool_call_id: 'chatcmpl-tool-b7beee18ac56f10c',
+            content: 'exit 0\ntotal 1504\ndrwxr-xr-x@  34 qduc...',
+            name: 'shell',
+        },
+        {
+            role: 'assistant',
+            content: '',
+            reasoning: 'Let me look for some content to search for...',
+            reasoning_details: [
+                {
+                    type: 'reasoning.text',
+                    text: 'Let me look for some content to search for...',
+                    format: 'unknown',
+                    index: 0,
+                },
+            ],
+        },
+        {
+            role: 'assistant',
+            content: 'Now let me pick a search term and run it wi...',
+        },
+        {
+            role: 'assistant',
+            content: '',
+            tool_calls: [
+                {
+                    id: 'chatcmpl-tool-81bf68f7f26e9d9c',
+                    type: 'function',
+                    function: {
+                        name: 'shell',
+                        arguments: '{"command":"grep -r \\"grep\\" --include=\\"*.ts\\"...}',
+                    },
+                },
+            ],
+            reasoning_details: [],
+        },
+        {
+            role: 'tool',
+            tool_call_id: 'chatcmpl-tool-81bf68f7f26e9d9c',
+            content: "exit 0\n./dist/tools/grep.js:        name: 'g...",
+            name: 'shell',
+        },
+    ];
+    t.deepEqual(mergeAssistantMessages(messages), [
+        {
+            role: 'system',
+            content: [{ type: 'text', text: 'You are a lightweight terminal assistant fo...' }],
+        },
+        {
+            role: 'user',
+            content: 'Help me test if the grep tool in this enviro...',
+        },
+        {
+            role: 'assistant',
+            content: "I'll test the `grep` tool by running the sa...",
+            reasoning: 'The user wants me to test if the grep tool...',
+            reasoning_details: [
+                {
+                    type: 'reasoning.text',
+                    text: 'The user wants me to test if the grep tool...',
+                    format: 'unknown',
+                    index: 0,
+                },
+            ],
+            tool_calls: [
+                {
+                    id: 'chatcmpl-tool-b7beee18ac56f10c',
+                    type: 'function',
+                    function: {
+                        name: 'shell',
+                        arguments: '{"command":"ls -la"}',
+                    },
+                },
+            ],
+        },
+        {
+            role: 'tool',
+            tool_call_id: 'chatcmpl-tool-b7beee18ac56f10c',
+            content: 'exit 0\ntotal 1504\ndrwxr-xr-x@  34 qduc...',
+            name: 'shell',
+        },
+        {
+            role: 'assistant',
+            content: 'Now let me pick a search term and run it wi...',
+            reasoning: 'Let me look for some content to search for...',
+            reasoning_details: [
+                {
+                    type: 'reasoning.text',
+                    text: 'Let me look for some content to search for...',
+                    format: 'unknown',
+                    index: 0,
+                },
+            ],
+            tool_calls: [
+                {
+                    id: 'chatcmpl-tool-81bf68f7f26e9d9c',
+                    type: 'function',
+                    function: {
+                        name: 'shell',
+                        arguments: '{"command":"grep -r \\"grep\\" --include=\\"*.ts\\"...}',
+                    },
+                },
+            ],
+        },
+        {
+            role: 'tool',
+            tool_call_id: 'chatcmpl-tool-81bf68f7f26e9d9c',
+            content: "exit 0\n./dist/tools/grep.js:        name: 'g...",
+            name: 'shell',
+        },
+    ]);
+});
+test('withMergedAssistantMessages normalizes doGenerate messages before delegating', async (t) => {
+    let delegatedOptions;
+    const model = withMergedAssistantMessages({
+        provider: 'example',
+        modelId: 'model',
+        specificationVersion: 'v3',
+        supportedUrls: {},
+        doGenerate: async (options) => {
+            delegatedOptions = options;
+            return { text: 'ok' };
+        },
+        doStream: async () => ({ stream: [] }),
+    });
+    await model.doGenerate({
+        temperature: 0,
+        messages: [
+            { role: 'assistant', content: '', reasoning_content: 'reasoning' },
+            { role: 'assistant', content: null, tool_calls: [{ id: 'call:0' }] },
+        ],
+    });
+    t.deepEqual(delegatedOptions, {
+        temperature: 0,
+        messages: [{ role: 'assistant', content: null, reasoning_content: 'reasoning', tool_calls: [{ id: 'call:0' }] }],
+    });
+});
+test('withMergedAssistantMessages normalizes doGenerate prompt before delegating', async (t) => {
+    let delegatedOptions;
+    const model = withMergedAssistantMessages({
+        provider: 'example',
+        modelId: 'model',
+        specificationVersion: 'v3',
+        supportedUrls: {},
+        doGenerate: async (options) => {
+            delegatedOptions = options;
+            return { text: 'ok' };
+        },
+        doStream: async () => ({ stream: [] }),
+    });
+    await model.doGenerate({
+        prompt: [
+            { role: 'assistant', content: '', reasoning_content: 'reasoning' },
+            { role: 'assistant', content: null, tool_calls: [{ id: 'call:0' }] },
+        ],
+    });
+    t.deepEqual(delegatedOptions.prompt, [
+        { role: 'assistant', content: null, reasoning_content: 'reasoning', tool_calls: [{ id: 'call:0' }] },
+    ]);
+});
+test('withMergedAssistantMessages normalizes doStream messages before delegating', async (t) => {
+    let delegatedOptions;
+    const model = withMergedAssistantMessages({
+        provider: 'example',
+        modelId: 'model',
+        specificationVersion: 'v3',
+        supportedUrls: {},
+        doGenerate: async () => ({ text: 'ok' }),
+        doStream: async (options) => {
+            delegatedOptions = options;
+            return { stream: [] };
+        },
+    });
+    await model.doStream({
+        messages: [
+            { role: 'assistant', content: '', reasoning_content: 'reasoning' },
+            { role: 'assistant', content: null, tool_calls: [{ id: 'call:0' }] },
+        ],
+    });
+    t.deepEqual(delegatedOptions.messages, [
+        { role: 'assistant', content: null, reasoning_content: 'reasoning', tool_calls: [{ id: 'call:0' }] },
+    ]);
+});
+test('withMergedAssistantMessages preserves model properties exposed by getters', (t) => {
+    class GetterBackedModel {
+        #provider = 'example.chat';
+        #modelId = 'selected-model';
+        get provider() {
+            return this.#provider;
+        }
+        get modelId() {
+            return this.#modelId;
+        }
+        get specificationVersion() {
+            return 'v3';
+        }
+        get supportedUrls() {
+            return {};
+        }
+        async doGenerate() {
+            return { text: 'ok' };
+        }
+        async doStream() {
+            return { stream: [] };
+        }
+    }
+    const model = withMergedAssistantMessages(new GetterBackedModel());
+    t.is(model.provider, 'example.chat');
+    t.is(model.modelId, 'selected-model');
+    t.is(model.specificationVersion, 'v3');
+    t.deepEqual(model.supportedUrls, {});
+});
+//# sourceMappingURL=ai-sdk-message-normalizer.test.js.map

package/dist/providers/ai-sdk-message-normalizer.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ai-sdk-message-normalizer.test.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-message-normalizer.test.ts"],"names":[],"mappings":"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"}

package/dist/providers/ai-sdk-openai-compatible.provider.d.ts

@@ -3,6 +3,7 @@ export type AiSdkOpenAICompatibleConfig = {
     baseURL: string;
     apiKey?: string;
     headers?: Record<string, string>;
+    fetch?: typeof fetch;
 };
 export type AiSdkOpenAICompatibleProviderFactory = (options: {
     name: string;
@@ -10,6 +11,7 @@ export type AiSdkOpenAICompatibleProviderFactory = (options: {
     apiKey?: string;
     headers?: Record<string, string>;
     includeUsage?: boolean;
+    fetch?: typeof fetch;
 }) => (modelId: string) => any;
 export declare class AiSdkOpenAICompatibleProvider implements ModelProvider {
     #private;

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

@@ -1 +1 @@
-{"version":3,"file":"ai-sdk-openai-compatible.provider.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai-compatible.provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAErE,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,CAAC,OAAO,EAAE;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,KAAK,CAAC,OAAO,EAAE,MAAM,KAAK,GAAG,CAAC;AAE/B,qBAAa,6BAA8B,YAAW,aAAa;;gBAMrD,IAAI,EAAE;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,2BAA2B,CAAC;QACjD,cAAc,CAAC,EAAE,oCAAoC,CAAC;KACvD;IAOD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK;CAYrD"}
+{"version":3,"file":"ai-sdk-openai-compatible.provider.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai-compatible.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGrE,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,CAAC,OAAO,EAAE;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB,KAAK,CAAC,OAAO,EAAE,MAAM,KAAK,GAAG,CAAC;AAE/B,qBAAa,6BAA8B,YAAW,aAAa;;gBAMrD,IAAI,EAAE;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,2BAA2B,CAAC;QACjD,cAAc,CAAC,EAAE,oCAAoC,CAAC;KACvD;IAOD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK;CAarD"}

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

@@ -1,5 +1,5 @@
-import { aisdk } from '@openai/agents-extensions/ai-sdk';
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
+import { adaptAiSdkModelForAgents } from './ai-sdk-agents-adapter.js';
 export class AiSdkOpenAICompatibleProvider {
     #label;
     #defaultModel;
@@ -19,8 +19,9 @@ export class AiSdkOpenAICompatibleProvider {
             apiKey: config.apiKey,
             headers: config.headers,
             includeUsage: true,
+            fetch: config.fetch,
         });
-        return aisdk(provider(modelName || this.#defaultModel));
+        return adaptAiSdkModelForAgents(provider(modelName || this.#defaultModel));
     }
 }
 //# sourceMappingURL=ai-sdk-openai-compatible.provider.js.map

package/dist/providers/ai-sdk-openai-compatible.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ai-sdk-openai-compatible.provider.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai-compatible.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAiBnE,MAAM,OAAO,6BAA6B;IACxC,MAAM,CAAS;IACf,aAAa,CAAS;IACtB,cAAc,CAAoC;IAClD,eAAe,CAAuC;IAEtD,YAAY,IAKX;QACC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,IAAK,sBAA+D,CAAC;IACjH,CAAC;IAED,QAAQ,CAAC,SAAkB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;YACpC,IAAI,EAAE,IAAI,CAAC,MAAM;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,CAAqB,CAAC;IAC9E,CAAC;CACF"}
+{"version":3,"file":"ai-sdk-openai-compatible.provider.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai-compatible.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAkBtE,MAAM,OAAO,6BAA6B;IACxC,MAAM,CAAS;IACf,aAAa,CAAS;IACtB,cAAc,CAAoC;IAClD,eAAe,CAAuC;IAEtD,YAAY,IAKX;QACC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,IAAK,sBAA+D,CAAC;IACjH,CAAC;IAED,QAAQ,CAAC,SAAkB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;YACpC,IAAI,EAAE,IAAI,CAAC,MAAM;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,YAAY,EAAE,IAAI;YAClB,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;QAEH,OAAO,wBAAwB,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF"}

package/dist/providers/ai-sdk-openai-compatible.provider.test.js

@@ -65,4 +65,29 @@ test('AiSdkOpenAICompatibleProvider uses the default model when none is requeste
     provider.getModel();
     t.is(requestedModel, 'fallback-model');
 });
+test('AiSdkOpenAICompatibleProvider passes configured fetch to OpenAI-compatible provider', (t) => {
+    const fetchImpl = async () => new Response('{}');
+    const calls = [];
+    const provider = new AiSdkOpenAICompatibleProvider({
+        label: 'Example',
+        defaultModel: 'fallback-model',
+        resolveConfig: () => ({
+            baseURL: 'https://example.test/v1',
+            fetch: fetchImpl,
+        }),
+        createProvider: (options) => {
+            calls.push(options);
+            return (modelId) => ({
+                specificationVersion: 'v3',
+                provider: 'example.chat',
+                modelId,
+                supportedUrls: {},
+                doGenerate: async () => ({}),
+                doStream: async () => ({ stream: [] }),
+            });
+        },
+    });
+    provider.getModel('selected-model');
+    t.is(calls[0].fetch, fetchImpl);
+});
 //# sourceMappingURL=ai-sdk-openai-compatible.provider.test.js.map