@itphx/synth-backend 0.2.0 → 0.3.0

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.
Files changed (65) hide show
  1. package/dist/agents/definitions/admin.json +18 -7
  2. package/dist/agents/definitions/analyst.json +14 -7
  3. package/dist/agents/definitions/assistant.json +17 -5
  4. package/dist/agents/definitions/auditor.json +13 -7
  5. package/dist/agents/definitions/developer.json +13 -3
  6. package/dist/agents/definitions/devops.json +16 -6
  7. package/dist/agents/definitions/{definitions/explore.json → explore.json} +1 -1
  8. package/dist/agents/definitions/{definitions/general.json → general.json} +1 -1
  9. package/dist/agents/definitions/pm.json +14 -7
  10. package/dist/agents/definitions/qa.json +16 -7
  11. package/dist/lib/orchestrator-workspace.test.js +2 -2
  12. package/dist/lib/orchestrator-workspace.test.js.map +1 -1
  13. package/dist/lib/serialize.d.ts +9 -2
  14. package/dist/lib/serialize.d.ts.map +1 -1
  15. package/dist/lib/serialize.js +9 -2
  16. package/dist/lib/serialize.js.map +1 -1
  17. package/dist/lib/serialize.test.js +4 -5
  18. package/dist/lib/serialize.test.js.map +1 -1
  19. package/dist/main.js +53 -7
  20. package/dist/main.js.map +1 -1
  21. package/dist/routes/agents.d.ts.map +1 -1
  22. package/dist/routes/agents.js +42 -55
  23. package/dist/routes/agents.js.map +1 -1
  24. package/dist/routes/agents.test.js +43 -0
  25. package/dist/routes/agents.test.js.map +1 -1
  26. package/dist/routes/context.js +1 -1
  27. package/dist/routes/context.js.map +1 -1
  28. package/dist/routes/gateway-patterns.test.js +2 -2
  29. package/dist/routes/gateway-patterns.test.js.map +1 -1
  30. package/dist/routes/models.d.ts.map +1 -1
  31. package/dist/routes/models.js +30 -5
  32. package/dist/routes/models.js.map +1 -1
  33. package/dist/routes/models.test.d.ts +2 -0
  34. package/dist/routes/models.test.d.ts.map +1 -0
  35. package/dist/routes/models.test.js +137 -0
  36. package/dist/routes/models.test.js.map +1 -0
  37. package/dist/routes/queue.d.ts.map +1 -1
  38. package/dist/routes/queue.js +95 -37
  39. package/dist/routes/queue.js.map +1 -1
  40. package/dist/routes/queue.test.d.ts +2 -0
  41. package/dist/routes/queue.test.d.ts.map +1 -0
  42. package/dist/routes/queue.test.js +224 -0
  43. package/dist/routes/queue.test.js.map +1 -0
  44. package/dist/routes/sessions.d.ts +2 -1
  45. package/dist/routes/sessions.d.ts.map +1 -1
  46. package/dist/routes/sessions.js +68 -10
  47. package/dist/routes/sessions.js.map +1 -1
  48. package/dist/routes/sessions.test.js +97 -2
  49. package/dist/routes/sessions.test.js.map +1 -1
  50. package/dist/storage/project-store.d.ts.map +1 -1
  51. package/dist/storage/project-store.js +12 -0
  52. package/dist/storage/project-store.js.map +1 -1
  53. package/package.json +4 -4
  54. package/dist/agents/definitions/definitions/admin.json +0 -24
  55. package/dist/agents/definitions/definitions/analyst.json +0 -20
  56. package/dist/agents/definitions/definitions/assistant.json +0 -25
  57. package/dist/agents/definitions/definitions/auditor.json +0 -19
  58. package/dist/agents/definitions/definitions/developer.json +0 -23
  59. package/dist/agents/definitions/definitions/devops.json +0 -23
  60. package/dist/agents/definitions/definitions/pm.json +0 -20
  61. package/dist/agents/definitions/definitions/qa.json +0 -22
  62. package/dist/auth/config.d.ts +0 -3
  63. package/dist/auth/config.d.ts.map +0 -1
  64. package/dist/auth/config.js +0 -47
  65. package/dist/auth/config.js.map +0 -1
