@itphx/synth-core 0.2.0 → 0.3.0

package/dist/engine/llm-error.js

@@ -0,0 +1,86 @@
+/**
+ * Общая классификация ошибок LLM-провайдеров.
+ *
+ * Вынесено из ChatOrchestrator (_classifyError / _isRecoverable), чтобы
+ * retry-цикл саб-агента (task.ts / task-resume.ts) использовал ту же
+ * таксономию, что и QueueProcessor основной сессии:
+ *   recoverable   — network_error, timeout, rate_limit, server_error, unknown
+ *   unrecoverable — auth_error, model_not_found, context_length, provider_not_found
+ */
+import { ContextLengthExceededError } from '../providers/exceptions.js';
+/**
+ * Классификация ошибки провайдера по тексту. Совпадает с
+ * ChatOrchestrator._classifyError (оркестратор делегирует сюда).
+ */
+export function classifyLlmError(errMsg) {
+    const lower = errMsg.toLowerCase();
+    if (lower.includes('rate') || lower.includes('limit') || lower.includes('429'))
+        return 'rate_limit';
+    if (lower.includes('abort') || lower.includes('operation was aborted'))
+        return 'timeout';
+    if (lower.includes('timeout') || lower.includes('timed out'))
+        return 'timeout';
+    if (lower.includes('fetch failed') || lower.includes('network') || lower.includes('econnrefused') || lower.includes('enotfound') || lower.includes('eai_again'))
+        return 'network_error';
+    if (lower.includes('502') || lower.includes('503') || lower.includes('bad gateway'))
+        return 'server_error';
+    if (lower.includes('context length') || lower.includes('too long'))
+        return 'context_length';
+    if (lower.includes('401') || lower.includes('403') || lower.includes('auth'))
+        return 'auth_error';
+    if (lower.includes('model') && (lower.includes('not found') || lower.includes('invalid')))
+        return 'model_not_found';
+    return 'unknown';
+}
+/** Типы ошибок, при которых повтор не имеет смысла. */
+const UNRECOVERABLE_TYPES = [
+    'auth_error', 'model_not_found', 'context_length', 'provider_not_found',
+    'validation',
+];
+/**
+ * Подстроки, однозначно указывающие на невосполнимую ошибку.
+ *
+ * Единая точка истины — объединение из трёх ранее расходившихся списков:
+ *   - llm-error.ts (auth/model/key/подстрока 401): model not found,
+ *     model_not_found, does not exist, invalid model, unknown model,
+ *     invalid api key, incorrect api key, 401, authentication, unauthorized
+ *   - queue/processor.ts._isRecoverable (валидация/десериализация/type):
+ *     missing field, failed to deserialize, invalid type, unknown field,
+ *     bad request, validation, err_invalid_arg_type, cannot read properties,
+ *     is not a function, is not defined
+ */
+const UNRECOVERABLE_PATTERNS = [
+    'model not found', 'model_not_found', 'does not exist',
+    'invalid model', 'unknown model', 'invalid api key',
+    'incorrect api key', '401', 'authentication', 'unauthorized',
+    'missing field', 'failed to deserialize', 'invalid type',
+    'unknown field', 'bad request', 'validation',
+    'err_invalid_arg_type', 'cannot read properties',
+    'is not a function', 'is not defined',
+];
+/**
+ * Политика ретрая LLM-провайдеров — единая для основной сессии
+ * (QueueProcessor/оркестратор) и саб-агента (task.ts).
+ */
+export const LLM_MAX_ATTEMPTS = 3;
+/** Backoff между попытками, мс (index = попытка - 1). */
+export const LLM_RETRY_DELAYS_MS = [5000, 15000, 30000];
+/**
+ * Восполняемая ли ошибка провайдера (можно ретраить): network/timeout/
+ * rate_limit/server_error — да; auth/model_not_found/context_length —
+ * нет. Приоритеты:
+ *   1. ContextLengthExceededError (по классу) — невосполнима.
+ *   2. Явно переданный `errorType` из UNRECOVERABLE_TYPES — невосполнима.
+ *   3. Иначе — по подстрокам UNRECOVERABLE_PATTERNS в
+ *      `errMsg ?? error.message ?? String(error)`.
+ */
+export function isLlmErrorRecoverable(error, errMsg, errorType) {
+    if (error instanceof ContextLengthExceededError)
+        return false;
+    if (errorType && UNRECOVERABLE_TYPES.includes(errorType))
+        return false;
+    const raw = errMsg ?? (error instanceof Error ? error.message : String(error));
+    const lower = raw.toLowerCase();
+    return !UNRECOVERABLE_PATTERNS.some((p) => lower.includes(p));
+}
+//# sourceMappingURL=llm-error.js.map

