@itphx/synth-core 0.2.0 → 0.4.4

package/dist/providers/ollama.js

@@ -13,10 +13,16 @@ export class OllamaProvider extends BaseProvider {
             temperature: this.temperature,
             stream: !!stream,
         };
+        if (this.reasoningLevel === 'low')
+            body.think = true;
+        else if (this.reasoningLevel === 'none')
+            body.think = false;
         if (systemPrompt)
             body.system = systemPrompt;
         if (tools?.length)
             body.tools = this._formatTools(tools);
+        if (this.numCtx && this.numCtx > 0)
+            body.options = { num_ctx: this.numCtx };
         const headers = { 'Content-Type': 'application/json' };
         debugCollector?.captureApiRequest(this.url, 'POST', headers, body);
         const controller = new AbortController();
@@ -50,10 +56,16 @@ export class OllamaProvider extends BaseProvider {
             temperature: this.temperature,
             stream: true,
         };
+        if (this.reasoningLevel === 'low')
+            body.think = true;
+        else if (this.reasoningLevel === 'none')
+            body.think = false;
         if (systemPrompt)
             body.system = systemPrompt;
         if (tools?.length)
             body.tools = this._formatTools(tools);
+        if (this.numCtx && this.numCtx > 0)
+            body.options = { num_ctx: this.numCtx };
         const headers = { 'Content-Type': 'application/json' };
         debugCollector?.captureApiRequest(this.url, 'POST', headers, body);
         let accumulatedReasoning = '';
