@qduc/term2 0.3.1 → 0.5.0

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

@@ -1,6 +1,6 @@
 import test from 'ava';
-import { mergeAssistantReasoningIntoToolCalls, withMergedAssistantReasoning } from './ai-sdk-message-normalizer.js';
-test('mergeAssistantReasoningIntoToolCalls folds assistant reasoning into following assistant tool call', (t) => {
+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?' },
         {
@@ -23,7 +23,7 @@ test('mergeAssistantReasoningIntoToolCalls folds assistant reasoning into follow
             ],
         },
     ];
-    t.deepEqual(mergeAssistantReasoningIntoToolCalls(messages), [
+    t.deepEqual(mergeAssistantMessages(messages), [
         { role: 'user', content: 'what time is it?' },
         {
             role: 'assistant',
@@ -42,7 +42,23 @@ test('mergeAssistantReasoningIntoToolCalls folds assistant reasoning into follow
         },
     ]);
 });
-test('mergeAssistantReasoningIntoToolCalls folds AI SDK reasoning content part into following assistant tool call', (t) => {
+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',
@@ -71,7 +87,7 @@ test('mergeAssistantReasoningIntoToolCalls folds AI SDK reasoning content part i
             providerOptions: {},
         },
     ];
-    t.deepEqual(mergeAssistantReasoningIntoToolCalls(messages), [
+    t.deepEqual(mergeAssistantMessages(messages), [
         {
             role: 'assistant',
             content: [
@@ -94,30 +110,231 @@ test('mergeAssistantReasoningIntoToolCalls folds AI SDK reasoning content part i
         },
     ]);
 });
-test('mergeAssistantReasoningIntoToolCalls preserves messages that are not split reasoning and tool calls', (t) => {
+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: null,
+            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_content: 'already has a tool call',
-            tool_calls: [{ id: 'call:1' }],
+            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(mergeAssistantReasoningIntoToolCalls(messages), messages);
+    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('withMergedAssistantReasoning normalizes doGenerate messages before delegating', async (t) => {
+test('withMergedAssistantMessages normalizes doGenerate messages before delegating', async (t) => {
     let delegatedOptions;
-    const model = withMergedAssistantReasoning({
+    const model = withMergedAssistantMessages({
         provider: 'example',
         modelId: 'model',
         specificationVersion: 'v3',
@@ -140,9 +357,32 @@ test('withMergedAssistantReasoning normalizes doGenerate messages before delegat
         messages: [{ role: 'assistant', content: null, reasoning_content: 'reasoning', tool_calls: [{ id: 'call:0' }] }],
     });
 });
-test('withMergedAssistantReasoning normalizes doStream messages before delegating', async (t) => {
+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 = withMergedAssistantReasoning({
+    const model = withMergedAssistantMessages({
         provider: 'example',
         modelId: 'model',
         specificationVersion: 'v3',
@@ -163,7 +403,7 @@ test('withMergedAssistantReasoning normalizes doStream messages before delegatin
         { role: 'assistant', content: null, reasoning_content: 'reasoning', tool_calls: [{ id: 'call:0' }] },
     ]);
 });
-test('withMergedAssistantReasoning preserves model properties exposed by getters', (t) => {
+test('withMergedAssistantMessages preserves model properties exposed by getters', (t) => {
     class GetterBackedModel {
         #provider = 'example.chat';
         #modelId = 'selected-model';
@@ -186,7 +426,7 @@ test('withMergedAssistantReasoning preserves model properties exposed by getters
             return { stream: [] };
         }
     }
-    const model = withMergedAssistantReasoning(new GetterBackedModel());
+    const model = withMergedAssistantMessages(new GetterBackedModel());
     t.is(model.provider, 'example.chat');
     t.is(model.modelId, 'selected-model');
     t.is(model.specificationVersion, 'v3');

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

@@ -1 +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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"}
+{"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

@@ -1,8 +1,10 @@
 import { type ModelProvider, type Model } from '@openai/agents-core';
 export type AiSdkOpenAICompatibleConfig = {
+    providerType?: string;
     baseURL: string;
     apiKey?: string;
     headers?: Record<string, string>;
+    fetch?: typeof fetch;
 };
 export type AiSdkOpenAICompatibleProviderFactory = (options: {
     name: string;
@@ -10,11 +12,13 @@ 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;
     constructor(deps: {
         label: string;
+        providerType?: string;
         defaultModel: string;
         resolveConfig: () => AiSdkOpenAICompatibleConfig;
         createProvider?: AiSdkOpenAICompatibleProviderFactory;

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;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;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,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,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;AAM/B,qBAAa,6BAA8B,YAAW,aAAa;;gBAMrD,IAAI,EAAE;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,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;CAkBrD"}

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

@@ -1,27 +1,31 @@
-import { aisdk } from '@openai/agents-extensions/ai-sdk';
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
-import { withMergedAssistantReasoning } from './ai-sdk-message-normalizer.js';
+import { adaptAiSdkModelForAgents } from './ai-sdk-agents-adapter.js';
+function getProviderOptionsKey(providerType) {
+    return providerType.split('.')[0] || providerType;
+}
 export class AiSdkOpenAICompatibleProvider {
-    #label;
+    #providerType;
     #defaultModel;
     #resolveConfig;
     #createProvider;
     constructor(deps) {
-        this.#label = deps.label;
+        this.#providerType = deps.providerType || 'openai-compatible';
         this.#defaultModel = deps.defaultModel;
         this.#resolveConfig = deps.resolveConfig;
         this.#createProvider = deps.createProvider ?? createOpenAICompatible;
     }
     getModel(modelName) {
         const config = this.#resolveConfig();
+        const providerType = config.providerType || this.#providerType;
         const provider = this.#createProvider({
-            name: this.#label,
+            name: providerType,
             baseURL: config.baseURL,
             apiKey: config.apiKey,
             headers: config.headers,
             includeUsage: true,
+            fetch: config.fetch,
         });
-        return aisdk(withMergedAssistantReasoning(provider(modelName || this.#defaultModel)));
+        return adaptAiSdkModelForAgents(provider(modelName || this.#defaultModel), undefined, getProviderOptionsKey(providerType));
     }
 }
 //# 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;AAEnE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAgB9E,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,4BAA4B,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAqB,CAAC;IAC5G,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;AAmBtE,SAAS,qBAAqB,CAAC,YAAoB;IACjD,OAAO,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC;AACpD,CAAC;AAED,MAAM,OAAO,6BAA6B;IACxC,aAAa,CAAS;IACtB,aAAa,CAAS;IACtB,cAAc,CAAoC;IAClD,eAAe,CAAuC;IAEtD,YAAY,IAMX;QACC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,IAAI,mBAAmB,CAAC;QAC9D,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,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC;QAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;YACpC,IAAI,EAAE,YAAY;YAClB,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,CAC7B,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,EACzC,SAAS,EACT,qBAAqB,CAAC,YAAY,CAAC,CACpC,CAAC;IACJ,CAAC;CACF"}

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

@@ -5,6 +5,7 @@ test('AiSdkOpenAICompatibleProvider creates an AI SDK model with resolved settin
     let requestedModel;
     const provider = new AiSdkOpenAICompatibleProvider({
         label: 'Example',
+        providerType: 'example',
         defaultModel: 'fallback-model',
         resolveConfig: () => ({
             baseURL: 'https://example.test/v1',
@@ -31,7 +32,7 @@ test('AiSdkOpenAICompatibleProvider creates an AI SDK model with resolved settin
     const model = provider.getModel('selected-model');
     t.is(calls.length, 1);
     t.like(calls[0], {
-        name: 'Example',
+        name: 'example',
         baseURL: 'https://example.test/v1',
         apiKey: 'test-key',
         headers: {
@@ -42,6 +43,123 @@ test('AiSdkOpenAICompatibleProvider creates an AI SDK model with resolved settin
     t.is(typeof model.getResponse, 'function');
     t.is(typeof model.getStreamedResponse, 'function');
 });
+test('AiSdkOpenAICompatibleProvider uses provider type for AI SDK provider name', (t) => {
+    const calls = [];
+    const provider = new AiSdkOpenAICompatibleProvider({
+        label: 'Local Display Name',
+        providerType: 'lmstudio',
+        defaultModel: 'fallback-model',
+        resolveConfig: () => ({
+            baseURL: 'https://example.test/v1',
+        }),
+        createProvider: (options) => {
+            calls.push(options);
+            return (modelId) => ({
+                specificationVersion: 'v3',
+                provider: `${options.name}.chat`,
+                modelId,
+                supportedUrls: {},
+                doGenerate: async () => ({}),
+                doStream: async () => ({ stream: [] }),
+            });
+        },
+    });
+    provider.getModel('selected-model');
+    t.is(calls[0].name, 'lmstudio');
+});
+test('AiSdkOpenAICompatibleProvider defaults provider type for old configs', (t) => {
+    const calls = [];
+    const provider = new AiSdkOpenAICompatibleProvider({
+        label: 'Local Display Name',
+        defaultModel: 'fallback-model',
+        resolveConfig: () => ({
+            baseURL: 'https://example.test/v1',
+        }),
+        createProvider: (options) => {
+            calls.push(options);
+            return (modelId) => ({
+                specificationVersion: 'v3',
+                provider: `${options.name}.chat`,
+                modelId,
+                supportedUrls: {},
+                doGenerate: async () => ({}),
+                doStream: async () => ({ stream: [] }),
+            });
+        },
+    });
+    provider.getModel('selected-model');
+    t.is(calls[0].name, 'openai-compatible');
+});
+test('AiSdkOpenAICompatibleProvider forwards provider type to adapter for providerOptions keys', async (t) => {
+    let seenOptions;
+    const provider = new AiSdkOpenAICompatibleProvider({
+        label: 'Local Display Name',
+        providerType: 'lmstudio',
+        defaultModel: 'fallback-model',
+        resolveConfig: () => ({
+            baseURL: 'https://example.test/v1',
+        }),
+        createProvider: (options) => () => ({
+            specificationVersion: 'v3',
+            provider: `${options.name}.chat`,
+            modelId: 'selected-model',
+            supportedUrls: {},
+            doGenerate: async () => ({ content: [], usage: {} }),
+            doStream: async (options) => {
+                seenOptions = options;
+                return { stream: (async function* () { })() };
+            },
+        }),
+    });
+    const model = provider.getModel('selected-model');
+    for await (const _event of model.getStreamedResponse({
+        input: 'hi',
+        tools: [],
+        handoffs: [],
+        outputType: 'text',
+        modelSettings: {
+            providerData: { service_tier: 'flex' },
+        },
+    })) {
+        // Consume the stream.
+    }
+    t.is(seenOptions.providerOptions.lmstudio.service_tier, 'flex');
+});
+test('AiSdkOpenAICompatibleProvider matches AI SDK providerOptions key for dotted provider types', async (t) => {
+    let seenOptions;
+    const provider = new AiSdkOpenAICompatibleProvider({
+        label: 'Local Display Name',
+        providerType: 'llama.cpp',
+        defaultModel: 'fallback-model',
+        resolveConfig: () => ({
+            baseURL: 'https://example.test/v1',
+        }),
+        createProvider: (options) => () => ({
+            specificationVersion: 'v3',
+            provider: `${options.name}.chat`,
+            modelId: 'selected-model',
+            supportedUrls: {},
+            doGenerate: async () => ({ content: [], usage: {} }),
+            doStream: async (options) => {
+                seenOptions = options;
+                return { stream: (async function* () { })() };
+            },
+        }),
+    });
+    const model = provider.getModel('selected-model');
+    for await (const _event of model.getStreamedResponse({
+        input: 'hi',
+        tools: [],
+        handoffs: [],
+        outputType: 'text',
+        modelSettings: {
+            providerData: { service_tier: 'flex' },
+        },
+    })) {
+        // Consume the stream.
+    }
+    t.is(seenOptions.providerOptions.llama.service_tier, 'flex');
+});
 test('AiSdkOpenAICompatibleProvider uses the default model when none is requested', (t) => {
     let requestedModel;
     const provider = new AiSdkOpenAICompatibleProvider({
@@ -65,4 +183,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

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

@@ -1 +1 @@
-{"version":3,"file":"ai-sdk-openai-compatible.provider.test.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai-compatible.provider.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAEvF,IAAI,CAAC,8EAA8E,EAAE,CAAC,CAAC,EAAE,EAAE;IACzF,MAAM,KAAK,GAAU,EAAE,CAAC;IACxB,IAAI,cAAkC,CAAC;IACvC,MAAM,QAAQ,GAAG,IAAI,6BAA6B,CAAC;QACjD,KAAK,EAAE,SAAS;QAChB,YAAY,EAAE,gBAAgB;QAC9B,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;YACpB,OAAO,EAAE,yBAAyB;YAClC,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE;gBACP,QAAQ,EAAE,KAAK;aAChB;SACF,CAAC;QACF,cAAc,EAAE,CAAC,OAAY,EAAE,EAAE;YAC/B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpB,OAAO,CAAC,OAAe,EAAE,EAAE;gBACzB,cAAc,GAAG,OAAO,CAAC;gBACzB,OAAO;oBACL,oBAAoB,EAAE,IAAI;oBAC1B,QAAQ,EAAE,cAAc;oBACxB,OAAO;oBACP,aAAa,EAAE,EAAE;oBACjB,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;oBAC5B,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;iBAChC,CAAC;YACX,CAAC,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAElD,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACtB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QACf,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,yBAAyB;QAClC,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE;YACP,QAAQ,EAAE,KAAK;SAChB;KACF,CAAC,CAAC;IACH,CAAC,CAAC,EAAE,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;IACvC,CAAC,CAAC,EAAE,CAAC,OAAQ,KAAa,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACpD,CAAC,CAAC,EAAE,CAAC,OAAQ,KAAa,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;AAC9D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6EAA6E,EAAE,CAAC,CAAC,EAAE,EAAE;IACxF,IAAI,cAAkC,CAAC;IACvC,MAAM,QAAQ,GAAG,IAAI,6BAA6B,CAAC;QACjD,KAAK,EAAE,SAAS;QAChB,YAAY,EAAE,gBAAgB;QAC9B,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;YACpB,OAAO,EAAE,yBAAyB;SACnC,CAAC;QACF,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,OAAe,EAAE,EAAE;YACxC,cAAc,GAAG,OAAO,CAAC;YACzB,OAAO;gBACL,oBAAoB,EAAE,IAAI;gBAC1B,QAAQ,EAAE,cAAc;gBACxB,OAAO;gBACP,aAAa,EAAE,EAAE;gBACjB,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC5B,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;aAChC,CAAC;QACX,CAAC;KACF,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAEpB,CAAC,CAAC,EAAE,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;AACzC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ai-sdk-openai-compatible.provider.test.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai-compatible.provider.test.ts"],"names":[],"mappings":"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"}