package/dist/engine/llm-error.js.map

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

package/dist/engine/llm-error.test.d.ts

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

package/dist/engine/llm-error.test.d.ts.map

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

package/dist/engine/llm-error.test.js

@@ -0,0 +1,101 @@
+import { describe, it, expect } from 'vitest';
+import { classifyLlmError, isLlmErrorRecoverable, LLM_MAX_ATTEMPTS, LLM_RETRY_DELAYS_MS } from './llm-error.js';
+import { ContextLengthExceededError } from '../providers/exceptions.js';
+describe('classifyLlmError — единая таксономия типов', () => {
+    it('классифицирует recoverable-ошибки', () => {
+        expect(classifyLlmError('rate limit exceeded')).toBe('rate_limit');
+        expect(classifyLlmError('429 Too Many Requests')).toBe('rate_limit');
+        expect(classifyLlmError('timeout')).toBe('timeout');
+        expect(classifyLlmError('fetch failed: ECONNREFUSED')).toBe('network_error');
+        expect(classifyLlmError('502 Bad Gateway')).toBe('server_error');
+        expect(classifyLlmError('503 Service Unavailable')).toBe('server_error');
+    });
+    it('классифицирует unrecoverable-ошибки', () => {
+        expect(classifyLlmError('401 Unauthorized')).toBe('auth_error');
+        expect(classifyLlmError('model not found')).toBe('model_not_found');
+        expect(classifyLlmError('context length exceeded')).toBe('context_length');
+        expect(classifyLlmError('неизвестное')).toBe('unknown');
+    });
+});
+describe('isLlmErrorRecoverable — объединённый набор паттернов', () => {
+    // Представительные строки из бывшего списка llm-error.ts (auth/model/key).
+    it.each([
+        'model not found',
+        'model_not_found',
+        'model does not exist',
+        'invalid model selected',
+        'unknown model',
+        'invalid api key',
+        'incorrect api key',
+        'HTTP 401',
+        'authentication required',
+        'unauthorized',
+    ])('паттерн llm-error.ts: %s → unrecoverable (false)', (msg) => {
+        expect(isLlmErrorRecoverable(new Error(msg))).toBe(false);
+    });
+    // Представительные строки из бывшего списка queue/processor.ts._isRecoverable
+    // (валидация/десериализация/type).
+    it.each([
+        'missing field: name',
+        'failed to deserialize',
+        'invalid type: expected string',
+        'unknown field',
+        'bad request',
+        'validation error',
+        'err_invalid_arg_type',
+        'cannot read properties of undefined',
+        'x is not a function',
+        'y is not defined',
+    ])('паттерн processor.ts: %s → unrecoverable (false)', (msg) => {
+        expect(isLlmErrorRecoverable(undefined, msg)).toBe(false);
+    });
+    // Recoverable-строки должны остаться восполняемыми.
+    it.each([
+        'fetch failed: ECONNREFUSED',
+        '503 Service Unavailable',
+        'rate limit exceeded',
+        'AbortError: This operation was aborted',
+        'request timed out',
+        'connection reset',
+        'неизвестная ошибка',
+    ])('recoverable-строка: %s → true', (msg) => {
+        expect(isLlmErrorRecoverable(new Error(msg), msg)).toBe(true);
+    });
+    it('использует error.message при отсутствии errMsg', () => {
+        expect(isLlmErrorRecoverable(new Error('invalid api key'))).toBe(false);
+        expect(isLlmErrorRecoverable(new Error('fetch failed'))).toBe(true);
+    });
+    it('использует String(error) для не-Error значений', () => {
+        expect(isLlmErrorRecoverable('401 Unauthorized')).toBe(false);
+        expect(isLlmErrorRecoverable('timeout')).toBe(true);
+    });
+});
+describe('isLlmErrorRecoverable — приоритет errorType', () => {
+    // errorType из UNRECOVERABLE_TYPES -> false, даже если текст их не содержит.
+    it.each(['context_length', 'auth_error', 'model_not_found', 'provider_not_found', 'validation'])('errorType=%s → false даже без совпадения по тексту', (type) => {
+        expect(isLlmErrorRecoverable(new Error('argle bargle'), 'argle bargle', type)).toBe(false);
+    });
+    // recoverable-типы в errorType → true (текст не содержит паттернов).
+    it.each(['timeout', 'network_error', 'rate_limit', 'server_error', 'unknown'])('errorType=%s → true', (type) => {
+        expect(isLlmErrorRecoverable(new Error('argle bargle'), 'argle bargle', type)).toBe(true);
+    });
+    it('errorType=context_length побеждает даже при recoverable-тексте', () => {
+        expect(isLlmErrorRecoverable(new Error('fetch failed'), 'fetch failed', 'context_length')).toBe(false);
+    });
+});
+describe('isLlmErrorRecoverable — ContextLengthExceededError', () => {
+    it('возвращает false по классу ошибки (не по тексту)', () => {
+        // Текст «too long» НЕ входит в UNRECOVERABLE_PATTERNS — решает именно класс.
+        expect(isLlmErrorRecoverable(new ContextLengthExceededError('too long'))).toBe(false);
+        expect(isLlmErrorRecoverable(new ContextLengthExceededError('Контекстное окно превышено'))).toBe(false);
+    });
+});
+describe('Политика ретрая — единые константы', () => {
+    it('LLM_MAX_ATTEMPTS = 3', () => {
+        expect(LLM_MAX_ATTEMPTS).toBe(3);
+    });
+    it('LLM_RETRY_DELAYS_MS = [5000, 15000, 30000]', () => {
+        expect(LLM_RETRY_DELAYS_MS).toEqual([5000, 15000, 30000]);
+    });
+});
+//# sourceMappingURL=llm-error.test.js.map