@@ -0,0 +1,137 @@
1
+ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
2
+ import { Hono } from 'hono';
3
+ import { mkdtemp, rm } from 'node:fs/promises';
4
+ import { tmpdir } from 'node:os';
5
+ import { join } from 'node:path';
6
+ import { createModelRoutes } from './models.js';
7
+ import { JsonStore } from '../storage/json-store.js';
8
+ import { ProviderFactory } from '@itphx/synth-core';
9
+ const BASE = '/api/v2/models';
10
+ function createKit() {
11
+ return {
12
+ requireAuth: async (_c, next) => { await next(); },
13
+ requireAdmin: async (_c, next) => { await next(); },
14
+ };
15
+ }
16
+ async function makeApp(tmpDir) {
17
+ const modelStore = new JsonStore({ dataDir: tmpDir, subdir: 'models' });
18
+ const providerStore = new JsonStore({ dataDir: tmpDir, subdir: 'providers' });
19
+ await providerStore.save('p1', {
20
+ name: 'p1',
21
+ type: 'openai',
22
+ baseUrl: 'http://provider.local',
23
+ enabled: true,
24
+ });
25
+ const app = new Hono();
26
+ app.route(BASE, createModelRoutes(createKit(), modelStore, providerStore));
27
+ return { app, modelStore };
28
+ }
29
+ function postJSON(body) {
30
+ return {
31
+ method: 'POST',
32
+ headers: { 'Content-Type': 'application/json' },
33
+ body: JSON.stringify(body),
34
+ };
35
+ }
36
+ describe('routes/models', () => {
37
+ let tmpDir;
38
+ let stores;
39
+ beforeEach(async () => {
40
+ tmpDir = await mkdtemp(join(tmpdir(), 'synth-models-test-'));
41
+ stores = await makeApp(tmpDir);
42
+ });
43
+ afterEach(async () => {
44
+ await rm(tmpDir, { recursive: true, force: true });
45
+ vi.restoreAllMocks();
46
+ });
47
+ it('POST /models принимает snake_case, GET возвращает camelCase', async () => {
48
+ const res = await stores.app.request(BASE, postJSON({
49
+ id: 'p1/m1',
50
+ name: 'm1',
51
+ provider: 'p1',
52
+ context_window: 4096,
53
+ context_source: 'manual',
54
+ input_price: 1.5,
55
+ output_price: 0.75,
56
+ }));
57
+ expect(res.status).toBe(201);
58
+ const list = await stores.app.request(BASE);
59
+ const body = await list.json();
60
+ const model = body.groups.find((g) => g.provider.name === 'p1').models[0];
61
+ expect(model.contextWindow).toBe(4096);
62
+ expect(model.contextSource).toBe('manual');
63
+ expect(model.inputPrice).toBe(1.5);
64
+ expect(model.outputPrice).toBe(0.75);
65
+ });
66
+ it('POST /models принимает camelCase', async () => {
67
+ const res = await stores.app.request(BASE, postJSON({
68
+ id: 'p1/m2',
69
+ name: 'm2',
70
+ provider: 'p1',
71
+ contextWindow: 8192,
72
+ contextSource: 'api',
73
+ }));
74
+ expect(res.status).toBe(201);
75
+ const saved = await stores.modelStore.load('p1/m2');
76
+ expect(saved?.contextWindow).toBe(8192);
77
+ expect(saved?.contextSource).toBe('api');
78
+ });
79
+ it('POST /models c context_window=null очищает сохранённое окно и сбрасывает source', async () => {
80
+ await stores.modelStore.save('p1/m1', {
81
+ id: 'p1/m1', name: 'm1', provider: 'p1', enabled: true,
82
+ contextWindow: 4096, contextSource: 'manual',
83
+ });
84
+ const res = await stores.app.request(BASE, postJSON({
85
+ id: 'p1/m1',
86
+ context_window: null,
87
+ context_source: 'unknown',
88
+ }));
89
+ expect(res.status).toBe(200);
90
+ const saved = await stores.modelStore.load('p1/m1');
91
+ expect(saved?.contextWindow).toBeUndefined();
92
+ expect(saved?.contextSource).toBe('unknown');
93
+ });
94
+ describe('POST /models/fetch', () => {
95
+ it('не перезаписывает вручную заданное окно (source=manual)', async () => {
96
+ await stores.modelStore.save('p1/m1', {
97
+ id: 'p1/m1', name: 'm1', provider: 'p1', enabled: true,
98
+ contextWindow: 999, contextSource: 'manual',
99
+ });
100
+ vi.spyOn(ProviderFactory, 'create').mockReturnValue({
101
+ listModelsDetailed: vi.fn().mockResolvedValue([{ id: 'm1', contextWindow: 262144 }]),
102
+ });
103
+ const res = await stores.app.request(`${BASE}/fetch?provider=p1`, { method: 'POST' });
104
+ const body = await res.json();
105
+ expect(body.enriched).toBe(0);
106
+ const saved = await stores.modelStore.load('p1/m1');
107
+ expect(saved?.contextWindow).toBe(999);
108
+ expect(saved?.contextSource).toBe('manual');
109
+ });
110
+ it('обновляет окно из провайдера, если source не manual (reference/unknown/0)', async () => {
111
+ await stores.modelStore.save('p1/m1', {
112
+ id: 'p1/m1', name: 'm1', provider: 'p1', enabled: true,
113
+ contextWindow: 100, contextSource: 'reference',
114
+ });
115
+ await stores.modelStore.save('p1/m2', {
116
+ id: 'p1/m2', name: 'm2', provider: 'p1', enabled: true,
117
+ contextWindow: 0, contextSource: 'unknown',
118
+ });
119
+ vi.spyOn(ProviderFactory, 'create').mockReturnValue({
120
+ listModelsDetailed: vi.fn().mockResolvedValue([
121
+ { id: 'm1', contextWindow: 262144 },
122
+ { id: 'm2', contextWindow: 131072 },
123
+ ]),
124
+ });
125
+ const res = await stores.app.request(`${BASE}/fetch?provider=p1`, { method: 'POST' });
126
+ const body = await res.json();
127
+ expect(body.enriched).toBe(2);
128
+ const m1 = await stores.modelStore.load('p1/m1');
129
+ expect(m1?.contextWindow).toBe(262144);
130
+ expect(m1?.contextSource).toBe('api');
131
+ const m2 = await stores.modelStore.load('p1/m2');
132
+ expect(m2?.contextWindow).toBe(131072);
133
+ expect(m2?.contextSource).toBe('api');
134
+ });
135
+ });
136
+ });
137
+ //# sourceMappingURL=models.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"models.test.js","sourceRoot":"","sources":["../../src/routes/models.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/routes/queue.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,qBAAqB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI3G,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,OAAO,EACZ,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,qBAAqB,EACnC,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,GACnE,IAAI,CAgGN"}
1
+ {"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/routes/queue.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,qBAAqB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI3G,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,OAAO,EACZ,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,qBAAqB,EACnC,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,GACnE,IAAI,CA+JN"}
@@ -1,5 +1,5 @@
1
1
  import { Hono } from 'hono';
