@mcp-abap-adt/llm-agent-server-libs 30.10.1 → 31.0.1
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/README.md +27 -0
- package/dist/builders/controller-skill-pipeline-builder.d.ts +3 -1
- package/dist/builders/controller-skill-pipeline-builder.d.ts.map +1 -1
- package/dist/builders/controller-skill-pipeline-builder.js +8 -1
- package/dist/builders/controller-skill-pipeline-builder.js.map +1 -1
- package/dist/generated/version.d.ts +1 -1
- package/dist/generated/version.d.ts.map +1 -1
- package/dist/generated/version.js +1 -1
- package/dist/generated/version.js.map +1 -1
- package/dist/pipelines/controller.d.ts.map +1 -1
- package/dist/pipelines/controller.js +5 -2
- package/dist/pipelines/controller.js.map +1 -1
- package/dist/pipelines/dag.d.ts.map +1 -1
- package/dist/pipelines/dag.js +5 -2
- package/dist/pipelines/dag.js.map +1 -1
- package/dist/pipelines/flat.d.ts.map +1 -1
- package/dist/pipelines/flat.js +2 -1
- package/dist/pipelines/flat.js.map +1 -1
- package/dist/pipelines/linear.d.ts.map +1 -1
- package/dist/pipelines/linear.js +5 -1
- package/dist/pipelines/linear.js.map +1 -1
- package/dist/pipelines/stepper.d.ts.map +1 -1
- package/dist/pipelines/stepper.js +5 -1
- package/dist/pipelines/stepper.js.map +1 -1
- package/dist/smart-agent/config-reload-watcher.d.ts.map +1 -1
- package/dist/smart-agent/config-reload-watcher.js +3 -1
- package/dist/smart-agent/config-reload-watcher.js.map +1 -1
- package/dist/smart-agent/config-validator.d.ts +1 -1
- package/dist/smart-agent/config-validator.d.ts.map +1 -1
- package/dist/smart-agent/config-validator.js.map +1 -1
- package/dist/smart-agent/config.d.ts +1 -1
- package/dist/smart-agent/config.d.ts.map +1 -1
- package/dist/smart-agent/config.js.map +1 -1
- package/dist/smart-agent/controller/subagent-client.d.ts.map +1 -1
- package/dist/smart-agent/controller/subagent-client.js +2 -0
- package/dist/smart-agent/controller/subagent-client.js.map +1 -1
- package/dist/smart-agent/embedder-circuit-breakers.d.ts +14 -0
- package/dist/smart-agent/embedder-circuit-breakers.d.ts.map +1 -0
- package/dist/smart-agent/embedder-circuit-breakers.js +51 -0
- package/dist/smart-agent/embedder-circuit-breakers.js.map +1 -0
- package/dist/smart-agent/http/adapter-route-handler.d.ts +2 -0
- package/dist/smart-agent/http/adapter-route-handler.d.ts.map +1 -1
- package/dist/smart-agent/http/adapter-route-handler.js +7 -0
- package/dist/smart-agent/http/adapter-route-handler.js.map +1 -1
- package/dist/smart-agent/http/chat-route-handler.d.ts +2 -0
- package/dist/smart-agent/http/chat-route-handler.d.ts.map +1 -1
- package/dist/smart-agent/http/chat-route-handler.js +9 -5
- package/dist/smart-agent/http/chat-route-handler.js.map +1 -1
- package/dist/smart-agent/http/sessions-route-handler.d.ts.map +1 -1
- package/dist/smart-agent/http/sessions-route-handler.js +30 -3
- package/dist/smart-agent/http/sessions-route-handler.js.map +1 -1
- package/dist/smart-agent/http/usage-route-handler.d.ts.map +1 -1
- package/dist/smart-agent/http/usage-route-handler.js +10 -1
- package/dist/smart-agent/http/usage-route-handler.js.map +1 -1
- package/dist/smart-agent/session-lifecycle/index.d.ts +6 -5
- package/dist/smart-agent/session-lifecycle/index.d.ts.map +1 -1
- package/dist/smart-agent/session-lifecycle/index.js +7 -6
- package/dist/smart-agent/session-lifecycle/index.js.map +1 -1
- package/dist/smart-agent/session-lifecycle/session-rag-registry.d.ts +8 -12
- package/dist/smart-agent/session-lifecycle/session-rag-registry.d.ts.map +1 -1
- package/dist/smart-agent/session-lifecycle/session-rag-registry.js +71 -27
- package/dist/smart-agent/session-lifecycle/session-rag-registry.js.map +1 -1
- package/dist/smart-agent/smart-server.d.ts +11 -6
- package/dist/smart-agent/smart-server.d.ts.map +1 -1
- package/dist/smart-agent/smart-server.js +160 -63
- package/dist/smart-agent/smart-server.js.map +1 -1
- package/dist/smart-agent/workers/worker-registry.d.ts +6 -1
- package/dist/smart-agent/workers/worker-registry.d.ts.map +1 -1
- package/dist/smart-agent/workers/worker-registry.js +54 -15
- package/dist/smart-agent/workers/worker-registry.js.map +1 -1
- package/package.json +6 -6
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { unwrapBuilderResult } from '@mcp-abap-adt/llm-agent-libs';
|
|
1
2
|
/**
|
|
2
3
|
* SmartServer — embeddable OpenAI-compatible HTTP server backed by SmartAgent.
|
|
3
4
|
*/
|
|
@@ -7,11 +8,12 @@ import { createRequire } from 'node:module';
|
|
|
7
8
|
import { resolve as pathResolve } from 'node:path';
|
|
8
9
|
import { pathToFileURL } from 'node:url';
|
|
9
10
|
import { asymmetricEmbedder, buildNamespacedTools, CircuitBreaker, defaultToolNamespace, isReadinessReporter, SimpleRagProviderRegistry, symmetricEmbedder, withCircuitBreaker, } from '@mcp-abap-adt/llm-agent';
|
|
10
|
-
import { applyRetrievalStrategy, ClaudeSkillManager, CodexSkillManager, FileSystemPluginLoader, FileSystemSkillManager, getDefaultPluginDirs, HealthChecker, InMemoryKnowledgeBackend, KnowledgeRag, mergePluginExports, SessionRequestLogger, SmartAgentBuilder, SmartAgentSubAgent, WindowContextStrategy, } from '@mcp-abap-adt/llm-agent-libs';
|
|
11
|
+
import { applyRetrievalStrategy, bindRagEmbedderBreaker, ClaudeSkillManager, CodexSkillManager, FileSystemPluginLoader, FileSystemSkillManager, getDefaultPluginDirs, HealthChecker, InMemoryKnowledgeBackend, KnowledgeRag, mergePluginExports, SessionRequestLogger, SmartAgentBuilder, SmartAgentSubAgent, WindowContextStrategy, } from '@mcp-abap-adt/llm-agent-libs';
|
|
11
12
|
import { DefaultMcpFailureClassifier, MCPClientWrapper, McpClientAdapter, } from '@mcp-abap-adt/llm-agent-mcp';
|
|
12
13
|
import { prefetchEmbedderFactories } from '@mcp-abap-adt/llm-agent-rag';
|
|
13
14
|
import { PACKAGE_VERSION } from '../generated/version.js';
|
|
14
15
|
import { ConfigReloadWatcher } from './config-reload-watcher.js';
|
|
16
|
+
import { EmbedderCircuitBreakers } from './embedder-circuit-breakers.js';
|
|
15
17
|
import { handleAdapterRequest } from './http/adapter-route-handler.js';
|
|
16
18
|
import { handleChat } from './http/chat-route-handler.js';
|
|
17
19
|
import { handleConfigUpdate, } from './http/config-route-handler.js';
|
|
@@ -30,6 +32,12 @@ import { resolveRetrievalStrategies, unknownRetrievalKeyWarnings, } from './reso
|
|
|
30
32
|
import { makeToolsRagHandle } from './tools-rag-handle.js';
|
|
31
33
|
import { assertWorkerLlmConfig, parseWorkerLlm } from './worker-llm.js';
|
|
32
34
|
export { writeNotReady } from './http/response-helpers.js';
|
|
35
|
+
export class ServerConfigError extends Error {
|
|
36
|
+
constructor(message) {
|
|
37
|
+
super(message);
|
|
38
|
+
this.name = 'ServerConfigError';
|
|
39
|
+
}
|
|
40
|
+
}
|
|
33
41
|
// ---------------------------------------------------------------------------
|
|
34
42
|
// Helpers
|
|
35
43
|
// ---------------------------------------------------------------------------
|
|
@@ -247,6 +255,7 @@ export class SmartServer {
|
|
|
247
255
|
_llmBreakers;
|
|
248
256
|
/** `circuitBreaker:` — the one embedder breaker, fed by the retrieval embedder. */
|
|
249
257
|
_embedderBreaker;
|
|
258
|
+
_embedderBreakers;
|
|
250
259
|
/** The one reranker of this server, resolved once in `_buildInfra()` (§7.4). */
|
|
251
260
|
_reranker;
|
|
252
261
|
/**
|
|
@@ -456,6 +465,14 @@ export class SmartServer {
|
|
|
456
465
|
_deps;
|
|
457
466
|
constructor(config, deps) {
|
|
458
467
|
assertConstructionSeams(deps);
|
|
468
|
+
if (!config.callerResolver?.resolve ||
|
|
469
|
+
!config.ragAccess?.decision?.canRead ||
|
|
470
|
+
!config.ragAccess.decision.canWrite ||
|
|
471
|
+
!config.ragAccess.roles?.rolesOf ||
|
|
472
|
+
!config.ragAccess.roles.listRoles ||
|
|
473
|
+
!config.ragAccess.bindings?.bind) {
|
|
474
|
+
throw new ServerConfigError('callerResolver and ragAccess are required');
|
|
475
|
+
}
|
|
459
476
|
this.cfg = config;
|
|
460
477
|
assertRagConfigShape(config.rag, 'rag');
|
|
461
478
|
for (const sub of config.subAgentConfigs ?? []) {
|
|
@@ -576,6 +593,8 @@ export class SmartServer {
|
|
|
576
593
|
if (this.cfg.circuitBreaker) {
|
|
577
594
|
this._llmBreakers = new LlmCircuitBreakers(this.cfg.circuitBreaker);
|
|
578
595
|
this._embedderBreaker = new CircuitBreaker(this.cfg.circuitBreaker);
|
|
596
|
+
this._embedderBreakers = new EmbedderCircuitBreakers(this.cfg.circuitBreaker);
|
|
597
|
+
this._embedderBreakers.resolve(this.cfg.rag, this._deps.embedder ?? this.cfg.embedder, this._embedderBreaker);
|
|
579
598
|
}
|
|
580
599
|
this._mainLlm = this.guardLlm(mainLlm, 'main');
|
|
581
600
|
this._classifierLlm = this.guardLlm(classifierLlm, 'classifier');
|
|
@@ -750,7 +769,7 @@ export class SmartServer {
|
|
|
750
769
|
subAgentConfigs: this.cfg.subAgentConfigs,
|
|
751
770
|
getFileLogger: () => this._fileLogger,
|
|
752
771
|
getEmbedderFactories: () => this._mergedEmbedderFactories ?? {},
|
|
753
|
-
buildSubAgent: (name, subCfg, parentLogger, factories, injected) => this.buildSubAgent(name, subCfg, parentLogger, factories, injected),
|
|
772
|
+
buildSubAgent: (name, subCfg, parentLogger, factories, injected, cache) => this.buildSubAgent(name, subCfg, parentLogger, factories, injected, cache),
|
|
754
773
|
});
|
|
755
774
|
// Resolve the embedder ONCE so the same instance feeds both makeRag and the
|
|
756
775
|
// subagent context-builder's toolSource (#137). See resolve-agent-embedder.
|
|
@@ -759,8 +778,8 @@ export class SmartServer {
|
|
|
759
778
|
// halves behind it — see resolveRetrievalEmbedder).
|
|
760
779
|
const resolvedEmbedder = await resolveRetrievalEmbedder(this.cfg.rag, this._deps.embedder ?? this.cfg.embedder, this._deps.resolveEmbedder, mergedEmbedderFactories, this._fileLogger,
|
|
761
780
|
// The embedder breaker sees the real embedding calls (§14.2): each half
|
|
762
|
-
// is wrapped below the document/query role.
|
|
763
|
-
this.embedderBreakerWrap());
|
|
781
|
+
// is wrapped below the document/query role.
|
|
782
|
+
this.embedderBreakerWrap(this._embedderBreaker));
|
|
764
783
|
// Hold the resolved embedder so buildServerCtx can thread it onto every
|
|
765
784
|
// pipeline context (the controller pipeline needs it for target-state).
|
|
766
785
|
this._resolvedEmbedder = resolvedEmbedder;
|
|
@@ -849,8 +868,8 @@ export class SmartServer {
|
|
|
849
868
|
// through its own. Two calls, two stores — the history store never shared
|
|
850
869
|
// the tools store's instance.
|
|
851
870
|
const input = toMakeRagInput(this.cfg.rag.store, resolvedEmbedder, 'rag');
|
|
852
|
-
toolsRag = this.withStrategy('tools', await this._deps.makeRag(input));
|
|
853
|
-
historyRag = this.withStrategy('history', await this._deps.makeRag(input));
|
|
871
|
+
toolsRag = this.withStrategy('tools', await this._deps.makeRag(input), this._embedderBreaker);
|
|
872
|
+
historyRag = this.withStrategy('history', await this._deps.makeRag(input), this._embedderBreaker);
|
|
854
873
|
}
|
|
855
874
|
// Capture the tools store for the flat/smart pipeline's ToolSelectHandler
|
|
856
875
|
// (and white-box vectorization assertions). See field doc.
|
|
@@ -959,7 +978,7 @@ export class SmartServer {
|
|
|
959
978
|
const registry = new Map();
|
|
960
979
|
if (this.cfg.subAgentConfigs && this.cfg.subAgentConfigs.length > 0) {
|
|
961
980
|
for (const sub of this.cfg.subAgentConfigs) {
|
|
962
|
-
const subAgent = await this.
|
|
981
|
+
const subAgent = await this._workers.construct(sub);
|
|
963
982
|
registry.set(sub.name, new SmartAgentSubAgent(sub.name, subAgent, {
|
|
964
983
|
description: sub.description,
|
|
965
984
|
}));
|
|
@@ -1000,7 +1019,7 @@ export class SmartServer {
|
|
|
1000
1019
|
// (Shared pipeline infra — knowledge backend, tools-RAG handle, MCP bridge —
|
|
1001
1020
|
// was hoisted UNCONDITIONALLY above via buildSharedPipelineInfra so every
|
|
1002
1021
|
// pipeline's buildServerCtx resolves its dep-sources.)
|
|
1003
|
-
const agentHandle = await builder.build();
|
|
1022
|
+
const agentHandle = await builder.build().then(unwrapBuilderResult);
|
|
1004
1023
|
const { agent: smartAgent, chat, streamChat, close: closeAgent, circuitBreakers, ragStores, modelProvider, } = agentHandle;
|
|
1005
1024
|
const { ragRegistry: globalRagRegistry, mcpClients: globalMcpClients } = agentHandle;
|
|
1006
1025
|
this._globalRagRegistry = globalRagRegistry;
|
|
@@ -1112,8 +1131,7 @@ export class SmartServer {
|
|
|
1112
1131
|
// hydrated for its identity (§6.4). Never the shared one: collections are
|
|
1113
1132
|
// addressed by name, so sharing it would put every session's collections
|
|
1114
1133
|
// in every session's address space. Hydration finds nothing until a
|
|
1115
|
-
// provider is registered
|
|
1116
|
-
// userId — see the limits stated above.
|
|
1134
|
+
// provider is registered; records are checked against the trusted caller.
|
|
1117
1135
|
ragRegistryFactory: (identity) => this._sessionRagRegistry(identity),
|
|
1118
1136
|
buildAgent: (parts) => this.buildSessionAgent(parts),
|
|
1119
1137
|
logger: fileLogger,
|
|
@@ -1152,6 +1170,9 @@ export class SmartServer {
|
|
|
1152
1170
|
version: this.cfg.version ?? PACKAGE_VERSION,
|
|
1153
1171
|
// Re-read per check: a PUT /v1/config swap replaces a key's breaker.
|
|
1154
1172
|
circuitBreakers: this.breakerList() ?? circuitBreakers,
|
|
1173
|
+
circuitBreakerLabel: (breaker) => breaker === this._embedderBreaker
|
|
1174
|
+
? undefined
|
|
1175
|
+
: this._embedderBreakers?.label(breaker),
|
|
1155
1176
|
});
|
|
1156
1177
|
// Startup health check removed — use `npm run models:check` for diagnostics.
|
|
1157
1178
|
// Running health check at startup wastes rate-limit budget when combined
|
|
@@ -1194,8 +1215,19 @@ export class SmartServer {
|
|
|
1194
1215
|
const { requestLogger } = agentHandle;
|
|
1195
1216
|
return {
|
|
1196
1217
|
close: async () => {
|
|
1197
|
-
|
|
1198
|
-
|
|
1218
|
+
const failures = [];
|
|
1219
|
+
for (const fn of closeFns) {
|
|
1220
|
+
const [result] = await Promise.allSettled([
|
|
1221
|
+
Promise.resolve().then(fn),
|
|
1222
|
+
]);
|
|
1223
|
+
if (result.status === 'rejected')
|
|
1224
|
+
failures.push(result);
|
|
1225
|
+
}
|
|
1226
|
+
if (failures.length === 1)
|
|
1227
|
+
throw failures[0].reason;
|
|
1228
|
+
if (failures.length > 1) {
|
|
1229
|
+
throw new AggregateError(failures.map((failure) => failure.reason), 'Failed to close server infrastructure');
|
|
1230
|
+
}
|
|
1199
1231
|
},
|
|
1200
1232
|
chat,
|
|
1201
1233
|
streamChat,
|
|
@@ -1241,7 +1273,7 @@ export class SmartServer {
|
|
|
1241
1273
|
try {
|
|
1242
1274
|
inst = await this.buildPipelineInstance({
|
|
1243
1275
|
sessionId: 'embedded',
|
|
1244
|
-
parts: this._embeddedSessionParts(infra.globalMcpClients, infra.globalRagRegistry),
|
|
1276
|
+
parts: await this._embeddedSessionParts(infra.globalMcpClients, infra.globalRagRegistry),
|
|
1245
1277
|
});
|
|
1246
1278
|
}
|
|
1247
1279
|
catch (e) {
|
|
@@ -1275,8 +1307,10 @@ export class SmartServer {
|
|
|
1275
1307
|
* seam won — so the embedded path carries the same descriptor pairing the
|
|
1276
1308
|
* per-session lifecycle now does.
|
|
1277
1309
|
*/
|
|
1278
|
-
_embeddedSessionParts(mcpClients, ragRegistry) {
|
|
1310
|
+
async _embeddedSessionParts(mcpClients, ragRegistry) {
|
|
1311
|
+
const caller = await this.resolveCaller('embedded', {});
|
|
1279
1312
|
return {
|
|
1313
|
+
caller,
|
|
1280
1314
|
sessionId: 'embedded',
|
|
1281
1315
|
mcpClients: mcpClients ?? this._sharedMcpClients ?? [],
|
|
1282
1316
|
mcpClientDescriptors: this._sharedMcpClientDescriptors,
|
|
@@ -1340,7 +1374,7 @@ export class SmartServer {
|
|
|
1340
1374
|
* rejected at config-parse time, so `subCfg.subAgentConfigs` is
|
|
1341
1375
|
* always undefined here.
|
|
1342
1376
|
*/
|
|
1343
|
-
async buildSubAgent(name, subCfg, parentLogger, embedderFactories, injected) {
|
|
1377
|
+
async buildSubAgent(name, subCfg, parentLogger, embedderFactories, injected, workerCache = this._workers.cache) {
|
|
1344
1378
|
// A worker's three LLM slots come from the SAME resolver as the pipeline's
|
|
1345
1379
|
// (§4.6.7): a named key resolves strictly, an omitted role as that name
|
|
1346
1380
|
// does for the pipeline. Instances are held by the resolver, so nothing is
|
|
@@ -1366,18 +1400,21 @@ export class SmartServer {
|
|
|
1366
1400
|
// re-wires (`injected` set) read from it via the same call below — the
|
|
1367
1401
|
// cache hit short-circuits all factories. This keeps the worker's
|
|
1368
1402
|
// declared RAG/MCP intact across per-session re-wires (review HIGH #1).
|
|
1403
|
+
const embedderBreaker = subCfg.rag
|
|
1404
|
+
? this._embedderBreakers?.resolve(subCfg.rag, subCfg.embedder)
|
|
1405
|
+
: this._embedderBreaker;
|
|
1369
1406
|
const cached = await resolveWorkerLlmSet({
|
|
1370
1407
|
name,
|
|
1371
|
-
cache:
|
|
1408
|
+
cache: workerCache,
|
|
1372
1409
|
// Worker-OWN tools RAG (from subCfg.rag, if declared). Built once;
|
|
1373
1410
|
// re-wired per-session by reference — never re-vectorized.
|
|
1374
1411
|
// rag.retrieval is server-wide: the worker's stores take the MAIN
|
|
1375
1412
|
// config's strategy for their key (§13.4).
|
|
1376
1413
|
makeToolsRag: subCfg.rag
|
|
1377
|
-
? async () => this.withStrategy('tools', await this._deps.makeRag(await this._workerRagInput(name, subCfg.rag, subCfg.embedder, embedderFactories)))
|
|
1414
|
+
? async () => this.withStrategy('tools', await this._deps.makeRag(await this._workerRagInput(name, subCfg.rag, subCfg.embedder, embedderFactories)), embedderBreaker)
|
|
1378
1415
|
: undefined,
|
|
1379
1416
|
makeHistoryRag: subCfg.rag
|
|
1380
|
-
? async () => this.withStrategy('history', await this._deps.makeRag(await this._workerRagInput(name, subCfg.rag, subCfg.embedder, embedderFactories)))
|
|
1417
|
+
? async () => this.withStrategy('history', await this._deps.makeRag(await this._workerRagInput(name, subCfg.rag, subCfg.embedder, embedderFactories)), embedderBreaker)
|
|
1381
1418
|
: undefined,
|
|
1382
1419
|
// Worker-OWN MCP clients. DI list (subCfg.mcpClients) wins; otherwise
|
|
1383
1420
|
// SmartAgentBuilder's own MCP-connect path handles `subCfg.mcp` — we
|
|
@@ -1393,11 +1430,17 @@ export class SmartServer {
|
|
|
1393
1430
|
prompts: subCfg.prompts,
|
|
1394
1431
|
skipModelValidation: subCfg.skipModelValidation,
|
|
1395
1432
|
})
|
|
1433
|
+
.withRagAccess(this.cfg.ragAccess)
|
|
1396
1434
|
.withMainLlm(mainLlm)
|
|
1397
1435
|
.withClassifierLlm(classifierLlm)
|
|
1398
1436
|
.withLogger(parentLogger)
|
|
1399
1437
|
.withMode(subCfg.mode ?? 'smart');
|
|
1400
1438
|
subBuilder = subBuilder.withHelperLlm(helperLlm);
|
|
1439
|
+
if (embedderBreaker) {
|
|
1440
|
+
subBuilder = subBuilder.withCircuitBreakers({
|
|
1441
|
+
embedder: embedderBreaker,
|
|
1442
|
+
});
|
|
1443
|
+
}
|
|
1401
1444
|
// SHARE the parent RAG registry + session logger when injected (per-session
|
|
1402
1445
|
// worker re-wire). The per-call scope filter isolates by ctx.sessionId.
|
|
1403
1446
|
const sharedReg = resolveSubAgentRagRegistry({
|
|
@@ -1445,13 +1488,13 @@ export class SmartServer {
|
|
|
1445
1488
|
for (const [key, strategy] of this._retrievalStrategies) {
|
|
1446
1489
|
subBuilder = subBuilder.withRetrievalStrategy(key, strategy);
|
|
1447
1490
|
}
|
|
1448
|
-
const handle = await subBuilder.build();
|
|
1491
|
+
const handle = await subBuilder.build().then(unwrapBuilderResult);
|
|
1449
1492
|
// Backfill the per-worker cache from the BUILT handle (review HIGH #7).
|
|
1450
1493
|
// Only runs on the primary build path (no `injected`) so per-session
|
|
1451
1494
|
// re-wires never overwrite the cache. See backfillWorkerCacheFromHandle's
|
|
1452
1495
|
// doc-comment for the rationale.
|
|
1453
1496
|
if (!injected) {
|
|
1454
|
-
const entry =
|
|
1497
|
+
const entry = workerCache.get(name);
|
|
1455
1498
|
if (entry)
|
|
1456
1499
|
await backfillWorkerCacheFromHandle(entry, handle);
|
|
1457
1500
|
}
|
|
@@ -1465,13 +1508,15 @@ export class SmartServer {
|
|
|
1465
1508
|
* Idempotent (`applyRetrievalStrategy`), so the builder's projection of the
|
|
1466
1509
|
* same store never wraps it twice — one rerank per query.
|
|
1467
1510
|
*/
|
|
1468
|
-
withStrategy(key, store) {
|
|
1511
|
+
withStrategy(key, store, breaker) {
|
|
1512
|
+
if (breaker)
|
|
1513
|
+
bindRagEmbedderBreaker(store, breaker);
|
|
1469
1514
|
const strategy = this._retrievalStrategies.get(key);
|
|
1470
1515
|
return strategy ? applyRetrievalStrategy(store, strategy) : store;
|
|
1471
1516
|
}
|
|
1472
1517
|
/** A worker's own store input: its embedder through the seam, then paired. */
|
|
1473
1518
|
async _workerRagInput(name, rag, diEmbedder, extraFactories) {
|
|
1474
|
-
const embedder = await resolveRetrievalEmbedder(rag, diEmbedder, this._deps.resolveEmbedder, extraFactories, this._fileLogger);
|
|
1519
|
+
const embedder = await resolveRetrievalEmbedder(rag, diEmbedder, this._deps.resolveEmbedder, extraFactories, this._fileLogger, this.embedderBreakerWrap(this._embedderBreakers?.resolve(rag, diEmbedder)));
|
|
1475
1520
|
return toMakeRagInput(rag.store, embedder, `subagent '${name}' rag`);
|
|
1476
1521
|
}
|
|
1477
1522
|
/** `ctx.resolveLlm(role)` — the role's default, through the held role map. */
|
|
@@ -1493,9 +1538,8 @@ export class SmartServer {
|
|
|
1493
1538
|
guardLlm(llm, key) {
|
|
1494
1539
|
return this._llmBreakers ? this._llmBreakers.wrap(llm, key) : llm;
|
|
1495
1540
|
}
|
|
1496
|
-
/**
|
|
1497
|
-
embedderBreakerWrap() {
|
|
1498
|
-
const breaker = this._embedderBreaker;
|
|
1541
|
+
/** Wrap below the retrieval role with the resolved identity's breaker. */
|
|
1542
|
+
embedderBreakerWrap(breaker) {
|
|
1499
1543
|
return breaker ? (e) => withCircuitBreaker(e, breaker) : undefined;
|
|
1500
1544
|
}
|
|
1501
1545
|
/** `/health`'s breakers: every key's current LLM breaker, then the embedder's. */
|
|
@@ -1504,7 +1548,11 @@ export class SmartServer {
|
|
|
1504
1548
|
const embedder = this._embedderBreaker;
|
|
1505
1549
|
if (!llm || !embedder)
|
|
1506
1550
|
return undefined;
|
|
1507
|
-
return () => [
|
|
1551
|
+
return () => [
|
|
1552
|
+
...llm.list(),
|
|
1553
|
+
embedder,
|
|
1554
|
+
...(this._embedderBreakers?.list().filter((b) => b !== embedder) ?? []),
|
|
1555
|
+
];
|
|
1508
1556
|
}
|
|
1509
1557
|
roleLlm() {
|
|
1510
1558
|
if (!this._roleLlm) {
|
|
@@ -1942,6 +1990,7 @@ export class SmartServer {
|
|
|
1942
1990
|
prompts: this.cfg.prompts,
|
|
1943
1991
|
skipModelValidation: this.cfg.skipModelValidation,
|
|
1944
1992
|
})
|
|
1993
|
+
.withRagAccess(this.cfg.ragAccess)
|
|
1945
1994
|
.withMainLlm(parts.mainLlm)
|
|
1946
1995
|
.withClassifierLlm(parts.classifierLlm)
|
|
1947
1996
|
.withLogger(parts.fileLogger)
|
|
@@ -1956,9 +2005,19 @@ export class SmartServer {
|
|
|
1956
2005
|
builder = builder.setHistoryRag(parts.historyRag);
|
|
1957
2006
|
}
|
|
1958
2007
|
for (const collection of parts.ragCollections ?? []) {
|
|
2008
|
+
if (this._embedderBreaker) {
|
|
2009
|
+
bindRagEmbedderBreaker(collection.rag, this._embedderBreaker);
|
|
2010
|
+
}
|
|
1959
2011
|
builder = builder.addRagCollection(collection);
|
|
1960
2012
|
}
|
|
1961
2013
|
if (parts.ragRegistry) {
|
|
2014
|
+
if (this._embedderBreaker) {
|
|
2015
|
+
for (const meta of parts.ragRegistry.list()) {
|
|
2016
|
+
const store = parts.ragRegistry.get(meta.name, meta.scope ?? 'global');
|
|
2017
|
+
if (store)
|
|
2018
|
+
bindRagEmbedderBreaker(store, this._embedderBreaker);
|
|
2019
|
+
}
|
|
2020
|
+
}
|
|
1962
2021
|
builder = builder.setRagRegistry(parts.ragRegistry);
|
|
1963
2022
|
}
|
|
1964
2023
|
// The server's one provider registry: without it build() substitutes an
|
|
@@ -2036,6 +2095,36 @@ export class SmartServer {
|
|
|
2036
2095
|
(() => new WindowContextStrategy()));
|
|
2037
2096
|
return builder;
|
|
2038
2097
|
}
|
|
2098
|
+
async resolveCaller(sessionId, headers) {
|
|
2099
|
+
const identity = await this.cfg.callerResolver.resolve(sessionId, headers);
|
|
2100
|
+
if (!identity.ok ||
|
|
2101
|
+
!identity.value.userId?.trim() ||
|
|
2102
|
+
typeof identity.value.isAdmin !== 'boolean')
|
|
2103
|
+
throw new Error('Caller refused');
|
|
2104
|
+
const caller = {
|
|
2105
|
+
sessionId,
|
|
2106
|
+
userId: identity.value.userId,
|
|
2107
|
+
isAdmin: identity.value.isAdmin,
|
|
2108
|
+
};
|
|
2109
|
+
const bound = await this.cfg.ragAccess.bindings.bind(sessionId, caller.userId);
|
|
2110
|
+
if (!bound.ok)
|
|
2111
|
+
throw bound.error;
|
|
2112
|
+
return caller;
|
|
2113
|
+
}
|
|
2114
|
+
async _refreshSessionRagRegistry(caller, registry) {
|
|
2115
|
+
if (!this._globalRagRegistry)
|
|
2116
|
+
return;
|
|
2117
|
+
await buildSessionRagRegistry({
|
|
2118
|
+
identity: caller,
|
|
2119
|
+
caller,
|
|
2120
|
+
ragAccess: this.cfg.ragAccess,
|
|
2121
|
+
globals: this._globalRagRegistry,
|
|
2122
|
+
providers: this._ragProviderRegistry,
|
|
2123
|
+
logger: this._fileLogger,
|
|
2124
|
+
reported: this._reportedCatalogFindings,
|
|
2125
|
+
registry,
|
|
2126
|
+
});
|
|
2127
|
+
}
|
|
2039
2128
|
/** The registry one session owns; see buildSessionRagRegistry. */
|
|
2040
2129
|
_sessionRagRegistry(identity) {
|
|
2041
2130
|
if (!this._globalRagRegistry) {
|
|
@@ -2043,6 +2132,8 @@ export class SmartServer {
|
|
|
2043
2132
|
}
|
|
2044
2133
|
return buildSessionRagRegistry({
|
|
2045
2134
|
identity,
|
|
2135
|
+
caller: { ...identity, isAdmin: identity.isAdmin === true },
|
|
2136
|
+
ragAccess: this.cfg.ragAccess,
|
|
2046
2137
|
globals: this._globalRagRegistry,
|
|
2047
2138
|
providers: this._ragProviderRegistry,
|
|
2048
2139
|
logger: this._fileLogger,
|
|
@@ -2098,44 +2189,50 @@ export class SmartServer {
|
|
|
2098
2189
|
* 2. release the refcount pin
|
|
2099
2190
|
*/
|
|
2100
2191
|
async _withSession(req, res, fn) {
|
|
2192
|
+
let graph;
|
|
2193
|
+
let sessionId;
|
|
2101
2194
|
const lifecycle = this._lifecycle;
|
|
2102
|
-
if (!lifecycle) {
|
|
2103
|
-
throw new Error('SmartServer lifecycle not initialized');
|
|
2104
|
-
}
|
|
2105
|
-
const traceId = randomUUID();
|
|
2106
|
-
const isHttps = req.socket.encrypted === true ||
|
|
2107
|
-
req.headers['x-forwarded-proto'] === 'https';
|
|
2108
|
-
const resolved = lifecycle.resolve(req.headers['cookie'], isHttps);
|
|
2109
|
-
const sessionId = resolved.identity.sessionId;
|
|
2110
|
-
if (resolved.minted && resolved.setCookie) {
|
|
2111
|
-
res.setHeader('Set-Cookie', resolved.setCookie);
|
|
2112
|
-
}
|
|
2113
|
-
const graph = await lifecycle.acquire(sessionId);
|
|
2114
|
-
// Register/touch the session in the meta store so /v1/sessions, resume and
|
|
2115
|
-
// delete reflect real chat/stream traffic (review Finding 3). Best-effort:
|
|
2116
|
-
// a meta-store hiccup must never break the actual request.
|
|
2117
2195
|
try {
|
|
2118
|
-
|
|
2119
|
-
|
|
2120
|
-
|
|
2121
|
-
|
|
2122
|
-
|
|
2123
|
-
|
|
2124
|
-
|
|
2125
|
-
|
|
2126
|
-
|
|
2196
|
+
if (!lifecycle)
|
|
2197
|
+
throw new Error('SmartServer lifecycle not initialized');
|
|
2198
|
+
const traceId = randomUUID();
|
|
2199
|
+
const isHttps = req.socket.encrypted === true ||
|
|
2200
|
+
req.headers['x-forwarded-proto'] === 'https';
|
|
2201
|
+
const resolved = lifecycle.resolve(req.headers['cookie'], isHttps);
|
|
2202
|
+
sessionId = resolved.identity.sessionId;
|
|
2203
|
+
if (resolved.minted && resolved.setCookie) {
|
|
2204
|
+
res.setHeader('Set-Cookie', resolved.setCookie);
|
|
2205
|
+
}
|
|
2206
|
+
const caller = await this.resolveCaller(sessionId, req.headers);
|
|
2207
|
+
graph = await lifecycle.acquire(caller);
|
|
2208
|
+
if (graph.ragRegistry)
|
|
2209
|
+
await this._refreshSessionRagRegistry(caller, graph.ragRegistry);
|
|
2210
|
+
await recordSessionStart(this._sessionMetaStore, sessionId, new Date().toISOString(), caller.userId);
|
|
2127
2211
|
try {
|
|
2128
|
-
await
|
|
2212
|
+
await fn(graph, sessionId, traceId, caller);
|
|
2129
2213
|
}
|
|
2130
|
-
|
|
2131
|
-
|
|
2214
|
+
finally {
|
|
2215
|
+
try {
|
|
2216
|
+
await recordSessionEnd(this._sessionMetaStore, sessionId, new Date().toISOString());
|
|
2217
|
+
}
|
|
2218
|
+
finally {
|
|
2219
|
+
graph.logger.dropRequest(traceId);
|
|
2220
|
+
// Pass the graph instance — `invalidateAll()` may have detached this
|
|
2221
|
+
// graph into the draining map while the request was in flight; we must
|
|
2222
|
+
// release THIS specific instance, not whatever currently lives under
|
|
2223
|
+
// `sessionId` in the registry.
|
|
2224
|
+
lifecycle.release(sessionId, graph);
|
|
2225
|
+
graph = undefined;
|
|
2226
|
+
}
|
|
2132
2227
|
}
|
|
2133
|
-
|
|
2134
|
-
|
|
2135
|
-
|
|
2136
|
-
|
|
2137
|
-
|
|
2138
|
-
|
|
2228
|
+
}
|
|
2229
|
+
catch {
|
|
2230
|
+
if (graph && sessionId)
|
|
2231
|
+
lifecycle?.release(sessionId, graph);
|
|
2232
|
+
if (!res.headersSent)
|
|
2233
|
+
res.writeHead(403, { 'Content-Type': 'application/json' });
|
|
2234
|
+
if (!res.writableEnded)
|
|
2235
|
+
res.end(JSON.stringify({ error: 'Access denied' }));
|
|
2139
2236
|
}
|
|
2140
2237
|
}
|
|
2141
2238
|
async _handle(req, res, requestLogger, smartAgent, chat, streamChat, log, healthChecker, modelProvider, adapterMap) {
|
|
@@ -2264,8 +2361,8 @@ export class SmartServer {
|
|
|
2264
2361
|
rc.res.end(jsonError('Anthropic adapter not registered', 'not_found'));
|
|
2265
2362
|
return;
|
|
2266
2363
|
}
|
|
2267
|
-
await rc.server._withSession(rc.req, rc.res, async (graph, sessionId, traceId) => {
|
|
2268
|
-
await handleAdapterRequest(rc.req, rc.res, graph.agent ?? rc.smartAgent, anthropicAdapter, { sessionId, traceId, graph }, this.cfg.agent?.heartbeatIntervalMs, rc.log);
|
|
2364
|
+
await rc.server._withSession(rc.req, rc.res, async (graph, sessionId, traceId, caller) => {
|
|
2365
|
+
await handleAdapterRequest(rc.req, rc.res, graph.agent ?? rc.smartAgent, anthropicAdapter, { sessionId, traceId, graph, caller }, this.cfg.agent?.heartbeatIntervalMs, rc.log);
|
|
2269
2366
|
});
|
|
2270
2367
|
},
|
|
2271
2368
|
});
|
|
@@ -2278,8 +2375,8 @@ export class SmartServer {
|
|
|
2278
2375
|
writeNotReady(rc.res);
|
|
2279
2376
|
return;
|
|
2280
2377
|
}
|
|
2281
|
-
await rc.server._withSession(rc.req, rc.res, async (graph, sessionId, traceId) => {
|
|
2282
|
-
await handleChat(rc.req, rc.res, rc.requestLogger, graph.agent ?? rc.smartAgent, rc.chat, rc.streamChat, rc.log, rc.modelProvider, { sessionId, traceId, graph }, this.cfg);
|
|
2378
|
+
await rc.server._withSession(rc.req, rc.res, async (graph, sessionId, traceId, caller) => {
|
|
2379
|
+
await handleChat(rc.req, rc.res, rc.requestLogger, graph.agent ?? rc.smartAgent, rc.chat, rc.streamChat, rc.log, rc.modelProvider, { sessionId, traceId, graph, caller }, this.cfg);
|
|
2283
2380
|
});
|
|
2284
2381
|
},
|
|
2285
2382
|
});
|