@@ -62,13 +74,36 @@ export class OllamaProvider extends BaseProvider {
         const accumulatedToolCalls = [];
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), this.timeout * 1000);
+        // Таймаут — только на ожидание первого чанка. Как только стрим пошёл,
+        // таймер снимается, дальше стрим длится сколько нужно.
+        let firstChunkReceived = false;
+        // Кнопка «Стоп»: отмена пользователя (cancellationToken.cancel) немедленно
+        // прерывает висящий fetch/reader.read() через AbortController — иначе
+        // reader.read() висит до таймаута 120с и отмена не работает.
+        if (cancellationToken) {
+            const originalCancel = cancellationToken.cancel.bind(cancellationToken);
+            cancellationToken.cancel = () => {
+                originalCancel();
+                controller.abort();
+            };
+        }
         try {
-            const resp = await fetch(this.url, {
-                method: 'POST',
-                headers,
-                body: JSON.stringify(body),
-                signal: controller.signal,
-            });
+            let resp;
+            try {
+                resp = await fetch(this.url, {
+                    method: 'POST',
+                    headers,
+                    body: JSON.stringify(body),
+                    signal: controller.signal,
+                });
+            }
+            catch (e) {
+                // Отмена пользователя — abort() из cancellationToken до/во время fetch:
+                // молча завершаем генератор, не превращая в stream.error.
+                if (cancellationToken?.cancelled)
+                    return;
+                throw e;
+            }
             if (!resp.ok) {
                 const errorText = await resp.text();
                 this._handleErrors(resp.status, errorText);
@@ -100,6 +135,10 @@ export class OllamaProvider extends BaseProvider {
                             debugCollector?.captureRawModelResponse(trimmed);
                             const msg = chunkData.message;
                             if (msg?.content && typeof msg.content === 'string') {
+                                if (!firstChunkReceived) {
+                                    firstChunkReceived = true;
+                                    clearTimeout(timer);
+                                }
                                 const hasReasoning = !!accumulatedReasoning;
                                 accumulatedContent += msg.content;
                                 yield {
@@ -113,18 +152,27 @@ export class OllamaProvider extends BaseProvider {
                                     accumulatedReasoning = '';
                             }
                             if (msg?.tool_calls) {
+                                if (!firstChunkReceived) {
+                                    firstChunkReceived = true;
+                                    clearTimeout(timer);
+                                }
                                 for (const tc of msg.tool_calls) {
                                     accumulatedToolCalls.push({
                                         id: tc.id,
                                         type: 'function',
                                         function: {
                                             name: tc.function?.name,
-                                            arguments: tc.function?.arguments,
+                                            // Строку → объект: единообразие с _parseResponse.
+                                            arguments: this._normalizeToolArguments(tc.function?.arguments),
                                         },
                                     });
                                 }
                             }
                             if (msg?.thinking && typeof msg.thinking === 'string') {
+                                if (!firstChunkReceived) {
+                                    firstChunkReceived = true;
+                                    clearTimeout(timer);
+                                }
                                 accumulatedReasoning += msg.thinking;
                                 debugCollector?.captureReasoning(accumulatedReasoning);
                                 yield {
@@ -148,7 +196,14 @@ export class OllamaProvider extends BaseProvider {
                 }
             }
             catch (e) {
-                info('OLLAMA', `Стрим прерван: ${e}`);
+                // Ошибки чтения стрима (таймаут/обрыв сети/AbortError) пробрасываем
+                // наружу — иначе генератор «успешно» завершится с пустым ответом и
+                // оркестратор не узнает о сбое провайдера. При пользовательской
+                // отмене (cancellationToken) молча выходим.
+                if (!cancellationToken?.cancelled) {
+                    info('OLLAMA', `Стрим прерван: ${e}`);
+                    throw e;
+                }
             }
             finally {
                 reader.releaseLock();
@@ -207,6 +262,15 @@ export class OllamaProvider extends BaseProvider {
         return data2.embedding ?? [];
     }
     async listModels() {
+        const models = await this.listModelsDetailed();
+        return models.map((m) => m.id);
+    }
+    /**
+     * Список моделей с контекстным окном из /api/tags.
+     * Ollama отдаёт context_length внутри details.context_length
+     * (а в некоторых версиях — в model_info.context_length).
+     */
+    async listModelsDetailed() {
         const baseUrl = this.url.replace('/api/chat', '').replace('/v1/chat/completions', '');
         const tagsUrl = `${baseUrl}/api/tags`;
         try {
@@ -216,7 +280,12 @@ export class OllamaProvider extends BaseProvider {
             clearTimeout(timer);
             if (resp.ok) {
                 const data = await resp.json();
-                return (data.models || []).map((m) => m.name).filter(Boolean);
+                return (data.models || [])
+                    .map((m) => ({
+                    id: m.name,
+                    contextWindow: this._extractContextWindow(m),
+                }))
+                    .filter((m) => m.id);
             }
         }
         catch {
@@ -224,6 +293,37 @@ export class OllamaProvider extends BaseProvider {
         }
         return [];
     }
+    /**
+     * Извлекает размер контекстного окна из записи /api/tags.
+     * Поле может лежать в details.context_length или model_info
+     * (context_length / ContextLength / llama.context_length) — берём
+     * первый числовой вариант. Если окно неизвестно — возвращаем undefined.
+     */
+    _extractContextWindow(model) {
+        const info = model.model_info ?? {};
+        const raw = model.details?.context_length
+            ?? info.context_length
+            ?? info.ContextLength
+            ?? info['llama.context_length'];
+        const num = typeof raw === 'number' ? raw : Number(raw);
+        return Number.isFinite(num) && num > 0 ? num : undefined;
+    }
+    /**
+     * Нормализует function.arguments в tool_calls: JSON-строка → объект.
+     * Сборка Ollama (0.32.x, llama-server c --spec-type draft-mtp) принимает
+     * только объект и падает с 400 «can't find closing '}'» на строке.
+     * Если парсинг не удался — оставляем строку как есть (не роняем запрос).
+     */
+    _normalizeToolArguments(args) {
+        if (typeof args !== 'string')
+            return args;
+        try {
+            return JSON.parse(args);
+        }
+        catch {
+            return args;
+        }
+    }
     _formatMessages(messages) {
         const formatted = [];
         for (const msg of messages) {
@@ -240,8 +340,22 @@ export class OllamaProvider extends BaseProvider {
                 continue;
             }
             const entry = { role: msg.role, content: msg.content };
-            if (msg.toolUse)
-                entry.tool_calls = msg.toolUse;
+            if (msg.toolUse) {
+                // Старые сессии хранят arguments строкой — приводим к объекту
+                // перед отправкой, иначе Ollama вернёт 400.
+                entry.tool_calls = msg.toolUse.map((tc) => {
+                    const fn = tc.function;
+                    if (!fn || typeof fn.arguments === 'undefined')
+                        return tc;
+                    return {
+                        ...tc,
+                        function: {
+                            ...fn,
+                            arguments: this._normalizeToolArguments(fn.arguments),
+                        },
+                    };
+                });
+            }
             formatted.push(entry);
         }
         return formatted;
@@ -259,7 +373,9 @@ export class OllamaProvider extends BaseProvider {
                 type: 'function',
                 function: {
                     name: tc.function?.name,
-                    arguments: tc.function?.arguments,
+                    // Строку → объект, чтобы в сессию сохранялись объекты (единообразие)
+                    // и повторная отправка не ломалась.
+                    arguments: this._normalizeToolArguments(tc.function?.arguments),
                 },
             }));
         }

package/dist/providers/ollama.js.map

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

package/dist/providers/ollama.test.d.ts

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

package/dist/providers/ollama.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ollama.test.d.ts","sourceRoot":"","sources":["../../src/providers/ollama.test.ts"],"names":[],"mappings":""}

package/dist/providers/ollama.test.js

@@ -0,0 +1,129 @@
+import { describe, it, expect } from 'vitest';
+import { OllamaProvider } from './ollama.js';
+const baseParams = {
+    url: 'http://omn.example.test/api/chat',
+    apiKey: 'key',
+    model: 'qwen3.8:27b',
+    timeout: 30,
+};
+function makeMessage(overrides = {}) {
+    return {
+        id: 'm1',
+        role: 'assistant',
+        content: '',
+        usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
+        disabled: false,
+        pinned: false,
+        branchId: 'b1',
+        ...overrides,
+    };
+}
+const STRING_ARGS = '{"category": "research"}';
+describe('OllamaProvider — нормализация function.arguments', () => {
+    const provider = new OllamaProvider(baseParams);
+    function firstToolCall(formatted) {
+        const tc = formatted[0].tool_calls[0];
+        return tc;
+    }
+    it('_formatMessages: arguments-строка превращается в объект', () => {
+        const formatted = provider._formatMessages([
+            makeMessage({
+                toolUse: [
+                    {
+                        index: 0,
+                        id: 'call_1',
+                        type: 'function',
+                        function: { name: 'classify_conversation', arguments: STRING_ARGS },
+                    },
+                ],
+            }),
+        ]);
+        const tc = firstToolCall(formatted);
+        const fn = tc.function;
+        expect(fn.arguments).toEqual({ category: 'research' });
+        expect(fn.name).toBe('classify_conversation');
+        expect(tc.id).toBe('call_1');
+        expect(tc.index).toBe(0);
+    });
+    it('_formatMessages: уже объект не трогается', () => {
+        const argsObj = { query: 'тест' };
+        const formatted = provider._formatMessages([
+            makeMessage({
+                toolUse: [
+                    {
+                        id: 'call_2',
+                        type: 'function',
+                        function: { name: 'web_search', arguments: argsObj },
+                    },
+                ],
+            }),
+        ]);
+        const fn = firstToolCall(formatted).function;
+        expect(fn.arguments).toBe(argsObj);
+    });
+    it('_formatMessages: невалидная JSON-строка остаётся строкой (не роняем запрос)', () => {
+        const bad = '{не json';
+        const formatted = provider._formatMessages([
+            makeMessage({
+                toolUse: [
+                    {
+                        id: 'call_3',
+                        type: 'function',
+                        function: { name: 'tool', arguments: bad },
+                    },
+                ],
+            }),
+        ]);
+        const fn = firstToolCall(formatted).function;
+        expect(fn.arguments).toBe(bad);
+    });
+    it('_formatMessages: отсутствие arguments не ломает отправку', () => {
+        const formatted = provider._formatMessages([
+            makeMessage({
+                toolUse: [
+                    { id: 'call_4', type: 'function', function: { name: 'noop' } },
+                ],
+            }),
+        ]);
+        const tc = firstToolCall(formatted);
+        expect(tc.function.name).toBe('noop');
+        expect(tc.function.arguments).toBeUndefined();
+    });
+    it('_parseResponse: arguments-строка из ответа превращается в объект', () => {
+        const resp = provider._parseResponse({
+            message: {
+                role: 'assistant',
+                content: '',
+                tool_calls: [
+                    {
+                        index: 0,
+                        id: 'call_5',
+                        type: 'function',
+                        function: { name: 'classify_conversation', arguments: STRING_ARGS },
+                    },
+                ],
+            },
+        });
+        const fn = resp.toolCalls[0].function;
+        expect(fn.arguments).toEqual({ category: 'research' });
+    });
+    it('_parseResponse: невалидная строка остаётся строкой (fallback)', () => {
+        const bad = 'не json';
+        const resp = provider._parseResponse({
+            message: {
+                role: 'assistant',
+                content: '',
+                tool_calls: [
+                    {
+                        id: 'call_6',
+                        type: 'function',
+                        function: { name: 'tool', arguments: bad },
+                    },
+                ],
+            },
+        });
+        const fn = resp.toolCalls[0].function;
+        expect(fn.arguments).toBe(bad);
+    });
+});
+//# sourceMappingURL=ollama.test.js.map

package/dist/providers/ollama.test.js.map

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

package/dist/providers/openai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAc,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,KAAK,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAElF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,qBAAa,cAAe,SAAQ,YAAY;IAC9C,eAAe,IAAI,MAAM;IAInB,IAAI,CACR,QAAQ,EAAE,UAAU,EAAE,EACtB,YAAY,CAAC,EAAE,MAAM,EACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EACjC,MAAM,CAAC,EAAE,OAAO,EAChB,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,WAAW,CAAC;IA4ChB,SAAS,CACd,QAAQ,EAAE,UAAU,EAAE,EACtB,YAAY,CAAC,EAAE,MAAM,EACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EACjC,cAAc,CAAC,EAAE,cAAc,EAC/B,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,cAAc,CAAC,QAAQ,CAAC;IAqKrB,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAyBrC,OAAO,CAAC,eAAe;IA+BvB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,aAAa;CAatB"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAc,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,KAAK,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAElF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,qBAAa,cAAe,SAAQ,YAAY;IAC9C,eAAe,IAAI,MAAM;IAInB,IAAI,CACR,QAAQ,EAAE,UAAU,EAAE,EACtB,YAAY,CAAC,EAAE,MAAM,EACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EACjC,MAAM,CAAC,EAAE,OAAO,EAChB,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,WAAW,CAAC;IA8ChB,SAAS,CACd,QAAQ,EAAE,UAAU,EAAE,EACtB,YAAY,CAAC,EAAE,MAAM,EACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EACjC,cAAc,CAAC,EAAE,cAAc,EAC/B,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,cAAc,CAAC,QAAQ,CAAC;IAiNrB,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAyBrC,OAAO,CAAC,eAAe;IAsDvB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,aAAa;CAatB"}

package/dist/providers/openai.js

@@ -13,6 +13,8 @@ export class OpenAIProvider extends BaseProvider {
             messages: formattedMessages,
             temperature: this.temperature,
         };
+        if (this.reasoningLevel && this.reasoningLevel !== 'default')
+            body.reasoning_effort = this.reasoningLevel;
         if (this.topP !== undefined)
             body.top_p = this.topP;
         if (this.topK !== undefined)
@@ -21,6 +23,8 @@ export class OpenAIProvider extends BaseProvider {
             body.tools = tools;
         if (stream)
             body.stream = true;
+        if (this.maxTokens && this.maxTokens > 0)
+            body.max_tokens = this.maxTokens;
         const headers = this._getHeaders();
         debugCollector?.captureApiRequest(this.url, 'POST', headers, body);
         const controller = new AbortController();
@@ -55,12 +59,16 @@ export class OpenAIProvider extends BaseProvider {
             temperature: this.temperature,
             stream: true,
         };
+        if (this.reasoningLevel && this.reasoningLevel !== 'default')
+            body.reasoning_effort = this.reasoningLevel;
         if (this.topP !== undefined)
             body.top_p = this.topP;
         if (this.topK !== undefined)
             body.top_k = this.topK;
         if (tools?.length)
             body.tools = tools;
+        if (this.maxTokens && this.maxTokens > 0)
+            body.max_tokens = this.maxTokens;
         const headers = this._getHeaders();
         debugCollector?.captureApiRequest(this.url, 'POST', headers, body);
         let accumulatedContent = '';
@@ -69,13 +77,36 @@ export class OpenAIProvider extends BaseProvider {
         const accumulatedToolCalls = [];
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), this.timeout * 1000);
+        // Таймаут — только на ожидание первого чанка. Как только стрим пошёл,
+        // таймер снимается, дальше стрим длится сколько нужно.
+        let firstChunkReceived = false;
+        // Кнопка «Стоп»: отмена пользователя (cancellationToken.cancel) немедленно
+        // прерывает висящий fetch/reader.read() через AbortController — иначе
+        // reader.read() висит до таймаута 120с и отмена не работает.
+        if (cancellationToken) {
+            const originalCancel = cancellationToken.cancel.bind(cancellationToken);
+            cancellationToken.cancel = () => {
+                originalCancel();
+                controller.abort();
+            };
+        }
         try {
-            const resp = await fetch(this.url, {
-                method: 'POST',
-                headers,
-                body: JSON.stringify(body),
-                signal: controller.signal,
-            });
+            let resp;
+            try {
+                resp = await fetch(this.url, {
+                    method: 'POST',
+                    headers,
+                    body: JSON.stringify(body),
+                    signal: controller.signal,
+                });
+            }
+            catch (e) {
+                // Отмена пользователя — abort() из cancellationToken до/во время fetch:
+                // молча завершаем генератор, не превращая в stream.error.
+                if (cancellationToken?.cancelled)
+                    return;
+                throw e;
+            }
             if (!resp.ok) {
                 const errorText = await resp.text();
                 this._handleErrors(resp.status, errorText);
@@ -114,6 +145,10 @@ export class OpenAIProvider extends BaseProvider {
                                 if (delta.reasoning_content && typeof delta.reasoning_content === 'string') {
                                     if (delta.reasoning_content === '.' || delta.reasoning_content === '.\n')
                                         continue;
+                                    if (!firstChunkReceived) {
+                                        firstChunkReceived = true;
+                                        clearTimeout(timer);
+                                    }
                                     accumulatedReasoning += delta.reasoning_content;
                                     yield {
                                         content: '',
@@ -123,6 +158,10 @@ export class OpenAIProvider extends BaseProvider {
                                     };
                                 }
                                 if (delta.content && typeof delta.content === 'string') {
+                                    if (!firstChunkReceived) {
+                                        firstChunkReceived = true;
+                                        clearTimeout(timer);
+                                    }
                                     accumulatedContent += delta.content;
                                     yield {
                                         content: delta.content,
@@ -133,6 +172,10 @@ export class OpenAIProvider extends BaseProvider {
                                     };
                                 }
                                 if (delta.tool_calls) {
+                                    if (!firstChunkReceived) {
+                                        firstChunkReceived = true;
+                                        clearTimeout(timer);
+                                    }
                                     for (const tc of delta.tool_calls) {
                                         const tcIndex = tc.index;
                                         const func = tc.function;
@@ -175,7 +218,14 @@ export class OpenAIProvider extends BaseProvider {
                 }
             }
             catch (e) {
-                info('OPENAI', `Стрим прерван: ${e}`);
+                // Ошибки чтения стрима (таймаут/обрыв сети/AbortError) пробрасываем
+                // наружу — иначе генератор «успешно» завершится с пустым ответом и
+                // оркестратор не узнает о сбое провайдера. При пользовательской
+                // отмене (cancellationToken) молча выходим.
+                if (!cancellationToken?.cancelled) {
+                    info('OPENAI', `Стрим прерван: ${e}`);
+                    throw e;
+                }
             }
             finally {
                 reader.releaseLock();
@@ -239,10 +289,33 @@ export class OpenAIProvider extends BaseProvider {
                 role: msg.role,
                 content: msg.content,
             };
-            if (msg.toolUse)
-                entry.tool_calls = msg.toolUse;
+            if (msg.toolUse) {
+                // Нормализация function.arguments: объект → JSON-строка. OpenAI-совместимые
+                // API (DeepSeek через open-webui) требуют строку и возвращают 400
+                // «invalid type: map, expected a string» на объекте. Строку не трогаем,
+                // невалидное/undefined оставляем как есть — запрос не роняем.
+                entry.tool_calls = msg.toolUse.map((tc) => {
+                    const fn = tc.function;
+                    if (!fn || typeof fn.arguments !== 'object' || fn.arguments === null)
+                        return tc;
+                    try {
+                        return {
+                            ...tc,
+                            function: { ...fn, arguments: JSON.stringify(fn.arguments) },
+                        };
+                    }
+                    catch {
+                        return tc;
+                    }
+                });
+            }
             if (msg.toolCallId)
                 entry.tool_call_id = msg.toolCallId;
+            // DeepSeek reasoning-модели требуют возврат reasoning_content в повторной
+            // истории (иначе 400 «The reasoning_content ... must be passed back»).
+            if (msg.role === 'assistant' && msg.reasoning) {
+                entry.reasoning_content = msg.reasoning;
+            }
             formatted.push(entry);
         }
         return formatted;