From 5433f65d95df00378650db6c69199bd3e53b281a Mon Sep 17 00:00:00 2001 From: RRFZ <247457381+Plastic-time@users.noreply.github.com> Date: Thu, 19 Nov 2026 15:19:46 -0500 Subject: [PATCH] refactor(cutter): share descriptor cleanup aggregation (#12504) --- .../baselines/cleanup-dependency-binding.json | 1 - src/cutter/CutterBridgeClient.ts | 15 +++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/verify/baselines/cleanup-dependency-binding.json b/scripts/verify/baselines/cleanup-dependency-binding.json index 5dd9a11d33..9403311394 100644 --- a/scripts/verify/baselines/cleanup-dependency-binding.json +++ b/scripts/verify/baselines/cleanup-dependency-binding.json @@ -10,7 +10,6 @@ "src/browser/PlaywrightBrowserScenarioProvider.ts": 1, "src/browser/WebSourceMapFetcher.ts": 2, "src/cli/desktopCaptureCommands.ts": 1, - "src/cutter/CutterBridgeClient.ts": 1, "src/desktop/ScreenJudgeProcess.ts": 1, "src/domain/explicitSensitiveFailure.ts": 1, "src/evm/EvmoleInterfaceProvider.ts": 3, diff --git a/src/cutter/CutterBridgeClient.ts b/src/cutter/CutterBridgeClient.ts index 83deda9523..50db936840 100644 --- a/src/cutter/CutterBridgeClient.ts +++ b/src/cutter/CutterBridgeClient.ts @@ -1,5 +1,8 @@ import { HOST_PLATFORM } from "../platform/HostPlatform.js"; -import { analysisErrorWithCleanupDependencies } from "../domain/analysisErrorCleanup.js"; +import { + analysisErrorWithCleanupDependencies, + providerCleanupErrorFromFailures, +} from "../domain/analysisErrorCleanup.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; import { ArtifactResourceScope, @@ -1302,12 +1305,12 @@ const discoveryFailure = ( }); const cleanup = failures.filter((failure) => failure.cleanupIncomplete); if (cleanup.length === 0) return failures[0]; - return new ProviderCleanupError( + return providerCleanupErrorFromFailures( "cutter", - cleanup.flatMap((failure) => failure.cleanupResources), - { reason: "Cutter descriptor discovery failed with unconfirmed closes" }, - { operation, cause: new AggregateError(failures, cause.message) }, - ).bindCleanupDependencies(cleanup); + cleanup, + "Cutter descriptor discovery failed with unconfirmed closes", + { operation, causes: failures, message: cause.message }, + ); } if (!(cause instanceof ArtifactReaderFailure)) return cause; if (cause.cleanup !== undefined) {