@itphx/synth-backend 0.6.1 → 0.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +93 -13
- package/dist/app.js.map +1 -1
- package/dist/auth/middleware.d.ts +6 -0
- package/dist/auth/middleware.d.ts.map +1 -1
- package/dist/auth/middleware.js +17 -0
- package/dist/auth/middleware.js.map +1 -1
- package/dist/events/hub.d.ts.map +1 -1
- package/dist/events/hub.js +48 -0
- package/dist/events/hub.js.map +1 -1
- package/dist/events/hub.test.d.ts +2 -0
- package/dist/events/hub.test.d.ts.map +1 -0
- package/dist/events/hub.test.js +74 -0
- package/dist/events/hub.test.js.map +1 -0
- package/dist/lib/orchestrator-workspace.test.js +3 -0
- package/dist/lib/orchestrator-workspace.test.js.map +1 -1
- package/dist/routes/agents.d.ts +1 -1
- package/dist/routes/agents.d.ts.map +1 -1
- package/dist/routes/agents.js +3 -3
- package/dist/routes/agents.js.map +1 -1
- package/dist/routes/agents.test.js +30 -3
- package/dist/routes/agents.test.js.map +1 -1
- package/dist/routes/debug.js +2 -2
- package/dist/routes/debug.js.map +1 -1
- package/dist/routes/debug.test.d.ts +2 -0
- package/dist/routes/debug.test.d.ts.map +1 -0
- package/dist/routes/debug.test.js +102 -0
- package/dist/routes/debug.test.js.map +1 -0
- package/dist/routes/llm.d.ts.map +1 -1
- package/dist/routes/llm.js +29 -9
- package/dist/routes/llm.js.map +1 -1
- package/dist/routes/llm.test.js +82 -5
- package/dist/routes/llm.test.js.map +1 -1
- package/dist/routes/mcp-network-policy.integration.test.d.ts +2 -0
- package/dist/routes/mcp-network-policy.integration.test.d.ts.map +1 -0
- package/dist/routes/mcp-network-policy.integration.test.js +44 -0
- package/dist/routes/mcp-network-policy.integration.test.js.map +1 -0
- package/dist/routes/mcp-registry.test.d.ts +2 -0
- package/dist/routes/mcp-registry.test.d.ts.map +1 -0
- package/dist/routes/mcp-registry.test.js +247 -0
- package/dist/routes/mcp-registry.test.js.map +1 -0
- package/dist/routes/mcp.d.ts +13 -10
- package/dist/routes/mcp.d.ts.map +1 -1
- package/dist/routes/mcp.js +219 -74
- package/dist/routes/mcp.js.map +1 -1
- package/dist/routes/mcp.test.js +69 -61
- package/dist/routes/mcp.test.js.map +1 -1
- package/dist/routes/models.d.ts +4 -0
- package/dist/routes/models.d.ts.map +1 -1
- package/dist/routes/models.js +96 -131
- package/dist/routes/models.js.map +1 -1
- package/dist/routes/models.test.js +246 -0
- package/dist/routes/models.test.js.map +1 -1
- package/dist/routes/projects-mcp.test.d.ts +6 -0
- package/dist/routes/projects-mcp.test.d.ts.map +1 -0
- package/dist/routes/projects-mcp.test.js +160 -0
- package/dist/routes/projects-mcp.test.js.map +1 -0
- package/dist/routes/projects.d.ts +4 -2
- package/dist/routes/projects.d.ts.map +1 -1
- package/dist/routes/projects.js +65 -2
- package/dist/routes/projects.js.map +1 -1
- package/dist/routes/projects.test.js +29 -0
- package/dist/routes/projects.test.js.map +1 -1
- package/dist/routes/providers.d.ts +4 -0
- package/dist/routes/providers.d.ts.map +1 -1
- package/dist/routes/providers.js +36 -150
- package/dist/routes/providers.js.map +1 -1
- package/dist/routes/providers.test.js +128 -0
- package/dist/routes/providers.test.js.map +1 -1
- package/dist/routes/sessions-mcp.test.d.ts +6 -0
- package/dist/routes/sessions-mcp.test.d.ts.map +1 -0
- package/dist/routes/sessions-mcp.test.js +182 -0
- package/dist/routes/sessions-mcp.test.js.map +1 -0
- package/dist/routes/sessions.d.ts +17 -1
- package/dist/routes/sessions.d.ts.map +1 -1
- package/dist/routes/sessions.js +105 -385
- package/dist/routes/sessions.js.map +1 -1
- package/dist/routes/sessions.test.js +81 -4
- package/dist/routes/sessions.test.js.map +1 -1
- package/dist/routes/settings.test.js +49 -1
- package/dist/routes/settings.test.js.map +1 -1
- package/package.json +3 -3
- package/dist/lib/mcp-config-store.d.ts +0 -17
- package/dist/lib/mcp-config-store.d.ts.map +0 -1
- package/dist/lib/mcp-config-store.js +0 -67
- package/dist/lib/mcp-config-store.js.map +0 -1
- package/dist/lib/serialize.d.ts +0 -188
- package/dist/lib/serialize.d.ts.map +0 -1
- package/dist/lib/serialize.js +0 -131
- package/dist/lib/serialize.js.map +0 -1
- package/dist/lib/serialize.test.d.ts +0 -2
- package/dist/lib/serialize.test.d.ts.map +0 -1
- package/dist/lib/serialize.test.js +0 -141
- package/dist/lib/serialize.test.js.map +0 -1
|
@@ -5,7 +5,23 @@ import type { EventBus } from '@itphx/synth-core';
|
|
|
5
5
|
import type { QueueProcessorManager } from '@itphx/synth-core';
|
|
6
6
|
import type { ChatOrchestrator } from '@itphx/synth-core';
|
|
7
7
|
import type { ContextOptimizer } from '@itphx/synth-core';
|
|
8
|
+
import type { ProfileStore } from '@itphx/synth-shared';
|
|
8
9
|
import type { EventHub } from '../events/hub.js';
|
|
9
10
|
import type { ProjectStore } from '../storage/project-store.js';
|
|
10
|
-
|
|
11
|
+
/**
|
|
12
|
+
* Backend-обёртка над core-фабрикой сессий (ТД-1, фаза B2). Здесь остаются только
|
|
13
|
+
* backend-специфичные роуты (MCP-скоуп сессии, секреты, export/import, отладка,
|
|
14
|
+
* оптимизация контекста, sticky notes). Общая логика (список/создание/чтение/
|
|
15
|
+
* изменение/удаление, status/prompt/stats, очередь+SSE, children/tree/fork,
|
|
16
|
+
* references, merge) — в `createSessionRoutes` из `@itphx/synth-core`.
|
|
17
|
+
*
|
|
18
|
+
* RBAC: core-фабрика параметризуется `resolveUserId`/`resolveOwner`/`resolveAuthor`,
|
|
19
|
+
* `canAccess` (владелец|ADMIN) и EventHub-хуками; remote/hybrid-ветки отключены
|
|
20
|
+
* (getRemoteClient не передаётся). `GET /:id/events` на backend не регистрируется.
|
|
21
|
+
*/
|
|
22
|
+
export declare function createSessionRoutes(kit: AuthKit, sessionManager: SessionManager, eventBus: EventBus, queueManager: QueueProcessorManager, processMessage: ReturnType<ChatOrchestrator['createProcessMessage']>, orchestrator: ChatOrchestrator, eventHub: EventHub, contextOptimizer?: ContextOptimizer, projectStore?: ProjectStore,
|
|
23
|
+
/** Профили пользователей: display name для статистики (fallback — username). */
|
|
24
|
+
profilesStore?: ProfileStore,
|
|
25
|
+
/** Агент по умолчанию для новых сессий без `settings.agentRole` (runtime-настройка). */
|
|
26
|
+
resolveDefaultAgent?: () => string | Promise<string>): Hono;
|
|
11
27
|
//# sourceMappingURL=sessions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/routes/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/routes/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAQ1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAQxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,OAAO,EACZ,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,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,YAAY,CAAC,EAAE,YAAY;AAC3B,gFAAgF;AAChF,aAAa,CAAC,EAAE,YAAY;AAC5B,wFAAwF;AACxF,mBAAmB,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GACnD,IAAI,CAmaN"}
|
package/dist/routes/sessions.js
CHANGED
|
@@ -1,170 +1,113 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
|
-
import { MessageRole,
|
|
2
|
+
import { MessageRole, generateStreamId, nowISO, sessionMcpUpdateSchema, } from '@itphx/synth-shared';
|
|
3
3
|
import { createRateLimiter } from '../middleware/rate-limiter.js';
|
|
4
|
-
import { enqueueUserMessage,
|
|
5
|
-
import { serializeSession } from '../lib/serialize.js';
|
|
4
|
+
import { enqueueUserMessage, serializeSession, createSessionRoutes as createCoreSessionRoutes, } from '@itphx/synth-core';
|
|
6
5
|
import { t } from '../lib/i18n.js';
|
|
7
|
-
|
|
6
|
+
/**
|
|
7
|
+
* Backend-обёртка над core-фабрикой сессий (ТД-1, фаза B2). Здесь остаются только
|
|
8
|
+
* backend-специфичные роуты (MCP-скоуп сессии, секреты, export/import, отладка,
|
|
9
|
+
* оптимизация контекста, sticky notes). Общая логика (список/создание/чтение/
|
|
10
|
+
* изменение/удаление, status/prompt/stats, очередь+SSE, children/tree/fork,
|
|
11
|
+
* references, merge) — в `createSessionRoutes` из `@itphx/synth-core`.
|
|
12
|
+
*
|
|
13
|
+
* RBAC: core-фабрика параметризуется `resolveUserId`/`resolveOwner`/`resolveAuthor`,
|
|
14
|
+
* `canAccess` (владелец|ADMIN) и EventHub-хуками; remote/hybrid-ветки отключены
|
|
15
|
+
* (getRemoteClient не передаётся). `GET /:id/events` на backend не регистрируется.
|
|
16
|
+
*/
|
|
17
|
+
export function createSessionRoutes(kit, sessionManager, eventBus, queueManager, processMessage, orchestrator, eventHub, contextOptimizer, projectStore,
|
|
18
|
+
/** Профили пользователей: display name для статистики (fallback — username). */
|
|
19
|
+
profilesStore,
|
|
20
|
+
/** Агент по умолчанию для новых сессий без `settings.agentRole` (runtime-настройка). */
|
|
21
|
+
resolveDefaultAgent) {
|
|
8
22
|
const app = new Hono();
|
|
9
23
|
const agentRegistry = orchestrator.agentRegistry;
|
|
10
|
-
//
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
projectId: body.project_id || body.projectId || undefined,
|
|
27
|
-
engine: body.engine || 'synth',
|
|
28
|
-
parentId: body.parent_id || body.parentId || undefined,
|
|
29
|
-
sessionOrigin: body.session_origin || body.sessionOrigin || undefined,
|
|
30
|
-
settings: { ...body.settings, agentRole: body.settings?.agentRole ?? DEFAULT_AGENT_ID },
|
|
31
|
-
userId: user.id,
|
|
32
|
-
ownerId: user.id,
|
|
33
|
-
});
|
|
34
|
-
// Автоматически подписываем активных клиентов на новую сессию
|
|
35
|
-
eventHub.subscribeToSession(user.id, session.id).catch((e) => console.warn('subscribeToSession failed:', e));
|
|
36
|
-
// Оповещаем клиентов о новой сессии
|
|
37
|
-
eventBus.publish(session.id, 'session.created', serializeSession(session, { agentRegistry }));
|
|
38
|
-
return c.json(serializeSession(session, { agentRegistry }), 201);
|
|
39
|
-
});
|
|
40
|
-
// GET /api/v2/sessions/:id — получить
|
|
41
|
-
app.get('/:id', kit.requireAuth, async (c) => {
|
|
24
|
+
// AD-071 §2.4: владелец сессии — обычный пользователь, управляющий её MCP-скоупом.
|
|
25
|
+
const isSessionOwner = (session, userId) => (session.ownerId ?? session.userId) === userId;
|
|
26
|
+
/** AD-071 §2.4: эффективный MCP-скоуп сессии (включая отключённые с причиной). */
|
|
27
|
+
const buildSessionMcpPayload = async (session) => {
|
|
28
|
+
const servers = await orchestrator.resolveMcpServers(session);
|
|
29
|
+
return {
|
|
30
|
+
servers,
|
|
31
|
+
enabled: servers.filter((s) => s.enabled).map((s) => s.name),
|
|
32
|
+
disabled: servers.filter((s) => !s.enabled).map((s) => s.name),
|
|
33
|
+
mcpServers: session.settings.mcpServers ?? [],
|
|
34
|
+
mcpDisabledServers: session.settings.mcpDisabledServers ?? [],
|
|
35
|
+
};
|
|
36
|
+
};
|
|
37
|
+
// GET /api/v2/sessions/:id/mcp — эффективный MCP-скоуп (AD-071 §2.4).
|
|
38
|
+
// Показывает все серверы, включая отключённые (reason). RBAC: владелец сессии/ADMIN.
|
|
39
|
+
app.get('/:id/mcp', kit.requireAuth, async (c) => {
|
|
42
40
|
const session = await sessionManager.getSession(c.req.param('id'));
|
|
43
41
|
if (!session) {
|
|
44
42
|
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
45
43
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
// RBAC: только ADMIN/AUDITOR — сама карта является секретом.
|
|
50
|
-
app.get('/:id/secrets', kit.requirePermission('ADMIN', 'AUDITOR'), async (c) => {
|
|
51
|
-
const session = await sessionManager.getSession(c.req.param('id'));
|
|
52
|
-
if (!session) {
|
|
53
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
44
|
+
const user = (await kit.getCurrentUser(c));
|
|
45
|
+
if (!isSessionOwner(session, user.id) && !kit.isAdmin(c)) {
|
|
46
|
+
return c.json({ error: { code: 'FORBIDDEN', message: t('auth.forbidden', undefined, c) } }, 403);
|
|
54
47
|
}
|
|
55
|
-
return c.json(
|
|
48
|
+
return c.json(await buildSessionMcpPayload(session));
|
|
56
49
|
});
|
|
57
|
-
//
|
|
58
|
-
|
|
50
|
+
// PUT /api/v2/sessions/:id/mcp — переключение MCP пользователем (AD-071 §2.4),
|
|
51
|
+
// включая opt-out системных серверов. RBAC: владелец сессии/ADMIN.
|
|
52
|
+
app.put('/:id/mcp', kit.requireAuth, async (c) => {
|
|
59
53
|
const session = await sessionManager.getSession(c.req.param('id'));
|
|
60
54
|
if (!session) {
|
|
61
55
|
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
62
56
|
}
|
|
57
|
+
const user = (await kit.getCurrentUser(c));
|
|
58
|
+
if (!isSessionOwner(session, user.id) && !kit.isAdmin(c)) {
|
|
59
|
+
return c.json({ error: { code: 'FORBIDDEN', message: t('auth.forbidden', undefined, c) } }, 403);
|
|
60
|
+
}
|
|
63
61
|
const body = await c.req.json().catch(() => ({}));
|
|
64
|
-
|
|
65
|
-
// title/mode/project_id не входят в схему и обрабатываются отдельно ниже из body.
|
|
66
|
-
const parsed = sessionUpdateSchema.safeParse(body);
|
|
62
|
+
const parsed = sessionMcpUpdateSchema.safeParse(body);
|
|
67
63
|
if (!parsed.success) {
|
|
68
|
-
return c.json({
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
const prevProjectId = session.projectId;
|
|
78
|
-
let projectChanged = false;
|
|
79
|
-
if (body.project_id !== undefined || body.projectId !== undefined) {
|
|
80
|
-
const newProjectId = body.project_id ?? body.projectId;
|
|
81
|
-
if (newProjectId) {
|
|
82
|
-
if (!projectStore) {
|
|
83
|
-
return c.json({
|
|
84
|
-
error: { code: 'INTERNAL_ERROR', message: 'Хранилище проектов недоступно' },
|
|
85
|
-
}, 500);
|
|
86
|
-
}
|
|
87
|
-
const existing = await projectStore.load(newProjectId);
|
|
88
|
-
if (!existing) {
|
|
89
|
-
return c.json({
|
|
90
|
-
error: { code: 'PROJECT_NOT_FOUND', message: 'Проект не найден' },
|
|
91
|
-
}, 400);
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
const resolved = newProjectId || undefined;
|
|
95
|
-
if (prevProjectId !== resolved) {
|
|
96
|
-
session.projectId = resolved;
|
|
97
|
-
session.planApproved = false;
|
|
98
|
-
projectChanged = true;
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
if (body.name !== undefined)
|
|
102
|
-
session.title = body.name;
|
|
103
|
-
if (body.title !== undefined)
|
|
104
|
-
session.title = body.title;
|
|
105
|
-
if (body.engine !== undefined)
|
|
106
|
-
session.engine = body.engine;
|
|
107
|
-
if (body.mode !== undefined) {
|
|
108
|
-
if (!SESSION_MODES.includes(body.mode)) {
|
|
64
|
+
return c.json({ error: { code: 'VALIDATION_ERROR', message: parsed.error.message } }, 400);
|
|
65
|
+
}
|
|
66
|
+
const { name, enabled, mcpServers, mcpDisabledServers } = parsed.data;
|
|
67
|
+
const known = new Set((await orchestrator.resolveMcpServers(session)).map((s) => s.name));
|
|
68
|
+
const toValidate = name !== undefined
|
|
69
|
+
? [name]
|
|
70
|
+
: [...(mcpServers ?? []), ...(mcpDisabledServers ?? [])];
|
|
71
|
+
for (const serverName of toValidate) {
|
|
72
|
+
if (!known.has(serverName)) {
|
|
109
73
|
return c.json({
|
|
110
|
-
error: { code: 'VALIDATION_ERROR', message:
|
|
74
|
+
error: { code: 'VALIDATION_ERROR', message: `MCP-сервер "${serverName}" не найден` },
|
|
111
75
|
}, 400);
|
|
112
76
|
}
|
|
113
|
-
session.mode = body.mode;
|
|
114
77
|
}
|
|
115
|
-
if (
|
|
116
|
-
|
|
78
|
+
if (name !== undefined) {
|
|
79
|
+
// Точечный toggle: enabled → session.enabled; disabled → opt-out.
|
|
80
|
+
const enabledList = new Set(session.settings.mcpServers ?? []);
|
|
81
|
+
const disabledList = new Set(session.settings.mcpDisabledServers ?? []);
|
|
82
|
+
if (enabled === false) {
|
|
83
|
+
enabledList.delete(name);
|
|
84
|
+
disabledList.add(name);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
enabledList.add(name);
|
|
88
|
+
disabledList.delete(name);
|
|
89
|
+
}
|
|
90
|
+
session.settings.mcpServers = [...enabledList];
|
|
91
|
+
session.settings.mcpDisabledServers = [...disabledList];
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
if (mcpServers !== undefined)
|
|
95
|
+
session.settings.mcpServers = mcpServers;
|
|
96
|
+
if (mcpDisabledServers !== undefined)
|
|
97
|
+
session.settings.mcpDisabledServers = mcpDisabledServers;
|
|
117
98
|
}
|
|
118
99
|
await sessionManager.updateSession(session);
|
|
119
100
|
eventBus.publish(session.id, 'session.updated', serializeSession(session, { agentRegistry }));
|
|
120
|
-
|
|
121
|
-
eventBus.publish(session.id, 'session.moved', {
|
|
122
|
-
session_id: session.id,
|
|
123
|
-
project_id: session.projectId ?? null,
|
|
124
|
-
prev_project_id: prevProjectId ?? null,
|
|
125
|
-
});
|
|
126
|
-
}
|
|
127
|
-
return c.json(serializeSession(session, { agentRegistry }));
|
|
101
|
+
return c.json(await buildSessionMcpPayload(session));
|
|
128
102
|
});
|
|
129
|
-
//
|
|
130
|
-
|
|
103
|
+
// GET /api/v2/sessions/:id/secrets — карта обфускации LLM Gateway (AD-036).
|
|
104
|
+
// RBAC: только ADMIN/AUDITOR — сама карта является секретом.
|
|
105
|
+
app.get('/:id/secrets', kit.requirePermission('ADMIN', 'AUDITOR'), async (c) => {
|
|
131
106
|
const session = await sessionManager.getSession(c.req.param('id'));
|
|
132
107
|
if (!session) {
|
|
133
108
|
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
134
109
|
}
|
|
135
|
-
|
|
136
|
-
queueManager.stop(session.id);
|
|
137
|
-
// Оповещаем клиентов об удалении сессии
|
|
138
|
-
const user = (await kit.getCurrentUser(c));
|
|
139
|
-
eventBus.publish(session.id, 'session.deleted', { session_id: session.id });
|
|
140
|
-
// Отписываем клиентов от удалённой сессии
|
|
141
|
-
eventHub.unsubscribeFromSession(user.id, session.id);
|
|
142
|
-
return c.body(null, 204);
|
|
143
|
-
});
|
|
144
|
-
// POST /api/v2/sessions/:id/fork — ответвление сессии
|
|
145
|
-
app.post('/:id/fork', kit.requireAuth, async (c) => {
|
|
146
|
-
const user = (await kit.getCurrentUser(c));
|
|
147
|
-
const body = await c.req.json().catch(() => ({}));
|
|
148
|
-
const fork = await sessionManager.forkSession(c.req.param('id'), {
|
|
149
|
-
messageId: body.message_id ?? body.messageId,
|
|
150
|
-
messageIndex: body.message_index ?? body.messageIndex,
|
|
151
|
-
title: body.title,
|
|
152
|
-
userId: user.id,
|
|
153
|
-
ownerId: user.id,
|
|
154
|
-
});
|
|
155
|
-
eventHub.subscribeToSession(user.id, fork.id).catch((e) => console.warn('subscribeToSession failed:', e));
|
|
156
|
-
eventBus.publish(fork.id, 'session.fork.created', serializeSession(fork, { agentRegistry }));
|
|
157
|
-
return c.json(serializeSession(fork, { agentRegistry }), 201);
|
|
158
|
-
});
|
|
159
|
-
// GET /api/v2/sessions/:id/children — дочерние сессии
|
|
160
|
-
app.get('/:id/children', kit.requireAuth, async (c) => {
|
|
161
|
-
const children = await sessionManager.getChildren(c.req.param('id'));
|
|
162
|
-
return c.json(children.map((s) => serializeSession(s, { agentRegistry })));
|
|
163
|
-
});
|
|
164
|
-
// GET /api/v2/sessions/:id/tree — дерево сессий
|
|
165
|
-
app.get('/:id/tree', kit.requireAuth, async (c) => {
|
|
166
|
-
const tree = await sessionManager.getSessionTree(c.req.param('id'));
|
|
167
|
-
return c.json(tree);
|
|
110
|
+
return c.json({ sessionId: session.id, secrets: session.obfuscationMap ?? {} });
|
|
168
111
|
});
|
|
169
112
|
// GET /api/v2/sessions/:id/export — полный экспорт сессии для переноса между
|
|
170
113
|
// мирами (publish/fork). Внутренний формат: объект Session (camelCase) из
|
|
@@ -250,197 +193,6 @@ export function createSessionRoutes(kit, sessionManager, eventBus, queueManager,
|
|
|
250
193
|
eventBus.publish(session.id, 'session.created', serializeSession(session, { agentRegistry }));
|
|
251
194
|
return c.json(serializeSession(session, { agentRegistry }), 201);
|
|
252
195
|
});
|
|
253
|
-
// GET /api/v2/sessions/:id/status
|
|
254
|
-
app.get('/:id/status', kit.requireAuth, async (c) => {
|
|
255
|
-
const session = await sessionManager.getSession(c.req.param('id'));
|
|
256
|
-
if (!session) {
|
|
257
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
258
|
-
}
|
|
259
|
-
return c.json({
|
|
260
|
-
blocked: !!session.status.blocked,
|
|
261
|
-
pending_count: session.pendingMessages.length,
|
|
262
|
-
processor_running: queueManager.isRunning(session.id),
|
|
263
|
-
});
|
|
264
|
-
});
|
|
265
|
-
// POST /api/v2/sessions/:id/prompt — отправить сообщение (очередь + SSE-стрим)
|
|
266
|
-
app.post('/:id/prompt', kit.requireAuth, createRateLimiter(30, 60_000), async (c) => {
|
|
267
|
-
const user = (await kit.getCurrentUser(c));
|
|
268
|
-
const body = await c.req.json().catch(() => ({}));
|
|
269
|
-
const content = body.content?.trim();
|
|
270
|
-
if (!content) {
|
|
271
|
-
return c.json({ error: { code: 'VALIDATION_ERROR', message: t('errors.validation.contentRequired', undefined, c) } }, 400);
|
|
272
|
-
}
|
|
273
|
-
const sessionId = c.req.param('id');
|
|
274
|
-
const session = await sessionManager.getSession(sessionId);
|
|
275
|
-
if (!session) {
|
|
276
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
277
|
-
}
|
|
278
|
-
const streamId = body.messageId || generateStreamId();
|
|
279
|
-
const message = {
|
|
280
|
-
id: streamId,
|
|
281
|
-
role: MessageRole.USER,
|
|
282
|
-
seq: session.messages.length + 1,
|
|
283
|
-
origin: 'local',
|
|
284
|
-
parts: [{ id: generateStreamId(), type: 'text', data: content }],
|
|
285
|
-
content,
|
|
286
|
-
createdAt: nowISO(),
|
|
287
|
-
disabled: false,
|
|
288
|
-
pinned: false,
|
|
289
|
-
hidden: false,
|
|
290
|
-
author: user.username,
|
|
291
|
-
agentRole: body.agent || session.settings.agentRole,
|
|
292
|
-
provider: body.provider || session.settings.provider,
|
|
293
|
-
model: body.model || session.settings.model,
|
|
294
|
-
metadata: { ...(body.metadata || {}), stream_id: streamId },
|
|
295
|
-
};
|
|
296
|
-
// Ставим в очередь
|
|
297
|
-
const result = await enqueueUserMessage(sessionManager, eventBus, sessionId, message, queueManager, processMessage, (sid, msg) => orchestrator.obfuscateUserMessageForHistory(sid, msg));
|
|
298
|
-
if (!result) {
|
|
299
|
-
return c.json({
|
|
300
|
-
error: {
|
|
301
|
-
code: 'QUEUE_FULL',
|
|
302
|
-
message: t('errors.chat.queueFull', { max: 5 }, c),
|
|
303
|
-
},
|
|
304
|
-
}, 429);
|
|
305
|
-
}
|
|
306
|
-
// Возвращаем SSE-стрим, подписанный на EventBus
|
|
307
|
-
const signal = c.req.raw.signal;
|
|
308
|
-
return new Response(new ReadableStream({
|
|
309
|
-
async start(controller) {
|
|
310
|
-
const encoder = new TextEncoder();
|
|
311
|
-
try {
|
|
312
|
-
for await (const event of sseEventStream(eventBus, sessionId, signal)) {
|
|
313
|
-
const line = `data: ${JSON.stringify(event)}\n\n`;
|
|
314
|
-
controller.enqueue(encoder.encode(line));
|
|
315
|
-
// Останавливаемся после stream.done или stream.error для этого streamId
|
|
316
|
-
if ((event.type === 'stream.done' || event.type === 'stream.error' || event.type === 'stream.cancelled')
|
|
317
|
-
&& event.data.stream_id === streamId) {
|
|
318
|
-
break;
|
|
319
|
-
}
|
|
320
|
-
}
|
|
321
|
-
}
|
|
322
|
-
catch {
|
|
323
|
-
// client disconnected
|
|
324
|
-
}
|
|
325
|
-
finally {
|
|
326
|
-
try {
|
|
327
|
-
controller.close();
|
|
328
|
-
}
|
|
329
|
-
catch { /* already closed */ }
|
|
330
|
-
}
|
|
331
|
-
},
|
|
332
|
-
}), {
|
|
333
|
-
status: 200,
|
|
334
|
-
headers: {
|
|
335
|
-
'Content-Type': 'text/event-stream',
|
|
336
|
-
'Cache-Control': 'no-cache',
|
|
337
|
-
'Connection': 'keep-alive',
|
|
338
|
-
'X-Accel-Buffering': 'no',
|
|
339
|
-
},
|
|
340
|
-
});
|
|
341
|
-
});
|
|
342
|
-
// GET /api/v2/sessions/:id/messages — список сообщений
|
|
343
|
-
app.get('/:id/messages', kit.requireAuth, async (c) => {
|
|
344
|
-
const session = await sessionManager.getSession(c.req.param('id'));
|
|
345
|
-
if (!session) {
|
|
346
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
347
|
-
}
|
|
348
|
-
const { serializeMessage } = await import('../lib/serialize.js');
|
|
349
|
-
return c.json({
|
|
350
|
-
messages: session.messages.map((m, i) => serializeMessage(m, i)),
|
|
351
|
-
session_id: session.id,
|
|
352
|
-
engine: session.engine,
|
|
353
|
-
});
|
|
354
|
-
});
|
|
355
|
-
// POST /api/v2/sessions/:id/clear — очистить все сообщения
|
|
356
|
-
app.post('/:id/clear', kit.requireAuth, async (c) => {
|
|
357
|
-
const session = await sessionManager.getSession(c.req.param('id'));
|
|
358
|
-
if (!session) {
|
|
359
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
360
|
-
}
|
|
361
|
-
session.messages = session.messages.filter((m) => m.pinned);
|
|
362
|
-
session.pendingMessages = [];
|
|
363
|
-
session.inputTokens = 0;
|
|
364
|
-
session.outputTokens = 0;
|
|
365
|
-
session.totalTokens = 0;
|
|
366
|
-
session.inputCost = 0;
|
|
367
|
-
session.outputCost = 0;
|
|
368
|
-
session.cacheReadCost = 0;
|
|
369
|
-
session.cacheWriteCost = 0;
|
|
370
|
-
await sessionManager.updateSession(session);
|
|
371
|
-
return c.json(serializeSession(session, { agentRegistry }));
|
|
372
|
-
});
|
|
373
|
-
// POST /api/v2/sessions/:id/abort — отменить генерацию
|
|
374
|
-
app.post('/:id/abort', kit.requireAuth, async (c) => {
|
|
375
|
-
const session = await sessionManager.getSession(c.req.param('id'));
|
|
376
|
-
if (!session) {
|
|
377
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
378
|
-
}
|
|
379
|
-
// Отмена стрима: прерываем fetch через cancelToken (orchestrator.cancel).
|
|
380
|
-
// Очистку pendingMessages/blocked/currentStream выполняет сам QueueProcessor —
|
|
381
|
-
// при cancelled processStream публикует stream.cancelled и возвращает {},
|
|
382
|
-
// после чего процессор снимает blocked и очищает currentStream в успешной ветке.
|
|
383
|
-
// НЕ вызываем queueManager.stop() — иначе сессия остаётся «зависшей» (stalled).
|
|
384
|
-
if (session.currentStream) {
|
|
385
|
-
orchestrator.cancel(session.currentStream.streamId);
|
|
386
|
-
}
|
|
387
|
-
return c.json({ status: 'aborted' });
|
|
388
|
-
});
|
|
389
|
-
// POST /api/v2/sessions/:id/resume-subagent — возобновить прерванную/ошибочную
|
|
390
|
-
// дочернюю сессию саб-агента. Валидация + блокировка синхронно, прогон — в фоне;
|
|
391
|
-
// итог resume пишется в родительскую сессию. 202/400/404/409.
|
|
392
|
-
app.post('/:id/resume-subagent', kit.requireAuth, async (c) => {
|
|
393
|
-
try {
|
|
394
|
-
const result = await orchestrator.startSubagentResume(c.req.param('id'));
|
|
395
|
-
return c.json(result, 202);
|
|
396
|
-
}
|
|
397
|
-
catch (err) {
|
|
398
|
-
if (err instanceof SubagentResumeError) {
|
|
399
|
-
return c.json({ error: { code: err.code, message: err.message } }, err.httpStatus);
|
|
400
|
-
}
|
|
401
|
-
return c.json({ error: { code: 'INTERNAL_ERROR', message: String(err) } }, 500);
|
|
402
|
-
}
|
|
403
|
-
});
|
|
404
|
-
// POST /api/v2/sessions/:id/summarize — запросить суммаризацию (через очередь)
|
|
405
|
-
app.post('/:id/summarize', kit.requireAuth, async (c) => {
|
|
406
|
-
const session = await sessionManager.getSession(c.req.param('id'));
|
|
407
|
-
if (!session) {
|
|
408
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
409
|
-
}
|
|
410
|
-
if (!contextOptimizer) {
|
|
411
|
-
return c.json({ error: { code: 'INTERNAL_ERROR', message: 'Context optimizer not configured' } }, 500);
|
|
412
|
-
}
|
|
413
|
-
if (!session.settings.provider || !session.settings.model) {
|
|
414
|
-
return c.json({ error: { code: 'INVALID_REQUEST', message: 'No provider/model configured for session' } }, 400);
|
|
415
|
-
}
|
|
416
|
-
// Проверка на минимальное количество активных сообщений
|
|
417
|
-
if (!contextOptimizer.canSummarize(session)) {
|
|
418
|
-
return c.json({
|
|
419
|
-
error: { code: 'INVALID_REQUEST', message: 'Need at least 3 active messages since last summary' },
|
|
420
|
-
}, 400);
|
|
421
|
-
}
|
|
422
|
-
const user = (await kit.getCurrentUser(c));
|
|
423
|
-
const streamId = generateStreamId();
|
|
424
|
-
const sysMsg = {
|
|
425
|
-
id: streamId,
|
|
426
|
-
role: MessageRole.SYSTEM,
|
|
427
|
-
seq: 0,
|
|
428
|
-
origin: 'local',
|
|
429
|
-
parts: [{ id: generateStreamId(), type: 'text', data: '' }],
|
|
430
|
-
content: '',
|
|
431
|
-
createdAt: nowISO(),
|
|
432
|
-
disabled: false,
|
|
433
|
-
pinned: false,
|
|
434
|
-
hidden: false,
|
|
435
|
-
author: user.username,
|
|
436
|
-
metadata: { type: 'summarization_request', reason: 'manual', stream_id: streamId },
|
|
437
|
-
};
|
|
438
|
-
const result = await enqueueUserMessage(sessionManager, eventBus, session.id, sysMsg, queueManager, processMessage);
|
|
439
|
-
if (!result) {
|
|
440
|
-
return c.json({ error: { code: 'QUEUE_FULL', message: 'Queue is full' } }, 429);
|
|
441
|
-
}
|
|
442
|
-
return c.json({ status: 'enqueued', stream_id: streamId });
|
|
443
|
-
});
|
|
444
196
|
// POST /api/v2/sessions/:id/debug-system-message — отправить отладочное системное сообщение
|
|
445
197
|
app.post('/:id/debug-system-message', kit.requireAuth, async (c) => {
|
|
446
198
|
const session = await sessionManager.getSession(c.req.param('id'));
|
|
@@ -555,62 +307,6 @@ export function createSessionRoutes(kit, sessionManager, eventBus, queueManager,
|
|
|
555
307
|
}
|
|
556
308
|
return c.json({ success: true });
|
|
557
309
|
});
|
|
558
|
-
// ===== References =====
|
|
559
|
-
// GET /api/v2/sessions/:id/references — список ссылок
|
|
560
|
-
app.get('/:id/references', kit.requireAuth, async (c) => {
|
|
561
|
-
const session = await sessionManager.getSession(c.req.param('id'));
|
|
562
|
-
if (!session) {
|
|
563
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
564
|
-
}
|
|
565
|
-
const refs = await sessionManager.getReferences(c.req.param('id'));
|
|
566
|
-
return c.json({ references: refs });
|
|
567
|
-
});
|
|
568
|
-
// POST /api/v2/sessions/:id/references — добавить ссылку
|
|
569
|
-
app.post('/:id/references', kit.requireAuth, async (c) => {
|
|
570
|
-
const body = await c.req.json().catch(() => ({}));
|
|
571
|
-
const sourceSessionId = body.source_session_id || body.sourceSessionId;
|
|
572
|
-
if (!sourceSessionId) {
|
|
573
|
-
return c.json({ error: { code: 'VALIDATION_ERROR', message: 'source_session_id is required' } }, 400);
|
|
574
|
-
}
|
|
575
|
-
const ref = await sessionManager.addReference(c.req.param('id'), sourceSessionId, {
|
|
576
|
-
label: body.label,
|
|
577
|
-
messageRange: body.message_range || body.messageRange,
|
|
578
|
-
autoSummarize: body.auto_summarize ?? body.autoSummarize ?? false,
|
|
579
|
-
position: body.position,
|
|
580
|
-
});
|
|
581
|
-
eventBus.publish(c.req.param('id'), 'session.reference.added', { reference: ref });
|
|
582
|
-
return c.json({ reference: ref }, 201);
|
|
583
|
-
});
|
|
584
|
-
// DELETE /api/v2/sessions/:id/references/:refSid — удалить ссылку
|
|
585
|
-
app.delete('/:id/references/:refSid', kit.requireAuth, async (c) => {
|
|
586
|
-
await sessionManager.removeReference(c.req.param('id'), c.req.param('refSid'));
|
|
587
|
-
eventBus.publish(c.req.param('id'), 'session.reference.removed', { session_id: c.req.param('refSid') });
|
|
588
|
-
return c.body(null, 204);
|
|
589
|
-
});
|
|
590
|
-
// POST /api/v2/sessions/:id/messages/merge — копировать сообщения из другой сессии
|
|
591
|
-
app.post('/:id/messages/merge', kit.requireAuth, async (c) => {
|
|
592
|
-
const body = await c.req.json().catch(() => ({}));
|
|
593
|
-
const sourceSessionId = body.source_session_id || body.sourceSessionId;
|
|
594
|
-
const sourceRange = body.source_range || body.sourceRange;
|
|
595
|
-
const position = body.position || 'after';
|
|
596
|
-
const anchorMessageId = body.anchor_message_id || body.anchorMessageId;
|
|
597
|
-
const summarize = body.summarize || false;
|
|
598
|
-
if (!sourceSessionId || !sourceRange || !Array.isArray(sourceRange) || sourceRange.length !== 2) {
|
|
599
|
-
return c.json({ error: { code: 'VALIDATION_ERROR', message: 'source_session_id and source_range are required' } }, 400);
|
|
600
|
-
}
|
|
601
|
-
const merged = await sessionManager.mergeMessages(c.req.param('id'), sourceSessionId, {
|
|
602
|
-
sourceRange: sourceRange,
|
|
603
|
-
position: position,
|
|
604
|
-
anchorMessageId,
|
|
605
|
-
summarize,
|
|
606
|
-
});
|
|
607
|
-
const { serializeMessage } = await import('../lib/serialize.js');
|
|
608
|
-
eventBus.publish(c.req.param('id'), 'session.messages.merged', {
|
|
609
|
-
messages: merged.map((m, i) => serializeMessage(m, i)),
|
|
610
|
-
source_session_id: sourceSessionId,
|
|
611
|
-
});
|
|
612
|
-
return c.json({ messages: merged.map((m, i) => serializeMessage(m, i)) }, 201);
|
|
613
|
-
});
|
|
614
310
|
// ===== Sticky Notes =====
|
|
615
311
|
// GET /api/v2/sessions/:id/notes — список заметок
|
|
616
312
|
app.get('/:id/notes', kit.requireAuth, async (c) => {
|
|
@@ -672,6 +368,30 @@ export function createSessionRoutes(kit, sessionManager, eventBus, queueManager,
|
|
|
672
368
|
eventBus.publish(c.req.param('id'), 'context.sticky_note_deleted', { note_id: noteId });
|
|
673
369
|
return c.json({ notes: updated.stickyNotes });
|
|
674
370
|
});
|
|
371
|
+
// Общая логика — в core-фабрике (backend-специфика выше). Регистрируем её
|
|
372
|
+
// последней: статические/backend-only сегменты должны матчиться раньше.
|
|
373
|
+
app.route('/', createCoreSessionRoutes({ requireAuth: kit.requireAuth }, { sessionManager, eventBus, queueManager, processMessage, orchestrator, contextOptimizer, projectStore, profilesStore }, {
|
|
374
|
+
resolveUserId: async (c) => (await kit.getCurrentUser(c)).id,
|
|
375
|
+
resolveOwner: async (c) => (await kit.getCurrentUser(c)).id,
|
|
376
|
+
forkWithOwner: true,
|
|
377
|
+
canAccess: (session, c, userId) => isSessionOwner(session, userId) || kit.isAdmin(c),
|
|
378
|
+
resolveAuthor: async (c) => (await kit.getCurrentUser(c)).username,
|
|
379
|
+
promptMessageId: 'stream',
|
|
380
|
+
publishRenamed: false,
|
|
381
|
+
publishDeletedBefore: false,
|
|
382
|
+
onSessionCreated: (userId, sessionId) => { void eventHub.subscribeToSession(userId, sessionId).catch((e) => console.warn('subscribeToSession failed:', e)); },
|
|
383
|
+
onSessionDeleted: (userId, sessionId) => { eventHub.unsubscribeFromSession(userId, sessionId); },
|
|
384
|
+
onSessionForked: (userId, sessionId) => { void eventHub.subscribeToSession(userId, sessionId).catch((e) => console.warn('subscribeToSession failed:', e)); },
|
|
385
|
+
promptMiddleware: [createRateLimiter(30, 60_000)],
|
|
386
|
+
enableSessionEvents: false,
|
|
387
|
+
resolveDefaultAgent,
|
|
388
|
+
messages: {
|
|
389
|
+
sessionNotFound: (c) => t('errors.notFound.session', undefined, c),
|
|
390
|
+
forbidden: (c) => t('auth.forbidden', undefined, c),
|
|
391
|
+
contentRequired: (c) => t('errors.validation.contentRequired', undefined, c),
|
|
392
|
+
queueFull: (c, max) => t('errors.chat.queueFull', { max }, c),
|
|
393
|
+
},
|
|
394
|
+
}));
|
|
675
395
|
return app;
|
|
676
396
|
}
|
|
677
397
|
//# sourceMappingURL=sessions.js.map
|