fix(publication)!: retain cleanup owners across export workflows
Require an ArtifactResourceScope for web script exports and share its lifetime with CLI or MCP shutdown. Retain setup-failed output trees in firmware and Wakaru providers. Preserve completed publications when descriptor cleanup fails, returning the full result after a successful retry or as a partial observation while cleanup remains unresolved.
This commit is contained in:
@@ -211,7 +211,7 @@ export const createServer = (
|
||||
options.webSourceLocation ?? createWebSourceLocationService(environment);
|
||||
const javascriptRecovery =
|
||||
options.javascriptRecovery ?? createJavaScriptRecoveryProvider(environment);
|
||||
const javascriptApplicationResources = new ArtifactResourceScope();
|
||||
const artifactResources = new ArtifactResourceScope();
|
||||
const firmwareAnalysis = new FirmwareAnalysisService(
|
||||
options.firmwareAnalysis ?? createFirmwareAnalysisProvider(environment),
|
||||
);
|
||||
@@ -248,7 +248,7 @@ export const createServer = (
|
||||
evmInterface.close(),
|
||||
webSourceLocation.close(),
|
||||
javascriptRecovery.close?.() ?? Promise.resolve(),
|
||||
javascriptApplicationResources.close(),
|
||||
artifactResources.close(),
|
||||
firmwareAnalysis.close(),
|
||||
options.browserScenarioCapture?.close?.() ?? Promise.resolve(),
|
||||
])
|
||||
@@ -289,7 +289,7 @@ export const createServer = (
|
||||
recordEvidence,
|
||||
recordEvidenceWithUnknown,
|
||||
withAdmittedAnalysis: analysisAdmission,
|
||||
javascriptApplicationResources,
|
||||
artifactResources,
|
||||
};
|
||||
registerBinaryAnalysisTools(toolContext);
|
||||
const previousOnclose = server.server.onclose;
|
||||
@@ -501,7 +501,7 @@ const createSessionRecorders = (
|
||||
});
|
||||
|
||||
interface ServerToolContext extends ReturnType<typeof createSessionRecorders> {
|
||||
readonly javascriptApplicationResources: ArtifactResourceScope;
|
||||
readonly artifactResources: ArtifactResourceScope;
|
||||
readonly server: EvidenceMcpServer;
|
||||
readonly session: BinarySessionPort | undefined;
|
||||
readonly options: CreateServerOptions;
|
||||
@@ -572,10 +572,10 @@ const registerObservationTools = ({
|
||||
recordEvidence,
|
||||
recordEvidenceWithUnknown,
|
||||
withAdmittedAnalysis,
|
||||
javascriptApplicationResources,
|
||||
artifactResources,
|
||||
}: ServerToolContext): void => {
|
||||
const common = { logger, recordEvidence, withAdmittedAnalysis };
|
||||
registerWebScriptTool(server, common);
|
||||
registerWebScriptTool(server, { ...common, artifactResources });
|
||||
registerBrowserTools(server, {
|
||||
...common,
|
||||
browser: options.browserObservation,
|
||||
@@ -588,7 +588,7 @@ const registerObservationTools = ({
|
||||
});
|
||||
registerElectronTools(server, {
|
||||
...common,
|
||||
javascriptApplicationResources,
|
||||
artifactResources,
|
||||
evidenceById,
|
||||
electron: options.electronObservation,
|
||||
electronActive: options.electronActiveObservation,
|
||||
|
||||
@@ -35,7 +35,7 @@ import type { WithAdmittedAnalysis } from "./analysisAdmission.js";
|
||||
import { runAdmittedToolOperation } from "./admittedToolOperation.js";
|
||||
|
||||
interface ElectronToolRegistration {
|
||||
readonly javascriptApplicationResources: ArtifactResourceScope;
|
||||
readonly artifactResources: ArtifactResourceScope;
|
||||
readonly logger: Logger;
|
||||
readonly observationLoadFailure?: OptionalProviderLoadFailure | undefined;
|
||||
readonly activeLoadFailure?: OptionalProviderLoadFailure | undefined;
|
||||
@@ -106,7 +106,7 @@ export const registerElectronTools = (
|
||||
async ({ detail, ...request }, { signal, progress }) => {
|
||||
const analyzed = await analyzeJavaScriptApplicationValidated(
|
||||
request,
|
||||
options.javascriptApplicationResources,
|
||||
options.artifactResources,
|
||||
{ signal, progress },
|
||||
);
|
||||
return detail === "summary" && analyzed.ok
|
||||
|
||||
@@ -8,6 +8,7 @@ import { logToolExecution } from "./toolLogging.js";
|
||||
import { toolRegistrationOptions } from "./toolRegistrationOptions.js";
|
||||
import type { WithAdmittedAnalysis } from "./analysisAdmission.js";
|
||||
import { runAdmittedToolOperation } from "./admittedToolOperation.js";
|
||||
import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js";
|
||||
|
||||
/** Register local script export without requiring a live browser provider. */
|
||||
export const registerWebScriptTool = (
|
||||
@@ -15,6 +16,7 @@ export const registerWebScriptTool = (
|
||||
options: {
|
||||
readonly logger: Logger;
|
||||
readonly recordEvidence: EvidenceWriter["recordEvidence"] | undefined;
|
||||
readonly artifactResources: ArtifactResourceScope;
|
||||
readonly withAdmittedAnalysis?: WithAdmittedAnalysis;
|
||||
},
|
||||
): void => {
|
||||
@@ -33,7 +35,7 @@ export const registerWebScriptTool = (
|
||||
options.logger,
|
||||
contract.name,
|
||||
() =>
|
||||
exportWebScriptsValidated(input, {
|
||||
exportWebScriptsValidated(input, options.artifactResources, {
|
||||
signal: context.mcpReq.signal,
|
||||
}),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user