fix(mcp): admit composed analysis through result bookkeeping
This commit is contained in:
+26
-25
@@ -17,7 +17,6 @@ import {
|
||||
import { parseMcpResponseBudget } from "../config/mcpResponseBudget.js";
|
||||
import { isAbsolute } from "node:path";
|
||||
|
||||
import type { AnalysisOperationPort } from "../application/AnalysisProvider.js";
|
||||
import type { BinarySessionPort } from "../application/binary/BinarySessionPort.js";
|
||||
import type { BrowserObservationPort } from "../application/BrowserObservationPort.js";
|
||||
import type { BrowserScenarioCapturePort } from "../application/BrowserScenarioCapturePort.js";
|
||||
@@ -68,6 +67,11 @@ import { registerGuidedPrompts } from "./registerPrompts.js";
|
||||
import { registerSessionTools } from "./registerSessionTools.js";
|
||||
import type { AvailabilityPolicy } from "../application/CapabilityInventory.js";
|
||||
import { sessionAvailabilityPolicy } from "./sessionAvailabilityPolicy.js";
|
||||
import {
|
||||
withAdmittedAnalysis,
|
||||
type ServerAnalysisSource,
|
||||
} from "./analysisAdmission.js";
|
||||
import type { WithAdmittedAnalysis } from "./analysisAdmission.js";
|
||||
|
||||
const TARGET_FREE_INSTRUCTIONS =
|
||||
"REA provides reverse-engineering tools for local artifacts, native binaries, managed code, browser pages, and runtimes. Use the tool that directly answers the question; discover targets or inspect inventory only when needed. Tool results include inline Evidence and report their coverage and limitations.";
|
||||
@@ -168,10 +172,11 @@ const createMcpServer = (
|
||||
* fixed-target seam used by focused tests and embedders.
|
||||
*/
|
||||
export const createServer = (
|
||||
analysis: AnalysisOperationPort,
|
||||
session?: BinarySessionPort,
|
||||
source: ServerAnalysisSource,
|
||||
options: CreateServerOptions = {},
|
||||
): EvidenceMcpServer => {
|
||||
const session = source.kind === "session" ? source.session : undefined;
|
||||
const analysis = source.kind === "session" ? source.session : source.analysis;
|
||||
const environment = snapshotEnvironment(options.environment ?? process.env);
|
||||
const delivery = selectToolResultDelivery(environment, options.delivery);
|
||||
const selectedOptions = { ...options, environment, delivery };
|
||||
@@ -194,7 +199,6 @@ export const createServer = (
|
||||
} = createSessionRecorders(server, session);
|
||||
const toolContext: ServerToolContext = {
|
||||
server,
|
||||
analysis,
|
||||
session,
|
||||
options: selectedOptions,
|
||||
environment,
|
||||
@@ -203,6 +207,7 @@ export const createServer = (
|
||||
activeTarget,
|
||||
recordEvidence,
|
||||
recordEvidenceWithUnknown,
|
||||
withAdmittedAnalysis: withAdmittedAnalysis(source),
|
||||
};
|
||||
registerBinaryAnalysisTools(toolContext);
|
||||
const previousOnclose = server.server.onclose;
|
||||
@@ -344,39 +349,34 @@ const createSessionRecorders = (
|
||||
recordEvidence:
|
||||
session === undefined
|
||||
? undefined
|
||||
: (evidence: Parameters<typeof session.recordEvidence>[0]) => {
|
||||
const recorded = session.recordEvidence(evidence);
|
||||
return recorded;
|
||||
},
|
||||
: (evidence: Parameters<typeof session.recordEvidence>[0]) =>
|
||||
session.recordEvidence(evidence),
|
||||
recordEvidenceWithUnknown:
|
||||
session === undefined
|
||||
? undefined
|
||||
: (
|
||||
evidence: Parameters<typeof session.recordEvidenceWithUnknown>[0],
|
||||
input: Parameters<typeof session.recordEvidenceWithUnknown>[1],
|
||||
) => {
|
||||
const recorded = session.recordEvidenceWithUnknown(evidence, input);
|
||||
return recorded;
|
||||
},
|
||||
) => session.recordEvidenceWithUnknown(evidence, input),
|
||||
});
|
||||
|
||||
interface ServerToolContext extends ReturnType<typeof createSessionRecorders> {
|
||||
readonly server: EvidenceMcpServer;
|
||||
readonly analysis: AnalysisOperationPort;
|
||||
readonly session: BinarySessionPort | undefined;
|
||||
readonly options: CreateServerOptions;
|
||||
readonly environment: Readonly<NodeJS.ProcessEnv>;
|
||||
readonly logger: Logger;
|
||||
readonly withAdmittedAnalysis: WithAdmittedAnalysis;
|
||||
}
|
||||
|
||||
const registerBinaryAnalysisTools = ({
|
||||
server,
|
||||
analysis,
|
||||
session,
|
||||
logger,
|
||||
activeTarget,
|
||||
recordEvidence,
|
||||
recordEvidenceWithUnknown,
|
||||
withAdmittedAnalysis,
|
||||
}: ServerToolContext): void => {
|
||||
const recordUnknown =
|
||||
session === undefined
|
||||
@@ -388,9 +388,10 @@ const registerBinaryAnalysisTools = ({
|
||||
activeTarget,
|
||||
recordEvidence,
|
||||
recordUnknown,
|
||||
withAdmittedAnalysis,
|
||||
};
|
||||
registerOfficialTools(server, analysis, analysisOptions);
|
||||
registerEnhancedTools(server, analysis, {
|
||||
registerOfficialTools(server, analysisOptions);
|
||||
registerEnhancedTools(server, {
|
||||
...analysisOptions,
|
||||
analysisProfile:
|
||||
session === undefined ? undefined : () => session.analysisProfile(),
|
||||
@@ -403,15 +404,15 @@ const registerBinaryAnalysisTools = ({
|
||||
? undefined
|
||||
: (input) => session.recordWorkflowSnapshot(input),
|
||||
});
|
||||
const evidenceOptions = { logger, activeTarget, recordEvidence };
|
||||
registerNativeTools(server, analysis, evidenceOptions);
|
||||
registerArtifactTools(server, analysis, {
|
||||
...evidenceOptions,
|
||||
});
|
||||
registerManagedTools(server, analysis, {
|
||||
...evidenceOptions,
|
||||
session,
|
||||
});
|
||||
const evidenceOptions = {
|
||||
logger,
|
||||
activeTarget,
|
||||
recordEvidence,
|
||||
withAdmittedAnalysis,
|
||||
};
|
||||
registerNativeTools(server, evidenceOptions);
|
||||
registerArtifactTools(server, evidenceOptions);
|
||||
registerManagedTools(server, evidenceOptions);
|
||||
if (session !== undefined)
|
||||
registerManagedWorkflowTools(server, {
|
||||
logger,
|
||||
|
||||
Reference in New Issue
Block a user