@itphx/synth-backend 0.7.3 → 0.8.3
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 +1 -2
- package/dist/app.js +241 -85
- package/dist/auth/middleware.d.ts +0 -1
- package/dist/auth/middleware.js +0 -1
- package/dist/auth/oidc.d.ts +0 -1
- package/dist/auth/oidc.js +0 -1
- package/dist/events/hub.d.ts +0 -1
- package/dist/events/hub.js +0 -1
- package/dist/lib/app-config.d.ts +0 -1
- package/dist/lib/app-config.js +0 -1
- package/dist/lib/defaults-store.d.ts +0 -1
- package/dist/lib/defaults-store.js +0 -1
- package/dist/lib/i18n-config.d.ts +0 -1
- package/dist/lib/i18n-config.js +0 -1
- package/dist/lib/i18n.d.ts +0 -1
- package/dist/lib/i18n.js +2 -1
- package/dist/lib/recalc-can-summarize.d.ts +15 -0
- package/dist/lib/recalc-can-summarize.js +47 -0
- package/dist/main.d.ts +0 -1
- package/dist/main.js +0 -1
- package/dist/middleware/rate-limiter.d.ts +0 -1
- package/dist/middleware/rate-limiter.js +0 -1
- package/dist/routes/agents.d.ts +8 -4
- package/dist/routes/agents.js +18 -155
- package/dist/routes/audit.d.ts +0 -1
- package/dist/routes/audit.js +0 -1
- package/dist/routes/auth.d.ts +0 -1
- package/dist/routes/auth.js +0 -1
- package/dist/routes/context.d.ts +0 -1
- package/dist/routes/context.js +0 -1
- package/dist/routes/debug.d.ts +0 -1
- package/dist/routes/debug.js +0 -1
- package/dist/routes/gateway-patterns.d.ts +0 -1
- package/dist/routes/gateway-patterns.js +0 -1
- package/dist/routes/llm.d.ts +0 -1
- package/dist/routes/llm.js +0 -1
- package/dist/routes/logs.d.ts +0 -1
- package/dist/routes/logs.js +0 -1
- package/dist/routes/mcp-registry.d.ts +16 -0
- package/dist/routes/mcp-registry.js +359 -0
- package/dist/routes/mcp.d.ts +9 -14
- package/dist/routes/mcp.js +10 -383
- package/dist/routes/messages.d.ts +5 -1
- package/dist/routes/messages.js +15 -154
- package/dist/routes/models.d.ts +3 -3
- package/dist/routes/models.js +7 -169
- package/dist/routes/projects.d.ts +24 -4
- package/dist/routes/projects.js +53 -217
- package/dist/routes/providers.d.ts +1 -2
- package/dist/routes/providers.js +0 -1
- package/dist/routes/queue.d.ts +4 -1
- package/dist/routes/queue.js +11 -139
- package/dist/routes/sessions.d.ts +1 -2
- package/dist/routes/sessions.js +4 -2
- package/dist/routes/users.d.ts +0 -1
- package/dist/routes/users.js +0 -1
- package/package.json +4 -5
- package/dist/app.d.ts.map +0 -1
- package/dist/app.js.map +0 -1
- package/dist/auth/middleware.d.ts.map +0 -1
- package/dist/auth/middleware.js.map +0 -1
- package/dist/auth/oidc.d.ts.map +0 -1
- package/dist/auth/oidc.js.map +0 -1
- package/dist/auth/oidc.test.d.ts +0 -2
- package/dist/auth/oidc.test.d.ts.map +0 -1
- package/dist/auth/oidc.test.js +0 -39
- package/dist/auth/oidc.test.js.map +0 -1
- package/dist/events/hub.d.ts.map +0 -1
- package/dist/events/hub.js.map +0 -1
- package/dist/events/hub.test.d.ts +0 -2
- package/dist/events/hub.test.d.ts.map +0 -1
- package/dist/events/hub.test.js +0 -74
- package/dist/events/hub.test.js.map +0 -1
- package/dist/integration/hybrid.integration.test.d.ts +0 -2
- package/dist/integration/hybrid.integration.test.d.ts.map +0 -1
- package/dist/integration/hybrid.integration.test.js +0 -289
- package/dist/integration/hybrid.integration.test.js.map +0 -1
- package/dist/lib/app-config.d.ts.map +0 -1
- package/dist/lib/app-config.js.map +0 -1
- package/dist/lib/defaults-store.d.ts.map +0 -1
- package/dist/lib/defaults-store.js.map +0 -1
- package/dist/lib/defaults-store.test.d.ts +0 -2
- package/dist/lib/defaults-store.test.d.ts.map +0 -1
- package/dist/lib/defaults-store.test.js +0 -168
- package/dist/lib/defaults-store.test.js.map +0 -1
- package/dist/lib/git-service.d.ts +0 -15
- package/dist/lib/git-service.d.ts.map +0 -1
- package/dist/lib/git-service.js +0 -215
- package/dist/lib/git-service.js.map +0 -1
- package/dist/lib/i18n-config.d.ts.map +0 -1
- package/dist/lib/i18n-config.js.map +0 -1
- package/dist/lib/i18n.d.ts.map +0 -1
- package/dist/lib/i18n.js.map +0 -1
- package/dist/lib/orchestrator-workspace.test.d.ts +0 -2
- package/dist/lib/orchestrator-workspace.test.d.ts.map +0 -1
- package/dist/lib/orchestrator-workspace.test.js +0 -85
- package/dist/lib/orchestrator-workspace.test.js.map +0 -1
- package/dist/lib/workspace-resolver.d.ts +0 -26
- package/dist/lib/workspace-resolver.d.ts.map +0 -1
- package/dist/lib/workspace-resolver.js +0 -249
- package/dist/lib/workspace-resolver.js.map +0 -1
- package/dist/main.d.ts.map +0 -1
- package/dist/main.js.map +0 -1
- package/dist/middleware/rate-limiter.d.ts.map +0 -1
- package/dist/middleware/rate-limiter.js.map +0 -1
- package/dist/routes/agents.d.ts.map +0 -1
- package/dist/routes/agents.js.map +0 -1
- package/dist/routes/agents.test.d.ts +0 -2
- package/dist/routes/agents.test.d.ts.map +0 -1
- package/dist/routes/agents.test.js +0 -211
- package/dist/routes/agents.test.js.map +0 -1
- package/dist/routes/audit.d.ts.map +0 -1
- package/dist/routes/audit.js.map +0 -1
- package/dist/routes/audit.test.d.ts +0 -2
- package/dist/routes/audit.test.d.ts.map +0 -1
- package/dist/routes/audit.test.js +0 -285
- package/dist/routes/audit.test.js.map +0 -1
- package/dist/routes/auth.d.ts.map +0 -1
- package/dist/routes/auth.js.map +0 -1
- package/dist/routes/auth.test.d.ts +0 -2
- package/dist/routes/auth.test.d.ts.map +0 -1
- package/dist/routes/auth.test.js +0 -63
- package/dist/routes/auth.test.js.map +0 -1
- package/dist/routes/context.d.ts.map +0 -1
- package/dist/routes/context.js.map +0 -1
- package/dist/routes/debug.d.ts.map +0 -1
- package/dist/routes/debug.js.map +0 -1
- package/dist/routes/debug.test.d.ts +0 -2
- package/dist/routes/debug.test.d.ts.map +0 -1
- package/dist/routes/debug.test.js +0 -102
- package/dist/routes/debug.test.js.map +0 -1
- package/dist/routes/fs.d.ts +0 -5
- package/dist/routes/fs.d.ts.map +0 -1
- package/dist/routes/fs.js +0 -391
- package/dist/routes/fs.js.map +0 -1
- package/dist/routes/gateway-patterns.d.ts.map +0 -1
- package/dist/routes/gateway-patterns.js.map +0 -1
- package/dist/routes/gateway-patterns.test.d.ts +0 -2
- package/dist/routes/gateway-patterns.test.d.ts.map +0 -1
- package/dist/routes/gateway-patterns.test.js +0 -176
- package/dist/routes/gateway-patterns.test.js.map +0 -1
- package/dist/routes/git.d.ts +0 -5
- package/dist/routes/git.d.ts.map +0 -1
- package/dist/routes/git.js +0 -105
- package/dist/routes/git.js.map +0 -1
- package/dist/routes/llm.d.ts.map +0 -1
- package/dist/routes/llm.js.map +0 -1
- package/dist/routes/llm.test.d.ts +0 -2
- package/dist/routes/llm.test.d.ts.map +0 -1
- package/dist/routes/llm.test.js +0 -629
- package/dist/routes/llm.test.js.map +0 -1
- package/dist/routes/logs.d.ts.map +0 -1
- package/dist/routes/logs.js.map +0 -1
- package/dist/routes/logs.test.d.ts +0 -2
- package/dist/routes/logs.test.d.ts.map +0 -1
- package/dist/routes/logs.test.js +0 -269
- package/dist/routes/logs.test.js.map +0 -1
- package/dist/routes/mcp-network-policy.integration.test.d.ts +0 -2
- package/dist/routes/mcp-network-policy.integration.test.d.ts.map +0 -1
- package/dist/routes/mcp-network-policy.integration.test.js +0 -44
- package/dist/routes/mcp-network-policy.integration.test.js.map +0 -1
- package/dist/routes/mcp-registry.test.d.ts +0 -2
- package/dist/routes/mcp-registry.test.d.ts.map +0 -1
- package/dist/routes/mcp-registry.test.js +0 -247
- package/dist/routes/mcp-registry.test.js.map +0 -1
- package/dist/routes/mcp.d.ts.map +0 -1
- package/dist/routes/mcp.js.map +0 -1
- package/dist/routes/mcp.test.d.ts +0 -2
- package/dist/routes/mcp.test.d.ts.map +0 -1
- package/dist/routes/mcp.test.js +0 -388
- package/dist/routes/mcp.test.js.map +0 -1
- package/dist/routes/messages.d.ts.map +0 -1
- package/dist/routes/messages.js.map +0 -1
- package/dist/routes/models.d.ts.map +0 -1
- package/dist/routes/models.js.map +0 -1
- package/dist/routes/models.test.d.ts +0 -2
- package/dist/routes/models.test.d.ts.map +0 -1
- package/dist/routes/models.test.js +0 -449
- package/dist/routes/models.test.js.map +0 -1
- package/dist/routes/projects-mcp.test.d.ts +0 -6
- package/dist/routes/projects-mcp.test.d.ts.map +0 -1
- package/dist/routes/projects-mcp.test.js +0 -160
- package/dist/routes/projects-mcp.test.js.map +0 -1
- package/dist/routes/projects.d.ts.map +0 -1
- package/dist/routes/projects.js.map +0 -1
- package/dist/routes/projects.test.d.ts +0 -2
- package/dist/routes/projects.test.d.ts.map +0 -1
- package/dist/routes/projects.test.js +0 -250
- package/dist/routes/projects.test.js.map +0 -1
- package/dist/routes/providers.d.ts.map +0 -1
- package/dist/routes/providers.js.map +0 -1
- package/dist/routes/providers.test.d.ts +0 -2
- package/dist/routes/providers.test.d.ts.map +0 -1
- package/dist/routes/providers.test.js +0 -211
- package/dist/routes/providers.test.js.map +0 -1
- package/dist/routes/queue.d.ts.map +0 -1
- package/dist/routes/queue.js.map +0 -1
- package/dist/routes/queue.test.d.ts +0 -2
- package/dist/routes/queue.test.d.ts.map +0 -1
- package/dist/routes/queue.test.js +0 -224
- package/dist/routes/queue.test.js.map +0 -1
- package/dist/routes/sessions-mcp.test.d.ts +0 -6
- package/dist/routes/sessions-mcp.test.d.ts.map +0 -1
- package/dist/routes/sessions-mcp.test.js +0 -182
- package/dist/routes/sessions-mcp.test.js.map +0 -1
- package/dist/routes/sessions.d.ts.map +0 -1
- package/dist/routes/sessions.js.map +0 -1
- package/dist/routes/sessions.test.d.ts +0 -2
- package/dist/routes/sessions.test.d.ts.map +0 -1
- package/dist/routes/sessions.test.js +0 -602
- package/dist/routes/sessions.test.js.map +0 -1
- package/dist/routes/settings.test.d.ts +0 -2
- package/dist/routes/settings.test.d.ts.map +0 -1
- package/dist/routes/settings.test.js +0 -184
- package/dist/routes/settings.test.js.map +0 -1
- package/dist/routes/users.d.ts.map +0 -1
- package/dist/routes/users.js.map +0 -1
- package/dist/storage/json-store.d.ts +0 -20
- package/dist/storage/json-store.d.ts.map +0 -1
- package/dist/storage/json-store.js +0 -100
- package/dist/storage/json-store.js.map +0 -1
- package/dist/storage/json-store.test.d.ts +0 -2
- package/dist/storage/json-store.test.d.ts.map +0 -1
- package/dist/storage/json-store.test.js +0 -59
- package/dist/storage/json-store.test.js.map +0 -1
- package/dist/storage/project-store.d.ts +0 -30
- package/dist/storage/project-store.d.ts.map +0 -1
- package/dist/storage/project-store.js +0 -109
- package/dist/storage/project-store.js.map +0 -1
package/dist/app.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { Hono } from 'hono';
|
|
|
4
4
|
import { SessionManager, EventBus, QueueProcessorManager, ChatOrchestrator, RuntimeSettingsStore } from '@itphx/synth-core';
|
|
5
5
|
import type { BackendConfig } from './lib/app-config.js';
|
|
6
6
|
import type { AuthKit } from './auth/middleware.js';
|
|
7
|
-
import { ProjectStore } from '
|
|
7
|
+
import { ProjectStore } from '@itphx/synth-core';
|
|
8
8
|
import { EventHub } from './events/hub.js';
|
|
9
9
|
export interface CreateBackendAppOptions {
|
|
10
10
|
/** Путь к config.yaml (по умолчанию — каскадный поиск, как в main.ts). */
|
|
@@ -44,4 +44,3 @@ export interface BackendAppHandle {
|
|
|
44
44
|
}>;
|
|
45
45
|
}
|
|
46
46
|
export declare function createBackendApp(opts?: CreateBackendAppOptions): Promise<BackendAppHandle>;
|
|
47
|
-
//# sourceMappingURL=app.d.ts.map
|
package/dist/app.js
CHANGED
|
@@ -10,29 +10,28 @@
|
|
|
10
10
|
// тестам поднимать изолированный backend in-process с debug auth и
|
|
11
11
|
// фейковыми провайдерами без OIDC.
|
|
12
12
|
import { createServer } from 'node:http';
|
|
13
|
-
import {
|
|
13
|
+
import { mkdir } from 'node:fs/promises';
|
|
14
|
+
import { join, isAbsolute, normalize, resolve } from 'node:path';
|
|
14
15
|
import { WebSocketServer } from 'ws';
|
|
15
16
|
import { Readable } from 'node:stream';
|
|
16
17
|
import { Hono } from 'hono';
|
|
17
18
|
import { cors } from 'hono/cors';
|
|
18
19
|
import { logger } from 'hono/logger';
|
|
19
|
-
import { FileStore, SessionManager, EventBus, QueueProcessorManager, ContextConfig, ContextBuilder, ContextOptimizer, ChatOrchestrator, FileProfileStore, enqueueUserMessage, createToolRegistry, createAgentRegistry, McpManager, McpRegistryStore, RuntimeSettingsStore, createSettingsRoutes, AuditLogger, mergeLlmGatewayConfig, mergeSecurityConfig, mergeMcpNetworkPolicy, ProtectedPathsStore, SecretPatternStore, RateLimiter, DictionaryStore, createDictionaryRoutes, DEFAULT_AGENT_ID, } from '@itphx/synth-core';
|
|
20
|
-
import { nowISO, ensureDataDir, MessageRole, generateStreamId, SYNTH_VERSION, DEFAULT_LLM_GATEWAY_RATE_LIMIT } from '@itphx/synth-shared';
|
|
20
|
+
import { FileStore, SessionManager, EventBus, QueueProcessorManager, ContextConfig, ContextBuilder, ContextOptimizer, ChatOrchestrator, FileProfileStore, enqueueUserMessage, createToolRegistry, createAgentRegistry, McpManager, McpRegistryStore, RuntimeSettingsStore, createSettingsRoutes, AuditLogger, mergeLlmGatewayConfig, mergeSecurityConfig, mergeMcpNetworkPolicy, ProtectedPathsStore, SecretPatternStore, RateLimiter, DictionaryStore, createDictionaryRoutes, SkillService, createSkillRoutes, resolveProjectSkillSeed, migrateSessionScopeSnapshots, CommandService, createCommandRoutes, createSkillBundleRoutes, SkillBundleStore, createSessionSkillScopeRoutes, createProjectSkillScopeRoutes, createSkillSettingsRoutes, ProjectInstructionsResolver, createInstructionsInfoResolver, createContextRoutes as createCoreContextRoutes, DEFAULT_AGENT_ID, SSHKeyStore, createGitRoutes, createSshKeyRoutes, createAgentSshKeyRoutes, createFsRoutes, resolveProjectWorkspace, detectRuntimeDeps, syncProvidersFromEnv, } from '@itphx/synth-core';
|
|
21
|
+
import { nowISO, ensureDataDir, MessageRole, generateStreamId, SYNTH_VERSION, DEFAULT_LLM_GATEWAY_RATE_LIMIT, ProjectRole, resolveDefaultWorkspace, resolveSecretKey } from '@itphx/synth-shared';
|
|
21
22
|
import { loadBackendConfig } from './lib/app-config.js';
|
|
22
23
|
import { createAuthMiddleware } from './auth/middleware.js';
|
|
23
24
|
import { createAuthRoutes } from './routes/auth.js';
|
|
24
|
-
import { createProjectRoutes } from './routes/projects.js';
|
|
25
|
+
import { createProjectRoutes, createProjectAccess } from './routes/projects.js';
|
|
25
26
|
import { createSessionRoutes } from './routes/sessions.js';
|
|
26
27
|
import { createMessageRoutes } from './routes/messages.js';
|
|
27
28
|
import { createQueueRoutes } from './routes/queue.js';
|
|
28
|
-
import { createFsRoutes } from './routes/fs.js';
|
|
29
29
|
import { createProviderRoutes } from './routes/providers.js';
|
|
30
30
|
import { createModelRoutes } from './routes/models.js';
|
|
31
31
|
import { createAgentRoutes } from './routes/agents.js';
|
|
32
|
-
import { createContextRoutes } from './routes/context.js';
|
|
32
|
+
import { createContextRoutes as createContextFileRoutes } from './routes/context.js';
|
|
33
33
|
import { createDebugRoutes } from './routes/debug.js';
|
|
34
34
|
import { createUserRoutes } from './routes/users.js';
|
|
35
|
-
import { createGitRoutes } from './routes/git.js';
|
|
36
35
|
import { createMcpRoutes } from './routes/mcp.js';
|
|
37
36
|
import { createAuditRoutes } from './routes/audit.js';
|
|
38
37
|
import { createLogsRoutes, resolveLogDir } from './routes/logs.js';
|
|
@@ -41,8 +40,8 @@ import { createLlmRoutes } from './routes/llm.js';
|
|
|
41
40
|
import { createRateLimiter } from './middleware/rate-limiter.js';
|
|
42
41
|
import { DefaultsStore } from './lib/defaults-store.js';
|
|
43
42
|
import { t, getTranslations } from './lib/i18n.js';
|
|
44
|
-
import { ProjectStore } from '
|
|
45
|
-
import { JsonStore } from '
|
|
43
|
+
import { ProjectStore } from '@itphx/synth-core';
|
|
44
|
+
import { JsonStore } from '@itphx/synth-core';
|
|
46
45
|
import { EventHub } from './events/hub.js';
|
|
47
46
|
/**
|
|
48
47
|
* Вспомогательная функция для конвертации Node Request в Web Request.
|
|
@@ -139,8 +138,22 @@ export async function createBackendApp(opts = {}) {
|
|
|
139
138
|
const dataDir = backendConfig.dataDir;
|
|
140
139
|
await ensureDataDir(dataDir);
|
|
141
140
|
const fileStore = new FileStore({ dataDir });
|
|
142
|
-
const sessionManager = new SessionManager(fileStore);
|
|
143
141
|
const projectStore = new ProjectStore({ dataDir });
|
|
142
|
+
const sessionManager = new SessionManager(fileStore, {
|
|
143
|
+
projectStore,
|
|
144
|
+
// AD-071 §2.4 / AD-046 §4.5: системные дефолты для сессий без проекта.
|
|
145
|
+
systemDefaultsProvider: async () => ({
|
|
146
|
+
mcpDefaultOn: await mcpRegistryStore.toDefaultServers(),
|
|
147
|
+
skillsDefaultOn: (await resolveProjectSkillSeed(skillService, await settingsStore.getSkillsDisabledForNewProjects())).enabled,
|
|
148
|
+
}),
|
|
149
|
+
});
|
|
150
|
+
// AD-076 §T4: SSH-ключи агентов — core-хранилище поверх общего dataDir.
|
|
151
|
+
// Мастер-ключ: env `SYNTH_SECRET_KEY` > `config.security.secretKey` > файл dataDir.
|
|
152
|
+
const sshKeyStore = new SSHKeyStore({
|
|
153
|
+
dataDir,
|
|
154
|
+
secretKey: resolveSecretKey(backendConfig.synth),
|
|
155
|
+
env: process.env,
|
|
156
|
+
});
|
|
144
157
|
const providerStore = new JsonStore({ dataDir, subdir: 'providers' });
|
|
145
158
|
const modelStore = new JsonStore({ dataDir, subdir: 'models' });
|
|
146
159
|
const agentStore = new JsonStore({ dataDir, subdir: 'agents' });
|
|
@@ -150,6 +163,12 @@ export async function createBackendApp(opts = {}) {
|
|
|
150
163
|
const patternStore = new SecretPatternStore({ dataDir });
|
|
151
164
|
// Runtime-настройки (AD-005): workspace/mcp из {dataDir}/settings.json (переживают рестарт)
|
|
152
165
|
const settingsStore = new RuntimeSettingsStore({ dataDir });
|
|
166
|
+
// AD-075: дефолтный рабочий каталог — runtime-override `settings/workspace`
|
|
167
|
+
// приоритетнее config/env (`resolveDefaultWorkspace`), каталог создаётся
|
|
168
|
+
// заранее (как в core `server/app.ts`), чтобы инструменты не падали.
|
|
169
|
+
const runtimeWorkspace = await settingsStore.getWorkspace();
|
|
170
|
+
const defaultWorkingDir = runtimeWorkspace ?? resolveDefaultWorkspace(backendConfig.synth);
|
|
171
|
+
await mkdir(defaultWorkingDir, { recursive: true });
|
|
153
172
|
// Агент по умолчанию (админка «Агенты»): runtime-настройка поверх DEFAULT_AGENT_ID.
|
|
154
173
|
const getDefaultAgentId = async () => (await settingsStore.getDefaultAgent()) ?? DEFAULT_AGENT_ID;
|
|
155
174
|
// Умолчания оформления (AD-005): {dataDir}/defaults.json (переживают рестарт)
|
|
@@ -167,6 +186,8 @@ export async function createBackendApp(opts = {}) {
|
|
|
167
186
|
mcpManager.setServerTrusts(mcpMaps.trusts);
|
|
168
187
|
mcpManager.setServerAuthors(mcpMaps.authors);
|
|
169
188
|
mcpManager.setDefaultServers(mcpMaps.defaults);
|
|
189
|
+
// AD-071 §2.4: системный мастер-флаг серверов (реестр `enabled`).
|
|
190
|
+
mcpManager.setServerSystemEnabled(mcpMaps.systemEnabled);
|
|
170
191
|
// AD-071 §2.3.1: политика сетевого доступа HTTP-серверов (SSRF/egress).
|
|
171
192
|
// Runtime-настройка из админки (settings.json) приоритетнее config.yaml и
|
|
172
193
|
// переживает рестарт; храним в изменяемой переменной, чтобы registry-роуты
|
|
@@ -200,71 +221,9 @@ export async function createBackendApp(opts = {}) {
|
|
|
200
221
|
// поэтому кешируем провайдеров в Map
|
|
201
222
|
return providerCache.get(name) ?? null;
|
|
202
223
|
};
|
|
203
|
-
// AD-038: синхронизация провайдеров/моделей из переменных окружения (
|
|
204
|
-
// Вызывается ПОСЛЕ создания providerStore/modelStore, но ДО
|
|
205
|
-
// чтобы env-провайдеры попали в providerCache/modelCache.
|
|
206
|
-
async function syncProvidersFromEnv(providerStore, modelStore) {
|
|
207
|
-
const providerPattern = /^SYNTH_PROVIDER_([A-Z][A-Z0-9_]*?)_(API_KEY|URL|MODEL|TYPE)$/;
|
|
208
|
-
const providers = new Map();
|
|
209
|
-
for (const [key, value] of Object.entries(process.env)) {
|
|
210
|
-
const match = key.match(providerPattern);
|
|
211
|
-
if (!match || !value)
|
|
212
|
-
continue;
|
|
213
|
-
const [, rawName, field] = match;
|
|
214
|
-
if (!rawName)
|
|
215
|
-
continue;
|
|
216
|
-
const name = rawName.toLowerCase().replace(/_/g, '-');
|
|
217
|
-
if (!providers.has(name)) {
|
|
218
|
-
providers.set(name, { name, type: 'openai' });
|
|
219
|
-
}
|
|
220
|
-
const p = providers.get(name);
|
|
221
|
-
switch (field) {
|
|
222
|
-
case 'API_KEY':
|
|
223
|
-
p.apiKey = value;
|
|
224
|
-
break;
|
|
225
|
-
case 'URL':
|
|
226
|
-
p.baseUrl = value;
|
|
227
|
-
break;
|
|
228
|
-
case 'MODEL':
|
|
229
|
-
p.model = value;
|
|
230
|
-
break;
|
|
231
|
-
case 'TYPE':
|
|
232
|
-
p.type = value;
|
|
233
|
-
break;
|
|
234
|
-
}
|
|
235
|
-
}
|
|
236
|
-
for (const [name, envConfig] of providers) {
|
|
237
|
-
const existing = await providerStore.load(name);
|
|
238
|
-
const provider = {
|
|
239
|
-
name,
|
|
240
|
-
type: envConfig.type || existing?.type || 'openai',
|
|
241
|
-
baseUrl: envConfig.baseUrl || existing?.baseUrl,
|
|
242
|
-
apiKey: envConfig.apiKey || existing?.apiKey,
|
|
243
|
-
defaultModel: envConfig.model || existing?.defaultModel,
|
|
244
|
-
timeout: existing?.timeout ?? 120,
|
|
245
|
-
enabled: true,
|
|
246
|
-
icon: existing?.icon ?? '',
|
|
247
|
-
};
|
|
248
|
-
await providerStore.save(name, provider);
|
|
249
|
-
// Если указана модель — создаём её
|
|
250
|
-
if (envConfig.model) {
|
|
251
|
-
const modelId = `${name}/${envConfig.model}`;
|
|
252
|
-
const existingModel = await modelStore.load(modelId);
|
|
253
|
-
if (!existingModel) {
|
|
254
|
-
await modelStore.save(modelId, {
|
|
255
|
-
id: modelId,
|
|
256
|
-
name: envConfig.model,
|
|
257
|
-
provider: name,
|
|
258
|
-
description: '',
|
|
259
|
-
enabled: true,
|
|
260
|
-
isDefault: true,
|
|
261
|
-
});
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
console.log(` [env] провайдер: ${name} (${provider.type})${provider.baseUrl ? ` → ${provider.baseUrl}` : ''}`);
|
|
265
|
-
}
|
|
266
|
-
}
|
|
267
|
-
// Синхронизация провайдеров из окружения перед заполнением кэшей
|
|
224
|
+
// AD-038: синхронизация провайдеров/моделей из переменных окружения (общая
|
|
225
|
+
// core-реализация). Вызывается ПОСЛЕ создания providerStore/modelStore, но ДО
|
|
226
|
+
// заполнения кэшей, чтобы env-провайдеры попали в providerCache/modelCache.
|
|
268
227
|
await syncProvidersFromEnv(providerStore, modelStore);
|
|
269
228
|
// Кеш провайдеров (заполняется при старте)
|
|
270
229
|
const providerCache = new Map();
|
|
@@ -342,10 +301,42 @@ export async function createBackendApp(opts = {}) {
|
|
|
342
301
|
// AD-071 §2.6: runtime-отключение инструментов (админка) приоритетнее config.yaml
|
|
343
302
|
const runtimeToolsDisabled = await settingsStore.getToolsDisabled();
|
|
344
303
|
const toolsDisabled = runtimeToolsDisabled ?? backendConfig.synth.tools.disabled ?? { capabilities: [], tools: [] };
|
|
304
|
+
// AD-046 §4.5: runtime-отключение скиллов (админка) — hard-gate системного уровня.
|
|
305
|
+
const skillsDisabled = (await settingsStore.getSkillsDisabled())
|
|
306
|
+
?? { categories: [], groups: [], skills: [] };
|
|
345
307
|
const protectedPathsStore = new ProtectedPathsStore({ dataDir });
|
|
346
308
|
// Orchestrator
|
|
347
309
|
const toolRegistry = createToolRegistry();
|
|
348
310
|
const agentRegistry = createAgentRegistry(toolRegistry, join(dataDir, 'agents'));
|
|
311
|
+
// AD-046: сервис скиллов (discovery + instance-запись + каталог промпта).
|
|
312
|
+
const skillService = new SkillService({
|
|
313
|
+
dataDir,
|
|
314
|
+
configPaths: backendConfig.synth.skills.paths,
|
|
315
|
+
urls: backendConfig.synth.skills.urls,
|
|
316
|
+
trustedProjectDirs: backendConfig.synth.skills.trustedProjectDirs,
|
|
317
|
+
toolsets: backendConfig.synth.skills.toolsets,
|
|
318
|
+
});
|
|
319
|
+
// AD-046 §7: slash-команды и bundles (mirror core).
|
|
320
|
+
const bundleStore = new SkillBundleStore({
|
|
321
|
+
dataDir,
|
|
322
|
+
bundlesPath: backendConfig.synth.commands.bundlesPath,
|
|
323
|
+
});
|
|
324
|
+
const commandService = new CommandService({
|
|
325
|
+
config: {
|
|
326
|
+
dataDir,
|
|
327
|
+
commandsPaths: backendConfig.synth.commands.paths,
|
|
328
|
+
bundlesPath: backendConfig.synth.commands.bundlesPath,
|
|
329
|
+
conflict: backendConfig.synth.commands.conflict,
|
|
330
|
+
maxArgumentsLength: backendConfig.synth.commands.maxArgumentsLength,
|
|
331
|
+
maxRenderedBytes: backendConfig.synth.commands.maxRenderedBytes,
|
|
332
|
+
toolsets: backendConfig.synth.skills.toolsets,
|
|
333
|
+
trustedProjectDirs: backendConfig.synth.skills.trustedProjectDirs,
|
|
334
|
+
inlineShell: backendConfig.synth.skills.inlineShell ?? false,
|
|
335
|
+
},
|
|
336
|
+
skillRuntime: skillService,
|
|
337
|
+
skillSource: skillService,
|
|
338
|
+
bundleStore,
|
|
339
|
+
});
|
|
349
340
|
const orchestrator = new ChatOrchestrator({
|
|
350
341
|
sessionManager,
|
|
351
342
|
eventBus,
|
|
@@ -359,7 +350,14 @@ export async function createBackendApp(opts = {}) {
|
|
|
359
350
|
agentRegistry,
|
|
360
351
|
mcpManager,
|
|
361
352
|
projectStore,
|
|
353
|
+
// AD-076 §T6: тот же store, что у git/ssh-роутов — без дублей инстансов.
|
|
354
|
+
sshKeyStore,
|
|
362
355
|
workspacesRoot: backendConfig.workspacesRoot,
|
|
356
|
+
// AD-075: backend — managed-режим, workspace вне workspacesRoot запрещён.
|
|
357
|
+
workspaceManaged: true,
|
|
358
|
+
// AD-075: без defaultWorkingDir сессия без проекта получала бы
|
|
359
|
+
// {dataDir}/workspaces/default мимо runtime-override settings/workspace.
|
|
360
|
+
defaultWorkingDir,
|
|
363
361
|
routerConfig: backendConfig.synth.router,
|
|
364
362
|
permissionConfig: backendConfig.synth.permission,
|
|
365
363
|
defaultPlanMode: backendConfig.synth.session.planMode,
|
|
@@ -372,11 +370,33 @@ export async function createBackendApp(opts = {}) {
|
|
|
372
370
|
toolsPolicy,
|
|
373
371
|
mcpPolicy,
|
|
374
372
|
toolsDisabled,
|
|
373
|
+
// AD-046 §4.5: системный hard-gate скиллов (runtime-настройка).
|
|
374
|
+
skillsDisabled,
|
|
375
|
+
// AD-070 §2.9.1: зависимости окружения (git/rg/sh) — детекция при старте.
|
|
376
|
+
runtimeDeps: await detectRuntimeDeps(),
|
|
375
377
|
// AD-071 §2.6: калибровка chars-per-token по модели (runtime-настройки).
|
|
376
378
|
tokenRatioLoader: (model) => settingsStore.getTokenRatio(model),
|
|
377
379
|
onTokenRatioCalibrated: (model, ratio) => settingsStore.setTokenRatio(model, ratio),
|
|
380
|
+
// AD-046 §5: каталог скиллов в промпт + тул `skill`.
|
|
381
|
+
skillRuntime: skillService,
|
|
382
|
+
// AD-046 §7: резолвинг `/`-команд до LLM.
|
|
383
|
+
commandRuntime: commandService,
|
|
384
|
+
// AD-069 Фаза 1: проектные инструкции (merged chain AGENTS.md).
|
|
385
|
+
instructionsConfig: backendConfig.synth.instructions,
|
|
386
|
+
// AD-069 Фаза 2a: project-trust гейт инструкций (config.skills.trustedProjectDirs).
|
|
387
|
+
instructionsTrustedProjectDirs: backendConfig.synth.skills.trustedProjectDirs,
|
|
378
388
|
});
|
|
379
389
|
const processMessage = orchestrator.createProcessMessage();
|
|
390
|
+
// AD-071 §2.4 / AD-046 §4.5: разовая миграция снапшотов скоупа существующих сессий.
|
|
391
|
+
await migrateSessionScopeSnapshots({
|
|
392
|
+
sessionManager,
|
|
393
|
+
projectStore,
|
|
394
|
+
settingsStore,
|
|
395
|
+
resolveSystemDefaults: async () => ({
|
|
396
|
+
mcpDefaultOn: await mcpRegistryStore.toDefaultServers(),
|
|
397
|
+
skillsDefaultOn: (await resolveProjectSkillSeed(skillService, await settingsStore.getSkillsDisabledForNewProjects())).enabled,
|
|
398
|
+
}),
|
|
399
|
+
}).catch(() => 0);
|
|
380
400
|
// EventHub — центральный диспетчер подписок
|
|
381
401
|
const eventHub = new EventHub(eventBus, sessionManager);
|
|
382
402
|
// API-заглушки для UI
|
|
@@ -390,33 +410,139 @@ export async function createBackendApp(opts = {}) {
|
|
|
390
410
|
app.get('/api/v2/i18n/translations/ru', (c) => c.json(getTranslations('ru')));
|
|
391
411
|
app.get('/api/v2/i18n/translations/en', (c) => c.json(getTranslations('en')));
|
|
392
412
|
// Projects routes
|
|
393
|
-
app.route('/api/v2/projects', createProjectRoutes(auth, projectStore, sessionManager, backendConfig.workspacesRoot, mcpManager));
|
|
413
|
+
app.route('/api/v2/projects', createProjectRoutes(auth, projectStore, sessionManager, backendConfig.workspacesRoot, mcpManager, skillService, settingsStore, mcpRegistryStore));
|
|
394
414
|
// Sessions routes
|
|
395
415
|
app.route('/api/v2/sessions', createSessionRoutes(auth, sessionManager, eventBus, queueManager, processMessage, orchestrator, eventHub, contextOptimizer, projectStore, profilesStore, getDefaultAgentId));
|
|
396
416
|
// Messages routes
|
|
397
417
|
app.route('/api/v2/messages', createMessageRoutes(auth, sessionManager, contextOptimizer, eventBus));
|
|
398
418
|
// Queue routes
|
|
399
419
|
app.route('/api/v2/queue', createQueueRoutes(auth, sessionManager, queueManager, eventBus, processMessage));
|
|
400
|
-
// FS routes
|
|
401
|
-
app.route('/api/v2/fs', createFsRoutes(auth,
|
|
420
|
+
// FS routes (AD-075): core-фабрика, managed поверх workspace проекта.
|
|
421
|
+
app.route('/api/v2/fs', createFsRoutes(auth, backendConfig.workspacesRoot, undefined, {
|
|
422
|
+
requireProjectId: true,
|
|
423
|
+
getOutsideRootPolicy: () => 'deny',
|
|
424
|
+
getProtectedPathsPolicy: () => protectedPathsStore.getPolicy(),
|
|
425
|
+
getProjectWorkspace: (projectId) => resolveProjectWorkspace(projectId, {
|
|
426
|
+
workspacesRoot: backendConfig.workspacesRoot,
|
|
427
|
+
getProject: (id) => projectStore.load(id),
|
|
428
|
+
outsideRootPolicy: () => 'deny',
|
|
429
|
+
strict: true,
|
|
430
|
+
}),
|
|
431
|
+
}));
|
|
402
432
|
// Providers routes
|
|
403
433
|
app.route('/api/v2/providers', createProviderRoutes(auth, providerStore, providerCache));
|
|
404
434
|
// Models routes
|
|
405
435
|
app.route('/api/v2/models', createModelRoutes(auth, modelStore, providerStore, modelCache, providerCache));
|
|
406
436
|
// Agents routes
|
|
407
|
-
app.route('/api/v2/agents', createAgentRoutes(auth, agentStore,
|
|
408
|
-
// Context routes
|
|
409
|
-
app.route('/api/v2/context',
|
|
437
|
+
app.route('/api/v2/agents', createAgentRoutes(auth, agentStore, agentRegistry, getDefaultAgentId));
|
|
438
|
+
// Context routes (глобальные identity-файлы; админ-мутации)
|
|
439
|
+
app.route('/api/v2/context', createContextFileRoutes(auth, contextConfig));
|
|
410
440
|
// User admin routes
|
|
411
441
|
app.route('/api/v2/users', createUserRoutes(auth, profilesStore));
|
|
412
|
-
// Git routes
|
|
413
|
-
|
|
442
|
+
// Git routes (AD-076 §T4): core-фабрика + managed RBAC. Write-эндпоинты
|
|
443
|
+
// (init/clone/register/remove/fetch) требуют прав на изменение контента
|
|
444
|
+
// проекта (owner/EDITOR/LEAD/ADMIN); read-only (scan/log/commit) — requireAuth.
|
|
445
|
+
const projectAccess = createProjectAccess(auth);
|
|
446
|
+
app.route('/api/v2/git', createGitRoutes(auth, projectStore, backendConfig.workspacesRoot, {
|
|
447
|
+
sshKeyStore,
|
|
448
|
+
authorizeProject: async (c, projectId) => {
|
|
449
|
+
const user = await auth.getCurrentUser(c);
|
|
450
|
+
if (!user)
|
|
451
|
+
return false;
|
|
452
|
+
const project = await projectStore.load(projectId);
|
|
453
|
+
if (!project)
|
|
454
|
+
return false;
|
|
455
|
+
return projectAccess.canEditProjectContent(c, project, user.id);
|
|
456
|
+
},
|
|
457
|
+
}));
|
|
458
|
+
// SSH-ключи агентов (AD-076 §T5): core-фабрика + managed RBAC.
|
|
459
|
+
// Ключи — секреты: чтение — requireAuth (глобально), запись — только ADMIN.
|
|
460
|
+
app.route('/api/v2/ssh-keys', createSshKeyRoutes(auth, sshKeyStore, {
|
|
461
|
+
writeGuard: auth.requireAdmin,
|
|
462
|
+
}));
|
|
463
|
+
app.route('/api/v2/agents/:agentId/ssh-keys', createAgentSshKeyRoutes(auth, sshKeyStore, {
|
|
464
|
+
writeGuard: auth.requireAdmin,
|
|
465
|
+
}));
|
|
414
466
|
// MCP routes (единый реестр; legacy /servers — адаптеры над ним)
|
|
415
467
|
app.route('/api/v2/mcp', createMcpRoutes(auth, mcpManager, sessionManager, {
|
|
416
468
|
registry: mcpRegistryStore,
|
|
417
469
|
networkPolicy: effectiveNetworkPolicy,
|
|
418
470
|
getNetworkPolicy: () => effectiveNetworkPolicy,
|
|
419
471
|
}));
|
|
472
|
+
// Скиллы (AD-046 §9.1/§9.2): core-фабрика + RBAC ADMIN на запись.
|
|
473
|
+
app.route('/api/v2/skills', createSkillRoutes(auth, {
|
|
474
|
+
skillService,
|
|
475
|
+
resolveProjectWorkspace: async (projectId) => {
|
|
476
|
+
const project = await projectStore.load(projectId);
|
|
477
|
+
if (!project?.workspace)
|
|
478
|
+
return undefined;
|
|
479
|
+
return isAbsolute(project.workspace)
|
|
480
|
+
? normalize(project.workspace)
|
|
481
|
+
: resolve(backendConfig.workspacesRoot, project.workspace);
|
|
482
|
+
},
|
|
483
|
+
}, { writeGuard: auth.requireAdmin }));
|
|
484
|
+
// AD-046 §7/§9.1: команды и bundles (mirror core, мутации — ADMIN).
|
|
485
|
+
app.route('/api/v2/commands', createCommandRoutes(auth, {
|
|
486
|
+
commandService,
|
|
487
|
+
resolveProjectWorkspace: async (projectId) => {
|
|
488
|
+
const project = await projectStore.load(projectId);
|
|
489
|
+
if (!project?.workspace)
|
|
490
|
+
return undefined;
|
|
491
|
+
return isAbsolute(project.workspace)
|
|
492
|
+
? normalize(project.workspace)
|
|
493
|
+
: resolve(backendConfig.workspacesRoot, project.workspace);
|
|
494
|
+
},
|
|
495
|
+
}));
|
|
496
|
+
app.route('/api/v2/skill-bundles', createSkillBundleRoutes(auth, {
|
|
497
|
+
bundleStore,
|
|
498
|
+
validateSkills: async (names) => {
|
|
499
|
+
const missing = [];
|
|
500
|
+
for (const name of names) {
|
|
501
|
+
if (!(await skillService.get(name)))
|
|
502
|
+
missing.push(name);
|
|
503
|
+
}
|
|
504
|
+
return missing;
|
|
505
|
+
},
|
|
506
|
+
}, { writeGuard: auth.requireAdmin }));
|
|
507
|
+
// AD-046 §4.5: scope-API скиллов. Доступ к сессии — владелец|ADMIN
|
|
508
|
+
// (canAccess, как в session-роутах); проект — owner/LEAD/ADMIN.
|
|
509
|
+
const resolveSkillWorkspace = async (projectId) => {
|
|
510
|
+
const project = await projectStore.load(projectId);
|
|
511
|
+
if (!project?.workspace)
|
|
512
|
+
return undefined;
|
|
513
|
+
return isAbsolute(project.workspace)
|
|
514
|
+
? normalize(project.workspace)
|
|
515
|
+
: resolve(backendConfig.workspacesRoot, project.workspace);
|
|
516
|
+
};
|
|
517
|
+
app.route('/api/v2/sessions', createSessionSkillScopeRoutes(auth, {
|
|
518
|
+
sessionManager, skillService, settingsStore, projectStore,
|
|
519
|
+
permissionConfig: backendConfig.synth.permission,
|
|
520
|
+
resolveProjectWorkspace: resolveSkillWorkspace,
|
|
521
|
+
}, {
|
|
522
|
+
writeGuard: auth.requireAuth,
|
|
523
|
+
resolveUserId: async (c) => (await auth.getCurrentUser(c))?.id ?? '',
|
|
524
|
+
canAccess: (session, c, userId) => (session.ownerId ?? session.userId) === userId
|
|
525
|
+
|| auth.isAdmin(c),
|
|
526
|
+
}));
|
|
527
|
+
app.route('/api/v2/projects', createProjectSkillScopeRoutes(auth, {
|
|
528
|
+
sessionManager, skillService, settingsStore, projectStore,
|
|
529
|
+
permissionConfig: backendConfig.synth.permission,
|
|
530
|
+
resolveProjectWorkspace: resolveSkillWorkspace,
|
|
531
|
+
}, {
|
|
532
|
+
// AD-046 §4.5: проектным уровнем управляют owner/LEAD/ADMIN — как в
|
|
533
|
+
// project-MCP (`canManageProjectMcp`), поэтому writeGuard не requireAdmin;
|
|
534
|
+
// владение проверяет canAccessProject (403 не-членам, 404 — нет проекта).
|
|
535
|
+
writeGuard: auth.requireAuth,
|
|
536
|
+
resolveUserId: async (c) => (await auth.getCurrentUser(c))?.id ?? '',
|
|
537
|
+
canAccessProject: (project, c, userId) => auth.isAdmin(c)
|
|
538
|
+
|| auth.hasRole(c, 'LEAD')
|
|
539
|
+
|| project.ownerId === userId
|
|
540
|
+
|| project.members?.[userId] === ProjectRole.OWNER,
|
|
541
|
+
}));
|
|
542
|
+
app.route('/api/v2/settings', createSkillSettingsRoutes(auth, { settingsStore }, {
|
|
543
|
+
writeGuard: auth.requireAdmin,
|
|
544
|
+
onSkillsDisabledChange: (disabled) => orchestrator.setSkillsDisabled(disabled),
|
|
545
|
+
}));
|
|
420
546
|
// LLM Gateway audit routes (AD-036) — GET только ADMIN/AUDITOR, POST /revealed — все авторизованные
|
|
421
547
|
app.route('/api/v2/audit', createAuditRoutes(auth, {
|
|
422
548
|
auditLogPath: gatewayAuditLogger.logPath,
|
|
@@ -451,7 +577,12 @@ export async function createBackendApp(opts = {}) {
|
|
|
451
577
|
// Settings routes (runtime-настройки для UI: workspace + mcp; переиспользуем core-реализацию)
|
|
452
578
|
app.route('/api/v2/settings', createSettingsRoutes(auth, {
|
|
453
579
|
settingsStore,
|
|
454
|
-
fallbackWorkspace:
|
|
580
|
+
fallbackWorkspace: defaultWorkingDir,
|
|
581
|
+
// AD-075: managed-развёртывание — политика вне `workspacesRoot` всегда `deny`
|
|
582
|
+
// (enforcement — в `routes/projects.ts`); строго read-only: GET отдаёт
|
|
583
|
+
// fallback + readOnly, PUT/DELETE → 403 WORKSPACE_POLICY_READ_ONLY.
|
|
584
|
+
fallbackWorkspaceOutsideRootPolicy: 'deny',
|
|
585
|
+
workspacePolicyReadOnly: true,
|
|
455
586
|
// Агент по умолчанию при первом развёртывании (config.yaml не задаёт — DEFAULT_AGENT_ID).
|
|
456
587
|
fallbackDefaultAgent: DEFAULT_AGENT_ID,
|
|
457
588
|
// AD-072 Ф2: дефолты из config.yaml (без runtime) — для GET/DELETE-сброса к умолчанию.
|
|
@@ -510,6 +641,32 @@ export async function createBackendApp(opts = {}) {
|
|
|
510
641
|
// (тот же guard, что у users.ts). Реализация общая с core.
|
|
511
642
|
const dictionaryStore = new DictionaryStore(dataDir);
|
|
512
643
|
app.route('/api/v2/dictionaries', createDictionaryRoutes(auth, dictionaryStore, { writeGuard: auth.requireAdmin }));
|
|
644
|
+
// AD-069 §9.3: прозрачность проектных инструкций — core-фабрика (резолвер не
|
|
645
|
+
// дублируется). RBAC: сессия — владелец|ADMIN (canAccess, как в session-роутах);
|
|
646
|
+
// проект — owner/LEAD/ADMIN (canAccessProject, как в project-скиллах).
|
|
647
|
+
const instructionsInfoResolver = createInstructionsInfoResolver(new ProjectInstructionsResolver({
|
|
648
|
+
config: backendConfig.synth.instructions,
|
|
649
|
+
dictionaryStore,
|
|
650
|
+
dataDir,
|
|
651
|
+
trustedProjectDirs: backendConfig.synth.skills.trustedProjectDirs,
|
|
652
|
+
}), backendConfig.synth.instructions);
|
|
653
|
+
app.route('/api/v2/context', createCoreContextRoutes(auth, {
|
|
654
|
+
resolveInstructions: instructionsInfoResolver,
|
|
655
|
+
sessionManager,
|
|
656
|
+
projectStore,
|
|
657
|
+
resolveProjectWorkspace: resolveSkillWorkspace,
|
|
658
|
+
resolveContextWindow: (session) => {
|
|
659
|
+
const model = session?.settings.model;
|
|
660
|
+
return model ? modelWindowLoader(model) || undefined : undefined;
|
|
661
|
+
},
|
|
662
|
+
resolveUserId: async (c) => (await auth.getCurrentUser(c))?.id ?? '',
|
|
663
|
+
canAccess: (session, c, userId) => (session.ownerId ?? session.userId) === userId
|
|
664
|
+
|| auth.isAdmin(c),
|
|
665
|
+
canAccessProject: (project, c, userId) => auth.isAdmin(c)
|
|
666
|
+
|| auth.hasRole(c, 'LEAD')
|
|
667
|
+
|| project.ownerId === userId
|
|
668
|
+
|| project.members?.[userId] === ProjectRole.OWNER,
|
|
669
|
+
}));
|
|
513
670
|
// Глобальный SSE-хаб для всех сессий пользователя
|
|
514
671
|
app.get('/api/v2/events', auth.requireAuth, async (c) => {
|
|
515
672
|
const user = (await auth.getCurrentUser(c));
|
|
@@ -821,4 +978,3 @@ export async function createBackendApp(opts = {}) {
|
|
|
821
978
|
}
|
|
822
979
|
}
|
|
823
980
|
}
|
|
824
|
-
//# sourceMappingURL=app.js.map
|
|
@@ -36,4 +36,3 @@ export declare function createAuthMiddleware(config: AuthConfig): {
|
|
|
36
36
|
deleteSessionCookie: (c: Parameters<typeof deleteCookie>[0], sessionId: string) => void;
|
|
37
37
|
};
|
|
38
38
|
export type AuthKit = ReturnType<typeof createAuthMiddleware>;
|
|
39
|
-
//# sourceMappingURL=middleware.d.ts.map
|
package/dist/auth/middleware.js
CHANGED
package/dist/auth/oidc.d.ts
CHANGED
|
@@ -84,4 +84,3 @@ export declare function oidcUserToUser(o: OidcUser): User;
|
|
|
84
84
|
* Безопасно при отсутствии oidc-конфига: возвращает null вместо выбрасывания ошибки.
|
|
85
85
|
*/
|
|
86
86
|
export declare function createLazyOidcClient(oidc?: OidcConfig): () => OidcClient | null;
|
|
87
|
-
//# sourceMappingURL=oidc.d.ts.map
|
package/dist/auth/oidc.js
CHANGED
package/dist/events/hub.d.ts
CHANGED
package/dist/events/hub.js
CHANGED
package/dist/lib/app-config.d.ts
CHANGED
package/dist/lib/app-config.js
CHANGED
|
@@ -3,4 +3,3 @@ export declare function getDefaultLang(): Lang;
|
|
|
3
3
|
export declare function setDefaultLang(lang: Lang): void;
|
|
4
4
|
export declare function resolveDisplayName(record: Record<string, string>, override?: string | null): string;
|
|
5
5
|
export declare function resolveDescription(record: Record<string, string>, override?: string | null): string | undefined;
|
|
6
|
-
//# sourceMappingURL=i18n-config.d.ts.map
|
package/dist/lib/i18n-config.js
CHANGED
package/dist/lib/i18n.d.ts
CHANGED
package/dist/lib/i18n.js
CHANGED
|
@@ -6,6 +6,7 @@ const en = {
|
|
|
6
6
|
'errors.notFound.model': 'Model not found',
|
|
7
7
|
'errors.notFound.agent': 'Agent not found',
|
|
8
8
|
'errors.notFound.message': 'Message not found',
|
|
9
|
+
'errors.notFound.messageIndex': 'Message not found at index',
|
|
9
10
|
'errors.notFound.user': 'User not found',
|
|
10
11
|
'errors.notFound.file': 'File not found',
|
|
11
12
|
'errors.notFound.favicon': 'Favicon not found',
|
|
@@ -57,6 +58,7 @@ const ru = {
|
|
|
57
58
|
'errors.notFound.model': 'Модель не найдена',
|
|
58
59
|
'errors.notFound.agent': 'Агент не найден',
|
|
59
60
|
'errors.notFound.message': 'Сообщение не найдено',
|
|
61
|
+
'errors.notFound.messageIndex': 'Сообщение не найдено по индексу',
|
|
60
62
|
'errors.notFound.user': 'Пользователь не найден',
|
|
61
63
|
'errors.notFound.file': 'Файл не найден',
|
|
62
64
|
'errors.notFound.favicon': 'Favicon не найден',
|
|
@@ -137,4 +139,3 @@ export function getLocale(c) {
|
|
|
137
139
|
export function getTranslations(locale) {
|
|
138
140
|
return { ...dictionaries[locale] };
|
|
139
141
|
}
|
|
140
|
-
//# sourceMappingURL=i18n.js.map
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { SessionManager, ContextOptimizer, EventBus } from '@itphx/synth-core';
|
|
2
|
+
export interface RecalcCanSummarizeDeps {
|
|
3
|
+
sessionManager: SessionManager;
|
|
4
|
+
contextOptimizer: ContextOptimizer | null;
|
|
5
|
+
eventBus: EventBus;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Backend-специфичный пересчёт `canSummarize` после мутаций над сообщениями
|
|
9
|
+
* (batch/toggle/pin/delete/retry). Дополнительно перепроверяет флаг
|
|
10
|
+
* `summarizationPending` и публикует `session.updated` с токенами/стоимостью.
|
|
11
|
+
*
|
|
12
|
+
* Вынесено из роутов сообщений: сами роуты теперь — core-фабрика, а этот хук
|
|
13
|
+
* передаётся в неё через `onMessagesChanged`.
|
|
14
|
+
*/
|
|
15
|
+
export declare function createRecalcCanSummarize({ sessionManager, contextOptimizer, eventBus, }: RecalcCanSummarizeDeps): (sessionId: string) => Promise<void>;
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Backend-специфичный пересчёт `canSummarize` после мутаций над сообщениями
|
|
3
|
+
* (batch/toggle/pin/delete/retry). Дополнительно перепроверяет флаг
|
|
4
|
+
* `summarizationPending` и публикует `session.updated` с токенами/стоимостью.
|
|
5
|
+
*
|
|
6
|
+
* Вынесено из роутов сообщений: сами роуты теперь — core-фабрика, а этот хук
|
|
7
|
+
* передаётся в неё через `onMessagesChanged`.
|
|
8
|
+
*/
|
|
9
|
+
export function createRecalcCanSummarize({ sessionManager, contextOptimizer, eventBus, }) {
|
|
10
|
+
return async (sessionId) => {
|
|
11
|
+
if (!contextOptimizer)
|
|
12
|
+
return;
|
|
13
|
+
const s = await sessionManager.getSession(sessionId);
|
|
14
|
+
if (!s)
|
|
15
|
+
return;
|
|
16
|
+
const can = contextOptimizer.canSummarize(s);
|
|
17
|
+
// Перепроверить флаг summarizationPending при toggle/pin/delete
|
|
18
|
+
let shouldClearPending = false;
|
|
19
|
+
if (s.summarizationPending && s.settings.summarizationEnabled) {
|
|
20
|
+
const sumResult = contextOptimizer.shouldSummarize(s);
|
|
21
|
+
if (!sumResult.triggered) {
|
|
22
|
+
shouldClearPending = true;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
await sessionManager.withLock(sessionId, async (locked) => {
|
|
26
|
+
locked.canSummarize = can;
|
|
27
|
+
if (shouldClearPending)
|
|
28
|
+
locked.summarizationPending = false;
|
|
29
|
+
await sessionManager.saveSession(locked);
|
|
30
|
+
});
|
|
31
|
+
eventBus.publish(sessionId, 'session.updated', {
|
|
32
|
+
session_id: sessionId,
|
|
33
|
+
can_summarize: can,
|
|
34
|
+
summarization_pending: shouldClearPending ? false : undefined,
|
|
35
|
+
input_tokens: s.inputTokens,
|
|
36
|
+
output_tokens: s.outputTokens,
|
|
37
|
+
total_tokens: s.totalTokens,
|
|
38
|
+
cache_read_tokens: s.cacheReadTokens,
|
|
39
|
+
cache_write_tokens: s.cacheWriteTokens,
|
|
40
|
+
reasoning_tokens: s.reasoningTokens,
|
|
41
|
+
input_cost: s.inputCost,
|
|
42
|
+
output_cost: s.outputCost,
|
|
43
|
+
cache_read_cost: s.cacheReadCost,
|
|
44
|
+
cache_write_cost: s.cacheWriteCost,
|
|
45
|
+
});
|
|
46
|
+
};
|
|
47
|
+
}
|