@qduc/term2 0.3.0 → 0.3.1

package/dist/hooks/use-model-selection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-model-selection.d.ts","sourceRoot":"","sources":["../../source/hooks/use-model-selection.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzF,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAE3F,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAErH,eAAO,MAAM,aAAa,QAAmC,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAC7B,eAAO,MAAM,cAAc,QAAmC,CAAC;AAC/D,eAAO,MAAM,0BAA0B,QAAmC,CAAC;AAC3E,eAAO,MAAM,0BAA0B,QAAmC,CAAC;AAE3E,eAAO,MAAM,iBAAiB,GAC5B,MAAM;IACJ,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,gBAAgB,CAAC;CACnC,EACD,gCAA8B;;;;;;;;;;uBAmGf,MAAM;;;;;;;CAyEtB,CAAC"}
+{"version":3,"file":"use-model-selection.d.ts","sourceRoot":"","sources":["../../source/hooks/use-model-selection.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzF,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAE3F,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAErH,eAAO,MAAM,aAAa,QAAmC,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAC7B,eAAO,MAAM,cAAc,QAAmC,CAAC;AAC/D,eAAO,MAAM,0BAA0B,QAAmC,CAAC;AAC3E,eAAO,MAAM,0BAA0B,QAAmC,CAAC;AAE3E,eAAO,MAAM,iBAAiB,GAC5B,MAAM;IACJ,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,gBAAgB,CAAC;CACnC,EACD,gCAA8B;;;;;;;;;;uBAiHf,MAAM;;;;;;;CA8EtB,CAAC"}

package/dist/hooks/use-model-selection.js

@@ -20,6 +20,8 @@ export const useModelSelection = (deps, hasConversationHistory = false) => {
     const [scrollOffset, setScrollOffset] = useState(0);
     const failedProvidersRef = useRef(new Set());
     const isInitialLoadRef = useRef(true);
+    const loadRequestIdRef = useRef(0);
+    const modelsByProviderRef = useRef(new Map());
     const isOpen = mode === 'model_selection';
     const modelSettingConfig = getModelSettingConfigForInput(input);
     const canSwitchProvider = Boolean(modelSettingConfig && modelSettingConfig.providerKey !== 'agent.provider') || !hasConversationHistory;
@@ -43,35 +45,50 @@ export const useModelSelection = (deps, hasConversationHistory = false) => {
     useEffect(() => {
         if (!isOpen || !provider)
             return;
+        const requestId = ++loadRequestIdRef.current;
+        const isCurrentRequest = () => requestId === loadRequestIdRef.current;
+        const cachedModels = modelsByProviderRef.current.get(provider);
         const load = async () => {
             // If already marked as failed, don't try again in this session
             // unless it's the only one left (covered by logic below)
             if (failedProvidersRef.current.has(provider) && !isInitialLoadRef.current) {
                 return;
             }
-            setLoading(true);
+            setModels(cachedModels ?? []);
+            setSelectedIndex(0);
+            setScrollOffset(0);
+            setLoading(!cachedModels);
             setError(null);
             try {
                 const fetched = await fetchModels({ settingsService, loggingService }, provider);
+                modelsByProviderRef.current.set(provider, fetched);
+                if (!isCurrentRequest())
+                    return;
                 setModels(fetched);
                 isInitialLoadRef.current = false;
             }
             catch (err) {
+                if (!isCurrentRequest())
+                    return;
                 const message = err instanceof Error ? err.message : String(err);
                 loggingService.warn(`Model selection fetch failed for ${provider}`, { error: message });
                 failedProvidersRef.current.add(provider);
                 setError(message);
             }
             finally {
+                if (!isCurrentRequest())
+                    return;
                 setLoading(false);
             }
         };
         load().catch((err) => {
+            if (!isCurrentRequest())
+                return;
             const message = err instanceof Error ? err.message : String(err);
             setError(message);
             setLoading(false);
         });
-    }, [isOpen, provider]);
+    }, [isOpen, provider, settingsService, loggingService]);
     const filteredModels = useMemo(() => {
         return filterModels(models, query);
     }, [models, query]);
@@ -137,15 +154,19 @@ export const useModelSelection = (deps, hasConversationHistory = false) => {
         // If no providers available, stay on current
         if (allProviderIds.length === 0)
             return;
-        setProvider((prev) => {
-            const currentIndex = allProviderIds.indexOf(prev || allProviderIds[0]);
-            const nextIndex = (currentIndex + 1) % allProviderIds.length;
-            const nextProvider = allProviderIds[nextIndex];
-            // If the user manually selects it, we should allow retrying it
-            failedProvidersRef.current.delete(nextProvider);
-            return nextProvider;
-        });
-    }, []);
+        const currentIndex = allProviderIds.indexOf(provider || allProviderIds[0]);
+        const nextIndex = (currentIndex + 1) % allProviderIds.length;
+        const nextProvider = allProviderIds[nextIndex];
+        const cachedModels = modelsByProviderRef.current.get(nextProvider);
+        // If the user manually selects it, we should allow retrying it
+        failedProvidersRef.current.delete(nextProvider);
+        setModels(cachedModels ?? []);
+        setSelectedIndex(0);
+        setScrollOffset(0);
+        setLoading(!cachedModels);
+        setError(null);
+        setProvider(nextProvider);
+    }, [provider]);
     return {
         isOpen,
         triggerIndex,

package/dist/hooks/use-model-selection.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-model-selection.js","sourceRoot":"","sources":["../../source/hooks/use-model-selection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-model-selection.js","sourceRoot":"","sources":["../../source/hooks/use-model-selection.ts"],"names":[],"mappings":"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"}

package/dist/hooks/use-model-selection.test.js

@@ -1,24 +1,29 @@
 import test from 'ava';
-import React, { useEffect } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { render } from 'ink-testing-library';
 import { InputProvider, useInputContext } from '../context/InputContext.js';
 import { useModelSelection } from './use-model-selection.js';
 import { createMockSettingsService } from '../services/settings-service.mock.js';
 import { Text } from 'ink';
-const TestComponent = ({ onResults }) => {
+import { clearModelCache } from '../services/model-service.js';
+import { getProviderIds, registerProvider, unregisterProvider } from '../providers/index.js';
+const TestComponent = ({ onResults, settingsService, initialInput = '/model deepseek-v4-flash --provider=opencode go', }) => {
     const { setInput, setCursorOffset, setMode, setTriggerIndex } = useInputContext();
+    const resolvedSettingsService = useMemo(() => settingsService ??
+        createMockSettingsService({
+            'agent.openrouter.apiKey': 'fake-key',
+        }), [settingsService]);
+    const loggingService = useMemo(() => ({ warn: () => { } }), []);
     useEffect(() => {
-        const input = '/model deepseek-v4-flash --provider=opencode go';
+        const input = initialInput;
         setInput(input);
         setCursorOffset(input.length);
         setTriggerIndex('/model '.length);
         setMode('model_selection');
-    }, [setCursorOffset, setInput, setMode, setTriggerIndex]);
+    }, [initialInput, setCursorOffset, setInput, setMode, setTriggerIndex]);
     const models = useModelSelection({
-        loggingService: { warn: () => { } },
-        settingsService: createMockSettingsService({
-            'agent.openrouter.apiKey': 'fake-key',
-        }),
+        loggingService,
+        settingsService: resolvedSettingsService,
     });
     useEffect(() => {
         onResults(models);
@@ -27,7 +32,7 @@ const TestComponent = ({ onResults }) => {
         "Provider: ",
         models.provider);
 };
-test('toggleProvider cycles through available providers', async (t) => {
+test.serial('toggleProvider cycles through available providers', async (t) => {
     let capturedModels;
     render(React.createElement(InputProvider, null,
         React.createElement(TestComponent, { onResults: (m) => {
@@ -47,7 +52,7 @@ test('toggleProvider cycles through available providers', async (t) => {
     const thirdProvider = capturedModels.provider;
     t.not(thirdProvider, secondProvider, 'Provider should have switched again');
 });
-test('model selection query strips provider suffix from input', async (t) => {
+test.serial('model selection query strips provider suffix from input', async (t) => {
     let capturedModels;
     render(React.createElement(InputProvider, null,
         React.createElement(TestComponent, { onResults: (m) => {
@@ -56,4 +61,96 @@ test('model selection query strips provider suffix from input', async (t) => {
     await new Promise((resolve) => setTimeout(resolve, 50));
     t.is(capturedModels.query, 'deepseek-v4-flash');
 });
+test.serial('ignores stale model results after switching providers', async (t) => {
+    clearModelCache();
+    const firstProvider = `slow-provider-${Date.now()}-${Math.random()}`;
+    const secondProvider = `fast-provider-${Date.now()}-${Math.random()}`;
+    let resolveFirst;
+    registerProvider({
+        id: firstProvider,
+        label: firstProvider,
+        fetchModels: async () => {
+            await new Promise((resolve) => {
+                resolveFirst = resolve;
+            });
+            return [{ id: 'slow-model', name: 'Slow Model' }];
+        },
+    });
+    registerProvider({
+        id: secondProvider,
+        label: secondProvider,
+        fetchModels: async () => [{ id: 'fast-model', name: 'Fast Model' }],
+    });
+    t.teardown(() => {
+        clearModelCache();
+        unregisterProvider(firstProvider);
+        unregisterProvider(secondProvider);
+    });
+    let capturedModels;
+    const settingsService = createMockSettingsService({
+        'agent.provider': firstProvider,
+    });
+    render(React.createElement(InputProvider, null,
+        React.createElement(TestComponent, { settingsService: settingsService, initialInput: "/model ", onResults: (m) => {
+                capturedModels = m;
+            } })));
+    await new Promise((resolve) => setTimeout(resolve, 50));
+    t.is(capturedModels.provider, firstProvider);
+    capturedModels.toggleProvider();
+    await new Promise((resolve) => setTimeout(resolve, 50));
+    t.is(capturedModels.provider, secondProvider);
+    t.deepEqual(capturedModels.filteredModels.map((model) => model.id), ['fast-model']);
+    resolveFirst?.();
+    await new Promise((resolve) => setTimeout(resolve, 50));
+    t.is(capturedModels.provider, secondProvider);
+    t.deepEqual(capturedModels.filteredModels.map((model) => model.id), ['fast-model']);
+});
+test.serial('keeps completed provider results ready when switching back', async (t) => {
+    clearModelCache();
+    const firstProvider = `return-slow-provider-${Date.now()}-${Math.random()}`;
+    const secondProvider = `return-fast-provider-${Date.now()}-${Math.random()}`;
+    let resolveFirst;
+    registerProvider({
+        id: firstProvider,
+        label: firstProvider,
+        fetchModels: async () => {
+            await new Promise((resolve) => {
+                resolveFirst = resolve;
+            });
+            return [{ id: 'slow-model', name: 'Slow Model' }];
+        },
+    });
+    registerProvider({
+        id: secondProvider,
+        label: secondProvider,
+        fetchModels: async () => [{ id: 'fast-model', name: 'Fast Model' }],
+    });
+    t.teardown(() => {
+        clearModelCache();
+        unregisterProvider(firstProvider);
+        unregisterProvider(secondProvider);
+    });
+    let capturedModels;
+    const settingsService = createMockSettingsService({
+        'agent.provider': firstProvider,
+    });
+    render(React.createElement(InputProvider, null,
+        React.createElement(TestComponent, { settingsService: settingsService, initialInput: "/model ", onResults: (m) => {
+                capturedModels = m;
+            } })));
+    await new Promise((resolve) => setTimeout(resolve, 50));
+    capturedModels.toggleProvider();
+    await new Promise((resolve) => setTimeout(resolve, 50));
+    t.is(capturedModels.provider, secondProvider);
+    t.deepEqual(capturedModels.filteredModels.map((model) => model.id), ['fast-model']);
+    resolveFirst?.();
+    await new Promise((resolve) => setTimeout(resolve, 50));
+    t.deepEqual(capturedModels.filteredModels.map((model) => model.id), ['fast-model']);
+    for (let i = 0; i < getProviderIds().length && capturedModels.provider !== firstProvider; i++) {
+        capturedModels.toggleProvider();
+        await new Promise((resolve) => setTimeout(resolve, 50));
+    }
+    t.is(capturedModels.provider, firstProvider);
+    t.deepEqual(capturedModels.filteredModels.map((model) => model.id), ['slow-model']);
+});
 //# sourceMappingURL=use-model-selection.test.js.map

package/dist/hooks/use-model-selection.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-model-selection.test.js","sourceRoot":"","sources":["../../source/hooks/use-model-selection.test.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-model-selection.test.js","sourceRoot":"","sources":["../../source/hooks/use-model-selection.test.tsx"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,8 @@
+type AiSdkModelLike = {
+    doGenerate: (options: any) => PromiseLike<any> | any;
+    doStream: (options: any) => PromiseLike<any> | any;
+};
+export declare function mergeAssistantReasoningIntoToolCalls(messages: any[]): any[];
+export declare function withMergedAssistantReasoning<T extends AiSdkModelLike>(model: T): T;
+export {};
+//# sourceMappingURL=ai-sdk-message-normalizer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ai-sdk-message-normalizer.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-message-normalizer.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,WAAW,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IACrD,QAAQ,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,WAAW,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;CACpD,CAAC;AAsCF,wBAAgB,oCAAoC,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,CA0B3E;AAcD,wBAAgB,4BAA4B,CAAC,CAAC,SAAS,cAAc,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAclF"}

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

@@ -0,0 +1,70 @@
+function isAssistantReasoningOnlyMessage(message) {
+    const content = message?.content;
+    if (message?.role === 'assistant' &&
+        Array.isArray(content) &&
+        content.length > 0 &&
+        content.every((part) => part?.type === 'reasoning') &&
+        !Array.isArray(message.tool_calls)) {
+        return true;
+    }
+    return (message?.role === 'assistant' &&
+        typeof message.reasoning_content === 'string' &&
+        (message.content === '' || message.content === null || message.content === undefined) &&
+        !Array.isArray(message.tool_calls));
+}
+function isAssistantToolCallMessage(message) {
+    const content = message?.content;
+    if (message?.role === 'assistant' &&
+        Array.isArray(content) &&
+        content.some((part) => part?.type === 'tool-call') &&
+        message.reasoning_content === undefined) {
+        return true;
+    }
+    return message?.role === 'assistant' && Array.isArray(message.tool_calls) && message.reasoning_content === undefined;
+}
+export function mergeAssistantReasoningIntoToolCalls(messages) {
+    const merged = [];
+    for (const message of messages) {
+        const previous = merged[merged.length - 1];
+        if (isAssistantReasoningOnlyMessage(previous) && isAssistantToolCallMessage(message)) {
+            if (Array.isArray(previous.content) && Array.isArray(message.content)) {
+                merged[merged.length - 1] = {
+                    ...message,
+                    content: [...previous.content, ...message.content],
+                };
+                continue;
+            }
+            merged[merged.length - 1] = {
+                ...message,
+                reasoning_content: previous.reasoning_content,
+            };
+            continue;
+        }
+        merged.push(message);
+    }
+    return merged;
+}
+function normalizeOptions(options) {
+    if (!Array.isArray(options?.prompt) && !Array.isArray(options?.messages)) {
+        return options;
+    }
+    return {
+        ...options,
+        ...(Array.isArray(options.prompt) ? { prompt: mergeAssistantReasoningIntoToolCalls(options.prompt) } : {}),
+        ...(Array.isArray(options.messages) ? { messages: mergeAssistantReasoningIntoToolCalls(options.messages) } : {}),
+    };
+}
+export function withMergedAssistantReasoning(model) {
+    return new Proxy(model, {
+        get(target, property) {
+            if (property === 'doGenerate') {
+                return (options) => target.doGenerate(normalizeOptions(options));
+            }
+            if (property === 'doStream') {
+                return (options) => target.doStream(normalizeOptions(options));
+            }
+            return Reflect.get(target, property, target);
+        },
+    });
+}
+//# 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,195 @@
+import test from 'ava';
+import { mergeAssistantReasoningIntoToolCalls, withMergedAssistantReasoning } from './ai-sdk-message-normalizer.js';
+test('mergeAssistantReasoningIntoToolCalls 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(mergeAssistantReasoningIntoToolCalls(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('mergeAssistantReasoningIntoToolCalls 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(mergeAssistantReasoningIntoToolCalls(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('mergeAssistantReasoningIntoToolCalls preserves messages that are not split reasoning and tool calls', (t) => {
+    const messages = [
+        {
+            role: 'assistant',
+            content: 'visible text',
+            reasoning_content: 'internal reasoning',
+        },
+        {
+            role: 'assistant',
+            content: null,
+            tool_calls: [{ id: 'call:0' }],
+        },
+        {
+            role: 'assistant',
+            content: '',
+            reasoning_content: 'already has a tool call',
+            tool_calls: [{ id: 'call:1' }],
+        },
+    ];
+    t.deepEqual(mergeAssistantReasoningIntoToolCalls(messages), messages);
+});
+test('withMergedAssistantReasoning normalizes doGenerate messages before delegating', async (t) => {
+    let delegatedOptions;
+    const model = withMergedAssistantReasoning({
+        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('withMergedAssistantReasoning normalizes doStream messages before delegating', async (t) => {
+    let delegatedOptions;
+    const model = withMergedAssistantReasoning({
+        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('withMergedAssistantReasoning 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 = withMergedAssistantReasoning(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.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":"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"}

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

@@ -1,5 +1,6 @@
 import { aisdk } from '@openai/agents-extensions/ai-sdk';
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
+import { withMergedAssistantReasoning } from './ai-sdk-message-normalizer.js';
 export class AiSdkOpenAICompatibleProvider {
     #label;
     #defaultModel;
@@ -20,7 +21,7 @@ export class AiSdkOpenAICompatibleProvider {
             headers: config.headers,
             includeUsage: true,
         });
-        return aisdk(provider(modelName || this.#defaultModel));
+        return aisdk(withMergedAssistantReasoning(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,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"}