@mcp-abap-adt/llm-agent-libs 30.32.3 → 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 +33 -0
- package/dist/agent/rag-orchestrator-types.d.ts +4 -2
- package/dist/agent/rag-orchestrator-types.d.ts.map +1 -1
- package/dist/agent/rag-orchestrator.d.ts.map +1 -1
- package/dist/agent/rag-orchestrator.js +11 -4
- package/dist/agent/rag-orchestrator.js.map +1 -1
- package/dist/agent.d.ts +4 -2
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +13 -3
- package/dist/agent.js.map +1 -1
- package/dist/builder-types.d.ts +7 -1
- package/dist/builder-types.d.ts.map +1 -1
- package/dist/builder-types.js +12 -0
- package/dist/builder-types.js.map +1 -1
- package/dist/builder.d.ts +19 -7
- package/dist/builder.d.ts.map +1 -1
- package/dist/builder.js +179 -93
- package/dist/builder.js.map +1 -1
- package/dist/context/context-assembler.d.ts.map +1 -1
- package/dist/context/context-assembler.js +7 -3
- package/dist/context/context-assembler.js.map +1 -1
- package/dist/coordinator/adaptive/adaptive-interpreter.d.ts +1 -0
- package/dist/coordinator/adaptive/adaptive-interpreter.d.ts.map +1 -1
- package/dist/coordinator/adaptive/adaptive-interpreter.js +1 -0
- package/dist/coordinator/adaptive/adaptive-interpreter.js.map +1 -1
- package/dist/coordinator/dag/dag-plan-interpreter.d.ts.map +1 -1
- package/dist/coordinator/dag/dag-plan-interpreter.js +2 -0
- package/dist/coordinator/dag/dag-plan-interpreter.js.map +1 -1
- package/dist/coordinator/dag/llm-dag-planner.d.ts.map +1 -1
- package/dist/coordinator/dag/llm-dag-planner.js +1 -0
- package/dist/coordinator/dag/llm-dag-planner.js.map +1 -1
- package/dist/coordinator/dag/llm-finalizer.d.ts.map +1 -1
- package/dist/coordinator/dag/llm-finalizer.js +2 -1
- package/dist/coordinator/dag/llm-finalizer.js.map +1 -1
- package/dist/coordinator/dag/llm-review-strategy.d.ts.map +1 -1
- package/dist/coordinator/dag/llm-review-strategy.js +2 -0
- package/dist/coordinator/dag/llm-review-strategy.js.map +1 -1
- package/dist/coordinator/dag/replan-error-strategy.d.ts.map +1 -1
- package/dist/coordinator/dag/replan-error-strategy.js +1 -0
- package/dist/coordinator/dag/replan-error-strategy.js.map +1 -1
- package/dist/coordinator/dag/subagent-state-oracle.d.ts.map +1 -1
- package/dist/coordinator/dag/subagent-state-oracle.js +1 -0
- package/dist/coordinator/dag/subagent-state-oracle.js.map +1 -1
- package/dist/coordinator/dialogue/dialogue-session.d.ts +3 -1
- package/dist/coordinator/dialogue/dialogue-session.d.ts.map +1 -1
- package/dist/coordinator/dialogue/dialogue-session.js +7 -0
- package/dist/coordinator/dialogue/dialogue-session.js.map +1 -1
- package/dist/coordinator/dialogue/planner-memory.d.ts.map +1 -1
- package/dist/coordinator/dialogue/planner-memory.js +3 -4
- package/dist/coordinator/dialogue/planner-memory.js.map +1 -1
- package/dist/coordinator/dialogue/task-board.d.ts +1 -0
- package/dist/coordinator/dialogue/task-board.d.ts.map +1 -1
- package/dist/coordinator/dialogue/task-board.js +2 -0
- package/dist/coordinator/dialogue/task-board.js.map +1 -1
- package/dist/coordinator/dispatch/self.d.ts.map +1 -1
- package/dist/coordinator/dispatch/self.js +5 -0
- package/dist/coordinator/dispatch/self.js.map +1 -1
- package/dist/coordinator/dispatch/subagent.d.ts.map +1 -1
- package/dist/coordinator/dispatch/subagent.js +2 -0
- package/dist/coordinator/dispatch/subagent.js.map +1 -1
- package/dist/coordinator/planning/one-shot.d.ts.map +1 -1
- package/dist/coordinator/planning/one-shot.js +1 -0
- package/dist/coordinator/planning/one-shot.js.map +1 -1
- package/dist/coordinator/planning/replan-on-error.d.ts.map +1 -1
- package/dist/coordinator/planning/replan-on-error.js +1 -0
- package/dist/coordinator/planning/replan-on-error.js.map +1 -1
- package/dist/health/agent-health.d.ts +3 -2
- package/dist/health/agent-health.d.ts.map +1 -1
- package/dist/health/agent-health.js +1 -1
- package/dist/health/agent-health.js.map +1 -1
- package/dist/health/health-checker.d.ts +2 -0
- package/dist/health/health-checker.d.ts.map +1 -1
- package/dist/health/health-checker.js +5 -0
- package/dist/health/health-checker.js.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/interfaces/pipeline.d.ts +7 -3
- package/dist/interfaces/pipeline.d.ts.map +1 -1
- package/dist/interfaces/pipeline.js +0 -11
- package/dist/interfaces/pipeline.js.map +1 -1
- package/dist/mcp/tool-registry.d.ts +3 -2
- package/dist/mcp/tool-registry.d.ts.map +1 -1
- package/dist/mcp/tool-registry.js +1 -1
- package/dist/mcp/tool-registry.js.map +1 -1
- package/dist/pipeline/context.d.ts +7 -1
- package/dist/pipeline/context.d.ts.map +1 -1
- package/dist/pipeline/context.js +0 -17
- package/dist/pipeline/context.js.map +1 -1
- package/dist/pipeline/default-pipeline.d.ts +2 -2
- package/dist/pipeline/default-pipeline.d.ts.map +1 -1
- package/dist/pipeline/default-pipeline.js +31 -30
- package/dist/pipeline/default-pipeline.js.map +1 -1
- package/dist/pipeline/handlers/adaptive-coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/adaptive-coordinator.js +6 -0
- package/dist/pipeline/handlers/adaptive-coordinator.js.map +1 -1
- package/dist/pipeline/handlers/coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/coordinator.js +18 -3
- package/dist/pipeline/handlers/coordinator.js.map +1 -1
- package/dist/pipeline/handlers/dag-coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/dag-coordinator.js +12 -0
- package/dist/pipeline/handlers/dag-coordinator.js.map +1 -1
- package/dist/pipeline/handlers/expand.d.ts +1 -1
- package/dist/pipeline/handlers/expand.d.ts.map +1 -1
- package/dist/pipeline/handlers/expand.js +2 -1
- package/dist/pipeline/handlers/expand.js.map +1 -1
- package/dist/pipeline/handlers/history-upsert.d.ts.map +1 -1
- package/dist/pipeline/handlers/history-upsert.js +3 -16
- package/dist/pipeline/handlers/history-upsert.js.map +1 -1
- package/dist/pipeline/handlers/rag-query.d.ts +0 -20
- package/dist/pipeline/handlers/rag-query.d.ts.map +1 -1
- package/dist/pipeline/handlers/rag-query.js +10 -42
- package/dist/pipeline/handlers/rag-query.js.map +1 -1
- package/dist/pipeline/handlers/rerank.d.ts +1 -1
- package/dist/pipeline/handlers/rerank.js +3 -3
- package/dist/pipeline/handlers/rerank.js.map +1 -1
- package/dist/pipeline/handlers/skill-select.d.ts +0 -11
- package/dist/pipeline/handlers/skill-select.d.ts.map +1 -1
- package/dist/pipeline/handlers/skill-select.js +6 -1
- package/dist/pipeline/handlers/skill-select.js.map +1 -1
- package/dist/pipeline/handlers/subagent.d.ts.map +1 -1
- package/dist/pipeline/handlers/subagent.js +5 -0
- package/dist/pipeline/handlers/subagent.js.map +1 -1
- package/dist/pipeline/handlers/tool-loop.d.ts.map +1 -1
- package/dist/pipeline/handlers/tool-loop.js +26 -15
- package/dist/pipeline/handlers/tool-loop.js.map +1 -1
- package/dist/pipeline/handlers/tool-select.d.ts +0 -14
- package/dist/pipeline/handlers/tool-select.d.ts.map +1 -1
- package/dist/pipeline/handlers/tool-select.js +6 -15
- package/dist/pipeline/handlers/tool-select.js.map +1 -1
- package/dist/pipeline/handlers/wrap-final-response.d.ts +3 -0
- package/dist/pipeline/handlers/wrap-final-response.d.ts.map +1 -0
- package/dist/pipeline/handlers/wrap-final-response.js +6 -0
- package/dist/pipeline/handlers/wrap-final-response.js.map +1 -0
- package/dist/pipeline/pipeline-to-stream.d.ts +2 -2
- package/dist/pipeline/pipeline-to-stream.d.ts.map +1 -1
- package/dist/pipeline/pipeline-to-stream.js +2 -2
- package/dist/pipeline/pipeline-to-stream.js.map +1 -1
- package/dist/rag/owner-bound-query.d.ts +6 -0
- package/dist/rag/owner-bound-query.d.ts.map +1 -0
- package/dist/rag/owner-bound-query.js +85 -0
- package/dist/rag/owner-bound-query.js.map +1 -0
- package/dist/retrieval/relevance-query.d.ts +10 -0
- package/dist/retrieval/relevance-query.d.ts.map +1 -0
- package/dist/retrieval/relevance-query.js +9 -0
- package/dist/retrieval/relevance-query.js.map +1 -0
- package/dist/retrieval/reranked-retrieval.d.ts.map +1 -1
- package/dist/retrieval/reranked-retrieval.js +2 -1
- package/dist/retrieval/reranked-retrieval.js.map +1 -1
- package/dist/session/session-graph-factory.d.ts +5 -3
- package/dist/session/session-graph-factory.d.ts.map +1 -1
- package/dist/session/session-graph-factory.js +3 -0
- package/dist/session/session-graph-factory.js.map +1 -1
- package/dist/session/session-graph.d.ts +5 -0
- package/dist/session/session-graph.d.ts.map +1 -1
- package/dist/session/session-graph.js +4 -0
- package/dist/session/session-graph.js.map +1 -1
- package/dist/session/session-registry.d.ts +5 -1
- package/dist/session/session-registry.d.ts.map +1 -1
- package/dist/session/session-registry.js +20 -2
- package/dist/session/session-registry.js.map +1 -1
- package/dist/subagent/default-context-builder.d.ts.map +1 -1
- package/dist/subagent/default-context-builder.js +14 -2
- package/dist/subagent/default-context-builder.js.map +1 -1
- package/dist/subagent/direct-llm-subagent.d.ts.map +1 -1
- package/dist/subagent/direct-llm-subagent.js +1 -0
- package/dist/subagent/direct-llm-subagent.js.map +1 -1
- package/dist/subagent/smart-agent-subagent.d.ts.map +1 -1
- package/dist/subagent/smart-agent-subagent.js +5 -1
- package/dist/subagent/smart-agent-subagent.js.map +1 -1
- package/dist/testing/index.d.ts +16 -2
- package/dist/testing/index.d.ts.map +1 -1
- package/dist/testing/index.js +46 -13
- package/dist/testing/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-select.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/tool-select.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"tool-select.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/tool-select.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wrap-final-response.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/wrap-final-response.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,EAC3C,OAAO,EAAE,MAAM,GACd,MAAM,CAIR"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wrap-final-response.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/wrap-final-response.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB,CAC/B,GAA2C,EAC3C,OAAe;IAEf,OAAO,GAAG,CAAC,aAAa,IAAI,OAAO;QACjC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC;QACzC,CAAC,CAAC,OAAO,CAAC;AACd,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { CallOptions, LlmStreamChunk, LlmTool, Message, Result } from '@mcp-abap-adt/llm-agent';
|
|
1
|
+
import type { CallOptions, IClientAdapter, LlmStreamChunk, LlmTool, Message, Result } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import { OrchestratorError } from '@mcp-abap-adt/llm-agent';
|
|
3
3
|
import type { IPipeline } from '../interfaces/pipeline.js';
|
|
4
|
-
export declare function pipelineToStream(pipeline: IPipeline, input: string | Message[], externalTools: LlmTool[], opts: CallOptions | undefined): AsyncIterable<Result<LlmStreamChunk, OrchestratorError>>;
|
|
4
|
+
export declare function pipelineToStream(pipeline: IPipeline, input: string | Message[], externalTools: LlmTool[], opts: CallOptions | undefined, clientAdapter?: IClientAdapter): AsyncIterable<Result<LlmStreamChunk, OrchestratorError>>;
|
|
5
5
|
//# sourceMappingURL=pipeline-to-stream.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-to-stream.d.ts","sourceRoot":"","sources":["../../src/pipeline/pipeline-to-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,OAAO,EACP,OAAO,EACP,MAAM,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE3D,wBAAuB,gBAAgB,CACrC,QAAQ,EAAE,SAAS,EACnB,KAAK,EAAE,MAAM,GAAG,OAAO,EAAE,EACzB,aAAa,EAAE,OAAO,EAAE,EACxB,IAAI,EAAE,WAAW,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"pipeline-to-stream.d.ts","sourceRoot":"","sources":["../../src/pipeline/pipeline-to-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,cAAc,EACd,OAAO,EACP,OAAO,EACP,MAAM,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE3D,wBAAuB,gBAAgB,CACrC,QAAQ,EAAE,SAAS,EACnB,KAAK,EAAE,MAAM,GAAG,OAAO,EAAE,EACzB,aAAa,EAAE,OAAO,EAAE,EACxB,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,aAAa,CAAC,EAAE,cAAc,GAC7B,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAuD1D"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OrchestratorError } from '@mcp-abap-adt/llm-agent';
|
|
2
|
-
export async function* pipelineToStream(pipeline, input, externalTools, opts) {
|
|
2
|
+
export async function* pipelineToStream(pipeline, input, externalTools, opts, clientAdapter) {
|
|
3
3
|
if (!pipeline)
|
|
4
4
|
return;
|
|
5
5
|
const history = typeof input === 'string' ? [] : input;
|
|
@@ -13,7 +13,7 @@ export async function* pipelineToStream(pipeline, input, externalTools, opts) {
|
|
|
13
13
|
resolveWait();
|
|
14
14
|
resolveWait = null;
|
|
15
15
|
}
|
|
16
|
-
}, externalTools)
|
|
16
|
+
}, externalTools, clientAdapter)
|
|
17
17
|
.then(() => {
|
|
18
18
|
done = true;
|
|
19
19
|
if (resolveWait) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-to-stream.js","sourceRoot":"","sources":["../../src/pipeline/pipeline-to-stream.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pipeline-to-stream.js","sourceRoot":"","sources":["../../src/pipeline/pipeline-to-stream.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,gBAAgB,CACrC,QAAmB,EACnB,KAAyB,EACzB,aAAwB,EACxB,IAA6B,EAC7B,aAA8B;IAE9B,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,MAAM,OAAO,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAEvD,MAAM,UAAU,GAAgD,EAAE,CAAC;IACnE,IAAI,WAAW,GAAwB,IAAI,CAAC;IAC5C,IAAI,IAAI,GAAG,KAAK,CAAC;IAEjB,MAAM,eAAe,GAAG,QAAQ;SAC7B,OAAO,CACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,CAAC,KAAK,EAAE,EAAE;QACR,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,IAAI,WAAW,EAAE,CAAC;YAChB,WAAW,EAAE,CAAC;YACd,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC;IACH,CAAC,EACD,aAAa,EACb,aAAa,CACd;SACA,IAAI,CAAC,GAAG,EAAE;QACT,IAAI,GAAG,IAAI,CAAC;QACZ,IAAI,WAAW,EAAE,CAAC;YAChB,WAAW,EAAE,CAAC;YACd,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,UAAU,CAAC,IAAI,CAAC;YACd,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,IAAI,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC;SAC5D,CAAC,CAAC;QACH,IAAI,GAAG,IAAI,CAAC;QACZ,IAAI,WAAW,EAAE,CAAC;YAChB,WAAW,EAAE,CAAC;YACd,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,OAAO,CAAC,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;YACjC,IAAI,KAAK,KAAK,SAAS;gBAAE,MAAM,KAAK,CAAC;QACvC,CAAC;aAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE;gBAC5B,WAAW,GAAG,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,eAAe,CAAC;AACxB,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type CallOptions, type IQueryEmbedding, type RagAccess, type RagError, type RagResult, type Result, type SmartAgentRagStores } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
export type OwnedRagStore = SmartAgentRagStores[string];
|
|
3
|
+
/** Missing configuration must never grant collection access. */
|
|
4
|
+
export declare const denyRagAccess: RagAccess;
|
|
5
|
+
export declare function ownerBoundQuery(store: OwnedRagStore, embedding: IQueryEmbedding, k: number, options: CallOptions, access: RagAccess): Promise<Result<RagResult[], RagError>>;
|
|
6
|
+
//# sourceMappingURL=owner-bound-query.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"owner-bound-query.d.ts","sourceRoot":"","sources":["../../src/rag/owner-bound-query.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,eAAe,EAEpB,KAAK,SAAS,EAEd,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,MAAM,EAEX,KAAK,mBAAmB,EACzB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;AAExD,gEAAgE;AAChE,eAAO,MAAM,aAAa,EAAE,SAc3B,CAAC;AAEF,wBAAsB,eAAe,CACnC,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,eAAe,EAC1B,CAAC,EAAE,MAAM,EACT,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC,CAsExC"}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import { checkRagAccess, matchesRagIdentity, RagAccessDeniedError, ragIdentityFilter, } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
/** Missing configuration must never grant collection access. */
|
|
3
|
+
export const denyRagAccess = {
|
|
4
|
+
decision: { canRead: async () => false, canWrite: async () => false },
|
|
5
|
+
roles: {
|
|
6
|
+
listRoles: async () => ({ ok: false, error: new RagAccessDeniedError() }),
|
|
7
|
+
createRole: async () => ({ ok: false, error: new RagAccessDeniedError() }),
|
|
8
|
+
deleteRole: async () => ({ ok: false, error: new RagAccessDeniedError() }),
|
|
9
|
+
assign: async () => ({ ok: false, error: new RagAccessDeniedError() }),
|
|
10
|
+
revoke: async () => ({ ok: false, error: new RagAccessDeniedError() }),
|
|
11
|
+
rolesOf: async () => ({ ok: false, error: new RagAccessDeniedError() }),
|
|
12
|
+
},
|
|
13
|
+
bindings: {
|
|
14
|
+
getUserId: async () => ({ ok: false, error: new RagAccessDeniedError() }),
|
|
15
|
+
bind: async () => ({ ok: false, error: new RagAccessDeniedError() }),
|
|
16
|
+
},
|
|
17
|
+
};
|
|
18
|
+
export async function ownerBoundQuery(store, embedding, k, options, access) {
|
|
19
|
+
const deny = () => ({
|
|
20
|
+
ok: false,
|
|
21
|
+
error: new RagAccessDeniedError(),
|
|
22
|
+
});
|
|
23
|
+
const caller = options.caller;
|
|
24
|
+
if (!caller?.sessionId?.trim() || !caller.userId?.trim())
|
|
25
|
+
return deny();
|
|
26
|
+
try {
|
|
27
|
+
const binding = await access.bindings.getUserId(caller.sessionId);
|
|
28
|
+
if (!binding.ok || binding.value !== caller.userId)
|
|
29
|
+
return deny();
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
return deny();
|
|
33
|
+
}
|
|
34
|
+
const filter = options.ragFilter;
|
|
35
|
+
if (filter?.owner !== undefined)
|
|
36
|
+
return deny();
|
|
37
|
+
if (filter?.sessionId !== undefined && filter.sessionId !== caller.sessionId)
|
|
38
|
+
return deny();
|
|
39
|
+
if (filter?.userId !== undefined && filter.userId !== caller.userId)
|
|
40
|
+
return deny();
|
|
41
|
+
if (filter?.roleId !== undefined) {
|
|
42
|
+
if (typeof filter.roleId !== 'string')
|
|
43
|
+
return deny();
|
|
44
|
+
try {
|
|
45
|
+
const roles = await access.roles.rolesOf(caller.userId);
|
|
46
|
+
if (!roles.ok || !roles.value.has(filter.roleId))
|
|
47
|
+
return deny();
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return deny();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
const isHistory = store.owner.scope === 'session' && 'perRequest' in store.owner;
|
|
54
|
+
const owner = isHistory
|
|
55
|
+
? { scope: 'session', sessionId: caller.sessionId }
|
|
56
|
+
: store.owner;
|
|
57
|
+
// Built-in history keeps binding and session isolation, without a server decision.
|
|
58
|
+
if (!isHistory && owner.scope !== 'internal') {
|
|
59
|
+
const allowed = await checkRagAccess(caller, { name: store.name, owner }, 'read', access);
|
|
60
|
+
if (!allowed.ok)
|
|
61
|
+
return allowed;
|
|
62
|
+
}
|
|
63
|
+
const ownerFilter = owner.scope === 'internal'
|
|
64
|
+
? {}
|
|
65
|
+
: owner.scope === 'session'
|
|
66
|
+
? { owner, sessionId: owner.sessionId }
|
|
67
|
+
: owner.scope === 'user'
|
|
68
|
+
? { owner, userId: owner.userId }
|
|
69
|
+
: owner.scope === 'role'
|
|
70
|
+
? { owner, roleId: owner.roleId }
|
|
71
|
+
: { owner };
|
|
72
|
+
const result = await store.rag.query(embedding, k, {
|
|
73
|
+
...options,
|
|
74
|
+
ragFilter: { ...filter, ...ownerFilter },
|
|
75
|
+
});
|
|
76
|
+
if (!result.ok)
|
|
77
|
+
return result;
|
|
78
|
+
// Keep untagged or foreign records closed if a custom backend returns them.
|
|
79
|
+
return {
|
|
80
|
+
ok: true,
|
|
81
|
+
value: result.value.filter((record) => owner.scope === 'internal' ||
|
|
82
|
+
matchesRagIdentity(record.metadata, ragIdentityFilter({ ragFilter: ownerFilter }))),
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
//# sourceMappingURL=owner-bound-query.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"owner-bound-query.js","sourceRoot":"","sources":["../../src/rag/owner-bound-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { CallOptions } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
declare const RELEVANCE_QUERY: unique symbol;
|
|
3
|
+
type RelevanceOptions = CallOptions & {
|
|
4
|
+
[RELEVANCE_QUERY]?: string;
|
|
5
|
+
};
|
|
6
|
+
/** Keep relevance judgments independent of retrieval query transformations. */
|
|
7
|
+
export declare function withRelevanceQuery(options: CallOptions, text: string): RelevanceOptions;
|
|
8
|
+
export declare function relevanceQuery(options?: RelevanceOptions): string | undefined;
|
|
9
|
+
export {};
|
|
10
|
+
//# sourceMappingURL=relevance-query.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relevance-query.d.ts","sourceRoot":"","sources":["../../src/retrieval/relevance-query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,QAAA,MAAM,eAAe,eAA4B,CAAC;AAElD,KAAK,gBAAgB,GAAG,WAAW,GAAG;IAAE,CAAC,eAAe,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,+EAA+E;AAC/E,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,GACX,gBAAgB,CAElB;AAED,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS,CAE7E"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
const RELEVANCE_QUERY = Symbol('relevance-query');
|
|
2
|
+
/** Keep relevance judgments independent of retrieval query transformations. */
|
|
3
|
+
export function withRelevanceQuery(options, text) {
|
|
4
|
+
return { ...options, [RELEVANCE_QUERY]: text };
|
|
5
|
+
}
|
|
6
|
+
export function relevanceQuery(options) {
|
|
7
|
+
return options?.[RELEVANCE_QUERY];
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=relevance-query.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relevance-query.js","sourceRoot":"","sources":["../../src/retrieval/relevance-query.ts"],"names":[],"mappings":"AAEA,MAAM,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAIlD,+EAA+E;AAC/E,MAAM,UAAU,kBAAkB,CAChC,OAAoB,EACpB,IAAY;IAEZ,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAA0B;IACvD,OAAO,OAAO,EAAE,CAAC,eAAe,CAAC,CAAC;AACpC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reranked-retrieval.d.ts","sourceRoot":"","sources":["../../src/retrieval/reranked-retrieval.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,eAAe,EACf,IAAI,EACJ,SAAS,EACT,kBAAkB,EAClB,QAAQ,EACR,SAAS,EACT,MAAM,EACP,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"reranked-retrieval.d.ts","sourceRoot":"","sources":["../../src/retrieval/reranked-retrieval.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,eAAe,EACf,IAAI,EACJ,SAAS,EACT,kBAAkB,EAClB,QAAQ,EACR,SAAS,EACT,MAAM,EACP,MAAM,yBAAyB,CAAC;AAwCjC,sDAAsD;AACtD,qBAAa,iBAAkB,YAAW,kBAAkB;IAKxD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI;IALvB,QAAQ,CAAC,IAAI,YAAY;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAGhB,QAAQ,EAAE,SAAS,EACnB,IAAI,GAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAO;IAMlE,QAAQ,CACZ,KAAK,EAAE,IAAI,EACX,KAAK,EAAE,eAAe,EACtB,CAAC,EAAE,MAAM,EACT,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;CAa1C;AAED;;;GAGG;AACH,qBAAa,kBAAmB,YAAW,kBAAkB;IAIzD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAJvB,QAAQ,CAAC,IAAI,gBAAgB;gBAGV,QAAQ,EAAE,SAAS,EACnB,IAAI,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;IAShE,QAAQ,CACZ,KAAK,EAAE,IAAI,EACX,KAAK,EAAE,eAAe,EACtB,CAAC,EAAE,MAAM,EACT,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;CAiB1C"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { assertPositiveInteger } from '../util/assert-positive-integer.js';
|
|
2
|
+
import { relevanceQuery } from './relevance-query.js';
|
|
2
3
|
/** Cap on a thrown error's text in the step: enough for a reason, never a dump. */
|
|
3
4
|
const MAX_THROWN_MESSAGE = 500;
|
|
4
5
|
async function rerankOrFallback(name, storeName, reranker, query, candidates, k, options) {
|
|
5
6
|
let code;
|
|
6
7
|
let message;
|
|
7
8
|
try {
|
|
8
|
-
const r = await reranker.rerank(query.text, candidates, options);
|
|
9
|
+
const r = await reranker.rerank(relevanceQuery(options) ?? query.text, candidates, options);
|
|
9
10
|
if (r.ok)
|
|
10
11
|
return { ok: true, value: r.value.slice(0, k) };
|
|
11
12
|
code = r.error.code;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reranked-retrieval.js","sourceRoot":"","sources":["../../src/retrieval/reranked-retrieval.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"reranked-retrieval.js","sourceRoot":"","sources":["../../src/retrieval/reranked-retrieval.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import type { AnyLogger, IMcpClient, IMcpServer, IRag, IRagRegistry, McpClientDescriptor } from '@mcp-abap-adt/llm-agent';
|
|
1
|
+
import type { AnyLogger, IMcpClient, IMcpServer, IRag, IRagRegistry, McpClientDescriptor, RagCaller } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import type { SmartAgent } from '../agent.js';
|
|
3
3
|
import { SessionRequestLogger } from '../logger/session-request-logger.js';
|
|
4
4
|
import { SessionGraph } from './session-graph.js';
|
|
5
5
|
export interface SessionGraphIdentity {
|
|
6
6
|
readonly sessionId: string;
|
|
7
|
-
readonly userId
|
|
7
|
+
readonly userId: string;
|
|
8
|
+
readonly isAdmin?: boolean;
|
|
8
9
|
}
|
|
9
10
|
/**
|
|
10
11
|
* Parts handed to `buildAgent` — the injected globals + per-session services.
|
|
@@ -13,6 +14,7 @@ export interface SessionGraphIdentity {
|
|
|
13
14
|
* path with this session's logger + the cached per-worker LLM/embedder).
|
|
14
15
|
*/
|
|
15
16
|
export interface SessionAgentParts {
|
|
17
|
+
readonly caller: RagCaller;
|
|
16
18
|
readonly sessionId: string;
|
|
17
19
|
readonly mcpClients: IMcpClient[];
|
|
18
20
|
/**
|
|
@@ -81,7 +83,7 @@ export interface SessionGraphFactoryOptions {
|
|
|
81
83
|
* Builds the registry THIS session owns (§6.4): handed to `buildAgent`, and
|
|
82
84
|
* the one `dispose()` closes — the shared `ragRegistry` is then neither used
|
|
83
85
|
* nor closed. Receives the full identity, which a build callback cannot
|
|
84
|
-
* (`SessionAgentParts`
|
|
86
|
+
* (`SessionAgentParts.caller` carries it), and is awaited, because hydration is
|
|
85
87
|
* asynchronous (describeCollections, openCollection). Called before any MCP
|
|
86
88
|
* server starts, so a rejection leaves nothing to stop.
|
|
87
89
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-graph-factory.d.ts","sourceRoot":"","sources":["../../src/session/session-graph-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAET,UAAU,EACV,UAAU,EACV,IAAI,EACJ,YAAY,EACZ,mBAAmB,
|
|
1
|
+
{"version":3,"file":"session-graph-factory.d.ts","sourceRoot":"","sources":["../../src/session/session-graph-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAET,UAAU,EACV,UAAU,EACV,IAAI,EACJ,YAAY,EACZ,mBAAmB,EACnB,SAAS,EACV,MAAM,yBAAyB,CAAC;AAKjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAI3E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,CAAC;IAClC;;;;;OAKG;IACH,QAAQ,CAAC,oBAAoB,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC/D,iFAAiF;IACjF,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;CACvC;AAED,MAAM,WAAW,0BAA0B;IACzC;;;;;;;;OAQG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,UAAU,EAAE,CAAC;IAC7E;;;;;;;;;OASG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,UAAU,EAAE,CAAC;IAC7E;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,+BAA+B,CAAC,EAAE,CACzC,QAAQ,EAAE,oBAAoB,KAC3B;QACH,OAAO,EAAE,UAAU,EAAE,CAAC;QACtB,iBAAiB,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;QACnD,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAC9B,CAAC;IACF,wFAAwF;IACxF,QAAQ,CAAC,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC;IACpC;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC;IACpC;;;;;;;OAOG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,QAAQ,EAAE,oBAAoB,KAC3B,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,CACnB,KAAK,EAAE,iBAAiB,KACrB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IACrC;;;;;;;OAOG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;IAC5B;;;;;;;OAOG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D;;;;;;;OAOG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D;AAyBD,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAuC;gBAEhD,IAAI,EAAE,0BAA0B;YAM9B,kBAAkB;IAY1B,KAAK,CAAC,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC;CA6KnE"}
|
|
@@ -72,6 +72,7 @@ export class SessionGraphFactory {
|
|
|
72
72
|
let graph;
|
|
73
73
|
try {
|
|
74
74
|
agent = await this.opts.buildAgent({
|
|
75
|
+
caller: { ...identity, isAdmin: identity.isAdmin === true },
|
|
75
76
|
sessionId: identity.sessionId,
|
|
76
77
|
mcpClients,
|
|
77
78
|
mcpClientDescriptors,
|
|
@@ -81,6 +82,8 @@ export class SessionGraphFactory {
|
|
|
81
82
|
logger,
|
|
82
83
|
});
|
|
83
84
|
graph = new SessionGraph({
|
|
85
|
+
userId: identity.userId,
|
|
86
|
+
ragRegistry,
|
|
84
87
|
sessionId: identity.sessionId,
|
|
85
88
|
toolAvailability,
|
|
86
89
|
pendingToolResults,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-graph-factory.js","sourceRoot":"","sources":["../../src/session/session-graph-factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session-graph-factory.js","sourceRoot":"","sources":["../../src/session/session-graph-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
import { type IRagRegistry } from '@mcp-abap-adt/llm-agent';
|
|
1
2
|
import type { SmartAgent } from '../agent.js';
|
|
2
3
|
import type { SessionRequestLogger } from '../logger/session-request-logger.js';
|
|
3
4
|
import type { PendingToolResultsRegistry } from '../policy/pending-tool-results-registry.js';
|
|
4
5
|
import type { ToolAvailabilityRegistry } from '../policy/tool-availability-registry.js';
|
|
5
6
|
export interface SessionGraphParts {
|
|
7
|
+
readonly userId?: string;
|
|
8
|
+
readonly ragRegistry?: IRagRegistry;
|
|
6
9
|
readonly sessionId: string;
|
|
7
10
|
/** sessionId-keyed registries hoisted out of per-request pipeline creation. */
|
|
8
11
|
readonly toolAvailability: ToolAvailabilityRegistry;
|
|
@@ -22,6 +25,8 @@ export interface SessionGraphParts {
|
|
|
22
25
|
* mark-for-disposal "drain" so a pinned graph is torn down once it goes idle.
|
|
23
26
|
*/
|
|
24
27
|
export declare class SessionGraph {
|
|
28
|
+
readonly userId: string | undefined;
|
|
29
|
+
readonly ragRegistry: IRagRegistry | undefined;
|
|
25
30
|
readonly sessionId: string;
|
|
26
31
|
readonly toolAvailability: ToolAvailabilityRegistry;
|
|
27
32
|
readonly pendingToolResults: PendingToolResultsRegistry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-graph.d.ts","sourceRoot":"","sources":["../../src/session/session-graph.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session-graph.d.ts","sourceRoot":"","sources":["../../src/session/session-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAC7F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AAExF,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,+EAA+E;IAC/E,QAAQ,CAAC,gBAAgB,EAAE,wBAAwB,CAAC;IACpD,QAAQ,CAAC,kBAAkB,EAAE,0BAA0B,CAAC;IACxD,iEAAiE;IACjE,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,oFAAoF;IACpF,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;IAC5B,kFAAkF;IAClF,QAAQ,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAED;;;;;;GAMG;AACH,qBAAa,YAAY;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC;IAC/C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,gBAAgB,EAAE,wBAAwB,CAAC;IACpD,QAAQ,CAAC,kBAAkB,EAAE,0BAA0B,CAAC;IACxD,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IACjE,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAS;gBAEd,KAAK,EAAE,iBAAiB;IAWpC,IAAI,cAAc,IAAI,MAAM,CAE3B;IACD,IAAI,QAAQ,IAAI,OAAO,CAEtB;IACD,IAAI,UAAU,IAAI,MAAM,CAEvB;IACD,IAAI,iBAAiB,IAAI,OAAO,CAE/B;IAED,OAAO,IAAI,IAAI;IAUf,OAAO,IAAI,IAAI;IAKf,eAAe,IAAI,IAAI;IAIvB;;;;;;;;OAQG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAS/B"}
|
|
@@ -7,6 +7,8 @@ import { OrchestratorError } from '@mcp-abap-adt/llm-agent';
|
|
|
7
7
|
* mark-for-disposal "drain" so a pinned graph is torn down once it goes idle.
|
|
8
8
|
*/
|
|
9
9
|
export class SessionGraph {
|
|
10
|
+
userId;
|
|
11
|
+
ragRegistry;
|
|
10
12
|
sessionId;
|
|
11
13
|
toolAvailability;
|
|
12
14
|
pendingToolResults;
|
|
@@ -18,6 +20,8 @@ export class SessionGraph {
|
|
|
18
20
|
_marked = false;
|
|
19
21
|
_disposed = false;
|
|
20
22
|
constructor(parts) {
|
|
23
|
+
this.userId = parts.userId;
|
|
24
|
+
this.ragRegistry = parts.ragRegistry;
|
|
21
25
|
this.sessionId = parts.sessionId;
|
|
22
26
|
this.toolAvailability = parts.toolAvailability;
|
|
23
27
|
this.pendingToolResults = parts.pendingToolResults;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-graph.js","sourceRoot":"","sources":["../../src/session/session-graph.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"session-graph.js","sourceRoot":"","sources":["../../src/session/session-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAqB/E;;;;;;GAMG;AACH,MAAM,OAAO,YAAY;IACd,MAAM,CAAqB;IAC3B,WAAW,CAA2B;IACtC,SAAS,CAAS;IAClB,gBAAgB,CAA2B;IAC3C,kBAAkB,CAA6B;IAC/C,MAAM,CAAuB;IAC7B,KAAK,CAAc;IACX,SAAS,CAAuC;IACzD,OAAO,GAAG,CAAC,CAAC;IACZ,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,OAAO,GAAG,KAAK,CAAC;IAChB,SAAS,GAAG,KAAK,CAAC;IAE1B,YAAY,KAAwB;QAClC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,kBAAkB,CAAC;QACnD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IAC1B,CAAC;IACD,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,iBAAiB,CACzB,0CAA0C,EAC1C,wBAAwB,CACzB,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAChC,CAAC;IACD,OAAO;QACL,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC;YAAE,IAAI,CAAC,OAAO,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAChC,CAAC;IAED,eAAe;QACb,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;CACF"}
|
|
@@ -13,6 +13,8 @@ export interface SessionRegistryOptions {
|
|
|
13
13
|
}
|
|
14
14
|
export declare class SessionRegistry {
|
|
15
15
|
private readonly opts;
|
|
16
|
+
private readonly users;
|
|
17
|
+
private readonly pendingUsers;
|
|
16
18
|
private readonly graphs;
|
|
17
19
|
/**
|
|
18
20
|
* Graphs detached from `graphs` because they were pinned at the moment
|
|
@@ -51,7 +53,9 @@ export declare class SessionRegistry {
|
|
|
51
53
|
* and receive the identical graph (never two graphs for one session). Each
|
|
52
54
|
* in-flight request increments the refcount (spec A.4).
|
|
53
55
|
*/
|
|
54
|
-
acquire(
|
|
56
|
+
acquire(identity: SessionGraphIdentity & {
|
|
57
|
+
userId: string;
|
|
58
|
+
}): Promise<SessionGraph>;
|
|
55
59
|
/**
|
|
56
60
|
* Release one in-flight request. Non-creating lookup: an unknown/removed
|
|
57
61
|
* sessionId is a no-op (never resurrect). Disposes a marked graph once idle.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-registry.d.ts","sourceRoot":"","sources":["../../src/session/session-registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,8EAA8E;AAC9E,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC9D;AAED,MAAM,WAAW,sBAAsB;IACrC,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,kFAAkF;IAClF,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,kBAAkB,CAAC;CAC7B;AAED,qBAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"session-registry.d.ts","sourceRoot":"","sources":["../../src/session/session-registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,8EAA8E;AAC9E,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC9D;AAED,MAAM,WAAW,sBAAsB;IACrC,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,kFAAkF;IAClF,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,kBAAkB,CAAC;CAC7B;AAED,qBAAa,eAAe;IAkCd,OAAO,CAAC,QAAQ,CAAC,IAAI;IAjCjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuC;IAC7D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmC;IAC1D;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAC5D,iFAAiF;IACjF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4C;IAC1E,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C;;;;;OAKG;IACH,OAAO,CAAC,OAAO,CAAS;IACxB;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW,CAAK;gBAEK,IAAI,EAAE,sBAAsB;IAEzD,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;OAKG;IACG,OAAO,CACX,QAAQ,EAAE,oBAAoB,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAClD,OAAO,CAAC,YAAY,CAAC;IA+FxB;;;OAGG;IACH,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,YAAY,GAAG,IAAI;IA2CtD;;;;;OAKG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhD,6DAA6D;IACvD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhC,sEAAsE;IAChE,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBjC;;;;;;;;;;OAUG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BpC,OAAO,CAAC,UAAU;IAuBlB,mEAAmE;IACnE,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,QAAQ;CAIjB"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { OrchestratorError } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
export class SessionRegistry {
|
|
3
3
|
opts;
|
|
4
|
+
users = new WeakMap();
|
|
5
|
+
pendingUsers = new Map();
|
|
4
6
|
graphs = new Map();
|
|
5
7
|
/**
|
|
6
8
|
* Graphs detached from `graphs` because they were pinned at the moment
|
|
@@ -43,7 +45,16 @@ export class SessionRegistry {
|
|
|
43
45
|
* and receive the identical graph (never two graphs for one session). Each
|
|
44
46
|
* in-flight request increments the refcount (spec A.4).
|
|
45
47
|
*/
|
|
46
|
-
async acquire(
|
|
48
|
+
async acquire(identity) {
|
|
49
|
+
const { sessionId, userId } = identity;
|
|
50
|
+
if (!sessionId?.trim() || !userId?.trim())
|
|
51
|
+
throw new Error('Session and user identity are required');
|
|
52
|
+
const live = this.graphs.get(sessionId);
|
|
53
|
+
const previous = live
|
|
54
|
+
? (this.users.get(live) ?? live.userId)
|
|
55
|
+
: this.pendingUsers.get(sessionId);
|
|
56
|
+
if (previous !== undefined && previous !== userId)
|
|
57
|
+
throw new Error('Session user mismatch');
|
|
47
58
|
if (this._closed) {
|
|
48
59
|
throw new OrchestratorError('SessionRegistry is closed; cannot acquire', 'SESSION_REGISTRY_CLOSED');
|
|
49
60
|
}
|
|
@@ -66,10 +77,11 @@ export class SessionRegistry {
|
|
|
66
77
|
const clearIfMine = () => {
|
|
67
78
|
if (this.pendingBuilds.get(sessionId) === self) {
|
|
68
79
|
this.pendingBuilds.delete(sessionId);
|
|
80
|
+
this.pendingUsers.delete(sessionId);
|
|
69
81
|
}
|
|
70
82
|
};
|
|
71
83
|
build = this.opts.factory
|
|
72
|
-
.build(
|
|
84
|
+
.build(identity)
|
|
73
85
|
.then((graph) => {
|
|
74
86
|
if (this._generation !== buildGen) {
|
|
75
87
|
// Orphaned by invalidateAll(); dispose async and do NOT
|
|
@@ -78,6 +90,7 @@ export class SessionRegistry {
|
|
|
78
90
|
clearIfMine();
|
|
79
91
|
throw new OrchestratorError('Session graph invalidated mid-build', 'SESSION_INVALIDATED');
|
|
80
92
|
}
|
|
93
|
+
this.users.set(graph, userId);
|
|
81
94
|
this.graphs.set(sessionId, graph);
|
|
82
95
|
clearIfMine();
|
|
83
96
|
this.enforceCap();
|
|
@@ -90,6 +103,7 @@ export class SessionRegistry {
|
|
|
90
103
|
throw err;
|
|
91
104
|
});
|
|
92
105
|
self = build;
|
|
106
|
+
this.pendingUsers.set(sessionId, userId);
|
|
93
107
|
this.pendingBuilds.set(sessionId, build);
|
|
94
108
|
}
|
|
95
109
|
g = await build;
|
|
@@ -108,6 +122,8 @@ export class SessionRegistry {
|
|
|
108
122
|
if (this._generation !== gen) {
|
|
109
123
|
throw new OrchestratorError('Session graph invalidated mid-build', 'SESSION_INVALIDATED');
|
|
110
124
|
}
|
|
125
|
+
if (g.userId !== undefined && g.userId !== userId)
|
|
126
|
+
throw new Error('Session graph user mismatch');
|
|
111
127
|
g.acquire();
|
|
112
128
|
return g;
|
|
113
129
|
}
|
|
@@ -215,6 +231,7 @@ export class SessionRegistry {
|
|
|
215
231
|
this.pending.push(g.dispose());
|
|
216
232
|
}
|
|
217
233
|
this.pendingBuilds.clear();
|
|
234
|
+
this.pendingUsers.clear();
|
|
218
235
|
await this.flushEvictions();
|
|
219
236
|
}
|
|
220
237
|
/**
|
|
@@ -255,6 +272,7 @@ export class SessionRegistry {
|
|
|
255
272
|
// Defense-in-depth: pendingBuilds is rarely non-empty at config-change
|
|
256
273
|
// time in practice.
|
|
257
274
|
this.pendingBuilds.clear();
|
|
275
|
+
this.pendingUsers.clear();
|
|
258
276
|
await this.flushEvictions();
|
|
259
277
|
}
|
|
260
278
|
enforceCap() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-registry.js","sourceRoot":"","sources":["../../src/session/session-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAiB5D,MAAM,OAAO,eAAe;
|
|
1
|
+
{"version":3,"file":"session-registry.js","sourceRoot":"","sources":["../../src/session/session-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAiB5D,MAAM,OAAO,eAAe;IAkCG;IAjCZ,KAAK,GAAG,IAAI,OAAO,EAAwB,CAAC;IAC5C,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAC;IAC1D;;;;;;;OAOG;IACc,QAAQ,GAAG,IAAI,GAAG,EAAwB,CAAC;IAC5D,iFAAiF;IAChE,aAAa,GAAG,IAAI,GAAG,EAAiC,CAAC;IACzD,OAAO,GAAoB,EAAE,CAAC;IAC/C;;;;;OAKG;IACK,OAAO,GAAG,KAAK,CAAC;IACxB;;;;;;;;OAQG;IACK,WAAW,GAAG,CAAC,CAAC;IAExB,YAA6B,IAA4B;QAA5B,SAAI,GAAJ,IAAI,CAAwB;IAAG,CAAC;IAE7D,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CACX,QAAmD;QAEnD,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;QACvC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE;YACvC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI;YACnB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC;YACvC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,MAAM;YAC/C,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,IAAI,iBAAiB,CACzB,2CAA2C,EAC3C,yBAAyB,CAC1B,CAAC;QACJ,CAAC;QACD,6DAA6D;QAC7D,qEAAqE;QACrE,gEAAgE;QAChE,+CAA+C;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC;QAC7B,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,QAAQ,GAAG,GAAG,CAAC;gBACrB,mEAAmE;gBACnE,4DAA4D;gBAC5D,qEAAqE;gBACrE,gEAAgE;gBAChE,iDAAiD;gBACjD,IAAI,IAA2B,CAAC;gBAChC,MAAM,WAAW,GAAG,GAAG,EAAE;oBACvB,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC;wBAC/C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;wBACrC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;oBACtC,CAAC;gBACH,CAAC,CAAC;gBACF,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO;qBACtB,KAAK,CAAC,QAAQ,CAAC;qBACf,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;oBACd,IAAI,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;wBAClC,wDAAwD;wBACxD,+DAA+D;wBAC/D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;wBACnC,WAAW,EAAE,CAAC;wBACd,MAAM,IAAI,iBAAiB,CACzB,qCAAqC,EACrC,qBAAqB,CACtB,CAAC;oBACJ,CAAC;oBACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;oBAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;oBAClC,WAAW,EAAE,CAAC;oBACd,IAAI,CAAC,UAAU,EAAE,CAAC;oBAClB,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACb,mEAAmE;oBACnE,0DAA0D;oBAC1D,WAAW,EAAE,CAAC;oBACd,MAAM,GAAG,CAAC;gBACZ,CAAC,CAAC,CAAC;gBACL,IAAI,GAAG,KAAK,CAAC;gBACb,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAC3C,CAAC;YACD,CAAC,GAAG,MAAM,KAAK,CAAC;QAClB,CAAC;QACD,uEAAuE;QACvE,uEAAuE;QACvE,yEAAyE;QACzE,qEAAqE;QACrE,qBAAqB;QACrB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,IAAI,iBAAiB,CACzB,2CAA2C,EAC3C,yBAAyB,CAC1B,CAAC;QACJ,CAAC;QACD,kEAAkE;QAClE,yEAAyE;QACzE,qEAAqE;QACrE,IAAI,IAAI,CAAC,WAAW,KAAK,GAAG,EAAE,CAAC;YAC7B,MAAM,IAAI,iBAAiB,CACzB,qCAAqC,EACrC,qBAAqB,CACtB,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM;YAC/C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC,CAAC,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,CAAC;IACX,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,SAAiB,EAAE,KAAoB;QAC7C,yEAAyE;QACzE,0EAA0E;QAC1E,wEAAwE;QACxE,4DAA4D;QAC5D,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,OAAO,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACpB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC3C,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;oBACpB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;oBAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;oBACnC,OAAO;gBACT,CAAC;gBACD,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;oBAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBACxC,IAAI,IAAI,KAAK,KAAK;wBAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;oBAClD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC;YACD,OAAO;QACT,CAAC;QACD,qEAAqE;QACrE,kEAAkE;QAClE,mDAAmD;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3C,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,OAAO,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACpB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACrC,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC,CAAC;YAAE,OAAO;QACf,CAAC,CAAC,OAAO,EAAE,CAAC;QACZ,IAAI,CAAC,CAAC,iBAAiB,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,QAAQ,CAAC,SAAiB;QAC9B,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC,CAAC;YAAE,OAAO;QACf,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;YACf,CAAC,CAAC,eAAe,EAAE,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAC9B,CAAC;QACD,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;IAED,6DAA6D;IAC7D,KAAK,CAAC,SAAS;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAClC,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,GAAG,GAAG,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC7D,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QACD,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;IAED,sEAAsE;IACtE,KAAK,CAAC,cAAc;QAClB,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,UAAU;QACd,2EAA2E;QAC3E,2EAA2E;QAC3E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7D,CAAC;QACD,KAAK,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACvB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACjC,CAAC;QACD,0DAA0D;QAC1D,KAAK,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,aAAa;QACjB,wEAAwE;QACxE,yEAAyE;QACzE,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACf,iEAAiE;gBACjE,6DAA6D;gBAC7D,4DAA4D;gBAC5D,qDAAqD;gBACrD,CAAC,CAAC,eAAe,EAAE,CAAC;gBACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QACD,yEAAyE;QACzE,uEAAuE;QACvE,sEAAsE;QACtE,sEAAsE;QACtE,wEAAwE;QACxE,uEAAuE;QACvE,uEAAuE;QACvE,oBAAoB;QACpB,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;IAEO,UAAU;QAChB,OAAO,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAChD,IAAI,KAAyB,CAAC;YAC9B,IAAI,QAAkC,CAAC;YACvC,IAAI,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC;YACvC,KAAK,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAClC,IAAI,CAAC,CAAC,iBAAiB;oBAAE,SAAS,CAAC,mBAAmB;gBACtD,IAAI,CAAC,CAAC,UAAU,GAAG,OAAO,EAAE,CAAC;oBAC3B,OAAO,GAAG,CAAC,CAAC,UAAU,CAAC;oBACvB,KAAK,GAAG,EAAE,CAAC;oBACX,QAAQ,GAAG,CAAC,CAAC;gBACf,CAAC;YACH,CAAC;YACD,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ;gBAAE,MAAM,CAAC,uBAAuB;YACvD,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACtB,wEAAwE;gBACxE,QAAQ,CAAC,eAAe,EAAE,CAAC;gBAC3B,MAAM;YACR,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,mEAAmE;IAC3D,SAAS;QACf,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,IAAI,CAAC,CAAC,CAAC,iBAAiB;gBAAE,CAAC,EAAE,CAAC;QACpE,OAAO,CAAC,CAAC;IACX,CAAC;IAEO,QAAQ,CAAC,SAAiB,EAAE,CAAe;QACjD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IACjC,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-context-builder.d.ts","sourceRoot":"","sources":["../../src/subagent/default-context-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,uBAAuB,EACvB,SAAS,EACT,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,yBAAyB,CAAC;AAEjC;;;;;;GAMG;AACH,MAAM,MAAM,uBAAuB,GAAG,CACpC,IAAI,EAAE,MAAM,EACZ,CAAC,EAAE,MAAM,EACT,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AAE1B,MAAM,WAAW,mCAAmC;IAClD,mDAAmD;IACnD,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,qDAAqD;IACrD,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAMD;;;;GAIG;AACH,qBAAa,6BAA8B,YAAW,uBAAuB;IAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,mCAAmC;IAElE,KAAK,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"default-context-builder.d.ts","sourceRoot":"","sources":["../../src/subagent/default-context-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,uBAAuB,EACvB,SAAS,EACT,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,yBAAyB,CAAC;AAEjC;;;;;;GAMG;AACH,MAAM,MAAM,uBAAuB,GAAG,CACpC,IAAI,EAAE,MAAM,EACZ,CAAC,EAAE,MAAM,EACT,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AAE1B,MAAM,WAAW,mCAAmC;IAClD,mDAAmD;IACnD,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,qDAAqD;IACrD,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAMD;;;;GAIG;AACH,qBAAa,6BAA8B,YAAW,uBAAuB;IAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,mCAAmC;IAElE,KAAK,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAwExE,OAAO,CAAC,KAAK;CAKd"}
|
|
@@ -22,7 +22,13 @@ export class DefaultSubAgentContextBuilder {
|
|
|
22
22
|
const maxChars = this.config.maxContextChars ?? DEFAULT_MAX_CHARS;
|
|
23
23
|
if (this.config.projectSource) {
|
|
24
24
|
try {
|
|
25
|
-
const results = await this.config.projectSource(req.task, topKProject, req.signal, {
|
|
25
|
+
const results = await this.config.projectSource(req.task, topKProject, req.signal, {
|
|
26
|
+
caller: req.caller,
|
|
27
|
+
sessionId: req.sessionId,
|
|
28
|
+
signal: req.signal,
|
|
29
|
+
usage: req.usage,
|
|
30
|
+
usageOp: req.usageOp,
|
|
31
|
+
});
|
|
26
32
|
for (const r of results.slice(0, topKProject)) {
|
|
27
33
|
parts.push(r.text);
|
|
28
34
|
sources.push({
|
|
@@ -37,7 +43,13 @@ export class DefaultSubAgentContextBuilder {
|
|
|
37
43
|
}
|
|
38
44
|
if (this.config.toolSource) {
|
|
39
45
|
try {
|
|
40
|
-
const results = await this.config.toolSource(req.task, topKTool, req.signal, {
|
|
46
|
+
const results = await this.config.toolSource(req.task, topKTool, req.signal, {
|
|
47
|
+
caller: req.caller,
|
|
48
|
+
sessionId: req.sessionId,
|
|
49
|
+
signal: req.signal,
|
|
50
|
+
usage: req.usage,
|
|
51
|
+
usageOp: req.usageOp,
|
|
52
|
+
});
|
|
41
53
|
for (const r of results.slice(0, topKTool)) {
|
|
42
54
|
parts.push(r.text);
|
|
43
55
|
sources.push({
|