Skip to content

armgit / rea

Public Imported from GitHub
0

Reverse engineer anything with agents, from app behavior down to native binaries.

refactor(core): import shared contracts from their owners

morluto9a426033ff78
diff --git a/src/application/ClientConfigurationCleanup.ts b/src/application/ClientConfigurationCleanup.ts
index 596c32dcd..09e7ca4f4 100644
--- a/src/application/ClientConfigurationCleanup.ts
+++ b/src/application/ClientConfigurationCleanup.ts
@@ -6,11 +6,11 @@ import {
import type { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js";
import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js";
import type { AnalysisCleanupObservation } from "../domain/analysisErrorBase.js";
-import type { RegularFileOperationOutcome } from "../filesystem/OwnedRegularFile.js";
import {
RegularFileCleanupFailure,
- retryRegularFileCleanupFailures,
-} from "./RegularFileRead.js";
+ type RegularFileOperationOutcome,
+} from "../filesystem/OwnedRegularFile.js";
+import { retryRegularFileCleanupFailures } from "./RegularFileRead.js";
/** Completion and exact staging owner retained when publication cleanup fails. */
export class ClientConfigurationPublicationFailure<
diff --git a/src/application/ClientConfigurationFiles.ts b/src/application/ClientConfigurationFiles.ts
index 35e02bcd9..0067b1e7e 100644
--- a/src/application/ClientConfigurationFiles.ts
+++ b/src/application/ClientConfigurationFiles.ts
@@ -1,8 +1,6 @@
import { err, ok, type Result } from "../domain/result.js";
-import {
- RegularFileCleanupFailure,
- readRegularFileText,
-} from "./RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
+import { readRegularFileText } from "./RegularFileRead.js";
import {
effectiveClientServer,
parseClientConfiguration,
diff --git a/src/application/ClientRegistrationStatus.ts b/src/application/ClientRegistrationStatus.ts
index 7a1e7b0ba..d876ee934 100644
--- a/src/application/ClientRegistrationStatus.ts
+++ b/src/application/ClientRegistrationStatus.ts
@@ -1,3 +1,4 @@
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
import { readClientPolicyBlock } from "./GeminiClientSettings.js";
import { readEffectiveClientRegistrationConfiguration } from "./ClientConfigurationFiles.js";
import {
@@ -13,7 +14,6 @@ import { isAbsolute } from "node:path";
import { z } from "zod";
import { valid } from "semver";
-import { RegularFileCleanupFailure } from "./RegularFileRead.js";
import { PRODUCT_IDENTITY } from "../identity.js";
import { snapshotEnvironment } from "../process/snapshotEnvironment.js";
import { CURRENT_ENTRYPOINT_PATH } from "../process/CurrentEntrypointPath.js";
diff --git a/src/application/JsonFiles.ts b/src/application/JsonFiles.ts
index ac3f607a2..f3d490bd7 100644
--- a/src/application/JsonFiles.ts
+++ b/src/application/JsonFiles.ts
@@ -26,7 +26,7 @@ import {
type JsonObjectMemberReader,
} from "./JsonInputFile.js";
import { NonRegularFileReadError } from "../filesystem/RegularFile.js";
-import { RegularFileCleanupFailure } from "./RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js";
import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js";
import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js";
diff --git a/src/application/LinuxHopper.test.ts b/src/application/LinuxHopper.test.ts
index 1ba6a1fdb..b1c802879 100644
--- a/src/application/LinuxHopper.test.ts
+++ b/src/application/LinuxHopper.test.ts
@@ -16,12 +16,12 @@ import {
type LinuxHopperDownload,
type LinuxHopperInstallHost,
type LinuxHopperLauncherStatus,
- type LinuxPackageFamily,
type LinuxPackageInstallFailure,
type LinuxPackageInstallOutcome,
} from "./LinuxHopper.js";
import { err, ok } from "../domain/result.js";
import {
+ type LinuxPackageFamily,
HopperReleaseError,
type LinuxHopperRelease,
} from "./HopperReleaseFeed.js";
diff --git a/src/application/LinuxHopper.ts b/src/application/LinuxHopper.ts
index e5c4ee33f..203debce3 100644
--- a/src/application/LinuxHopper.ts
+++ b/src/application/LinuxHopper.ts
@@ -29,8 +29,6 @@ import {
type VerifiedLinuxHopperLauncher,
} from "./LinuxHopperPublisher.js";
-export type { LinuxPackageFamily } from "./HopperReleaseFeed.js";
-
/** Package-manager output retained per stream without stopping the command. */
const PACKAGE_MANAGER_OUTPUT_BYTES = 64 * 1024;
diff --git a/src/application/LinuxHopperPublisher.ts b/src/application/LinuxHopperPublisher.ts
index 9d6f1451f..efbae7a2f 100644
--- a/src/application/LinuxHopperPublisher.ts
+++ b/src/application/LinuxHopperPublisher.ts
@@ -47,10 +47,7 @@ import {
type LinuxHopperRelease,
type LinuxPackageFamily,
} from "./HopperReleaseFeed.js";
-import {
- RegularFileCleanupFailure as RegularFileReadCleanupFailure,
- withRegularFile,
-} from "./RegularFileRead.js";
+import { withRegularFile } from "./RegularFileRead.js";
/** Metadata/key inspection budget, independent of the compressed package budget. */
const RELEASE_METADATA_BYTES = 1024 * 1024;
@@ -940,7 +937,7 @@ export class LinuxHopperPublisher {
).catch((cause: unknown) => {
if (
resources === this.#resources &&
- cause instanceof RegularFileReadCleanupFailure
+ cause instanceof RegularFileCleanupFailure
)
pendingCleanup.add(resources);
throw cause;
diff --git a/src/application/ReferenceSourceImportPolicy.ts b/src/application/ReferenceSourceImportPolicy.ts
index fabf36070..262e69965 100644
--- a/src/application/ReferenceSourceImportPolicy.ts
+++ b/src/application/ReferenceSourceImportPolicy.ts
@@ -4,7 +4,6 @@ import { join, resolve } from "node:path";
import ignore from "ignore";
import {
readRegularFileText,
- RegularFileCleanupFailure,
RegularFileReadFailure,
retryRegularFileCleanup,
} from "./RegularFileRead.js";
@@ -18,7 +17,10 @@ import {
type ReferenceSourceImportOptions,
} from "./ReferenceSourceImportTypes.js";
import { rootFilesystemFailure } from "../reference/ReferenceSourceReaderErrors.js";
-import { regularFileCancellation } from "../filesystem/OwnedRegularFile.js";
+import {
+ RegularFileCleanupFailure,
+ regularFileCancellation,
+} from "../filesystem/OwnedRegularFile.js";
/** Validated inputs ready for filesystem traversal. */
export interface PreparedReferenceSourceImport {
diff --git a/src/application/ReferenceSourceVcsAdapter.ts b/src/application/ReferenceSourceVcsAdapter.ts
index cd372e230..54bc6a747 100644
--- a/src/application/ReferenceSourceVcsAdapter.ts
+++ b/src/application/ReferenceSourceVcsAdapter.ts
@@ -4,11 +4,8 @@ import { dirname, join, resolve } from "node:path";
import { err, ok, type Result } from "../domain/result.js";
import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js";
import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js";
-import {
- readRegularFile,
- RegularFileCleanupFailure,
- retryRegularFileCleanup,
-} from "./RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
+import { readRegularFile, retryRegularFileCleanup } from "./RegularFileRead.js";
import { referenceSourceResourceFailure } from "../reference/ReferenceSourceReaderErrors.js";
import type { ReferenceSourceReaderError } from "../reference/ReferenceSourceReaderTypes.js";
diff --git a/src/application/RegularFileRead.ts b/src/application/RegularFileRead.ts
index 7e46e1430..adf174bb8 100644
--- a/src/application/RegularFileRead.ts
+++ b/src/application/RegularFileRead.ts
@@ -52,8 +52,6 @@ export class InvalidUtf8FileError extends TypeError {
}
}
-export { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
-
/** Retry a failed close through its retained owner and report any remaining cleanup. */
export const retryRegularFileCleanup = async <Value>(
failure: RegularFileCleanupFailure<Value>,
diff --git a/src/application/SetupClientConfiguration.ts b/src/application/SetupClientConfiguration.ts
index 2ce8c10fb..c6c09a773 100644
--- a/src/application/SetupClientConfiguration.ts
+++ b/src/application/SetupClientConfiguration.ts
@@ -41,10 +41,8 @@ import {
} from "../mcpStartupPolicy.js";
import { resolveClientConfigTransactionPath } from "./ClientConfigPath.js";
import { packageReadTargetChanged } from "./MsixPackageStorage.js";
-import {
- readRegularFileText,
- RegularFileCleanupFailure,
-} from "./RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
+import { readRegularFileText } from "./RegularFileRead.js";
import {
preserveCurrentRecoveryBackup,
selectCurrentRecoveryBackup,
diff --git a/src/application/SetupHost.ts b/src/application/SetupHost.ts
index 8317b20f9..aa17c643f 100644
--- a/src/application/SetupHost.ts
+++ b/src/application/SetupHost.ts
@@ -47,7 +47,7 @@ import {
} from "./SetupClientConfiguration.js";
import { failedConfigurationMessage } from "./SetupClients.js";
import { setupInstallFailure } from "./SetupInstallFailure.js";
-import { RegularFileCleanupFailure } from "./RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
import {
explicitSetupRegistrationEnvironment,
providerRegistrationEnvironment,
diff --git a/src/application/SetupPlan.ts b/src/application/SetupPlan.ts
index e43f3877a..40b0035df 100644
--- a/src/application/SetupPlan.ts
+++ b/src/application/SetupPlan.ts
@@ -1,8 +1,6 @@
import { classifyClientRegistrationCommand } from "./ClientRegistrationIdentity.js";
-import {
- linuxHopperInstallDisclosure,
- type LinuxPackageFamily,
-} from "./LinuxHopper.js";
+import type { LinuxPackageFamily } from "./HopperReleaseFeed.js";
+import { linuxHopperInstallDisclosure } from "./LinuxHopper.js";
import type { SkillDestination } from "./SetupSkill.js";
import { macHopperInstallDisclosure } from "./MacHopper.js";
import { macHopperUserApplicationPath } from "./MacHopperPaths.js";
diff --git a/src/application/SetupRecoveryBackup.ts b/src/application/SetupRecoveryBackup.ts
index f457582d9..74ebb2ffa 100644
--- a/src/application/SetupRecoveryBackup.ts
+++ b/src/application/SetupRecoveryBackup.ts
@@ -2,10 +2,8 @@ import { createHash } from "node:crypto";
import { constants as fsConstants } from "node:fs";
import { copyFile } from "node:fs/promises";
import { err, ok, type Result } from "../domain/result.js";
-import {
- readRegularFile,
- RegularFileCleanupFailure,
-} from "./RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
+import { readRegularFile } from "./RegularFileRead.js";
import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js";
export interface RecoveryBackupSelection {
diff --git a/src/application/SetupSkill.ts b/src/application/SetupSkill.ts
index 02e22bfc8..96423f64d 100644
--- a/src/application/SetupSkill.ts
+++ b/src/application/SetupSkill.ts
@@ -12,10 +12,8 @@ import {
NonRegularFileReadError,
RegularFileChangedError,
} from "../filesystem/RegularFile.js";
-import {
- RegularFileCleanupFailure,
- withRegularFile,
-} from "./RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
+import { withRegularFile } from "./RegularFileRead.js";
import { clientSkillDirectories } from "./SupportedClients.js";
import { preserveCurrentRecoveryBackup } from "./SetupRecoveryBackup.js";
diff --git a/src/application/Uninstall.ts b/src/application/Uninstall.ts
index 843c78e14..2233396e6 100644
--- a/src/application/Uninstall.ts
+++ b/src/application/Uninstall.ts
@@ -36,9 +36,9 @@ import {
preserveCurrentRecoveryBackup,
type RecoveryBackupPreservationOptions,
} from "./SetupRecoveryBackup.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
import {
InvalidUtf8FileError,
- RegularFileCleanupFailure,
readRegularFileText,
} from "./RegularFileRead.js";
import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js";
diff --git a/src/application/UpdateMaintenance.ts b/src/application/UpdateMaintenance.ts
index e8a206da3..fa1d4023e 100644
--- a/src/application/UpdateMaintenance.ts
+++ b/src/application/UpdateMaintenance.ts
@@ -1,5 +1,5 @@
import { z } from "zod";
-import { RegularFileCleanupFailure } from "./RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
import { classifyClientRegistrationCommand } from "./ClientRegistrationIdentity.js";
import { readClientRegistrationInspections } from "./ClientRegistrationStatus.js";
diff --git a/src/application/WebScriptExportService.ts b/src/application/WebScriptExportService.ts
index 7986f8bbb..39955e856 100644
--- a/src/application/WebScriptExportService.ts
+++ b/src/application/WebScriptExportService.ts
@@ -35,7 +35,6 @@ import type { ExecutionOptions } from "./AnalysisProvider.js";
import { WEB_SCRIPT_EXPORT_PROVIDER as PROVIDER } from "./InvestigationProviders.js";
import {
readRegularFile,
- RegularFileCleanupFailure,
RegularFileReadFailure,
retryRegularFileCleanup,
} from "./RegularFileRead.js";
@@ -45,7 +44,10 @@ import {
RegularFileOperationCancelled,
} from "../filesystem/RegularFile.js";
import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js";
-import { regularFileCancellation } from "../filesystem/OwnedRegularFile.js";
+import {
+ RegularFileCleanupFailure,
+ regularFileCancellation,
+} from "../filesystem/OwnedRegularFile.js";
const OPERATION = "export_web_scripts";
diff --git a/src/application/binary/AnalysisSnapshotFiles.ts b/src/application/binary/AnalysisSnapshotFiles.ts
index e4b69953a..a3807a8ba 100644
--- a/src/application/binary/AnalysisSnapshotFiles.ts
+++ b/src/application/binary/AnalysisSnapshotFiles.ts
@@ -15,7 +15,7 @@ import { err, ok, type Result } from "../../domain/result.js";
import type { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js";
import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";
import { readJsonObjectMembersFile, writeTextFile } from "../JsonFiles.js";
-import { RegularFileCleanupFailure } from "../RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../filesystem/OwnedRegularFile.js";
import type { JsonObjectMemberReader } from "../JsonInputFile.js";
import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js";
diff --git a/src/application/javascript/JavaScriptArtifactAnalysis.ts b/src/application/javascript/JavaScriptArtifactAnalysis.ts
index 903c90b9d..7b3f1d9fd 100644
--- a/src/application/javascript/JavaScriptArtifactAnalysis.ts
+++ b/src/application/javascript/JavaScriptArtifactAnalysis.ts
@@ -7,7 +7,10 @@ import { resolveJavaScriptSourceMapReferences } from "../../domain/javascript/ja
import { analyzeParsedJavaScriptStaticSourceSteps } from "../../domain/javascript/javascriptStaticAnalysis.js";
import { analyzeParsedJavaScriptSemanticsSteps } from "../../domain/javascript/javascriptSemanticAnalysis.js";
import type { JavaScriptSemanticIr } from "../../domain/javascript/javascriptSemanticIr.js";
-import { projectJavaScriptModuleSemantics } from "../../domain/javascript/javascriptModuleSemanticIr.js";
+import {
+ type JavaScriptModuleSemanticIr,
+ projectJavaScriptModuleSemantics,
+} from "../../domain/javascript/javascriptModuleSemanticIr.js";
import { parseJavaScriptSource } from "../../domain/javascript/javascriptSourceParser.js";
import { hasValidSourceMapContents } from "../../domain/sourceMapContents.js";
import {
@@ -28,7 +31,6 @@ import type {
JavaScriptArtifactAnalysisScope,
JavaScriptArtifactAnalysis,
JavaScriptModuleArtifactAnalysis,
- JavaScriptModuleSemanticIr,
JavaScriptHtmlInlineScriptsObservation,
JavaScriptHtmlScriptObservation,
JavaScriptJsonModuleObservation,
diff --git a/src/application/javascript/JavaScriptArtifactAnalysisTypes.ts b/src/application/javascript/JavaScriptArtifactAnalysisTypes.ts
index d4d22b6dc..8b420340a 100644
--- a/src/application/javascript/JavaScriptArtifactAnalysisTypes.ts
+++ b/src/application/javascript/JavaScriptArtifactAnalysisTypes.ts
@@ -120,9 +120,6 @@ export type JavaScriptJsonModuleObservation = JavaScriptStructuredObservation &
}
);
-/** Module facts needed after file-local semantic projection has finished. */
-export type { JavaScriptModuleSemanticIr } from "../../domain/javascript/javascriptModuleSemanticIr.js";
-
/** Applicable processing of inventoried files; native bytes remain metadata-only. */
export const javascriptArtifactAnalysisScopes = {
javascript: {
diff --git a/src/application/javascript/JavaScriptModuleRelationships.ts b/src/application/javascript/JavaScriptModuleRelationships.ts
index 52cbec75b..990c1cc89 100644
--- a/src/application/javascript/JavaScriptModuleRelationships.ts
+++ b/src/application/javascript/JavaScriptModuleRelationships.ts
@@ -38,7 +38,7 @@ import {
} from "./JavaScriptArtifactPathResolution.js";
import { projectJavaScriptExportReturnShapes } from "../../domain/javascript/javascriptExportReturnShapeProjection.js";
-import type { JavaScriptModuleSemanticIr } from "./JavaScriptArtifactAnalysisTypes.js";
+import type { JavaScriptModuleSemanticIr } from "../../domain/javascript/javascriptModuleSemanticIr.js";
interface SemanticAnalysis {
readonly ir: JavaScriptModuleSemanticIr;
diff --git a/src/application/native/NativeFunctionMatchingService.ts b/src/application/native/NativeFunctionMatchingService.ts
index c99d2a51b..47cf75de4 100644
--- a/src/application/native/NativeFunctionMatchingService.ts
+++ b/src/application/native/NativeFunctionMatchingService.ts
@@ -1,6 +1,6 @@
import { NativeMatchingAdmission } from "./NativeMatchingAdmission.js";
import { loadNativeMatchingBundleSources } from "./NativeMatchingBundleSources.js";
-import { RegularFileCleanupFailure } from "../RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../filesystem/OwnedRegularFile.js";
import { matchFunctionInventories } from "../../domain/native/matchFunctionInventories.js";
import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js";
import { setImmediate } from "node:timers/promises";
diff --git a/src/application/process/ProcessCli.ts b/src/application/process/ProcessCli.ts
index efe558cd4..badbf5e13 100644
--- a/src/application/process/ProcessCli.ts
+++ b/src/application/process/ProcessCli.ts
@@ -29,7 +29,7 @@ import {
parseProcessCaptureEvidence,
} from "./ProcessEvidence.js";
import { readJsonFile } from "../JsonFiles.js";
-import { RegularFileCleanupFailure } from "../RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../filesystem/OwnedRegularFile.js";
/** Safe process-command failure returned to the CLI adapter. */
export interface ProcessCliErrorOutput extends AnalysisErrorProjection {
diff --git a/src/browser/WebSourceMapFetcher.ts b/src/browser/WebSourceMapFetcher.ts
index 1d39e5ff8..d3a698a7c 100644
--- a/src/browser/WebSourceMapFetcher.ts
+++ b/src/browser/WebSourceMapFetcher.ts
@@ -67,10 +67,8 @@ const SOURCE_MAP_OUTPUT_BYTES = WEB_SOURCE_MAP_LIMITS.outputBytes;
const SOURCE_MAP_FAILURE_LIMITATION_RESERVE = 512;
const SOURCE_MAP_COLLECTION_ENVELOPE_RESERVE = 1_024;
-type SourceMaps = WebSourceMaps;
-type SourceMapItem = WebSourceMapItem;
type ParsedSourceMapItem = Extract<
- SourceMapItem,
+ WebSourceMapItem,
{ status: "included" | "partial" }
>;
interface SourceMapDecodeContext {
@@ -90,7 +88,7 @@ export const fetchWebSourceMaps = async (
input: AnalyzeWebBundleInput,
signal?: AbortSignal,
host: SourceMapFetchHost = { fetch: globalThis.fetch },
-): Promise<SourceMaps> => {
+): Promise<WebSourceMaps> => {
throwIfAborted(signal);
if (requests.length === 0)
return webSourceMapsSchema.parse({
@@ -99,7 +97,7 @@ export const fetchWebSourceMaps = async (
processed: 0,
items: [],
});
- const items: SourceMapItem[] = [];
+ const items: WebSourceMapItem[] = [];
const operationController = new AbortController();
const fetchTimeoutMs =
host.timeoutMs ??
@@ -203,9 +201,9 @@ const sourceMapOutputLimitation = (unprocessed: number): string =>
`source-map output budget could not retain results for ${String(unprocessed)} requested map${unprocessed === 1 ? "" : "s"}. their results are unknown.`;
const sourceMapsStatus = (
- items: readonly SourceMapItem[],
+ items: readonly WebSourceMapItem[],
omitted: boolean,
-): SourceMaps["status"] => {
+): WebSourceMaps["status"] => {
const retained = items.filter(
({ status }) => status === "included" || status === "partial",
).length;
@@ -264,7 +262,7 @@ const fetchOne = async (
resolvedSourceBytes: number;
};
},
-): Promise<SourceMapItem> => {
+): Promise<WebSourceMapItem> => {
if (!approvedUrl(request.fetchUrl, input.allowed_origins))
return emptySourceMapItem(
request,
@@ -563,7 +561,7 @@ const normalizeSourceMap = (
text: string,
fetchedUrl: string,
context: SourceMapDecodeContext,
-): SourceMapItem => {
+): WebSourceMapItem => {
const parsedJson = safeParseJson(sourceMapJsonText(text));
if (!parsedJson.ok)
return emptySourceMapItem(
@@ -886,10 +884,10 @@ const sourceMapContext = (
const emptySourceMapItem = (
request: WebSourceMapRequest,
- status: Extract<SourceMapItem, { readonly artifact: null }>["status"],
+ status: Extract<WebSourceMapItem, { readonly artifact: null }>["status"],
limitation: string,
effectiveUrl: string | null = null,
-): Extract<SourceMapItem, { readonly artifact: null }> => ({
+): Extract<WebSourceMapItem, { readonly artifact: null }> => ({
...sourceMapContext(request, effectiveUrl),
status,
artifact: null,
@@ -1023,7 +1021,7 @@ const sourceMapFailureReservation = (
effectiveUrl: string | null = null,
limitation?: string,
status: Extract<
- SourceMapItem,
+ WebSourceMapItem,
{ readonly artifact: null }
>["status"] = "fetch_failed",
): number =>
diff --git a/src/dotnet/ManagedSnapshot.ts b/src/dotnet/ManagedSnapshot.ts
index 7d539171f..43a2f4a4c 100644
--- a/src/dotnet/ManagedSnapshot.ts
+++ b/src/dotnet/ManagedSnapshot.ts
@@ -4,9 +4,9 @@ import type { FileHandle } from "node:fs/promises";
import { MANAGED_STATIC_PROVIDER } from "../application/InvestigationProviders.js";
import { classifyBinaryTargetFilesystemFailure } from "../application/BinaryTargetResolver.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
import {
withRegularFile,
- RegularFileCleanupFailure,
type RegularFileReadOptions,
} from "../application/RegularFileRead.js";
import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js";
diff --git a/src/dotnet/ManagedStaticProvider.ts b/src/dotnet/ManagedStaticProvider.ts
index eda9a5458..b292822db 100644
--- a/src/dotnet/ManagedStaticProvider.ts
+++ b/src/dotnet/ManagedStaticProvider.ts
@@ -39,7 +39,7 @@ import { err, ok, type Result } from "../domain/result.js";
import { inspectManagedArtifactBytes } from "./ManagedArtifactInspector.js";
import { inspectManagedMembersBytes } from "./ManagedMemberInspector.js";
import { inspectManagedNativeBoundariesBytes } from "./ManagedNativeBoundaryInspector.js";
-import { RegularFileCleanupFailure } from "../application/RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
import { ManagedReaderFailure } from "./ManagedReaderFailure.js";
import {
hashManagedSource,
diff --git a/tests/boundary/filesystem/analysisSnapshot.test.ts b/tests/boundary/filesystem/analysisSnapshot.test.ts
index 523a3e4d5..35b5c20ac 100644
--- a/tests/boundary/filesystem/analysisSnapshot.test.ts
+++ b/tests/boundary/filesystem/analysisSnapshot.test.ts
@@ -31,7 +31,7 @@ import { createEvidenceBundle } from "../../../src/domain/evidenceBundle.js";
import { readJsonObjectFile } from "../../../src/application/JsonInputFile.js";
import { RegularFileChangedError } from "../../../src/filesystem/RegularFile.js";
import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js";
-import { RegularFileCleanupFailure } from "../../../src/application/RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../../src/filesystem/OwnedRegularFile.js";
import { OwnedStagedOutput } from "../../../src/filesystem/OwnedStagedOutput.js";
import { createTestBinarySession } from "../../fixtures/binarySession.js";
diff --git a/tests/boundary/filesystem/evidenceBundleFiles.test.ts b/tests/boundary/filesystem/evidenceBundleFiles.test.ts
index 9dcee5621..9f4574ede 100644
--- a/tests/boundary/filesystem/evidenceBundleFiles.test.ts
+++ b/tests/boundary/filesystem/evidenceBundleFiles.test.ts
@@ -23,7 +23,7 @@ import {
deliverAnalysisEvidence,
} from "../../../src/application/EvidenceBundleCommands.js";
import { EvidenceLedger } from "../../../src/application/investigation/EvidenceLedger.js";
-import { RegularFileCleanupFailure } from "../../../src/application/RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../../src/filesystem/OwnedRegularFile.js";
import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js";
import { OwnedStagedOutput } from "../../../src/filesystem/OwnedStagedOutput.js";
import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js";
diff --git a/tests/boundary/filesystem/jsonFileResourceOwnership.test.ts b/tests/boundary/filesystem/jsonFileResourceOwnership.test.ts
index 9e04ec1e0..38588caa5 100644
--- a/tests/boundary/filesystem/jsonFileResourceOwnership.test.ts
+++ b/tests/boundary/filesystem/jsonFileResourceOwnership.test.ts
@@ -5,7 +5,7 @@ import { expect, it, vi } from "vitest";
import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js";
import { readJsonFile } from "../../../src/application/JsonFiles.js";
-import { RegularFileCleanupFailure } from "../../../src/application/RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../../src/filesystem/OwnedRegularFile.js";
import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js";
import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";
diff --git a/tests/boundary/filesystem/processCliFileInput.test.ts b/tests/boundary/filesystem/processCliFileInput.test.ts
index ca3105fcf..ac204ddfa 100644
--- a/tests/boundary/filesystem/processCliFileInput.test.ts
+++ b/tests/boundary/filesystem/processCliFileInput.test.ts
@@ -11,7 +11,7 @@ import { createEvidence } from "../../../src/domain/evidence.js";
import { PROCESS_PROVIDER } from "../../../src/domain/process/processEvidenceProvider.js";
import { EMPTY_PROCESS_CAPTURE_EXAMPLE } from "../../../src/domain/process/processCaptureExample.js";
import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js";
-import { RegularFileCleanupFailure } from "../../../src/application/RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../../src/filesystem/OwnedRegularFile.js";
import { analysisCliErrorEnvelopeSchema } from "../../../src/contracts/errorSchemas.js";
import { EvidenceFileError } from "../../../src/domain/evidenceErrors.js";
import { err } from "../../../src/domain/result.js";
diff --git a/tests/boundary/filesystem/setupClientConfigCleanupOwnership.test.ts b/tests/boundary/filesystem/setupClientConfigCleanupOwnership.test.ts
index fd63214fb..a780ef3f5 100644
--- a/tests/boundary/filesystem/setupClientConfigCleanupOwnership.test.ts
+++ b/tests/boundary/filesystem/setupClientConfigCleanupOwnership.test.ts
@@ -26,7 +26,7 @@ import {
filterClientsNeedingConfigure,
systemSetupHost,
} from "../../../src/application/SetupHost.js";
-import { RegularFileCleanupFailure } from "../../../src/application/RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../../src/filesystem/OwnedRegularFile.js";
import { configureDetectedClients } from "../../../src/application/SetupClients.js";
import { configureClientConfiguration } from "../../../src/application/SetupClientConfiguration.js";
import { systemUninstallHost } from "../../../src/application/Uninstall.js";
diff --git a/tests/boundary/filesystem/setupSkillCleanupOwnership.test.ts b/tests/boundary/filesystem/setupSkillCleanupOwnership.test.ts
index 0a2799ba4..77e988bca 100644
--- a/tests/boundary/filesystem/setupSkillCleanupOwnership.test.ts
+++ b/tests/boundary/filesystem/setupSkillCleanupOwnership.test.ts
@@ -20,7 +20,7 @@ import {
readSkillFile,
skillDestinations,
} from "../../../src/application/SetupSkill.js";
-import { RegularFileCleanupFailure } from "../../../src/application/RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../../src/filesystem/OwnedRegularFile.js";
import { systemSetupHost } from "../../../src/application/SetupHost.js";
import {
runUninstall,
diff --git a/tests/boundary/providers/managed/managedHashCancellation.test.ts b/tests/boundary/providers/managed/managedHashCancellation.test.ts
index 63be19e8b..13edc9e33 100644
--- a/tests/boundary/providers/managed/managedHashCancellation.test.ts
+++ b/tests/boundary/providers/managed/managedHashCancellation.test.ts
@@ -7,7 +7,7 @@ import { parseBinaryTarget } from "../../../../src/application/BinaryTargetResol
import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js";
import { buildManagedPeFixture } from "../../../../src/dotnet/ManagedPe.fixture.js";
import { ManagedStaticProvider } from "../../../../src/dotnet/ManagedStaticProvider.js";
-import { RegularFileCleanupFailure } from "../../../../src/application/RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../../../src/filesystem/OwnedRegularFile.js";
import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js";
import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js";
diff --git a/tests/boundary/providers/managed/managedStaticProvider.test.ts b/tests/boundary/providers/managed/managedStaticProvider.test.ts
index 562dec2bd..0d793049a 100644
--- a/tests/boundary/providers/managed/managedStaticProvider.test.ts
+++ b/tests/boundary/providers/managed/managedStaticProvider.test.ts
@@ -21,7 +21,7 @@ import {
} from "../../../../src/dotnet/ManagedSnapshot.js";
import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js";
import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js";
-import { RegularFileCleanupFailure } from "../../../../src/application/RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../../../src/filesystem/OwnedRegularFile.js";
import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js";
import * as boundedFileBytes from "../../../../src/process/BoundedFileBytes.js";
diff --git a/tests/process-global/setupConfigurationRollback.test.ts b/tests/process-global/setupConfigurationRollback.test.ts
index 6c3f99641..1c5a8020e 100644
--- a/tests/process-global/setupConfigurationRollback.test.ts
+++ b/tests/process-global/setupConfigurationRollback.test.ts
@@ -141,7 +141,7 @@ vi.mock("../../src/application/RegularFileRead.js", async (importOriginal) => {
import { ClientConfigurationPublication } from "../../src/application/ClientConfigurationPublication.js";
import { configureClientConfiguration } from "../../src/application/SetupClientConfiguration.js";
-import { RegularFileCleanupFailure } from "../../src/application/RegularFileRead.js";
+import { RegularFileCleanupFailure } from "../../src/filesystem/OwnedRegularFile.js";
import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js";
import type { DoctorHost } from "../../src/application/Doctor.js";
import { systemSetupHost } from "../../src/application/SetupHost.js";