@itphx/synth-core 0.2.0 → 0.3.0

package/dist/server/routes/fs.js

@@ -1,13 +1,24 @@
+import { createReadStream } from 'node:fs';
+import { mkdir, readdir, readFile, rename, rmdir, stat, unlink, writeFile } from 'node:fs/promises';
+import { basename, join, relative, resolve, sep } from 'node:path';
+import { Readable } from 'node:stream';
 import { Hono } from 'hono';
-import { readdir, readFile, stat } from 'node:fs/promises';
-import { join, resolve } from 'node:path';
+/** Резолвит путь относительно root и проверяет, что результат внутри root. */
+function resolveSafe(root, p) {
+    const full = resolve(root, p || '');
+    const prefix = root.endsWith(sep) ? root : root + sep;
+    if (full !== root && !full.startsWith(prefix))
+        return null;
+    return full;
+}
 export function createFsRoutes(auth, workspacesRoot) {
     const app = new Hono();
     const root = workspacesRoot || process.cwd();
+    // GET / — список файлов в директории
     app.get('/', auth.requireAuth, async (c) => {
         const path = c.req.query('path') || '';
-        const fullPath = resolve(root, path);
-        if (!fullPath.startsWith(root)) {
+        const fullPath = resolveSafe(root, path);
+        if (!fullPath) {
             return c.json({ error: { code: 'FORBIDDEN', message: 'Доступ запрещён' } }, 403);
         }
         try {
@@ -44,10 +55,11 @@ export function createFsRoutes(auth, workspacesRoot) {
             return c.json({ error: { code: 'NOT_FOUND', message: 'Директория не найдена' } }, 404);
         }
     });
+    // GET /read — содержимое файла
     app.get('/read', auth.requireAuth, async (c) => {
         const filePath = c.req.query('path') || '';
-        const fullPath = resolve(root, filePath);
-        if (!fullPath.startsWith(root)) {
+        const fullPath = resolveSafe(root, filePath);
+        if (!fullPath) {
             return c.json({ error: { code: 'FORBIDDEN', message: 'Доступ запрещён' } }, 403);
         }
         try {
@@ -62,6 +74,173 @@ export function createFsRoutes(auth, workspacesRoot) {
             return c.json({ error: { code: 'NOT_FOUND', message: 'Файл не найден' } }, 404);
         }
     });
+    // POST /write — запись файла
+    app.post('/write', auth.requireAuth, async (c) => {
+        const body = await c.req.json().catch(() => null);
+        const path = body?.path;
+        const content = body?.content;
+        if (typeof path !== 'string' || !path || typeof content !== 'string') {
+            return c.json({ error: { code: 'VALIDATION_ERROR', message: 'Ожидаются поля path и content' } }, 400);
+        }
+        const fullPath = resolveSafe(root, path);
+        if (!fullPath) {
+            return c.json({ error: { code: 'FORBIDDEN', message: 'Доступ запрещён' } }, 403);
+        }
+        try {
+            await mkdir(join(fullPath, '..'), { recursive: true }).catch(() => { });
+            await writeFile(fullPath, content, 'utf-8');
+            const s = await stat(fullPath);
+            return c.json({ path, content, size: s.size, encoding: 'utf-8' }, 200);
+        }
+        catch {
+            return c.json({ error: { code: 'INTERNAL_ERROR', message: 'Не удалось записать файл' } }, 500);
+        }
+    });
+    // POST /upload — загрузка файла (multipart)
+    app.post('/upload', auth.requireAuth, async (c) => {
+        const formData = await c.req.parseBody({ all: true });
+        const dirPath = typeof formData.path === 'string' ? formData.path : '';
+        const file = formData.file;
+        const uploadedFile = Array.isArray(file) ? file[0] : file;
+        if (!uploadedFile || typeof uploadedFile === 'string') {
+            return c.json({ error: { code: 'VALIDATION_ERROR', message: 'Файл не передан' } }, 400);
+        }
+        const targetDir = resolveSafe(root, dirPath);
+        if (!targetDir) {
+            return c.json({ error: { code: 'FORBIDDEN', message: 'Доступ запрещён' } }, 403);
+        }
+        const rawName = uploadedFile.name;
+        const fileName = basename(rawName || 'uploaded-file');
+        const targetPath = join(targetDir, fileName);
+        const safeTarget = resolveSafe(root, relative(root, targetPath));
+        if (!safeTarget) {
+            return c.json({ error: { code: 'FORBIDDEN', message: 'Доступ запрещён' } }, 403);
+        }
+        try {
+            await mkdir(join(safeTarget, '..'), { recursive: true }).catch(() => { });
+            let data;
+            if (typeof uploadedFile.arrayBuffer === 'function') {
+                data = await uploadedFile.arrayBuffer();
+            }
+            else {
+                return c.json({ error: { code: 'VALIDATION_ERROR', message: 'Неподдерживаемый тип файла' } }, 400);
+            }
+            await writeFile(safeTarget, new Uint8Array(data));
+            return c.json({ path: relative(root, safeTarget), name: fileName }, 201);
+        }
+        catch {
+            return c.json({ error: { code: 'INTERNAL_ERROR', message: 'Не удалось загрузить файл' } }, 500);
+        }
+    });
+    // GET /download — скачивание файла
+    app.get('/download', auth.requireAuth, async (c) => {
+        const filePath = c.req.query('path') || '';
+        const fullPath = resolveSafe(root, filePath);
+        if (!fullPath) {
+            return c.json({ error: { code: 'FORBIDDEN', message: 'Доступ запрещён' } }, 403);
+        }
+        const s = await stat(fullPath).catch(() => null);
+        if (!s) {
+            return c.json({ error: { code: 'NOT_FOUND', message: 'Файл не найден' } }, 404);
+        }
+        if (s.isDirectory()) {
+            return c.json({ error: { code: 'IS_DIRECTORY', message: 'Нельзя скачать директорию' } }, 400);
+        }
+        const fileName = basename(fullPath);
+        const fileStream = createReadStream(fullPath);
+        const webStream = Readable.toWeb(fileStream);
+        return new Response(webStream, {
+            status: 200,
+            headers: {
+                'Content-Type': 'application/octet-stream',
+                'Content-Disposition': `attachment; filename="${encodeURIComponent(fileName)}"`,
+                'Content-Length': String(s.size),
+            },
+        });
+    });
+    // DELETE / — удаление файла или пустой директории
+    app.delete('/', auth.requireAuth, async (c) => {
+        const path = c.req.query('path') || '';
+        const fullPath = resolveSafe(root, path);
+        if (!fullPath) {
+            return c.json({ error: { code: 'FORBIDDEN', message: 'Доступ запрещён' } }, 403);
+        }
+        const s = await stat(fullPath).catch(() => null);
+        if (!s) {
+            return c.json({ error: { code: 'NOT_FOUND', message: 'Путь не найден' } }, 404);
+        }
+        try {
+            if (s.isDirectory()) {
+                const files = await readdir(fullPath);
+                if (files.length > 0) {
+                    return c.json({ error: { code: 'DIR_NOT_EMPTY', message: 'Директория не пуста' } }, 400);
+                }
+                await rmdir(fullPath);
+            }
+            else {
+                await unlink(fullPath);
+            }
+        }
+        catch {
+            return c.json({ error: { code: 'INTERNAL_ERROR', message: 'Не удалось удалить' } }, 500);
+        }
+        return c.json({ deleted: true, path }, 200);
+    });
+    // POST /mkdir — создание директории
+    app.post('/mkdir', auth.requireAuth, async (c) => {
+        const body = await c.req.json().catch(() => null);
+        const path = body?.path;
+        if (typeof path !== 'string' || !path) {
+            return c.json({ error: { code: 'VALIDATION_ERROR', message: 'Ожидается поле path' } }, 400);
+        }
+        const fullPath = resolveSafe(root, path);
+        if (!fullPath) {
+            return c.json({ error: { code: 'FORBIDDEN', message: 'Доступ запрещён' } }, 403);
+        }
+        try {
+            const existing = await stat(fullPath);
+            if (existing.isDirectory()) {
+                return c.json({ error: { code: 'ALREADY_EXISTS', message: 'Директория уже существует' } }, 409);
+            }
+            return c.json({ error: { code: 'ALREADY_EXISTS', message: 'Файл с таким именем уже существует' } }, 409);
+        }
+        catch {
+            // не существует — можно создавать
+        }
+        try {
+            await mkdir(fullPath, { recursive: true });
+        }
+        catch {
+            return c.json({ error: { code: 'INTERNAL_ERROR', message: 'Не удалось создать директорию' } }, 500);
+        }
+        return c.json({ created: true, path }, 201);
+    });
+    // POST /move — перемещение/переименование
+    app.post('/move', auth.requireAuth, async (c) => {
+        const body = await c.req.json().catch(() => null);
+        const sourcePath = body?.sourcePath;
+        const targetPath = body?.targetPath;
+        if (typeof sourcePath !== 'string' || !sourcePath || typeof targetPath !== 'string' || !targetPath) {
+            return c.json({ error: { code: 'VALIDATION_ERROR', message: 'sourcePath и targetPath обязательны' } }, 400);
+        }
+        const fullSource = resolveSafe(root, sourcePath);
+        const fullTarget = resolveSafe(root, targetPath);
+        if (!fullSource || !fullTarget) {
+            return c.json({ error: { code: 'FORBIDDEN', message: 'Доступ запрещён' } }, 403);
+        }
+        const sourceStat = await stat(fullSource).catch(() => null);
+        if (!sourceStat) {
+            return c.json({ error: { code: 'NOT_FOUND', message: 'Путь не найден' } }, 404);
+        }
+        try {
+            await mkdir(join(fullTarget, '..'), { recursive: true }).catch(() => { });
+            await rename(fullSource, fullTarget);
+        }
+        catch {
+            return c.json({ error: { code: 'INTERNAL_ERROR', message: 'Не удалось переместить' } }, 500);
+        }
+        return c.json({ moved: true, sourcePath, targetPath }, 200);
+    });
     return app;
 }
 //# sourceMappingURL=fs.js.map

package/dist/server/routes/fs.js.map

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

package/dist/server/routes/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/server/routes/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEvE,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,EAClC,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,GACvC,IAAI,CA0GN"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/server/routes/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEvE,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,EAClC,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,GACvC,IAAI,CA4GN"}

package/dist/server/routes/models.js

@@ -72,7 +72,9 @@ export function createModelRoutes(auth, modelStore, providerStore) {
             description: body.description ?? existing?.description ?? '',
             enabled: body.enabled ?? existing?.enabled ?? true,
             isDefault: body.is_default ?? body.isDefault ?? existing?.isDefault ?? false,
-            contextWindow: body.context_window ?? body.contextWindow ?? existing?.contextWindow,
+            contextWindow: 'context_window' in body
+                ? (body.context_window ?? undefined)
+                : (body.contextWindow ?? existing?.contextWindow),
             contextSource: body.context_source ?? body.contextSource ?? existing?.contextSource ?? (body.context_window ? 'manual' : 'unknown'),
             maxOutputTokens: body.max_output_tokens ?? body.maxOutputTokens ?? existing?.maxOutputTokens,
             inputPrice: body.input_price ?? body.inputPrice ?? existing?.inputPrice,

package/dist/server/routes/models.js.map

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

package/dist/server/routes/queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/server/routes/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGxG,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,OAAO,EACb,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,qBAAqB,EACnC,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,GACnE,IAAI,CAyEN"}
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/server/routes/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGxG,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,OAAO,EACb,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,qBAAqB,EACnC,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,GACnE,IAAI,CAsJN"}

package/dist/server/routes/queue.js

@@ -1,5 +1,5 @@
 import { Hono } from 'hono';
-import { generateStreamId } from '@itphx/synth-shared';
+import { generateStreamId, MessageRole } from '@itphx/synth-shared';
 export function createQueueRoutes(auth, sessionManager, queueManager, eventBus, processMessage) {
     const app = new Hono();
     app.post('/:sessionId/clear', auth.requireAuth, async (c) => {
@@ -12,22 +12,64 @@ export function createQueueRoutes(auth, sessionManager, queueManager, eventBus,
     });
     app.post('/:sessionId/return', auth.requireAuth, async (c) => {
         const sessionId = c.req.param('sessionId');
+        const indexStr = c.req.query('index');
+        const index = indexStr !== undefined ? parseInt(indexStr, 10) : undefined;
         const session = await sessionManager.getSession(sessionId);
         if (!session) {
             return c.json({ error: { code: 'NOT_FOUND', message: 'Сессия не найдена' } }, 404);
         }
-        const hasActiveStream = session.currentStream != null;
-        const msgs = hasActiveStream ? session.pendingMessages.slice(1) : session.pendingMessages;
-        const texts = msgs.map((m) => m.content);
+        if (index !== undefined && !isNaN(index) && !session.pendingMessages[index]) {
+            return c.json({ error: { code: 'NOT_FOUND', message: 'Сообщение не найдено по индексу' } }, 404);
+        }
+        // Активный стрим (не отменённый) продолжает обрабатываться — его user-сообщение
+        // из истории удалять нельзя. При зависшей сессии (cancelled=true) — можно.
+        const activeStreamId = session.currentStream && !session.currentStream.cancelled
+            ? session.currentStream.streamId
+            : undefined;
+        let texts = [];
+        let remainingCount = 0;
         await sessionManager.safeUpdate(sessionId, async (s) => {
-            if (hasActiveStream) {
-                s.pendingMessages = s.pendingMessages.slice(0, 1);
+            let removedStreamIds = [];
+            if (index !== undefined && !isNaN(index)) {
+                const msg = s.pendingMessages[index];
+                if (!msg)
+                    return;
+                texts = [msg.content];
+                const sid = msg.metadata?.stream_id;
+                removedStreamIds = sid ? [sid] : [];
+                s.pendingMessages = s.pendingMessages.filter((_, i) => i !== index);
             }
             else {
+                texts = s.pendingMessages.map((m) => m.content);
+                removedStreamIds = s.pendingMessages
+                    .map((m) => m.metadata?.stream_id)
+                    .filter((id) => !!id);
                 s.pendingMessages = [];
             }
+            remainingCount = s.pendingMessages.length;
+            // Удаляем возвращённые user-сообщения из истории по stream_id, чтобы при
+            // повторной отправке из поля ввода не было дубля. Активный стрим не трогаем.
+            if (removedStreamIds.length > 0) {
+                s.messages = s.messages.filter((m) => {
+                    if (m.role !== MessageRole.USER)
+                        return true;
+                    const sid = m.metadata?.stream_id;
+                    if (!sid)
+                        return true;
+                    if (sid === activeStreamId)
+                        return true;
+                    return !removedStreamIds.includes(sid);
+                });
+            }
+            // Разблокируем сессию: снимаем blocked и currentStream (иначе return
+            // оставит сессию в «зависшем» состоянии с pending=0, но blocked).
+            if (remainingCount === 0) {
+                s.status.blocked = undefined;
+                s.status.blockedAt = undefined;
+                s.currentStream = undefined;
+            }
         });
-        if (session.pendingMessages.length === 0) {
+        if (remainingCount === 0 && !activeStreamId) {
             queueManager.stop(sessionId);
         }
         return c.json({ texts });
@@ -42,23 +84,55 @@ export function createQueueRoutes(auth, sessionManager, queueManager, eventBus,
             return c.json({ resumed: true, pending_count: 0 });
         }
         await sessionManager.forceReleaseLock(sessionId);
+        // Используем существующий stream_id первого pending-сообщения, НЕ генерируем
+        // новый — иначе Phase 1 нового процессора повторно запушит сообщение в историю.
+        // Если stream_id отсутствует — генерируем один раз и сохраняем.
         const firstMsg = session.pendingMessages[0];
+        let streamId;
+        let alreadyInHistory = false;
         if (firstMsg) {
-            if (!firstMsg.metadata)
-                firstMsg.metadata = {};
-            if (!firstMsg.metadata.stream_id)
-                firstMsg.metadata.stream_id = generateStreamId();
-            eventBus.publish(sessionId, 'message.queued', {
-                stream_id: firstMsg.metadata.stream_id,
-                pending_count: session.pendingMessages.length,
-                message: firstMsg.content,
-                agent_role: firstMsg.agentRole,
-                author: firstMsg.author,
+            await sessionManager.safeUpdate(sessionId, async (s) => {
+                const p = s.pendingMessages[0];
+                if (!p)
+                    return;
+                if (!p.metadata)
+                    p.metadata = {};
+                if (!p.metadata.stream_id)
+                    p.metadata.stream_id = generateStreamId();
+                streamId = p.metadata.stream_id;
+                alreadyInHistory = s.messages.some((m) => m.role === MessageRole.USER && m.metadata?.stream_id === streamId);
             });
+            if (streamId && !alreadyInHistory) {
+                eventBus.publish(sessionId, 'message.queued', {
+                    stream_id: streamId,
+                    pending_count: session.pendingMessages.length,
+                    message: firstMsg.content,
+                    agent_role: firstMsg.agentRole,
+                    author: firstMsg.author,
+                });
+            }
         }
         queueManager.createProcessor(sessionId, sessionManager, eventBus, processMessage);
         return c.json({ resumed: true, pending_count: session.pendingMessages.length });
     });
+    // POST /:sessionId/retry-now — немедленный повтор при backoff (без ожидания паузы)
+    app.post('/:sessionId/retry-now', auth.requireAuth, async (c) => {
+        const sessionId = c.req.param('sessionId');
+        const retried = queueManager.retryNow(sessionId);
+        if (!retried) {
+            return c.json({ error: { code: 'CONFLICT', message: 'Процессор не находится в состоянии повтора' } }, 409);
+        }
+        return c.json({ retried: true });
+    });
+    // POST /:sessionId/cancel-retry — отменить повторные попытки (снять pending, разблокировать)
+    app.post('/:sessionId/cancel-retry', auth.requireAuth, async (c) => {
+        const sessionId = c.req.param('sessionId');
+        const cancelled = await queueManager.cancelRetry(sessionId);
+        if (!cancelled) {
+            return c.json({ error: { code: 'CONFLICT', message: 'Процессор не найден' } }, 409);
+        }
+        return c.json({ cancelled: true });
+    });
     return app;
 }
 //# sourceMappingURL=queue.js.map

package/dist/server/routes/queue.js.map

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

package/dist/server/routes/sessions.d.ts

@@ -1,5 +1,6 @@
 import { Hono } from 'hono';
 import type { AuthKit } from '../../auth/local.js';
 import type { SessionManager, EventBus, QueueProcessorManager, ChatOrchestrator, ContextOptimizer } from '../../index.js';
-export declare function createSessionRoutes(auth: AuthKit, sessionManager: SessionManager, eventBus: EventBus, queueManager: QueueProcessorManager, processMessage: ReturnType<ChatOrchestrator['createProcessMessage']>, orchestrator: ChatOrchestrator, contextOptimizer?: ContextOptimizer): Hono;
+import type { ProjectStore } from '../../storage/project-store.js';
+export declare function createSessionRoutes(auth: AuthKit, sessionManager: SessionManager, eventBus: EventBus, queueManager: QueueProcessorManager, processMessage: ReturnType<ChatOrchestrator['createProcessMessage']>, orchestrator: ChatOrchestrator, contextOptimizer?: ContextOptimizer, projectStore?: ProjectStore): Hono;
 //# sourceMappingURL=sessions.d.ts.map

package/dist/server/routes/sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/server/routes/sessions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAQ1H,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,OAAO,EACb,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,qBAAqB,EACnC,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,EACpE,YAAY,EAAE,gBAAgB,EAC9B,gBAAgB,CAAC,EAAE,gBAAgB,GAClC,IAAI,CAqXN"}
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/server/routes/sessions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAK1H,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAInE,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,OAAO,EACb,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,qBAAqB,EACnC,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,EACpE,YAAY,EAAE,gBAAgB,EAC9B,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,YAAY,CAAC,EAAE,YAAY,GAC1B,IAAI,CAibN"}

package/dist/server/routes/sessions.js

@@ -1,10 +1,10 @@
 import { ReadableStream } from 'node:stream/web';
 import { Hono } from 'hono';
-import { MessageRole, SESSION_MODES, generateStreamId, nowISO } from '@itphx/synth-shared';
-import { enqueueUserMessage, sseEventStream } from '../../index.js';
+import { MessageRole, SESSION_MODES, generateStreamId, nowISO, sessionUpdateSchema } from '@itphx/synth-shared';
+import { enqueueUserMessage, sseEventStream, DEFAULT_AGENT_ID, SubagentResumeError } from '../../index.js';
 import { serializeSession, serializeMessage } from '../serialize.js';
 const LOCAL_USER_ID = 'local';
-export function createSessionRoutes(auth, sessionManager, eventBus, queueManager, processMessage, orchestrator, contextOptimizer) {
+export function createSessionRoutes(auth, sessionManager, eventBus, queueManager, processMessage, orchestrator, contextOptimizer, projectStore) {
     const app = new Hono();
     const agentRegistry = orchestrator.agentRegistry;
     app.get('/', auth.requireAuth, async (c) => {
@@ -21,7 +21,7 @@ export function createSessionRoutes(auth, sessionManager, eventBus, queueManager
             engine: body.engine || 'synth',
             parentId: body.parent_id || body.parentId || undefined,
             sessionOrigin: body.session_origin || body.sessionOrigin || undefined,
-            settings: body.settings,
+            settings: { ...body.settings, agentRole: body.settings?.agentRole ?? DEFAULT_AGENT_ID },
         });
         session.userId = LOCAL_USER_ID;
         session.ownerId = LOCAL_USER_ID;
@@ -42,8 +42,42 @@ export function createSessionRoutes(auth, sessionManager, eventBus, queueManager
             return c.json({ error: { code: 'NOT_FOUND', message: 'Сессия не найдена' } }, 404);
         }
         const body = await c.req.json().catch(() => ({}));
+        // Валидация тела PATCH (sessionUpdateSchema): невалидные settings/engine/name → 400.
+        // title/mode/project_id не входят в схему и обрабатываются отдельно ниже из body.
+        const parsed = sessionUpdateSchema.safeParse(body);
+        if (!parsed.success) {
+            return c.json({
+                error: {
+                    code: 'VALIDATION_ERROR',
+                    message: 'Некорректные данные: ' + parsed.error.issues.map(i => i.path.join('.') + ' ' + i.message).join('; '),
+                },
+            }, 400);
+        }
+        // AD-040: перенос сессии между проектами (project_id). Валидируем существование
+        // нового проекта и публикуем session.moved при фактической смене проекта.
+        const prevProjectId = session.projectId;
+        let projectChanged = false;
         if (body.project_id !== undefined || body.projectId !== undefined) {
-            session.projectId = body.project_id ?? body.projectId;
+            const newProjectId = body.project_id ?? body.projectId;
+            if (newProjectId) {
+                if (!projectStore) {
+                    return c.json({
+                        error: { code: 'INTERNAL_ERROR', message: 'Хранилище проектов недоступно' },
+                    }, 500);
+                }
+                const existing = await projectStore.load(newProjectId);
+                if (!existing) {
+                    return c.json({
+                        error: { code: 'PROJECT_NOT_FOUND', message: 'Проект не найден' },
+                    }, 400);
+                }
+            }
+            const resolved = newProjectId || undefined;
+            if (prevProjectId !== resolved) {
+                session.projectId = resolved;
+                session.planApproved = false;
+                projectChanged = true;
+            }
         }
         if (body.name !== undefined)
             session.title = body.name;
@@ -64,11 +98,18 @@ export function createSessionRoutes(auth, sessionManager, eventBus, queueManager
             }
             session.mode = body.mode;
         }
-        if (body.settings !== undefined) {
-            session.settings = { ...session.settings, ...body.settings };
+        if (parsed.data.settings !== undefined) {
+            session.settings = { ...session.settings, ...parsed.data.settings };
         }
         await sessionManager.updateSession(session);
         eventBus.publish(session.id, 'session.updated', serializeSession(session, { agentRegistry }));
+        if (projectChanged) {
+            eventBus.publish(session.id, 'session.moved', {
+                session_id: session.id,
+                project_id: session.projectId ?? null,
+                prev_project_id: prevProjectId ?? null,
+            });
+        }
         return c.json(serializeSession(session, { agentRegistry }));
     });
     app.delete('/:id', auth.requireAuth, async (c) => {
@@ -194,14 +235,31 @@ export function createSessionRoutes(auth, sessionManager, eventBus, queueManager
         if (!session) {
             return c.json({ error: { code: 'NOT_FOUND', message: 'Сессия не найдена' } }, 404);
         }
+        // Отмена стрима: прерываем fetch через cancelToken (orchestrator.cancel).
+        // Очистку pendingMessages/blocked/currentStream выполняет сам QueueProcessor —
+        // при cancelled processStream публикует stream.cancelled и возвращает {},
+        // после чего процессор снимает blocked и очищает currentStream в успешной ветке.
+        // НЕ вызываем queueManager.stop() — иначе сессия остаётся «зависшей» (stalled).
         if (session.currentStream) {
             orchestrator.cancel(session.currentStream.streamId);
-            session.currentStream.cancelled = true;
-            await sessionManager.updateSession(session);
         }
-        queueManager.stop(session.id);
         return c.json({ status: 'aborted' });
     });
+    // POST /api/v2/sessions/:id/resume-subagent — возобновить прерванную/ошибочную
+    // дочернюю сессию саб-агента (B2). Валидация + блокировка синхронно, прогон —
+    // в фоне; итог resume пишется в родительскую сессию.
+    app.post('/:id/resume-subagent', auth.requireAuth, async (c) => {
+        try {
+            const result = await orchestrator.startSubagentResume(c.req.param('id'));
+            return c.json(result, 202);
+        }
+        catch (err) {
+            if (err instanceof SubagentResumeError) {
+                return c.json({ error: { code: err.code, message: err.message } }, err.httpStatus);
+            }
+            return c.json({ error: { code: 'INTERNAL_ERROR', message: String(err) } }, 500);
+        }
+    });
     app.post('/:id/summarize', auth.requireAuth, async (c) => {
         const session = await sessionManager.getSession(c.req.param('id'));
         if (!session) {