package/dist/engine/llm-error.test.js.map

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

package/dist/engine/orchestrator-deny-abort.test.d.ts

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

package/dist/engine/orchestrator-deny-abort.test.d.ts.map

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

package/dist/engine/orchestrator-deny-abort.test.js

@@ -0,0 +1,414 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { z } from 'zod';
+import { ChatOrchestrator } from './orchestrator.js';
+import { SessionManager } from '../sessions/manager.js';
+import { FileStore } from '../storage/file-store.js';
+import { EventBus } from '../events/bus.js';
+import { createToolRegistry } from './tools/index.js';
+import { ContextConfig } from './context/config.js';
+import { ProviderFactory, BaseProvider } from '../providers/base.js';
+import { generateId, MessageRole, nowISO, makeTextPart, ToolCapability } from '@itphx/synth-shared';
+function makeCtxBuilder() {
+    return {
+        buildSystemPrompt: async () => 'system prompt',
+    };
+}
+function makeMessage() {
+    return {
+        id: generateId(),
+        role: MessageRole.USER,
+        seq: 0,
+        origin: 'local',
+        parts: [makeTextPart('выполни задачу')],
+        content: 'выполни задачу',
+        createdAt: nowISO(),
+        disabled: false,
+        pinned: false,
+        hidden: false,
+        author: 'user',
+        metadata: { stream_id: generateId() },
+    };
+}
+/**
+ * Провайдер для теста deny + пустой финальный ответ:
+ * вызовы 0..2 — execute_shell с опасной командой (deny по системной
+ * shell-политике definitions/shell-policy.json), вызов 3 — пустой
+ * контент без toolCalls (модель «сдалась» после серии deny).
+ */
+class MockDenyLoopProvider extends BaseProvider {
+    static calls = 0;
+    _next() {
+        if (MockDenyLoopProvider.calls < 3) {
+            const n = MockDenyLoopProvider.calls;
+            return {
+                content: '',
+                toolCalls: [{
+                        id: `call_d${n}`,
+                        function: { name: 'execute_shell', arguments: JSON.stringify({ command: 'rm -rf /' }) },
+                    }],
+            };
+        }
+        return { content: '', toolCalls: undefined };
+    }
+    async chat(_messages, _systemPrompt, _tools) {
+        const next = this._next();
+        MockDenyLoopProvider.calls++;
+        return { content: next.content, model: this.model, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 }, toolCalls: next.toolCalls };
+    }
+    async *chatAsync(_messages, _systemPrompt, _tools, _debugCollector, _cancellationToken) {
+        const next = this._next();
+        MockDenyLoopProvider.calls++;
+        yield { content: next.content, isFinal: true, toolCalls: next.toolCalls, model: this.model, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 } };
+    }
+    getProviderName() {
+        return 'mockdenyloop';
+    }
+}
+/**
+ * Провайдер для теста abort:
+ * вызов 0 — завершённая итерация: текст + execute_shell (deny);
+ * вызов 1 — медленный стрим текста, прерывается abort'ом.
+ */
+class MockAbortProvider extends BaseProvider {
+    static calls = 0;
+    async chat(_messages, _systemPrompt, _tools) {
+        return { content: 'x', model: this.model, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 } };
+    }
+    async *chatAsync(_messages, _systemPrompt, _tools, _debugCollector, ct) {
+        const n = MockAbortProvider.calls++;
+        if (n === 0) {
+            yield {
+                content: 'Шаг 1: анализ команды', isFinal: true,
+                toolCalls: [{ id: 'call_a0', function: { name: 'execute_shell', arguments: JSON.stringify({ command: 'rm -rf /' }) } }],
+                model: this.model, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 },
+            };
+            return;
+        }
+        const parts = ['Полный', ' частичный', ' ответ', ' — модель', ' уже', ' написала', ' это'];
+        for (const p of parts) {
+            if (ct?.cancelled)
+                return;
+            yield { content: p, isFinal: false, model: this.model, usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0 } };
+            await new Promise((r) => setTimeout(r, 10));
+        }
+        yield { content: 'Конец', isFinal: true, model: this.model, usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0 } };
+    }
+    getProviderName() {
+        return 'mockabort';
+    }
+}
+/** Провайдер: 3 одинаковых вызова read_file (НЕ deny), затем текст — для проверки сохранения doom loop. */
+class MockDoomProvider extends BaseProvider {
+    static calls = 0;
+    _next() {
+        if (MockDoomProvider.calls < 3) {
+            const n = MockDoomProvider.calls;
+            return {
+                content: '',
+                toolCalls: [{
+                        id: `call_r${n}`,
+                        function: { name: 'read_file', arguments: JSON.stringify({ file_path: 'x.txt' }) },
+                    }],
+            };
+        }
+        return { content: 'Готово' };
+    }
+    async chat(_messages, _systemPrompt, _tools) {
+        const next = this._next();
+        MockDoomProvider.calls++;
+        return { content: next.content, model: this.model, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 }, toolCalls: next.toolCalls };
+    }
+    async *chatAsync(_messages, _systemPrompt, _tools, _debugCollector, _cancellationToken) {
+        const next = this._next();
+        MockDoomProvider.calls++;
+        yield { content: next.content, isFinal: true, toolCalls: next.toolCalls, model: this.model, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 } };
+    }
+    getProviderName() {
+        return 'mockdoom';
+    }
+}
+/** Провайдер: всегда возвращает пустой контент без toolCalls (модель «не ответила»). */
+class MockEmptyProvider extends BaseProvider {
+    async chat(_messages, _systemPrompt, _tools) {
+        return { content: '', model: this.model, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 } };
+    }
+    async *chatAsync(_messages, _systemPrompt, _tools, _debugCollector, _cancellationToken) {
+        yield { content: '', isFinal: true, model: this.model, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 } };
+    }
+    getProviderName() {
+        return 'mockempty';
+    }
+}
+async function makeHarness(providerName) {
+    const tmpDir = await mkdtemp(join(tmpdir(), 'synth-deny-abort-'));
+    const store = new FileStore({ dataDir: tmpDir });
+    const sessionManager = new SessionManager(store);
+    const eventBus = new EventBus();
+    const orchestrator = new ChatOrchestrator({
+        sessionManager,
+        eventBus,
+        contextBuilder: makeCtxBuilder(),
+        providerLoader: (name) => {
+            return { name, type: providerName, baseUrl: '', apiKey: '', defaultModel: 'm' };
+        },
+        toolRegistry: createToolRegistry(),
+        permissionConfig: { rules: {}, askTimeoutMs: 1000 },
+        defaultWorkingDir: tmpDir,
+        contextConfig: new ContextConfig({ userDataDir: join(tmpDir, 'context') }),
+    });
+    const session = await sessionManager.createSession({
+        title: 'DenyAbort',
+        settings: { provider: providerName, model: 'm', systemPrompt: 'test', agentRole: 'developer' },
+    });
+    const msg = makeMessage();
+    await sessionManager.addMessage(session.id, msg);
+    return { orchestrator, sessionManager, eventBus, tmpDir, sessionId: session.id };
+}
+async function run(h, signal, publishChunk) {
+    const processMessage = h.orchestrator.createProcessMessage();
+    const fresh = (await h.sessionManager.getSession(h.sessionId));
+    const userMsg = fresh.messages.find((m) => m.role === MessageRole.USER);
+    return processMessage(fresh, userMsg, signal, publishChunk);
+}
+describe('ChatOrchestrator: deny × doom loop + abort (баги фикса)', () => {
+    beforeEach(() => {
+        ProviderFactory.register('mockdenyloop', MockDenyLoopProvider);
+        ProviderFactory.register('mockabort', MockAbortProvider);
+        ProviderFactory.register('mockdoom', MockDoomProvider);
+        ProviderFactory.register('mockempty', MockEmptyProvider);
+        MockDenyLoopProvider.calls = 0;
+        MockAbortProvider.calls = 0;
+        MockDoomProvider.calls = 0;
+    });
+    afterEach(async () => {
+        ProviderFactory['_providers'].delete('mockdenyloop');
+        ProviderFactory['_providers'].delete('mockabort');
+        ProviderFactory['_providers'].delete('mockdoom');
+        ProviderFactory['_providers'].delete('mockempty');
+    });
+    it('deny 3+ раза: каждый deny даёт tool_call.result с объяснением политики, без «Цикл прерван»; пустой ответ модели подставлен', async () => {
+        const h = await makeHarness('mockdenyloop');
+        const chunks = [];
+        const result = await run(h, new AbortController().signal, (event, data) => chunks.push({ event, data }));
+        expect(result.error).toBeUndefined();
+        // Все 3 deny-вызова публикуют tool_call.result (в т.ч. 3-й — раньше его глушил doom loop)
+        const denyResults = chunks
+            .filter((c) => c.event === 'tool_call.result')
+            .map((c) => c.data.result);
+        expect(denyResults).toHaveLength(3);
+        for (const r of denyResults) {
+            expect(r.isError).toBe(true);
+            expect(r.content).toContain('Permission denied');
+            // Инструкция модели для deny
+            expect(r.content).toContain('The action is prohibited by the security policy');
+            // Никаких «Цикл прерван» без объяснения
+            expect(r.content).not.toContain('Цикл прерван');
+        }
+        // tool_call.started публикуется и для 3-го вызова
+        const starts = chunks.filter((c) => c.event === 'tool_call.started');
+        expect(starts).toHaveLength(3);
+        // Пустой финальный ответ модели подставлен
+        const done = chunks.find((c) => c.event === 'stream.done');
+        expect(done.data.content).toBe('Could not proceed: the action was blocked by the security policy');
+        // В истории нет пустого assistant-сообщения
+        const session = (await h.sessionManager.getSession(h.sessionId));
+        const assistant = [...session.messages].reverse().find((m) => m.role === MessageRole.ASSISTANT && !m.metadata?.tool_chain);
+        expect(assistant).toBeDefined();
+        expect(assistant.content.length).toBeGreaterThan(0);
+        expect(assistant.content).toContain('Could not proceed');
+        await rm(h.tmpDir, { recursive: true, force: true });
+    });
+    it('abort во время генерации после deny: в истории полный текст всех итераций + tool_results с deny', async () => {
+        const h = await makeHarness('mockabort');
+        const ac = new AbortController();
+        const chunks = [];
+        let textChunks = 0;
+        const promise = run(h, ac.signal, (event, data) => {
+            chunks.push({ event, data });
+            // После 2-го текстового чанка незавершённой итерации — стоп
+            if (event === 'stream.chunk' && data.iteration === 1) {
+                textChunks++;
+                if (textChunks >= 2)
+                    setTimeout(() => ac.abort(), 5);
+            }
+        });
+        const result = await promise;
+        expect(result.error).toBeUndefined();
+        // stream.cancelled несёт полный накопленный текст (завершённая + текущая итерация)
+        const cancelled = chunks.find((c) => c.event === 'stream.cancelled');
+        const cancelledContent = cancelled.data.content;
+        expect(cancelledContent).toContain('Шаг 1: анализ команды');
+        expect(cancelledContent).toContain('Полный');
+        // Финальное assistant-сообщение содержит полный текст (не обрывок последней итерации)
+        const session = (await h.sessionManager.getSession(h.sessionId));
+        const assistant = [...session.messages].reverse().find((m) => m.role === MessageRole.ASSISTANT && !m.metadata?.tool_chain);
+        expect(assistant).toBeDefined();
+        expect(assistant.content).toContain('Шаг 1: анализ команды');
+        expect(assistant.content).toContain('Полный');
+        expect(assistant.content).not.toContain('Конец');
+        // deny сохранился в tool_results финального сообщения
+        const meta = assistant.metadata;
+        const toolResults = meta.tool_results;
+        expect(toolResults).toBeDefined();
+        expect(toolResults.length).toBeGreaterThan(0);
+        expect(toolResults[0].name).toBe('execute_shell');
+        expect(toolResults[0].result?.isError).toBe(true);
+        expect(toolResults[0].result?.content).toContain('Permission denied');
+        // При отмене blocks НЕ дублируются: они уже вошли в content (иначе UI
+        // режима 'bottom' склеил бы их с content повторно)
+        expect(meta.intermediate_text_blocks).toBeUndefined();
+        await rm(h.tmpDir, { recursive: true, force: true });
+    });
+    it('doom loop для НЕ-deny повторяющихся вызовов сохранён: 3-й одинаковый вызов не публикует tool_call.result', async () => {
+        const h = await makeHarness('mockdoom');
+        const chunks = [];
+        const result = await run(h, new AbortController().signal, (event, data) => chunks.push({ event, data }));
+        expect(result.error).toBeUndefined();
+        // Первые два вызова read_file выполнились (tool_call.result), третий заглушён doom loop
+        const toolResults = chunks.filter((c) => c.event === 'tool_call.result');
+        expect(toolResults).toHaveLength(2);
+        // Провайдер вызван 4 раза: 3 tool-итерации + финальный текст
+        expect(MockDoomProvider.calls).toBe(4);
+        // Нормальное завершение текстом
+        const done = chunks.find((c) => c.event === 'stream.done');
+        expect(done.data.content).toBe('Готово');
+        await rm(h.tmpDir, { recursive: true, force: true });
+    });
+    it('пустой ответ модели без deny — подставляется общий fallback, в истории нет пустого assistant-сообщения', async () => {
+        const h = await makeHarness('mockempty');
+        const chunks = [];
+        const result = await run(h, new AbortController().signal, (event, data) => chunks.push({ event, data }));
+        expect(result.error).toBeUndefined();
+        const done = chunks.find((c) => c.event === 'stream.done');
+        expect(done.data.content).toBe('Could not complete the request: the model response was empty');
+        const session = (await h.sessionManager.getSession(h.sessionId));
+        const assistant = [...session.messages].reverse().find((m) => m.role === MessageRole.ASSISTANT);
+        expect(assistant).toBeDefined();
+        expect(assistant.content).toBe('Could not complete the request: the model response was empty');
+        await rm(h.tmpDir, { recursive: true, force: true });
+    });
+});
+/** Тул, который «работает», пока его не прервут через ctx.abortSignal. */
+function makeSlowAbortableTool() {
+    return {
+        name: 'slow_tool',
+        description: 'тестовый долгий тул — завершается при отмене',
+        parameters: z.object({}),
+        capabilities: [ToolCapability.RUNTIME],
+        async execute(_args, ctx) {
+            await new Promise((resolve) => {
+                if (ctx.abortSignal?.aborted) {
+                    resolve();
+                    return;
+                }
+                ctx.abortSignal?.addEventListener('abort', () => resolve(), { once: true });
+            });
+            return { content: 'slow_tool: прерван отменой' };
+        },
+    };
+}
+/**
+ * Провайдер для теста отмены ВО ВРЕМЯ исполнения тула:
+ * вызов 0 — текст + slow_tool; вызов 1 — не должен произойти
+ * (если баг вернулся, провайдер повиснет до отмены — тест это детектирует).
+ */
+class MockToolCancelProvider extends BaseProvider {
+    static calls = 0;
+    async chat(_messages, _systemPrompt, _tools) {
+        return { content: '', model: this.model, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 } };
+    }
+    async *chatAsync(_messages, _systemPrompt, _tools, _debugCollector, ct) {
+        const n = MockToolCancelProvider.calls++;
+        if (n === 0) {
+            yield {
+                content: 'Запускаю долгий тул', isFinal: true,
+                toolCalls: [{ id: 'call_slow', function: { name: 'slow_tool', arguments: '{}' } }],
+                model: this.model, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 },
+            };
+            return;
+        }
+        // Второй итерации быть не должно: до её начала отмена уже зафиксирована.
+        // Если баг вернулся — цикл родителя дойдёт сюда и провайдер повиснет.
+        while (!ct?.cancelled) {
+            await new Promise((r) => setTimeout(r, 10));
+        }
+        return;
+    }
+    getProviderName() {
+        return 'mocktoolcancel';
+    }
+}
+describe('ChatOrchestrator: отмена во время исполнения тула', () => {
+    beforeEach(() => {
+        ProviderFactory.register('mocktoolcancel', MockToolCancelProvider);
+        MockToolCancelProvider.calls = 0;
+    });
+    afterEach(async () => {
+        ProviderFactory['_providers'].delete('mocktoolcancel');
+    });
+    it('abort во время тулa: публикуется stream.cancelled (не «ответ модели пуст» через stream.done), tool-chain сохранён', async () => {
+        const tmpDir = await mkdtemp(join(tmpdir(), 'synth-tool-cancel-'));
+        const store = new FileStore({ dataDir: tmpDir });
+        const sessionManager = new SessionManager(store);
+        const eventBus = new EventBus();
+        const toolRegistry = createToolRegistry();
+        toolRegistry.register(makeSlowAbortableTool());
+        const orchestrator = new ChatOrchestrator({
+            sessionManager,
+            eventBus,
+            contextBuilder: makeCtxBuilder(),
+            providerLoader: (name) => {
+                return { name, type: 'mocktoolcancel', baseUrl: '', apiKey: '', defaultModel: 'm' };
+            },
+            toolRegistry,
+            permissionConfig: { rules: {}, askTimeoutMs: 1000 },
+            defaultWorkingDir: tmpDir,
+            contextConfig: new ContextConfig({ userDataDir: join(tmpDir, 'context') }),
+        });
+        const session = await sessionManager.createSession({
+            title: 'ToolCancel',
+            settings: { provider: 'mocktoolcancel', model: 'm', systemPrompt: 'test', agentRole: 'developer' },
+        });
+        const msg = makeMessage();
+        await sessionManager.addMessage(session.id, msg);
+        const ac = new AbortController();
+        const chunks = [];
+        const processMessage = orchestrator.createProcessMessage();
+        const fresh = (await sessionManager.getSession(session.id));
+        const userMsg = fresh.messages.find((m) => m.role === MessageRole.USER);
+        const promise = processMessage(fresh, userMsg, ac.signal, (event, data) => {
+            chunks.push({ event, data });
+            // Тул запущен — жмём «Стоп»
+            if (event === 'tool_call.started') {
+                setTimeout(() => ac.abort(), 10);
+            }
+        });
+        await promise;
+        // Сабагент-тул прерван, вторая LLM-итерация не началась
+        expect(MockToolCancelProvider.calls).toBe(1);
+        // Завершение — как отмена: stream.cancelled, БЕЗ stream.done с «ответ модели пуст»
+        const cancelled = chunks.find((c) => c.event === 'stream.cancelled');
+        expect(cancelled).toBeDefined();
+        expect(cancelled.data.stream_id).toBe(msg.metadata.stream_id);
+        const done = chunks.find((c) => c.event === 'stream.done');
+        expect(done).toBeUndefined();
+        // Результат тулa опубликован (UI видит, чем тул завершился)
+        const toolResult = chunks.find((c) => c.event === 'tool_call.result');
+        expect(toolResult).toBeDefined();
+        expect(toolResult.data.result.content)
+            .toContain('прерван отменой');
+        // История: tool-chain сохранён (assistant с toolCalls + tool), без фейкового финала
+        const updated = (await sessionManager.getSession(session.id));
+        const toolMsg = updated.messages.find((m) => m.role === MessageRole.TOOL);
+        expect(toolMsg).toBeDefined();
+        expect(toolMsg.content).toContain('прерван отменой');
+        const cancelledAssistant = [...updated.messages].reverse().find((m) => m.role === MessageRole.ASSISTANT && !m.metadata?.tool_chain);
+        expect(cancelledAssistant).toBeDefined();
+        expect(cancelledAssistant.metadata?.tool_results).toBeDefined();
+        await rm(tmpDir, { recursive: true, force: true });
+    });
+});
+//# sourceMappingURL=orchestrator-deny-abort.test.js.map