2
- import { generateStreamId } from '@itphx/synth-shared';
2
+ import { generateStreamId, MessageRole } from '@itphx/synth-shared';
3
3
  import { t } from '../lib/i18n.js';
4
4
  export function createQueueRoutes(kit, sessionManager, queueManager, eventBus, processMessage) {
5
5
  const app = new Hono();
@@ -22,31 +22,58 @@ export function createQueueRoutes(kit, sessionManager, queueManager, eventBus, p
22
22
  if (!session) {
23
23
  return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
24
24
  }
25
- let texts;
26
- if (index !== undefined && !isNaN(index)) {
27
- const msg = session.pendingMessages[index];
28
- if (!msg) {
29
- return c.json({ error: { code: 'NOT_FOUND', message: 'Message not found at index' } }, 404);
30
- }
31
- texts = [msg.content];
32
- await sessionManager.safeUpdate(sessionId, async (s) => {
33
- s.pendingMessages = s.pendingMessages.filter((_, i) => i !== index);
34
- });
25
+ if (index !== undefined && !isNaN(index) && !session.pendingMessages[index]) {
26
+ return c.json({ error: { code: 'NOT_FOUND', message: 'Message not found at index' } }, 404);
35
27
  }
36
- else {
37
- const hasActiveStream = session.currentStream != null;
38
- const msgs = hasActiveStream ? session.pendingMessages.slice(1) : session.pendingMessages;
39
- texts = msgs.map((m) => m.content);
40
- await sessionManager.safeUpdate(sessionId, async (s) => {
41
- if (hasActiveStream) {
42
- s.pendingMessages = s.pendingMessages.slice(0, 1);
43
- }
44
- else {
45
- s.pendingMessages = [];
46
- }
47
- });
48
- }
49
- if (session.pendingMessages.length === 0) {
28
+ // Активный стрим (не отменённый) продолжает обрабатываться — его user-сообщение
29
+ // из истории удалять нельзя. При зависшей сессии (cancelled=true) — можно.
30
+ const activeStreamId = session.currentStream && !session.currentStream.cancelled
31
+ ? session.currentStream.streamId
32
+ : undefined;
33
+ let texts = [];
34
+ let remainingCount = 0;
35
+ await sessionManager.safeUpdate(sessionId, async (s) => {
36
+ let removedStreamIds = [];
37
+ if (index !== undefined && !isNaN(index)) {
38
+ const msg = s.pendingMessages[index];
39
+ if (!msg)
40
+ return;
41
+ texts = [msg.content];
42
+ const sid = msg.metadata?.stream_id;
43
+ removedStreamIds = sid ? [sid] : [];
44
+ s.pendingMessages = s.pendingMessages.filter((_, i) => i !== index);
45
+ }
46
+ else {
47
+ texts = s.pendingMessages.map((m) => m.content);
48
+ removedStreamIds = s.pendingMessages
49
+ .map((m) => m.metadata?.stream_id)
50
+ .filter((id) => !!id);
51
+ s.pendingMessages = [];
52
+ }
53
+ remainingCount = s.pendingMessages.length;
54
+ // Удаляем возвращённые user-сообщения из истории по stream_id, чтобы при
55
+ // повторной отправке из поля ввода не было дубля. Активный стрим не трогаем.
56
+ if (removedStreamIds.length > 0) {
57
+ s.messages = s.messages.filter((m) => {
58
+ if (m.role !== MessageRole.USER)
59
+ return true;
60
+ const sid = m.metadata?.stream_id;
61
+ if (!sid)
62
+ return true;
63
+ if (sid === activeStreamId)
64
+ return true;
65
+ return !removedStreamIds.includes(sid);
66
+ });
67
+ }
68
+ // Разблокируем сессию: снимаем blocked и currentStream (иначе return
69
+ // оставит сессию в «зависшем» состоянии с pending=0, но blocked).
70
+ if (remainingCount === 0) {
71
+ s.status.blocked = undefined;
72
+ s.status.blockedAt = undefined;
73
+ s.currentStream = undefined;
74
+ }
75
+ });
76
+ if (remainingCount === 0 && !activeStreamId) {
50
77
  queueManager.stop(sessionId);
51
78
  }
52
79
  return c.json({ texts });
@@ -63,25 +90,56 @@ export function createQueueRoutes(kit, sessionManager, queueManager, eventBus, p
63
90
  }
64
91
  // Разблокировать и запустить процессор заново
65
92
  await sessionManager.forceReleaseLock(sessionId);
66
- // Сообщения уже в очереди — не переенквеиваем, иначе будет дубликат.
67
- // Публикуем message.queued вручную и стартуем процессор.
93
+ // Используем существующий stream_id первого pending-сообщения, НЕ генерируем
94
+ // новый — иначе Phase 1 нового процессора повторно запушит сообщение в историю.
95
+ // Если stream_id отсутствует — генерируем один раз и сохраняем.
96
+ // Публикуем message.queued только если сообщение ещё НЕ в истории.
68
97
  const firstMsg = session.pendingMessages[0];
98
+ let streamId;
99
+ let alreadyInHistory = false;
69
100
  if (firstMsg) {
70
- if (!firstMsg.metadata)
71
- firstMsg.metadata = {};
72
- if (!firstMsg.metadata.stream_id)
73
- firstMsg.metadata.stream_id = generateStreamId();
74
- eventBus.publish(sessionId, 'message.queued', {
75
- stream_id: firstMsg.metadata.stream_id,
76
- pending_count: session.pendingMessages.length,
77
- message: firstMsg.content,
78
- agent_role: firstMsg.agentRole,
79
- author: firstMsg.author,
101
+ await sessionManager.safeUpdate(sessionId, async (s) => {
102
+ const p = s.pendingMessages[0];
103
+ if (!p)
104
+ return;
105
+ if (!p.metadata)
106
+ p.metadata = {};
107
+ if (!p.metadata.stream_id)
108
+ p.metadata.stream_id = generateStreamId();
109
+ streamId = p.metadata.stream_id;
110
+ alreadyInHistory = s.messages.some((m) => m.role === MessageRole.USER && m.metadata?.stream_id === streamId);
80
111
  });
112
+ if (streamId && !alreadyInHistory) {
113
+ eventBus.publish(sessionId, 'message.queued', {
114
+ stream_id: streamId,
115
+ pending_count: session.pendingMessages.length,
116
+ message: firstMsg.content,
117
+ agent_role: firstMsg.agentRole,
118
+ author: firstMsg.author,
119
+ });
120
+ }
81
121
  }
82
122
  queueManager.createProcessor(sessionId, sessionManager, eventBus, processMessage);
83
123
  return c.json({ resumed: true, pending_count: session.pendingMessages.length });
84
124
  });
125
+ // POST /api/v2/queue/:sessionId/retry-now — немедленный повтор при backoff
126
+ app.post('/:sessionId/retry-now', kit.requireAuth, async (c) => {
127
+ const sessionId = c.req.param('sessionId');
128
+ const retried = queueManager.retryNow(sessionId);
129
+ if (!retried) {
130
+ return c.json({ error: { code: 'CONFLICT', message: 'Процессор не находится в состоянии повтора' } }, 409);
131
+ }
132
+ return c.json({ retried: true });
133
+ });
134
+ // POST /api/v2/queue/:sessionId/cancel-retry — отменить повторные попытки
135
+ app.post('/:sessionId/cancel-retry', kit.requireAuth, async (c) => {
136
+ const sessionId = c.req.param('sessionId');
137
+ const cancelled = await queueManager.cancelRetry(sessionId);
138
+ if (!cancelled) {
139
+ return c.json({ error: { code: 'CONFLICT', message: 'Процессор не найден' } }, 409);
140
+ }
141
+ return c.json({ cancelled: true });
142
+ });
85
143
  return app;
86
144
  }
87
145
  //# sourceMappingURL=queue.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/routes/queue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/routes/queue.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=queue.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"queue.test.d.ts","sourceRoot":"","sources":["../../src/routes/queue.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,224 @@
1
+ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
2
+ import { Hono } from 'hono';
3
+ import { mkdtemp, rm } from 'node:fs/promises';
4
+ import { tmpdir } from 'node:os';
5
+ import { join } from 'node:path';
6
+ import { createQueueRoutes } from './queue.js';
7
+ import { SessionManager, EventBus, FileStore } from '@itphx/synth-core';
8
+ import { generateId, MessageRole, nowISO, makeTextPart } from '@itphx/synth-shared';
9
+ function makeMessage(content = 'Привет') {
10
+ return {
11
+ id: generateId(),
12
+ role: MessageRole.USER,
13
+ seq: 0,
14
+ origin: 'local',
15
+ parts: [makeTextPart(content)],
16
+ content,
17
+ createdAt: nowISO(),
18
+ disabled: false,
19
+ pinned: false,
20
+ hidden: false,
21
+ author: 'user',
22
+ metadata: { stream_id: generateId() },
23
+ };
24
+ }
25
+ function createMockKit() {
26
+ return {
27
+ requireAuth: async (_c, next) => { await next(); },
28
+ requirePermission: () => async (_c, next) => { await next(); },
29
+ getCurrentUser: () => ({
30
+ id: 'test-user',
31
+ username: 'test-user',
32
+ roles: ['USER'],
33
+ preferredLanguage: 'ru',
34
+ createdAt: '',
35
+ teamRole: 'USER',
36
+ notes: '',
37
+ interviewCompleted: false,
38
+ }),
39
+ };
40
+ }
41
+ function createMockQueueManager() {
42
+ return {
43
+ stop: vi.fn(),
44
+ createProcessor: vi.fn(),
45
+ retryNow: vi.fn().mockReturnValue(false),
46
+ cancelRetry: vi.fn().mockResolvedValue(false),
47
+ isRunning: vi.fn().mockReturnValue(false),
48
+ stopAll: vi.fn(),
49
+ getRingBuffer: vi.fn(),
50
+ setContextOptimizer: vi.fn(),
51
+ };
52
+ }
53
+ function createTestApp(tmpDir) {
54
+ const app = new Hono();
55
+ const kit = createMockKit();
56
+ const fileStore = new FileStore({ dataDir: tmpDir });
57
+ const sessionManager = new SessionManager(fileStore);
58
+ const eventBus = new EventBus();
59
+ const queueManager = createMockQueueManager();
60
+ const processMessage = vi.fn().mockResolvedValue({});
61
+ const queueRoutes = createQueueRoutes(kit, sessionManager, queueManager, eventBus, processMessage);
62
+ app.route('/api/v2/queue', queueRoutes);
63
+ return { app, sessionManager, eventBus, queueManager };
64
+ }
65
+ describe('Queue API Routes', () => {
66
+ let tmpDir;
67
+ beforeEach(async () => {
68
+ tmpDir = await mkdtemp(join(tmpdir(), 'synth-queue-'));
69
+ });
70
+ afterEach(async () => {
71
+ await rm(tmpDir, { recursive: true, force: true });
72
+ });
73
+ describe('POST /api/v2/queue/:sessionId/return', () => {
74
+ it('без index возвращает все тексты, очищает очередь и удаляет user-сообщения из истории', async () => {
75
+ const { app, sessionManager } = createTestApp(tmpDir);
76
+ const session = await sessionManager.createSession({ title: 'R' });
77
+ const msg1 = makeMessage('первое');
78
+ const msg2 = makeMessage('второе');
79
+ await sessionManager.addPendingMessage(session.id, msg1);
80
+ await sessionManager.addPendingMessage(session.id, msg2);
81
+ await sessionManager.addMessage(session.id, msg1);
82
+ await sessionManager.addMessage(session.id, msg2);
83
+ const res = await app.request(`/api/v2/queue/${session.id}/return`, { method: 'POST' });
84
+ expect(res.status).toBe(200);
85
+ const body = await res.json();
86
+ expect(body.texts).toEqual(['первое', 'второе']);
87
+ const s = await sessionManager.getSession(session.id);
88
+ expect(s.pendingMessages).toHaveLength(0);
89
+ expect(s.messages.filter((m) => m.role === MessageRole.USER)).toHaveLength(0);
90
+ });
91
+ it('с index=N возвращает одно сообщение и удаляет только его', async () => {
92
+ const { app, sessionManager } = createTestApp(tmpDir);
93
+ const session = await sessionManager.createSession({ title: 'R' });
94
+ const msg1 = makeMessage('первое');
95
+ const msg2 = makeMessage('второе');
96
+ await sessionManager.addPendingMessage(session.id, msg1);
97
+ await sessionManager.addPendingMessage(session.id, msg2);
98
+ await sessionManager.addMessage(session.id, msg1);
99
+ await sessionManager.addMessage(session.id, msg2);
100
+ const res = await app.request(`/api/v2/queue/${session.id}/return?index=0`, { method: 'POST' });
101
+ expect(res.status).toBe(200);
102
+ const body = await res.json();
103
+ expect(body.texts).toEqual(['первое']);
104
+ const s = await sessionManager.getSession(session.id);
105
+ expect(s.pendingMessages).toHaveLength(1);
106
+ expect(s.pendingMessages[0].content).toBe('второе');
107
+ expect(s.messages.filter((m) => m.role === MessageRole.USER && m.content === 'первое')).toHaveLength(0);
108
+ expect(s.messages.filter((m) => m.role === MessageRole.USER && m.content === 'второе')).toHaveLength(1);
109
+ });
110
+ it('не удаляет из истории сообщение активного (не отменённого) стрима', async () => {
111
+ const { app, sessionManager } = createTestApp(tmpDir);
112
+ const session = await sessionManager.createSession({ title: 'R' });
113
+ const active = makeMessage('активное');
114
+ const queued = makeMessage('в очереди');
115
+ await sessionManager.addPendingMessage(session.id, active);
116
+ await sessionManager.addPendingMessage(session.id, queued);
117
+ await sessionManager.addMessage(session.id, active);
118
+ await sessionManager.addMessage(session.id, queued);
119
+ const activeStreamId = active.metadata.stream_id;
120
+ await sessionManager.safeUpdate(session.id, async (s) => {
121
+ s.currentStream = {
122
+ streamId: activeStreamId,
123
+ message: active.content,
124
+ agentRole: active.agentRole,
125
+ startedAt: nowISO(),
126
+ cancelled: false,
127
+ };
128
+ });
129
+ const res = await app.request(`/api/v2/queue/${session.id}/return`, { method: 'POST' });
130
+ expect(res.status).toBe(200);
131
+ const body = await res.json();
132
+ expect(body.texts).toEqual(['активное', 'в очереди']);
133
+ const s = await sessionManager.getSession(session.id);
134
+ expect(s.pendingMessages).toHaveLength(0);
135
+ // Активный стрим остаётся в истории, queued — удаляется
136
+ expect(s.messages.filter((m) => m.role === MessageRole.USER && m.content === 'активное')).toHaveLength(1);
137
+ expect(s.messages.filter((m) => m.role === MessageRole.USER && m.content === 'в очереди')).toHaveLength(0);
138
+ });
139
+ it('при зависшей сессии (currentStream.cancelled=true) возвращает все тексты, удаляет сообщения и разблокирует', async () => {
140
+ const { app, sessionManager } = createTestApp(tmpDir);
141
+ const session = await sessionManager.createSession({ title: 'Stalled' });
142
+ const msg = makeMessage('зависшее');
143
+ await sessionManager.addPendingMessage(session.id, msg);
144
+ await sessionManager.addMessage(session.id, msg);
145
+ // Имитация «зависшей» сессии: currentStream не null, но cancelled=true
146
+ await sessionManager.safeUpdate(session.id, async (s) => {
147
+ s.status.blocked = session.id;
148
+ s.status.blockedAt = nowISO();
149
+ s.currentStream = {
150
+ streamId: msg.metadata.stream_id,
151
+ message: msg.content,
152
+ agentRole: msg.agentRole,
153
+ startedAt: nowISO(),
154
+ cancelled: true,
155
+ };
156
+ });
157
+ const res = await app.request(`/api/v2/queue/${session.id}/return`, { method: 'POST' });
158
+ expect(res.status).toBe(200);
159
+ const body = await res.json();
160
+ expect(body.texts).toEqual(['зависшее']);
161
+ const s = await sessionManager.getSession(session.id);
162
+ expect(s.pendingMessages).toHaveLength(0);
163
+ expect(s.status.blocked).toBeUndefined();
164
+ expect(s.currentStream).toBeUndefined();
165
+ expect(s.messages.filter((m) => m.role === MessageRole.USER)).toHaveLength(0);
166
+ });
167
+ it('возвращает 404 для несуществующего index', async () => {
168
+ const { app, sessionManager } = createTestApp(tmpDir);
169
+ const session = await sessionManager.createSession({ title: 'R' });
170
+ const msg = makeMessage('первое');
171
+ await sessionManager.addPendingMessage(session.id, msg);
172
+ const res = await app.request(`/api/v2/queue/${session.id}/return?index=5`, { method: 'POST' });
173
+ expect(res.status).toBe(404);
174
+ });
175
+ });
176
+ describe('POST /api/v2/queue/:sessionId/resume', () => {
177
+ it('не дублирует: не публикует message.queued, если сообщение уже в истории', async () => {
178
+ const { app, sessionManager, eventBus } = createTestApp(tmpDir);
179
+ const session = await sessionManager.createSession({ title: 'Resume' });
180
+ const msg = makeMessage('зависшее');
181
+ const streamId = msg.metadata.stream_id;
182
+ await sessionManager.addPendingMessage(session.id, msg);
183
+ await sessionManager.addMessage(session.id, msg);
184
+ const events = [];
185
+ eventBus.subscribe(session.id, (e) => events.push(e));
186
+ const res = await app.request(`/api/v2/queue/${session.id}/resume`, { method: 'POST' });
187
+ expect(res.status).toBe(200);
188
+ const body = await res.json();
189
+ expect(body.resumed).toBe(true);
190
+ expect(body.pending_count).toBe(1);
191
+ // stream_id не перегенерирован
192
+ const s = await sessionManager.getSession(session.id);
193
+ expect(s.pendingMessages[0].metadata?.stream_id).toBe(streamId);
194
+ // message.queued не опубликован (сообщение уже в истории)
195
+ expect(events.filter((e) => e.type === 'message.queued')).toHaveLength(0);
196
+ });
197
+ it('публикует message.queued с существующим stream_id, если сообщение не в истории', async () => {
198
+ const { app, sessionManager, eventBus } = createTestApp(tmpDir);
199
+ const session = await sessionManager.createSession({ title: 'Resume' });
200
+ const msg = makeMessage('новое');
201
+ const streamId = msg.metadata.stream_id;
202
+ await sessionManager.addPendingMessage(session.id, msg);
203
+ const events = [];
204
+ eventBus.subscribe(session.id, (e) => events.push(e));
205
+ const res = await app.request(`/api/v2/queue/${session.id}/resume`, { method: 'POST' });
206
+ expect(res.status).toBe(200);
207
+ const queued = events.find((e) => e.type === 'message.queued');
208
+ expect(queued).toBeDefined();
209
+ expect(queued.data.stream_id).toBe(streamId);
210
+ const s = await sessionManager.getSession(session.id);
211
+ expect(s.pendingMessages[0].metadata?.stream_id).toBe(streamId);
212
+ });
213
+ it('возвращает pending_count 0 для пустой очереди', async () => {
214
+ const { app, sessionManager } = createTestApp(tmpDir);
215
+ const session = await sessionManager.createSession({ title: 'Resume' });
216
+ const res = await app.request(`/api/v2/queue/${session.id}/resume`, { method: 'POST' });
217
+ expect(res.status).toBe(200);
218
+ const body = await res.json();
219
+ expect(body.resumed).toBe(true);
220
+ expect(body.pending_count).toBe(0);
221
+ });
222
+ });
223
+ });
224
+ //# sourceMappingURL=queue.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"queue.test.js","sourceRoot":"","sources":["../../src/routes/queue.test.ts"],"names":[],"mappings":"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"}
@@ -6,5 +6,6 @@ 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
8
  import type { EventHub } from '../events/hub.js';
9
- export declare function createSessionRoutes(kit: AuthKit, sessionManager: SessionManager, eventBus: EventBus, queueManager: QueueProcessorManager, processMessage: ReturnType<ChatOrchestrator['createProcessMessage']>, orchestrator: ChatOrchestrator, eventHub: EventHub, contextOptimizer?: ContextOptimizer): Hono;
9
+ import type { ProjectStore } from '../storage/project-store.js';
10
+ export declare function createSessionRoutes(kit: AuthKit, sessionManager: SessionManager, eventBus: EventBus, queueManager: QueueProcessorManager, processMessage: ReturnType<ChatOrchestrator['createProcessMessage']>, orchestrator: ChatOrchestrator, eventHub: EventHub, contextOptimizer?: ContextOptimizer, projectStore?: ProjectStore): Hono;
10
11
  //# 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;AAM1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,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,GAClC,IAAI,CA8lBN"}
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;AAM1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,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,GAC1B,IAAI,CAwpBN"}