refactor(server): admit complete evidence workflows and share handlers

Validation: integrated changes passed formatting, typecheck, lint, resolved module-boundary verification and git diff --check. Tests and real-provider workflows were not run.
This commit is contained in:
morluto
2026-10-11 00:03:24 +08:00
parent 5f30ea6ff2
commit c1b5ccf0a4
43 changed files with 1482 additions and 915 deletions
+77 -29
View File
@@ -204,7 +204,23 @@ export const createServer = (
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 };
const evmInterface =
options.evmInterface ?? createEvmInterfaceService(environment);
const webSourceLocation =
options.webSourceLocation ?? createWebSourceLocationService(environment);
const javascriptRecovery =
options.javascriptRecovery ?? createJavaScriptRecoveryProvider(environment);
const firmwareAnalysis = new FirmwareAnalysisService(
options.firmwareAnalysis ?? createFirmwareAnalysisProvider(environment),
);
const selectedOptions = {
...options,
environment,
delivery,
evmInterface,
webSourceLocation,
javascriptRecovery,
};
const startedAt = new Date().toISOString();
const logger = options.logger ?? silentLogger;
const server = createMcpServer(
@@ -220,9 +236,34 @@ export const createServer = (
const jeb = options.jebAnalysis ?? createJebAnalysisProvider(environment);
const adbDevice =
options.adbDeviceAnalysis ?? createAdbDeviceAnalysisProvider(environment);
let providerClose: Promise<void> | undefined;
const closeProviders = (): Promise<void> => {
providerClose ??= Promise.allSettled([
android.close(),
apktool.close(),
jeb.close(),
evmInterface.close(),
webSourceLocation.close(),
javascriptRecovery.close?.() ?? Promise.resolve(),
firmwareAnalysis.close(),
options.browserScenarioCapture?.close?.() ?? Promise.resolve(),
])
.then((results) => {
const failures = results.flatMap((result) =>
result.status === "rejected" ? [result.reason] : [],
);
if (failures.length > 0)
throw new AggregateError(failures, "REA provider cleanup failed");
})
.catch((cause: unknown) => {
providerClose = undefined;
throw cause;
});
return providerClose;
};
const availability = installSessionToolAvailability(
session,
selectedOptions,
options,
environment,
);
const toolLogger = logger.child({ layer: "server" });
@@ -232,6 +273,7 @@ export const createServer = (
recordEvidence,
recordEvidenceWithUnknown,
} = createSessionRecorders(server, session);
const analysisAdmission = withAdmittedAnalysis(source);
const toolContext: ServerToolContext = {
server,
session,
@@ -242,54 +284,39 @@ export const createServer = (
activeTarget,
recordEvidence,
recordEvidenceWithUnknown,
withAdmittedAnalysis: withAdmittedAnalysis(source),
withAdmittedAnalysis: analysisAdmission,
};
registerBinaryAnalysisTools(toolContext);
const previousOnclose = server.server.onclose;
server.server.onclose = () => {
previousOnclose?.();
void android.close().catch((cause: unknown) => {
void closeProviders().catch((cause: unknown) => {
logger.error(
{ error: cause instanceof Error ? cause.message : String(cause) },
"Android provider cleanup failed",
);
});
void apktool.close().catch((cause: unknown) => {
logger.error(
{ error: cause instanceof Error ? cause.message : String(cause) },
"Apktool provider cleanup failed",
);
});
void jeb.close().catch((cause: unknown) => {
logger.error(
{ error: cause instanceof Error ? cause.message : String(cause) },
"JEB provider cleanup failed",
"Provider cleanup failed during server shutdown",
);
});
};
const closeServer = server.close.bind(server);
server.close = async () => {
const results = await Promise.allSettled([
closeServer(),
android.close(),
apktool.close(),
jeb.close(),
]);
const results = await Promise.allSettled([closeServer(), closeProviders()]);
for (const result of results)
if (result.status === "rejected") throw result.reason;
};
registerConfiguredAnalysisTools(toolContext, android, jeb);
registerConfiguredAnalysisTools(toolContext, android, jeb, firmwareAnalysis);
registerAdbTools(
server,
new AdbDeviceAnalysisService(adbDevice),
toolLogger,
recordEvidence,
analysisAdmission,
);
registerApktoolTools(
server,
new ApktoolResourceAnalysisService(apktool),
toolLogger,
recordEvidence,
analysisAdmission,
);
registerObservationTools(toolContext);
registerGuidedPrompts(server, analysis, session);
@@ -339,21 +366,25 @@ const registerConfiguredAnalysisTools = (
logger: toolLogger,
evidenceById,
recordEvidence,
withAdmittedAnalysis,
}: ServerToolContext,
android: AndroidAnalysisPort,
jeb: JebAnalysisPort,
firmwareAnalysis: FirmwareAnalysisService,
): void => {
registerAndroidTools(
server,
new AndroidAnalysisService(android),
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
registerJebTools(
server,
new JebAnalysisService(jeb),
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
registerBinaryDiagnosticsTools(
server,
@@ -361,57 +392,70 @@ const registerConfiguredAnalysisTools = (
toolLogger,
recordEvidence,
evidenceById,
withAdmittedAnalysis,
);
registerAnalysisViewTool(
server,
toolLogger,
evidenceById,
recordEvidence,
withAdmittedAnalysis,
);
registerAnalysisViewTool(server, toolLogger, evidenceById, recordEvidence);
registerPeResourcesTool(
server,
createPeResourcesService(),
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
registerEvmTools(
server,
options.evmInterface ?? createEvmInterfaceService(environment),
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
registerRecordedCrashTools(
server,
options.recordedCrash ?? createRecordedCrashService(environment),
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
registerFirmwareTools(
server,
new FirmwareAnalysisService(
options.firmwareAnalysis ?? createFirmwareAnalysisProvider(environment),
),
firmwareAnalysis,
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
registerWebModuleTool(
server,
options.webModuleTrace ?? createWebModuleTraceService(environment),
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
registerWebSourceLocationTool(
server,
options.webSourceLocation ?? createWebSourceLocationService(environment),
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
registerWebRuntimeTools(
server,
options.webRuntime ?? createWebRuntimeService(),
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
registerWebNetworkCaptureTool(
server,
options.webNetworkCapture ?? createWebNetworkCaptureService(environment),
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
registerJavaScriptRecoveryTool(
server,
@@ -421,6 +465,7 @@ const registerConfiguredAnalysisTools = (
),
toolLogger,
recordEvidence,
withAdmittedAnalysis,
);
};
@@ -509,6 +554,7 @@ const registerBinaryAnalysisTools = ({
recordEvidence,
recordEvidenceWithUnknown,
session,
withAdmittedAnalysis,
});
};
@@ -519,8 +565,9 @@ const registerObservationTools = ({
logger,
recordEvidence,
recordEvidenceWithUnknown,
withAdmittedAnalysis,
}: ServerToolContext): void => {
const common = { logger, recordEvidence };
const common = { logger, recordEvidence, withAdmittedAnalysis };
registerWebScriptTool(server, common);
registerBrowserTools(server, {
...common,
@@ -553,5 +600,6 @@ const registerObservationTools = ({
logger,
recordEvidence,
recordEvidenceWithUnknown,
withAdmittedAnalysis,
});
};