From cef87c498a8889489be341eaabe79d638455084a Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Mon, 16 Nov 2026 03:56:10 +0800 Subject: [PATCH] refactor(architecture): add the ports and resources layers, move ports and shared resource owners there, and ratchet the layer baseline (#11208) * test(architecture): fail on a stale layer baseline and document the declared layers verify:module-boundaries reported a layer baseline entry whose imports were gone but still passed, so main kept process -> artifacts at 20 after it fell to 17 and a later change could add three imports back unnoticed. A stale entry now fails like growth; --shrink-layer-baseline lowers it in the change that removes the imports. The architecture map and CONTRIBUTING name scripts/lib/module-layers.mjs as the per-directory layer declaration. * test(architecture): refuse to lower the layer baseline after an inspection failure A file that cannot be parsed contributes no imports, so a shrink run would record counts that fail as growth once the file is fixed. Whole-command tests cover stale rejection, shrinking, refused growth and the inspection failure. * refactor(ports): move the progress, work-scope and inspection-scope ports to src/ports (#11214) * refactor(ports): move the progress, work-scope and inspection-scope ports to src/ports Pure move with git mv and import specifier updates. * test(architecture): declare the ports layer and lower the layer baseline src/ports sits between the foundation and the providers. Moving the three ports removes 11 provider -> application imports. * refactor(ports): move AnalysisProvider to src/ports (#11217) * refactor(ports): move AnalysisProvider to src/ports Pure move with git mv and import specifier updates in its importers, the built-fixture path, the CI scope glob and the lint-rule test spellings. * test(architecture): lower the layer baseline after moving AnalysisProvider * refactor(ports): move the per-feature provider ports to src/ports (#11226) * refactor(ports): move the per-feature provider ports to src/ports Pure move with git mv and import specifier updates: the 47 *Port.ts and *Ports.ts files that providers implement, plus OptionalObservationProviders, which only composes the observation ports. * test(architecture): lower the layer baseline after moving the feature ports * refactor(providers): move closeAnalysisClient and the Frida session input errors to their owners (#11233) * refactor(providers): move closeAnalysisClient to src/providers and the Frida session input errors to src/frida Pure move with git mv and import specifier updates. * test(architecture): drop the application-providers and application-frida cycles from the layer baseline * fix(ci): keep provider lanes selecting the ports moved to src/ports Each lane glob that matched a moved port under src/application gains its src/ports counterpart; the change-scope test pins one moved port per lane. * refactor(domain): declare the localPath host exception and read HOST_PLATFORM there (#11256) absoluteLocalPathStringSchema decides which paths are absolute on the running host, so it reads HOST_PLATFORM instead of process.platform. Domain may not import outside domain/contracts; module-layers now declares LAYER_EXCEPTIONS, exact file-to-file imports with a reason, and both the layer count and the pure-layer boundary skip only that import. Any other domain -> platform import still fails. * refactor(ports): move the doctor check and provider inspection types to src/ports (#11246) * refactor(ports): move the doctor check and provider inspection types to src/ports Declaration move from application/Doctor.ts (unchanged text) and import updates; no re-export from Doctor.ts. * test(architecture): lower the layer baseline after moving the doctor provider types * refactor(ports): move the packet capture and signal recording ports to src/ports (#11249) * refactor(ports): move the packet capture and signal recording ports to src/ports Declaration move (unchanged text) out of the two application services, with import updates. * test(architecture): lower the layer baseline after moving the capture and signal ports * refactor(domain): move the analysis error projection schema from contracts to domain (#11251) * refactor(domain): move the analysis error projection schema from contracts to domain Declaration move (unchanged text) of the projection schemas that domain modules embed; contracts/errorSchemas.ts keeps the CLI envelope and the published JSON Schema. Import updates only. * test(architecture): drop the contracts-domain cycle from the layer baseline * refactor(ports): drop the imports the moved capture, signal and doctor types left behind Also give the packet capture and signal recording lanes the new port paths, with change-scope cases. * refactor(resources): add src/resources and move AnalysisCleanupLease and ArtifactReader there (#11259) * refactor(resources): move AnalysisCleanupLease to src/resources Pure move: git mv plus import specifier rewrites (source, tests, and the dist paths the verifier scripts load). * refactor(resources): declare src/resources as a foundation unit src/resources owns the shared analysis resource modules that process, windows and providers hold; AnalysisCleanupLease is the first. Its tests join the adapters project, the apk signature lane selects it beside src/artifacts, and the layer baseline drops the process and windows imports of the lease. * test(ci): pin the apk signature lane on the moved cleanup lease * refactor(resources): move ArtifactReader to src/resources Pure move: git mv plus import specifier rewrites (source, tests, and the dist path a verifier script loads). * test(architecture): lower the layer baseline after moving ArtifactReader windows no longer imports src/artifacts; process -> artifacts 11 -> 9. The CI lanes that selected src/artifacts/ArtifactReader.ts select its new path, pinned in the change-scope test. * refactor(resources): move ArtifactResourceScope to src/resources (#11265) * refactor(artifacts): name the output tree and private root capabilities the resource scope releases ArtifactResourceScope typed its output-tree and private-runtime-root owners with SafeOutputTree (src/artifacts) and PrivateRuntimeRoot (src/process). It only calls rollback() and close(), so it now declares those capabilities itself and names neither unit, which lets it move to src/resources without a resources <-> process cycle. The withheld-export test narrows to SafeOutputTree where it reads the published flag. * refactor(resources): move ArtifactResourceScope to src/resources Pure move: git mv plus import specifier rewrites (source, tests, the dist paths verifier scripts load, and the FIFO probe's module-relative URL). * test(architecture): lower the layer baseline after moving ArtifactResourceScope process -> artifacts 9 -> 5, and the artifacts <-> dotnet mutual pair is gone. The sqlite and agentenv lanes select the scope at its new path, pinned in the change-scope test. * refactor(resources): move ArtifactFileOperation to src/resources (#11269) * refactor(resources): move ArtifactFileOperation to src/resources Pure move: git mv plus import specifier rewrites (source, tests, and the dist paths verifier scripts load). * test(architecture): lower the layer baseline after moving ArtifactFileOperation process -> artifacts 5 -> 1. * refactor(resources): move readStableArtifact to src/resources (#11271) * refactor(resources): move readStableArtifact to src/resources Pure move: git mv plus import specifier rewrites. * test(architecture): lower the layer baseline after moving readStableArtifact process no longer imports src/artifacts: process -> artifacts 1 -> 0 and the artifacts <-> process mutual pair is gone. The seven lanes that selected readStableArtifact select its new path, pinned in the change-scope test; the architecture map lists what src/resources owns. * refactor(hopper): take Linux launcher verification from composition through a port (#11278) The Hopper launcher imported inspectLinuxHopperLauncher and retryLinuxHopperPublisherCleanup from src/application (the two hopper -> application imports). src/ports/LinuxHopperLauncherVerification.ts now names that capability; src/application/LinuxHopper.ts provides LINUX_HOPPER_LAUNCHER_VERIFICATION, binary composition passes it to HopperProvider, and the provider hands it to the launcher. A launcher built without one refuses a Linux demo launch with reason verification_unavailable before running the launcher. Layer baseline: hopper -> application 2 -> 0. * refactor(config): move Hopper launcher discovery to a src/hopperPaths foundation unit (#11292) * refactor(hopper): move the launcher discovery and macOS Hopper paths to src/hopperPaths Pure move: git mv plus import specifier rewrites. * refactor(hopper): declare src/hopperPaths as a foundation unit with the Linux launcher candidates Hopper install paths and launcher discovery are pure path facts that the Hopper provider, doctor and setup all read. Declare src/hopperPaths in the foundation layer, add it to the adapters test project, the architecture map and the package-baseline CI lane, and move the Linux launcher candidates out of src/application/LinuxHopper.ts into src/hopperPaths/LinuxHopperPaths.ts so discovery no longer imports application code. * refactor(config): leave Hopper launcher discovery to the Hopper provider parseConfig resolved an unset HOPPER_LAUNCHER_PATH by probing the filesystem through application-owned discovery, so config imported application (config -> application 2, application <-> config cycle) and read process.platform ambiently. AppConfig.hopperLauncherPath is now the caller's HOPPER_LAUNCHER_PATH unchanged (string | undefined). src/hopperPaths/HopperLauncherDiscovery.ts owns the selection (selectedHopperLauncherPath: the configured spelling, else discovery from the caller environment's home on the provider's platform); HopperProvider and the two real-Hopper verifiers read it. Discovery tests move from config.test.ts to src/hopperPaths; a provider test covers discovery from the provider's own platform and home. Module layers: config -> application 2 -> 0; application <-> config removed. Architecture guards: ambient platform reads in parseConfig.ts 2 -> 0. * refactor(providers): move owned-process prerequisite availability out of application (#11294) * refactor(providers): move the owned-process prerequisite availability mapping to src/providers Pure move: git mv plus import specifier rewrites. * test(architecture): lower the layer baseline after moving owned-process availability android -> application 1 -> 0; apktool -> application 1 -> 0. * refactor(process): move the regular-file read owner out of application (#11299) * refactor(process): move the regular-file read owner from src/application to src/process Pure move: git mv plus import specifier rewrites. * test(architecture): lower the layer baseline after moving the regular-file read owner desktop -> application 5 -> 4; dotnet -> application 2 -> 1. The agentenv lane listed src/application/RegularFileRead.ts. At its new path it is a src/process/ shared boundary: fast qualification selects the code and runtime checks (and the single owning lane, web_source_map, via src/process/**), and full qualification selects every lane, as for every other src/process/ module. A second owner entry would only suppress the web_source_map selection, so the agentenv entry is removed, not renamed. * refactor(resources): give atomic text writes their own owner (#11302) * refactor(resources): give atomic text writes their own owner in src/resources src/application/JsonFiles.ts owned both JSON input reads and the atomic text write (writeTextFile / writeTextParts and their staged-output publication). The write side depends only on domain, filesystem and resource owners, but il2cpp's Ghidra seed writer had to import application to reach it (il2cpp -> application). Move the write side verbatim to src/resources/TextFileWrite.ts (TextWriteCancellation, writeTextFile, writeTextParts and their private staging, publication and failure classification helpers). JsonFiles keeps the JSON read owner and reads the shared errno-to-reason classifier (fileAccessFailureReason) from the write owner instead of a copy. Importers (il2cpp seed writer, evidence bundle files, desktop build solves, analysis snapshot files and four boundary tests) read the new path; no re-export is left in JsonFiles. * test(architecture): lower the layer baseline after moving the text write owner il2cpp -> application 1 -> 0. * refactor(ports): move the desktop build host contract to src/ports (#11303) * refactor(domain): move the setup cancellation check from src/application to src/domain Pure move: git mv plus import specifier rewrites. * refactor(ports): move the desktop build host contract to src/ports The desktop provider implements doctor's desktop build facts reader and setup's desktop build host, but the contract it implements lived in application (DesktopBuildDoctor, SetupDesktopBuild, Doctor's clientRegistrations signature, ClientRegistrationEnvironment's setting types), so desktop imported application four times and the two units were a recorded mutual pair. src/ports/DesktopBuildHost.ts now holds that contract, moved verbatim: DesktopBuildCommand, DesktopBuildFacts, DesktopBuildFactsInput, DesktopBuildSetupFacts, DesktopBuildSetupHost, RecordedProviderSettings and OwnedProviderSetting. Two names are new: DesktopBuildRegistration, the registration facts the host reads (client, command and the recorded-settings names; client registration status satisfies it), and DesktopBuildRegistrationReader, which replaces DoctorHost["clientRegistrations"] in the setup host. The facts input's registration reader returns DesktopBuildRegistration instead of the full application status; the setup facts' settings are spelled Readonly> (SetupProviderEnvironment's definition). Application imports the types from the port; no re-export is left. * test(architecture): lower the layer baseline after the desktop build host port desktop -> application 4 -> 0; the application <-> desktop mutual pair is gone. * refactor(domain): define the resolved app bundle resource root beside its schema (#11304) * refactor(domain): define the resolved app bundle resource root beside its provenance schema ResolvedAppBundleResourceRoot (an app directory's resource-only identity) is a pure type over BundleResourceRoot's layout, but it lived in src/application/AppBundleExecutable.ts, so the native and artifact providers that receive it imported application. Move the interface verbatim to src/domain/apple/bundleResourceRoot.ts, which owns BundleResourceRoot, and point its eight readers there (native macOS provider and plist source, artifact provider, binary composition, and the binary session, status, port and bundle-resource session). The resolver that produces it stays in application. * test(architecture): lower the layer baseline after moving the resource root type native -> application 2 -> 0; artifacts -> application 2 -> 1 (the artifact provider still constructs BundleResourceSession). * refactor(config): move the pwntools input bound parser to src/config (#11306) * refactor(config): move the pwntools input bound parser from src/native to src/config Pure move: git mv plus import specifier rewrites, and the module path in docs/design/rea-limit-inventory.md (table realigned by oxfmt). * test(architecture): lower the layer baseline after moving the pwntools input bound config -> native 1 -> 0. The binary_layout and recorded_crash lanes, which select src/native/pwntools/**, also select src/config/pwntoolsInputLimit*.ts; ciChangeScope.test.ts pins both. * refactor(filesystem): move REA cache directory helpers out of config (#11309) * refactor(filesystem): move the REA cache directory and lexical directory helpers from src/config to src/filesystem Pure move: git mv plus import specifier rewrites. * test(architecture): drop the config and filesystem cycle from the layer baseline config no longer imports filesystem; filesystem still reads the Windows ChangeTime settle budget from config. * refactor(windows): break the process and windows import cycle (#11317) * refactor(domain): move the runtime-control and private-runtime-root refusals from src/process to src/domain Pure move: git mv plus import specifier rewrites (including the dist path scripts/verify-windows-native.mjs loads). * refactor(windows): type Job Object cleanup by what a Windows job reports WindowsOwnedProcess.cleanup() returned process-ownership's ProcessCleanupResult, so src/windows imported src/process for a type while process imports windows to supervise Windows trees. A Job Object stop only ever reports settled-and-signalled or a reason it did not settle; name that subset WindowsJobCleanupResult in windows. It stays assignable to ProcessCleanupResult, so the process supervisor reads it unchanged. * test(architecture): drop the process and windows cycle from the layer baseline * test(architecture): ratchet cross-provider imports and imports past a provider entry (#11386) * test(architecture): ratchet cross-provider imports and imports past a provider entry A provider folder may import the domain, contracts, foundation and ports layers, the shared provider core (src/providers) and its own files; an import of another provider folder is a recorded exception. Application, composition and the CLI/MCP adapters reach a provider only through src//index.ts. verify:module-boundaries counts both kinds of import per unit pair in the layer baseline (crossProvider, providerEntry); like the upward counts they may only shrink, and a pair missing from the baseline fails. * refactor(resources): move StableArtifactFailure and StableArtifactObservation into src/resources (#11387) * refactor(resources): move StableArtifactFailure and StableArtifactObservation into src/resources Providers project stable-read failures through StableArtifactFailure next to the other shared provider toolkit owners (ArtifactReader, ArtifactResourceScope, ArtifactFileOperation, AnalysisCleanupLease, readStableArtifact) that already live in src/resources. Under src/artifacts it made every provider that reads a stable artifact import the artifacts provider. Pure move: git mv plus import specifier and baseline updates; the layer baseline drops the provider-boundary counts the move removes. * refactor(resources): reach the shared provider toolkit through src/resources/index.ts (#11390) * refactor(resources): import the shared provider toolkit through src/resources/index.ts Adds src/resources/index.ts, which exports the toolkit names that production code outside src/resources uses, and rewrites those importers (420 files) to import from it, merging each importer's toolkit imports into one declaration. Mechanical: import declarations only. * test(architecture): reach src/resources only through its entry file verify:module-boundaries now counts any production import of a src/resources file other than src/resources/index.ts, from any unit, with the imports past a provider entry. The count is renamed from providerEntry to entry ("import past the entry file"); it may only shrink, and src/resources starts at zero. * test(architecture): cover provider boundary counts through the verifier command * refactor(resources): move the safe output tree and artifact path owners into src/resources (#11398) * refactor(resources): move the safe output tree and artifact path owners into src/resources SafeOutputTree (with its admission, creation failure, readback, cleanup and identity files), StreamBytes, ArtifactPaths and readArtifactFileChunks depend only on domain, filesystem, platform and the toolkit, and browser, firmware, ghidra, javascript, android and apktool use them to publish outputs. Under src/artifacts every such provider imported the artifacts provider. Pure move: git mv, importers moved onto src/resources/index.ts (names added to the entry), the moved files import toolkit modules directly, path keys in the CI scopes and guard baseline follow the move, and the layer baseline drops the removed imports. * test(architecture): give the shared provider core its own layer below the providers (#11401) src/providers (deferred client owners and failure attribution) now imports only domain, ports, process, filesystem and the resources toolkit. Declaring it as the providerCore layer, between ports and providers, makes any import from it into a provider folder an upward import that verify:module-boundaries rejects, and lets every unit in the providers layer be a provider folder. * test(architecture): declare each provider's entry files instead of a provider barrel (#11407) * chore: ignore the source map parser move (#11348) in blame * test(architecture): declare inspector's use of the browser CDP client as a provider dependency (#11420) --- .git-blame-ignore-revs | 10 + CONTRIBUTING.md | 16 + docs/adr/architecture/provider-entry-files.md | 63 +++ docs/architecture/architecture.mermaid | 26 +- docs/design/rea-limit-inventory.md | 32 +- docs/specs/artifacts/deno-standalone/plan.md | 2 +- scripts/ci/scopes.mjs | 53 ++- scripts/lib/agent-evaluation-commands.mjs | 4 +- .../lib/browser-runtime-fixture-lifecycle.mjs | 4 +- scripts/lib/mcp-verifier-results.mjs | 2 +- scripts/lib/module-boundaries.mjs | 3 +- scripts/lib/module-layers.baseline.json | 92 ++-- scripts/lib/module-layers.d.mts | 58 ++- scripts/lib/module-layers.mjs | 371 +++++++++++++++- scripts/lib/native-value-e2e.mjs | 4 +- scripts/lib/test-projects.mjs | 4 +- scripts/lib/verifier-artifact-scope.d.mts | 2 +- scripts/lib/verifier-artifact-scope.mjs | 2 +- scripts/lib/verifier-command-owner.mts | 6 +- scripts/lib/verifier-file-resources.d.mts | 4 +- scripts/lib/verifier-file-resources.mjs | 4 +- scripts/lib/verifier-file-snapshot-owner.mts | 2 +- scripts/lib/verifier-terminal-owner.mts | 6 +- .../provider-failure-classifier-baseline.json | 2 +- scripts/verify-browser-dom-destinations.mjs | 4 +- scripts/verify-flutter.mjs | 2 +- scripts/verify-go-binary.mjs | 2 +- scripts/verify-il2cpp-metadata.mjs | 2 +- scripts/verify-module-boundaries.mjs | 53 ++- scripts/verify-pcap.mjs | 2 +- scripts/verify-real-hopper-callers.mjs | 12 +- scripts/verify-real-hopper-deadlines.mjs | 4 +- scripts/verify-real-hopper-fat.mjs | 10 +- scripts/verify-real-kuna.mjs | 4 +- scripts/verify-windows-native.mjs | 2 +- scripts/verify/android/failure-recovery.mjs | 2 +- scripts/verify/apple/dispatch.mjs | 2 +- scripts/verify/architecture-guards.mjs | 2 +- .../baselines/ambient-host-platform.json | 2 - scripts/verify/firmware/analysis.mjs | 2 +- .../verify/javascript/runtime-observation.mjs | 6 +- src/adb/AdbConfiguration.ts | 2 +- src/adb/AdbDeviceOperations.ts | 2 +- src/adb/AdbInputSnapshot.ts | 2 +- src/adb/AdbOperationResults.ts | 2 +- src/adb/AdbProvider.ts | 10 +- src/android/AndroidJniLibraries.ts | 8 +- src/android/AndroidMappingFile.ts | 10 +- src/android/JadxConfiguration.ts | 10 +- src/android/JadxDoctor.ts | 4 +- src/android/JadxJavaProbe.test.ts | 2 +- src/android/JadxJavaProbe.ts | 2 +- src/android/JadxProvider.ts | 10 +- src/android/JadxSession.ts | 6 +- src/apkSignature/ApkSignatureProvider.test.ts | 2 +- src/apkSignature/ApkSignatureProvider.ts | 14 +- src/apkSignature/apkSignatureFailures.ts | 8 +- src/apktool/ApktoolCommandCleanup.ts | 6 +- src/apktool/ApktoolConfiguration.ts | 2 +- src/apktool/ApktoolDecodedInventory.ts | 10 +- src/apktool/ApktoolProvider.ts | 12 +- .../ApktoolWorkspace.lifecycle.test.ts | 4 +- src/apktool/ApktoolWorkspace.ts | 16 +- .../AnalysisContextQueries.test.ts | 4 +- src/application/AnalysisContextQueries.ts | 2 +- src/application/AnalysisDocument.test.ts | 2 +- src/application/AnalysisDocument.ts | 2 +- .../AnalysisOperationFacts.test.ts | 2 +- src/application/AnalysisOperationFacts.ts | 2 +- src/application/AnalysisSettings.test.ts | 2 +- src/application/AppBundleExecutable.ts | 17 +- src/application/AppBundleResourceRoot.test.ts | 2 +- src/application/BinaryOverview.test.ts | 2 +- src/application/BinaryTargetResolver.ts | 8 +- src/application/BrowserEvidence.ts | 2 +- .../BrowserObservationContracts.test.ts | 2 +- .../BrowserObservationService.test.ts | 2 +- src/application/BrowserObservationService.ts | 4 +- .../BrowserScenarioCaptureService.test.ts | 2 +- .../BrowserScenarioCaptureService.ts | 4 +- src/application/BrowserScenarioEvidence.ts | 2 +- src/application/CallPathTracing.test.ts | 2 +- src/application/CallPathTracing.ts | 2 +- .../CallRelationshipTraversal.test.ts | 4 +- src/application/CallRelationshipTraversal.ts | 2 +- src/application/CapabilityAvailability.ts | 6 +- .../CapabilityInventory.optionalReads.test.ts | 2 +- src/application/CapabilityInventory.ts | 6 +- src/application/ClientConfigurationCleanup.ts | 8 +- src/application/ClientConfigurationFiles.ts | 4 +- .../ClientConfigurationPublication.ts | 4 +- src/application/ClientPrivateProfile.ts | 4 +- .../ClientRegistrationEnvironment.ts | 19 +- src/application/ClientRegistrationStatus.ts | 6 +- src/application/DesktopBuildDoctor.test.ts | 5 +- src/application/DesktopBuildDoctor.ts | 81 +--- src/application/DirectAnalysis.ts | 2 +- src/application/DirectAnalysisCleanup.ts | 2 +- src/application/Doctor.test.ts | 4 +- src/application/Doctor.ts | 78 +--- src/application/DoctorDiagnostics.ts | 6 +- src/application/DoctorScope.ts | 5 +- .../EnhancedLiteralTracing.test.ts | 2 +- src/application/EnhancedLiteralTracing.ts | 2 +- .../EnhancedToolSelectorOrigin.test.ts | 2 +- .../EnhancedTools.batchCleanup.test.ts | 4 +- src/application/EnhancedTools.input.test.ts | 2 +- .../EnhancedTools.inputValidation.test.ts | 2 +- .../EnhancedTools.objcClasses.test.ts | 2 +- src/application/EnhancedTools.ts | 2 +- src/application/EvidenceBundleCommands.ts | 2 +- src/application/EvidenceBundleFiles.ts | 7 +- .../FunctionAnalysisEvidence.test.ts | 2 +- src/application/FunctionAnalysisEvidence.ts | 2 +- src/application/GeminiClientSettings.ts | 2 +- .../GuidanceAccess.boundaries.test.ts | 2 +- .../GuidanceAccess.lifecycle.test.ts | 4 +- src/application/GuidanceAccess.test.ts | 4 +- src/application/GuidanceAccess.ts | 10 +- src/application/HopperLauncherDiscovery.ts | 49 -- .../InventoryProjectionEvidence.ts | 2 +- src/application/JsonFiles.ts | 417 +---------------- src/application/JsonInputFile.ts | 4 +- src/application/JunieClientSettings.ts | 2 +- src/application/LinuxHopper.ts | 33 +- src/application/LinuxHopperPublisher.ts | 8 +- src/application/MacHopper.ts | 2 +- .../McpClientRegistration.formats.test.ts | 2 +- .../McpClientRegistration.layers.test.ts | 2 +- ...McpClientRegistration.nativeFields.test.ts | 2 +- src/application/McpClientRegistration.test.ts | 4 +- src/application/McpClientRegistration.ts | 8 +- .../McpRegistrationCatalog.test.ts | 4 +- src/application/McpRegistrationCatalog.ts | 2 +- .../McpRegistrationConfiguration.ts | 2 +- src/application/McpRegistrationGit.test.ts | 2 +- src/application/McpRegistrationLocations.ts | 2 +- src/application/OperationAlternatives.ts | 2 +- src/application/ProcedureAddressResolution.ts | 2 +- src/application/ProviderOperationExecution.ts | 2 +- src/application/ReferenceSourceImport.ts | 2 +- .../ReferenceSourceImportPolicy.ts | 8 +- .../ReferenceSourceImportTypes.test.ts | 2 +- src/application/ReferenceSourceVcsAdapter.ts | 8 +- src/application/Setup.desktopBuild.test.ts | 2 +- src/application/Setup.fixture.ts | 5 +- src/application/Setup.ts | 2 +- src/application/SetupCleanupOwner.test.ts | 4 +- src/application/SetupCleanupOwner.ts | 6 +- src/application/SetupClientConfiguration.ts | 4 +- src/application/SetupClients.ts | 2 +- src/application/SetupDesktopBuild.ts | 38 +- src/application/SetupHost.ts | 14 +- src/application/SetupPlan.ts | 2 +- src/application/SetupRecoveryBackup.ts | 4 +- .../SetupRegistrationEnvironment.ts | 2 +- src/application/SetupSkill.ts | 8 +- src/application/SetupTypes.ts | 2 +- src/application/SkillFilePublication.ts | 2 +- src/application/SourceLimitations.ts | 2 +- src/application/Uninstall.ts | 10 +- src/application/UpdateCommandRunner.ts | 2 +- src/application/UpdateMaintenance.ts | 2 +- src/application/UpdateRuntime.ts | 2 +- src/application/WebModuleTraceService.ts | 4 +- src/application/WebNetworkCapturePort.ts | 2 +- .../WebNetworkCaptureService.test.ts | 2 +- src/application/WebNetworkCaptureService.ts | 2 +- src/application/WebRuntimeService.fixture.ts | 2 +- src/application/WebRuntimeService.ts | 4 +- src/application/WebScriptExportService.ts | 12 +- .../WebSourceLocationService.test.ts | 2 +- src/application/WebSourceLocationService.ts | 4 +- src/application/WorkflowAnalysisProfile.ts | 2 +- src/application/WorkflowEvidence.test.ts | 8 +- src/application/WorkflowEvidence.ts | 4 +- .../XrefsAddressResolution.test.ts | 2 +- src/application/XrefsAddressResolution.ts | 2 +- src/application/adb/AdbDeviceAnalysisPort.ts | 2 +- .../adb/AdbDeviceAnalysisService.test.ts | 2 +- .../adb/AdbDeviceAnalysisService.ts | 2 +- .../analysisView/AnalysisViewService.test.ts | 2 +- .../analysisView/evidenceFileSource.test.ts | 2 +- .../analysisView/evidenceFileSource.ts | 2 +- .../android/AndroidAnalysisService.test.ts | 4 +- .../android/AndroidAnalysisService.ts | 4 +- .../android/AndroidApplicationService.ts | 2 +- .../android/AndroidJniInspection.ts | 2 +- .../android/AndroidPackageInspection.ts | 2 +- .../android/AndroidSymbolInspection.ts | 2 +- .../apiContract/ApiContractRead.ts | 10 +- .../apiContract/ApiContractService.test.ts | 2 +- .../apiContract/ApiContractService.ts | 2 +- .../apiContract/GraphqlContractImport.ts | 2 +- .../GraphqlContractService.test.ts | 2 +- .../apkSignature/ApkSignatureService.ts | 4 +- .../apktool/ApktoolResourceAnalysisPort.ts | 2 +- .../ApktoolResourceAnalysisService.test.ts | 2 +- .../apktool/ApktoolResourceAnalysisService.ts | 2 +- .../apple/AppleApplicationService.ts | 2 +- .../artifacts/DesktopApplicationService.ts | 4 +- .../binary/AnalysisProviderEvaluation.ts | 2 +- .../binary/AnalysisProviderRegistry.test.ts | 2 +- .../binary/AnalysisProviderRegistry.ts | 16 +- .../binary/AnalysisSnapshotCache.test.ts | 4 +- .../binary/AnalysisSnapshotCache.ts | 2 +- .../binary/AnalysisSnapshotFiles.ts | 7 +- .../binary/BinarySession.openEffects.test.ts | 2 +- src/application/binary/BinarySession.ts | 10 +- .../BinarySessionBundleResources.test.ts | 2 +- .../binary/BinarySessionComposition.ts | 2 +- .../binary/BinarySessionExecution.ts | 2 +- .../binary/BinarySessionInvestigation.test.ts | 2 +- .../binary/BinarySessionLiveness.test.ts | 2 +- src/application/binary/BinarySessionOpen.ts | 2 +- src/application/binary/BinarySessionPort.ts | 4 +- .../binary/BinarySessionRecords.ts | 10 +- .../BinarySessionRefusalAlternatives.test.ts | 2 +- .../binary/BinarySessionRestoration.test.ts | 2 +- .../binary/BinarySessionStatus.test.ts | 2 +- src/application/binary/BinarySessionStatus.ts | 4 +- .../binary/BundleResourceSession.test.ts | 2 +- .../binary/BundleResourceSession.ts | 6 +- .../binary/CompositeProvider.test.ts | 4 +- src/application/binary/CompositeProvider.ts | 4 +- .../binary/DeferredAnalysisClient.test.ts | 2 +- .../binary/LazyAnalysisProvider.test.ts | 4 +- .../binary/LazyAnalysisProvider.ts | 2 +- .../binary/SessionEvidenceReuse.ts | 2 +- .../binary/SessionProviderPolicy.ts | 2 +- .../binary/SessionProviderRouter.ts | 2 +- .../binary/SessionRuntimeAvailability.ts | 2 +- .../binaryDiagnostics/AppleIpsService.ts | 4 +- .../BinaryHardeningService.ts | 4 +- .../binaryDiagnostics/BinaryLayoutService.ts | 4 +- .../binaryDiagnostics/ByteEntropyService.ts | 8 +- .../binaryDiagnostics/DevicetreeService.ts | 4 +- .../binaryDiagnostics/ElfNotesService.ts | 4 +- .../ElfUnwindRangesService.ts | 4 +- .../KernelBuildConfigService.ts | 4 +- .../binaryDiagnostics/KernelModuleService.ts | 4 +- .../binaryDiagnostics/NativeExportsService.ts | 4 +- .../NativeInitializersService.ts | 4 +- .../PeCertificatesService.ts | 4 +- .../binaryDiagnostics/PeImportsService.ts | 4 +- .../binaryDiagnostics/PeLoadConfigService.ts | 4 +- .../binaryDiagnostics/PeResourcesService.ts | 4 +- .../binaryDiagnostics/RecordedCrashService.ts | 4 +- .../WindowsShortcutService.ts | 4 +- .../captures/PacketCaptureService.test.ts | 2 +- .../captures/PacketCaptureService.ts | 21 +- .../decompileDirectory/decompileAll.test.ts | 4 +- .../decompileDirectory/decompileAll.ts | 4 +- .../exportResources.test.ts | 2 +- .../decompileDirectory/exportResources.ts | 12 +- .../decompileDirectory/exportTree.ts | 8 +- .../desktop/DesktopApplicationCapture.test.ts | 2 +- .../desktop/DesktopApplicationExport.test.ts | 6 +- .../desktop/DesktopApplicationState.test.ts | 2 +- .../desktop/DesktopApplicationState.ts | 2 +- .../desktop/DesktopArchiveTask.test.ts | 2 +- src/application/desktop/DesktopBuildBundle.ts | 6 +- .../desktop/DesktopBuildComputers.ts | 2 +- .../desktop/DesktopBuildOwnedWork.ts | 2 +- .../desktop/DesktopBuildSecrets.ts | 4 +- .../desktop/DesktopBuildSolves.test.ts | 2 +- src/application/desktop/DesktopBuildSolves.ts | 8 +- src/application/desktop/DesktopBuildSteps.ts | 2 +- .../desktop/DesktopBuildWitness.test.ts | 2 +- .../desktop/DesktopBuildWitness.ts | 2 +- .../desktop/DesktopBuildWitnessRecord.test.ts | 2 +- .../desktop/DesktopCaptureFailure.test.ts | 4 +- .../desktop/DesktopCaptureFailure.ts | 4 +- .../desktop/DesktopCaptureOutput.ts | 2 +- .../desktop/DesktopCaptureRefusals.test.ts | 6 +- .../desktop/DesktopCaptureRefusals.ts | 6 +- src/application/desktop/DesktopExportFiles.ts | 2 +- .../desktop/DesktopExportInstall.ts | 2 +- .../desktop/DesktopExportWithheld.test.ts | 13 +- src/application/desktop/DesktopOutputTree.ts | 8 +- .../DesktopRetainedContent.cleanup.test.ts | 6 +- .../desktop/DesktopRetainedContent.ts | 6 +- src/application/desktop/DesktopTaskExport.ts | 2 +- src/application/desktop/DesktopZipView.ts | 2 +- .../electron/ElectronFuseService.ts | 4 +- .../environment/environmentBuild.test.ts | 2 +- .../environment/environmentBundleTool.ts | 6 +- .../environmentBundleWrite.test.ts | 4 +- .../environment/environmentBundleWrite.ts | 22 +- .../environment/environmentExport.ts | 10 +- .../environmentInputCleanup.test.ts | 2 +- src/application/erlang/BeamService.ts | 4 +- .../evm/EvmInterfaceService.test.ts | 2 +- src/application/evm/EvmInterfaceService.ts | 4 +- .../firmware/FirmwareAnalysisService.test.ts | 2 +- .../firmware/FirmwareAnalysisService.ts | 4 +- src/application/flutter/DartAotInspection.ts | 2 +- .../flutter/FlutterBuildAnalysisPort.ts | 2 +- .../FlutterBuildAnalysisService.test.ts | 2 +- .../flutter/FlutterBuildAnalysisService.ts | 2 +- .../frida/FridaInstrumentationService.test.ts | 4 +- .../frida/FridaInstrumentationService.ts | 6 +- .../frida/fridaContractRequests.ts | 2 +- src/application/go/GoBinaryService.ts | 4 +- src/application/gpu/GpuCodeObjectsService.ts | 4 +- .../harmony/HarmonyApplicationService.ts | 2 +- .../il2cpp/Il2cppMetadataService.test.ts | 2 +- .../il2cpp/Il2cppMetadataService.ts | 6 +- .../InvestigationEvidence.test.ts | 2 +- .../investigation/UnknownEvidence.ts | 2 +- .../sourcePublicationRecovery.ts | 2 +- .../javascript/ElectronActiveEvidence.ts | 4 +- .../ElectronActiveObservationService.test.ts | 2 +- .../ElectronActiveObservationService.ts | 4 +- .../javascript/ElectronEvidence.ts | 2 +- .../ElectronObservationService.test.ts | 2 +- .../javascript/ElectronObservationService.ts | 4 +- .../JavaScriptAnalysisControl.test.ts | 2 +- .../javascript/JavaScriptAnalysisControl.ts | 2 +- .../JavaScriptApplicationEvidence.ts | 2 +- .../JavaScriptApplicationService.ts | 8 +- .../JavaScriptApplicationWorkflowService.ts | 4 +- .../javascript/JavaScriptArtifactAnalysis.ts | 2 +- .../JavaScriptArtifactReconstruction.ts | 8 +- .../javascript/JavaScriptPreloadDiscovery.ts | 2 +- .../JavaScriptRecoveryService.test.ts | 2 +- .../javascript/JavaScriptRecoveryService.ts | 4 +- .../JavaScriptRuntimeObservationEvidence.ts | 2 +- ...avaScriptRuntimeObservationService.test.ts | 2 +- .../JavaScriptRuntimeObservationService.ts | 4 +- .../JavaScriptRuntimeReconciliationService.ts | 2 +- .../JavaScriptSemanticTraceService.ts | 2 +- .../javascript/SourceToBundleReference.ts | 2 +- .../jeb/JebAnalysisService.test.ts | 4 +- src/application/jeb/JebAnalysisService.ts | 4 +- .../managed/ManagedApplicationGraphService.ts | 2 +- .../managed/ManagedMemberComparisonService.ts | 2 +- .../ManagedNativeVerificationService.ts | 2 +- .../managed/ManagedReconstructionService.ts | 2 +- src/application/model/ModelArtifactService.ts | 4 +- .../EnhancedNativeInvestigation.test.ts | 4 +- .../native/NativeCallRoutes.test.ts | 4 +- src/application/native/NativeCallRoutes.ts | 2 +- ...ispatchMetadataInspection.fallback.test.ts | 2 +- .../NativeDispatchMetadataInspection.ts | 2 +- .../native/NativeFunctionMatchingService.ts | 4 +- .../native/NativeMatchingBundleSources.ts | 2 +- .../native/NativeReaderEvidence.test.ts | 2 +- src/application/native/NativeUiActionTrace.ts | 2 +- .../native/NativeValueTrace.fixture.ts | 2 +- .../native/NativeValueTrace.test.ts | 2 +- src/application/native/NativeValueTrace.ts | 2 +- .../native/NativeValueTraceStops.test.ts | 2 +- src/application/ntfs/NtfsJournalCache.ts | 6 +- .../ntfs/NtfsJournalPaging.test.ts | 4 +- .../ntfs/NtfsJournalService.test.ts | 4 +- src/application/ntfs/NtfsJournalService.ts | 10 +- src/application/pcap/PcapAnalysisPort.ts | 2 +- .../pcap/PcapAnalysisService.test.ts | 2 +- src/application/pcap/PcapAnalysisService.ts | 2 +- .../playwrightTrace/PlaywrightTraceService.ts | 2 +- src/application/process/ProcessCli.ts | 10 +- src/application/python/PythonPycService.ts | 4 +- .../ReleaseExposureService.test.ts | 6 +- .../releaseExposure/ReleaseExposureService.ts | 6 +- .../reverse/ReverseEngineeringService.ts | 8 +- src/application/rust/RustBinaryService.ts | 4 +- .../signals/SignalRecordingService.test.ts | 2 +- .../signals/SignalRecordingService.ts | 21 +- .../sqlite/SqliteDatabaseService.test.ts | 2 +- .../sqlite/SqliteDatabaseService.ts | 4 +- .../v8CodeCache/V8CodeCacheService.ts | 4 +- src/application/wasm/WasmArtifactService.ts | 4 +- .../wasm/WasmInterfaceComparisonService.ts | 2 +- src/artifacts/ArtifactEmbeddedFormatProbes.ts | 2 +- src/artifacts/ArtifactFileAdmission.ts | 2 +- src/artifacts/ArtifactFileRange.ts | 6 +- src/artifacts/ArtifactFileSource.ts | 6 +- src/artifacts/ArtifactHash.ts | 4 +- .../ArtifactOperationFailure.test.ts | 8 +- src/artifacts/ArtifactOperationFailure.ts | 4 +- src/artifacts/ArtifactPreparation.test.ts | 2 +- src/artifacts/ArtifactPreparation.ts | 2 +- src/artifacts/ArtifactProvider.ts | 16 +- src/artifacts/ArtifactProviderCleanup.test.ts | 2 +- src/artifacts/ArtifactProviderMetadata.ts | 2 +- src/artifacts/ArtifactReaderLimits.ts | 2 +- src/artifacts/ArtifactSelectedSource.ts | 6 +- .../ArtifactSourceResolution.test.ts | 2 +- .../ArtifactTraversalObservation.test.ts | 2 +- src/artifacts/ArtifactTraversalObservation.ts | 4 +- src/artifacts/AsarArtifactReader.ts | 4 +- src/artifacts/AsarEntryStream.test.ts | 2 +- src/artifacts/AsarEntryStream.ts | 2 +- src/artifacts/AsarFailure.ts | 2 +- src/artifacts/AsarHeader.ts | 6 +- src/artifacts/AsarListing.ts | 5 +- src/artifacts/BunStandaloneArtifactReader.ts | 14 +- src/artifacts/DecodedRegionArtifactReader.ts | 6 +- src/artifacts/DenoStandaloneArtifactReader.ts | 16 +- src/artifacts/DesktopApplicationReader.ts | 10 +- src/artifacts/DesktopFileInspection.ts | 2 +- src/artifacts/DfuSeArtifactReader.test.ts | 2 +- src/artifacts/DirectoryArtifactReader.ts | 12 +- src/artifacts/DotnetBundleArtifactReader.ts | 10 +- .../EspFlashImageArtifactReader.test.ts | 4 +- src/artifacts/EspFlashImageArtifactReader.ts | 2 +- src/artifacts/EspFlashRegionReads.ts | 2 +- src/artifacts/EspImageArtifactReader.test.ts | 4 +- src/artifacts/EspImageArtifactReader.ts | 2 +- src/artifacts/FitArtifactReader.test.ts | 4 +- src/artifacts/FitArtifactReader.ts | 6 +- src/artifacts/GodotPckArtifactReader.test.ts | 2 +- src/artifacts/GodotPckArtifactReader.ts | 6 +- src/artifacts/GodotPckLocation.ts | 2 +- src/artifacts/HexRecordArtifactReader.test.ts | 4 +- src/artifacts/InesArtifactReader.ts | 24 +- src/artifacts/Lz4Block.ts | 2 +- .../MachOSliceArtifactReader.test.ts | 2 +- src/artifacts/MachOSliceArtifactReader.ts | 24 +- src/artifacts/NativeDmgArtifactReader.ts | 2 +- src/artifacts/NativeDmgProtocol.test.ts | 4 +- src/artifacts/NodeSeaArtifactReader.test.ts | 6 +- src/artifacts/NodeSeaArtifactReader.ts | 4 +- src/artifacts/NtfsMftArtifactReader.test.ts | 2 +- src/artifacts/NtfsMftArtifactReader.ts | 6 +- src/artifacts/OwnedArtifactStream.ts | 2 +- src/artifacts/OwnedAsyncArtifactStream.ts | 8 +- src/artifacts/PositionalArtifactReader.ts | 6 +- src/artifacts/PyInstallerArtifactReader.ts | 8 +- src/artifacts/RegularFileErrorProjection.ts | 2 +- src/artifacts/ReleaseExposureReader.test.ts | 14 +- src/artifacts/ReleaseExposureReader.ts | 20 +- src/artifacts/UImageArtifactReader.ts | 6 +- src/artifacts/UnityFsArtifactReader.test.ts | 2 +- src/artifacts/UnityFsArtifactReader.ts | 6 +- src/artifacts/UnityFsStructures.ts | 6 +- src/artifacts/WxapkgArtifactReader.test.ts | 2 +- src/artifacts/WxapkgArtifactReader.ts | 6 +- src/artifacts/WxapkgStructures.ts | 4 +- src/artifacts/ZipArtifactReader.test.ts | 5 +- src/artifacts/ZipArtifactReader.ts | 20 +- src/artifacts/ZipMemberRegion.test.ts | 2 +- .../apple/AppleAssetCatalogAnalysis.test.ts | 2 +- .../apple/AppleAssetCatalogAnalysis.ts | 18 +- src/artifacts/apple/DylibFileAccess.ts | 8 +- src/artifacts/apple/DylibResolutionReader.ts | 6 +- .../apple/InterfaceBuilderAnalysis.ts | 14 +- .../InterfaceBuilderFinalization.test.ts | 4 +- .../apple/KeyedArchiveRawRefusal.test.ts | 2 +- .../apple/KeyedArchiveReadFailure.test.ts | 2 +- src/artifacts/apple/KeyedArchiveReader.ts | 22 +- src/artifacts/artifactFormats.ts | 2 +- src/artifacts/bun/BunModuleGraphLayout.ts | 2 +- src/artifacts/bun/BunModuleGraphMembers.ts | 2 +- .../bun/BunStandaloneArtifactReader.test.ts | 4 +- src/artifacts/createArtifactReader.ts | 2 +- src/artifacts/deno/DenoSectionLayout.ts | 2 +- .../deno/DenoStandaloneArtifactReader.test.ts | 2 +- src/artifacts/deno/DenoStandaloneLocation.ts | 2 +- src/artifacts/deno/DenoVirtualFs.test.ts | 2 +- src/artifacts/deno/DenoVirtualFs.ts | 4 +- src/artifacts/dotnet/DotnetBundle.ts | 6 +- .../extraction/ArtifactExtraction.test.ts | 4 +- .../extraction/ArtifactExtraction.ts | 38 +- .../EmbeddedArtifactExtraction.test.ts | 2 +- src/artifacts/fit/FitStructure.ts | 2 +- .../ArtifactGraphConstruction.test.ts | 4 +- .../inventory/ArtifactGraphConstruction.ts | 4 +- .../ArtifactInventoryFinalization.test.ts | 4 +- src/artifacts/inventory/classify.ts | 6 +- .../inventory/hashStableRootArtifact.ts | 10 +- src/artifacts/inventory/reader.ts | 2 +- src/artifacts/inventory/scanCanonical.ts | 4 +- src/artifacts/inventory/scanReader.test.ts | 2 +- src/artifacts/inventory/scanReader.ts | 4 +- src/artifacts/inventory/types.ts | 2 +- .../javascript/JavaScriptArtifactFiles.ts | 14 +- .../javascript/JavaScriptArtifactReader.ts | 2 +- .../javascript/JavaScriptSourceAnalysis.ts | 2 +- src/artifacts/nodeSea/NodeSeaBlob.ts | 6 +- src/artifacts/nodeSea/NodeSeaLocation.ts | 2 +- src/artifacts/pe/PeResourceLayout.ts | 2 +- src/artifacts/pe/PeResourceParser.test.ts | 2 +- src/artifacts/pe/PeResourceParser.ts | 6 +- src/artifacts/pyinstaller/CArchiveMembers.ts | 5 +- .../pyinstaller/PyInstallerAdmission.test.ts | 2 +- .../PyInstallerAdmissionBoundaries.test.ts | 2 +- .../PyInstallerArtifactReader.test.ts | 2 +- .../pyinstaller/PyInstallerBoundaries.test.ts | 4 +- src/artifacts/pyinstaller/PyInstallerBytes.ts | 2 +- .../PyInstallerFormatBoundaries.test.ts | 2 +- .../pyinstaller/PyInstallerMemberStream.ts | 2 +- .../pyinstaller/PyInstallerPyzStore.ts | 6 +- src/artifacts/pyinstaller/PyzArchive.ts | 2 +- src/artifacts/withArtifactTargetIdentity.ts | 6 +- src/browser/BrowserScenarioSessionPort.ts | 2 +- src/browser/CdpBrowserProvider.ts | 4 +- src/browser/CdpElectronInspection.test.ts | 2 +- src/browser/CdpElectronInspection.ts | 2 +- src/browser/CdpElectronProvider.ts | 4 +- src/browser/CdpObservationSession.ts | 2 +- src/browser/CdpPageCapture.ts | 2 +- src/browser/CdpScreenshot.ts | 2 +- src/browser/CdpTargetSessionOwner.ts | 4 +- src/browser/CdpWebMcpDiscovery.ts | 2 +- .../ElectronCaptureCleanup.boundary.test.ts | 2 +- src/browser/ElectronCaptureCleanup.test.ts | 4 +- src/browser/ElectronCaptureCleanup.ts | 6 +- src/browser/ElectronFileScope.cleanup.test.ts | 2 +- src/browser/ElectronFileScope.ts | 6 +- .../PlaywrightBrowserScenarioProvider.test.ts | 2 +- .../PlaywrightBrowserScenarioProvider.ts | 6 +- .../PlaywrightElectronActiveActions.test.ts | 2 +- .../PlaywrightElectronActiveActions.ts | 4 +- src/browser/PlaywrightElectronActiveFuses.ts | 8 +- .../PlaywrightElectronActiveProvider.ts | 12 +- src/browser/PlaywrightScenarioBrowser.test.ts | 2 +- src/browser/PlaywrightScenarioBrowser.ts | 2 +- src/browser/PlaywrightScenarioSession.test.ts | 2 +- src/browser/PlaywrightScenarioSession.ts | 2 +- src/browser/PlaywrightScenarioStorage.ts | 2 +- src/browser/WebArtifactCleanup.test.ts | 2 +- src/browser/WebArtifactCleanup.ts | 8 +- src/browser/WebBundleAnalysisWorker.ts | 14 +- src/browser/WebBundleAnalysisWorkerServer.ts | 10 +- src/browser/assets/LocalWebScriptArtifacts.ts | 12 +- src/browser/assets/PublishWebScripts.ts | 14 +- src/browser/assets/WebArtifactReads.ts | 10 +- .../assets/WebSourceLocationArtifacts.ts | 8 +- src/browser/execution/CdpRuntimeSession.ts | 2 +- .../execution/CdpWebRuntimeProvider.ts | 4 +- src/browser/history/CaptureFailures.test.ts | 6 +- src/browser/history/CaptureFailures.ts | 12 +- .../history/HistoricalCaptureDecoder.ts | 12 +- .../history/HistoricalCaptureReply.test.ts | 2 +- src/browser/history/HistoricalCaptureReply.ts | 8 +- src/browser/history/NodeCaptureProcess.ts | 2 +- src/browser/history/SazCapture.ts | 2 +- .../PlaywrightTraceDecoder.test.ts | 2 +- .../playwrightTrace/PlaywrightTraceDecoder.ts | 12 +- .../PlaywrightTraceLifecycle.test.ts | 2 +- .../history/playwrightTrace/TraceFailure.ts | 8 +- .../history/playwrightTrace/TraceInventory.ts | 2 +- .../history/playwrightTrace/TraceLines.ts | 2 +- .../history/playwrightTrace/TraceStream.ts | 2 +- .../history/protobuf/ProtobufCapture.test.ts | 2 +- .../history/protobuf/ProtobufCapture.ts | 8 +- src/browser/modules/NativeModuleResolver.ts | 6 +- src/browser/modules/WebModuleArtifacts.ts | 8 +- src/browser/providerIdentities.ts | 2 +- src/captures/TsharkCaptureProvider.ts | 12 +- src/cli.ts | 2 +- src/cli/analysisViewCommands.ts | 2 +- src/cli/apiContractCommand.ts | 6 +- src/cli/artifactComparisonCommand.ts | 2 +- src/cli/browserContractCommands.ts | 2 +- src/cli/cliCommandRegistration.ts | 2 +- src/cli/cliJsonInput.ts | 2 +- src/cli/cliProgress.ts | 2 +- src/cli/cliResultOutput.ts | 2 +- src/cli/cliShell.ts | 2 +- src/cli/desktopCaptureCommands.ts | 6 +- src/cli/electronCommands.ts | 2 +- src/cli/evidenceInputCommand.ts | 2 +- src/cli/fridaCommands.ts | 2 +- src/cli/guidanceCommands.ts | 2 +- src/cli/javascriptApplicationAnalysis.ts | 8 +- src/cli/javascriptRuntimeCommands.ts | 2 +- src/cli/jebCommands.ts | 2 +- src/cli/mcpRegistration.ts | 6 +- src/cli/nativeFunctionMatchingCommands.ts | 2 +- src/cli/ntfsJournalCommand.ts | 6 +- src/cli/playwrightTraceCommand.ts | 6 +- src/cli/utilityCommands.ts | 2 +- src/cli/webRuntimeCommands.ts | 2 +- src/cli/webScriptCommands.ts | 2 +- src/cliBrowserScenarioCommands.ts | 2 +- src/cliLogging.ts | 6 +- src/cliMcpRegistration.test.ts | 2 +- src/composition/android.ts | 2 +- src/composition/binary.ts | 11 +- src/composition/binaryDiagnostics.ts | 2 +- src/composition/browserObservation.ts | 2 +- src/composition/browserScenario.ts | 2 +- src/composition/capabilityDeclarations.ts | 2 +- src/composition/capabilityServices.ts | 24 +- src/composition/electronObservation.ts | 2 +- src/composition/electronScenario.ts | 2 +- src/composition/firmware.ts | 2 +- src/composition/frida.ts | 2 +- src/composition/javascriptRecovery.ts | 2 +- .../javascriptRuntimeObservation.ts | 2 +- src/composition/jeb.ts | 2 +- .../optionalObservationProviders.ts | 2 +- src/config.test.ts | 65 +-- src/config/analysisSettings.ts | 2 +- src/config/parseConfig.ts | 37 +- .../pwntoolsInputLimit.test.ts} | 8 +- .../pwntoolsInputLimit.ts} | 4 +- src/config/types.ts | 7 +- src/contracts/analysisSettingsContracts.ts | 2 +- src/contracts/errorSchemas.ts | 108 +---- src/contracts/toolOutputSchemaGroups.ts | 2 +- src/cutter/CutterBridgeClient.ts | 6 +- .../AgentEnvComputerHelper.cleanup.test.ts | 4 +- src/desktop/AgentEnvComputerHelper.ts | 4 +- src/desktop/BuildComputerEnvironment.ts | 2 +- src/desktop/BuildSecretFiles.ts | 8 +- src/desktop/DconfDatabaseReader.test.ts | 2 +- src/desktop/DconfDatabaseReader.ts | 6 +- src/desktop/DebianPackageFile.ts | 6 +- src/desktop/DebianPackageFileCleanup.test.ts | 2 +- src/desktop/DebianPackageInventory.test.ts | 2 +- src/desktop/DebianPackageInventory.ts | 2 +- src/desktop/DesktopApplicationSession.test.ts | 2 +- src/desktop/DesktopApplicationSession.ts | 6 +- src/desktop/DesktopBuildDoctorFacts.test.ts | 4 +- src/desktop/DesktopBuildDoctorFacts.ts | 8 +- src/desktop/DesktopBuildOwnedCommand.test.ts | 2 +- src/desktop/DesktopBuildOwnedCommand.ts | 6 +- src/desktop/DesktopBuildSetupHost.test.ts | 2 +- src/desktop/DesktopBuildSetupHost.ts | 16 +- src/desktop/DesktopContentStore.test.ts | 2 +- src/desktop/DesktopContentStore.ts | 6 +- .../DesktopInspectionTermination.test.ts | 2 +- src/desktop/GpgvKeyCheck.test.ts | 2 +- src/desktop/GpgvKeyCheck.ts | 6 +- src/desktop/HomeStateWalker.test.ts | 2 +- src/desktop/HomeStateWalker.ts | 2 +- src/desktop/HostFileRead.ts | 4 +- src/desktop/HostQuery.test.ts | 2 +- src/desktop/HostQuery.ts | 2 +- src/desktop/LinuxApplicationInventory.test.ts | 2 +- src/desktop/LinuxApplicationInventory.ts | 6 +- src/desktop/ScreenJudgeProcess.ts | 2 +- src/desktop/X11WindowObserver.test.ts | 2 +- src/desktop/X11WindowObserver.ts | 2 +- src/doctorRuntime.test.ts | 2 +- src/doctorRuntime.ts | 15 +- src/domain/analysisAccessDenied.test.ts | 2 +- src/domain/analysisErrorProjection.test.ts | 2 +- src/domain/analysisErrorProjectionSchema.ts | 109 +++++ src/domain/analysisRefusal.test.ts | 2 +- src/domain/analysisView/batchDecompileView.ts | 2 +- .../analysisView/nativeObservationSchemas.ts | 2 +- src/domain/apple/bundleResourceRoot.ts | 12 + .../javascript/javascriptStaticAnalysis.ts | 12 +- src/domain/localPath.ts | 6 +- src/domain/native/batchDecompile.ts | 2 +- src/domain/native/nativeCallGraph.ts | 2 +- .../privateRuntimeRootUnavailableError.ts} | 2 +- src/domain/providerCleanupError.test.ts | 2 +- .../runtimeControlUnavailableError.ts} | 2 +- .../setupCancellation.ts} | 2 +- src/dotnet/ManagedSnapshot.ts | 4 +- src/dotnet/ManagedStaticProvider.ts | 8 +- src/dotnet/ManagedStaticProviderMetadata.ts | 2 +- src/electron/ElectronFuseCleanup.test.ts | 2 +- src/electron/ElectronFuseFailures.ts | 4 +- src/electron/ElectronFusePath.ts | 2 +- src/electron/ElectronFuseProvider.ts | 8 +- src/electron/ElectronFuseReader.ts | 4 +- .../ElectronFuseReaderCleanup.test.ts | 2 +- src/erlang/BeamParser.test.ts | 4 +- src/erlang/BeamParser.ts | 2 +- src/erlang/BeamProvider.ts | 14 +- src/evm/EvmoleFailures.test.ts | 2 +- src/evm/EvmoleInterfaceProvider.test.ts | 2 +- src/evm/EvmoleInterfaceProvider.ts | 16 +- src/evm/EvmoleInterfaceWorker.ts | 2 +- .../cacheDirectory.ts} | 5 +- src/firmware/FirmwareCommand.ts | 6 +- src/firmware/FirmwareDeadline.test.ts | 2 +- src/firmware/FirmwareFailures.ts | 4 +- src/firmware/FirmwareFiles.ts | 10 +- src/firmware/FirmwareNestedCoverage.test.ts | 2 +- src/firmware/FirmwareProvider.ts | 12 +- src/firmware/FirmwarePublication.ts | 10 +- src/firmware/devicetree/DevicetreeProvider.ts | 14 +- src/flutter/DartElf.ts | 2 +- src/flutter/ElfBuildId.ts | 2 +- src/flutter/ElfLoadMap.ts | 2 +- src/flutter/FlutterBuildProvider.ts | 14 +- src/frida/FridaInstrumentationManager.test.ts | 2 +- src/frida/FridaInstrumentationManager.ts | 13 +- .../frida/fridaInputErrors.ts | 2 +- src/ghidra/GhidraAnalysisProfile.ts | 4 +- src/ghidra/GhidraAnalysisSeeds.test.ts | 2 +- src/ghidra/GhidraAnalysisSeeds.ts | 4 +- src/ghidra/GhidraCheckpoint.test.ts | 2 +- src/ghidra/GhidraCheckpoint.ts | 4 +- src/ghidra/GhidraClient.ts | 10 +- src/ghidra/GhidraDisabledAnalyzers.ts | 2 +- src/ghidra/GhidraDoctor.ts | 4 +- src/ghidra/GhidraDosSnapshot.ts | 4 +- src/ghidra/GhidraExecutableHeader.ts | 2 +- src/ghidra/GhidraFileArtifacts.ts | 6 +- src/ghidra/GhidraInstallation.ts | 2 +- src/ghidra/GhidraInstallationProperties.ts | 4 +- src/ghidra/GhidraJavaLaunch.ts | 6 +- src/ghidra/GhidraJavaOptions.ts | 8 +- .../GhidraJavaProbe.preparation.test.ts | 2 +- src/ghidra/GhidraJavaProbe.test.ts | 2 +- src/ghidra/GhidraJavaProbe.ts | 2 +- src/ghidra/GhidraLanguageCatalog.ts | 6 +- src/ghidra/GhidraLanguageOverride.test.ts | 2 +- src/ghidra/GhidraLauncher.ts | 2 +- src/ghidra/GhidraLoadImageAttest.ts | 2 +- src/ghidra/GhidraNativeAotSnapshotOwner.ts | 2 +- src/ghidra/GhidraProjectSnapshot.ts | 4 +- src/ghidra/GhidraProvider.behavior.test.ts | 6 +- src/ghidra/GhidraProvider.ts | 14 +- src/ghidra/GhidraProviderCapabilities.ts | 2 +- src/ghidra/GhidraProviderClient.ts | 4 +- src/ghidra/GhidraProviderMetadata.ts | 2 +- src/ghidra/GhidraPspExtension.ts | 10 +- src/ghidra/GhidraSnapshotCache.test.ts | 2 +- src/ghidra/GhidraSocketConnection.ts | 2 +- src/ghidra/GhidraTargetSnapshot.ts | 8 +- src/ghidra/GhidraTemporaryDirectory.ts | 6 +- src/ghidra/GhidraTransport.ts | 8 +- .../extensions/GhidraExtensions.test.ts | 2 +- src/ghidra/extensions/GhidraExtensions.ts | 6 +- src/go/GoBinaryProvider.ts | 14 +- src/gpu/ClangOffloadBundle.ts | 2 +- src/gpu/CudaFatbinary.ts | 2 +- src/gpu/GpuCodeObjectsProvider.ts | 24 +- src/gpu/GpuInventory.test.ts | 2 +- src/gpu/GpuInventory.ts | 2 +- src/gpu/GpuPayloadCodec.ts | 2 +- src/gpu/GpuSource.ts | 6 +- src/hopper/BridgeLauncher.ts | 39 +- src/hopper/HopperAnalysisProfile.ts | 10 +- src/hopper/HopperCallerReconciliation.test.ts | 2 +- src/hopper/HopperCallerReconciliation.ts | 2 +- src/hopper/HopperCleanup.ts | 2 +- src/hopper/HopperClient.ts | 2 +- src/hopper/HopperImageCopy.test.ts | 2 +- src/hopper/HopperImageCopy.ts | 2 +- .../HopperMachOImage.copyLifecycle.test.ts | 2 +- src/hopper/HopperMachOImage.test.ts | 2 +- src/hopper/HopperMachOImage.ts | 6 +- src/hopper/HopperProvider.ts | 107 +++-- src/hopper/HopperProviderCapabilities.ts | 2 +- src/hopper/HopperProviderDiscovery.test.ts | 29 +- src/hopper/HopperProviderMetadata.ts | 2 +- src/hopper/HopperRegexSearch.ts | 2 +- src/hopper/HopperRequestQueue.ts | 2 +- src/hopper/LinuxPrivateDisplayProbe.ts | 2 +- .../HopperLauncherDiscovery.test.ts | 61 +++ src/hopperPaths/HopperLauncherDiscovery.ts | 99 +++++ src/hopperPaths/LinuxHopperPaths.ts | 23 + .../MacHopperPaths.test.ts | 4 +- .../MacHopperPaths.ts | 0 src/ida/IdaConfiguration.test.ts | 2 +- src/ida/IdaConfiguration.ts | 4 +- src/ida/IdaDoctor.test.ts | 2 +- src/ida/IdaDoctor.ts | 4 +- src/ida/IdaMcpConnection.ts | 4 +- src/ida/IdaNativeProtocol.test.ts | 4 +- src/ida/IdaOperationFailures.test.ts | 2 +- src/ida/IdaProvider.test.ts | 4 +- src/ida/IdaProvider.ts | 12 +- src/ida/IdaProviderCapabilities.ts | 2 +- src/ida/IdaProviderMetadata.ts | 2 +- src/ida/IdaSessionClient.ts | 8 +- src/ida/IdaStartupFailures.test.ts | 2 +- src/ida/IdaWorkspace.ts | 4 +- src/il2cpp/Il2cppGhidraSeedWriter.ts | 14 +- src/il2cpp/Il2cppMetadataProvider.ts | 14 +- src/inspector/V8InspectorProvider.ts | 4 +- src/inspector/providerIdentity.ts | 2 +- .../analysis/JavaScriptAnalysisWorker.ts | 10 +- .../recovery/RecoveryFiles.ownership.test.ts | 6 +- src/javascript/recovery/RecoveryFiles.test.ts | 2 +- src/javascript/recovery/RecoveryFiles.ts | 8 +- src/javascript/recovery/WakaruCommand.ts | 6 +- src/javascript/recovery/WakaruExecution.ts | 6 +- src/javascript/recovery/WakaruProvider.ts | 20 +- src/javascript/recovery/WakaruPublication.ts | 4 +- src/javascript/recovery/WakaruReport.ts | 8 +- .../sourceMaps/SourceMapCodecProcess.ts | 2 +- src/javascript/sourceMaps/SourceMapCommand.ts | 4 +- src/javascript/sourceMaps/SourceMapDecoder.ts | 4 +- src/jeb/JebMcpConnectionOwner.ts | 2 +- src/jeb/JebProvider.ts | 6 +- src/jeb/JebProviderIdentity.ts | 2 +- src/kuna/KunaCommand.ts | 6 +- src/kuna/KunaConfiguration.ts | 2 +- src/kuna/KunaCopy.test.ts | 6 +- src/kuna/KunaDoctor.ts | 4 +- src/kuna/KunaInstallation.ts | 6 +- src/kuna/KunaProjectCache.ts | 8 +- src/kuna/KunaProjectExport.ts | 6 +- src/kuna/KunaProvider.ts | 2 +- src/kuna/KunaProviderCapabilities.ts | 2 +- src/kuna/KunaProviderMetadata.ts | 2 +- src/kuna/KunaSessionClient.ts | 18 +- src/kuna/KunaTargetCommands.ts | 12 +- src/main/transport.ts | 4 +- src/main/types.ts | 2 +- src/model/ModelArtifactProvider.ts | 24 +- src/model/ModelHeaderReader.ts | 6 +- src/model/SafetensorsHeader.ts | 2 +- .../AppleDispatchMetadata.failure.test.ts | 2 +- src/native/AppleDispatchMetadata.ts | 22 +- src/native/CommandRunner.ts | 2 +- src/native/LldbCallTracer.ts | 8 +- src/native/LldbReadbackFiles.ts | 6 +- src/native/NativeCallObservation.test.ts | 2 +- src/native/NativeCallObservation.ts | 2 +- src/native/NativeCallTarget.ts | 6 +- src/native/NativeCommandAnalysisError.test.ts | 2 +- src/native/NativeCommandAnalysisError.ts | 2 +- src/native/NativeMacOSProvider.ts | 28 +- src/native/NativeMacOSProviderMetadata.ts | 2 +- src/native/NativeMachoSource.test.ts | 4 +- src/native/NativeMachoSource.ts | 6 +- src/native/NativeMacosProviderIdentity.ts | 2 +- src/native/NativePlistSource.ts | 26 +- src/native/NativeUiCleanupError.ts | 2 +- src/native/NativeUiHelperRuntime.ts | 6 +- src/native/NativeUiObservation.test.ts | 2 +- src/native/SignatureTargetBinding.test.ts | 2 +- src/native/SignatureTargetBinding.ts | 12 +- src/native/apple/AppleIpsProvider.ts | 36 +- src/native/elf/ElfNoteParser.test.ts | 2 +- src/native/elf/ElfNoteParser.ts | 6 +- src/native/elf/ElfNotesProvider.ts | 14 +- src/native/elf/ElfUnwindRangesProvider.ts | 14 +- src/native/elf/ElfUnwindTables.test.ts | 2 +- src/native/elf/ElfUnwindTables.ts | 6 +- src/native/elf/KernelBuildConfig.test.ts | 2 +- src/native/elf/KernelBuildConfig.ts | 6 +- src/native/elf/KernelBuildConfigProvider.ts | 14 +- src/native/elf/KernelModuleParser.test.ts | 2 +- src/native/elf/KernelModuleParser.ts | 2 +- src/native/elf/KernelModuleProvider.ts | 14 +- src/native/exports/NativeExportsProvider.ts | 14 +- .../hardening/BinaryHardeningParsers.test.ts | 2 +- .../hardening/BinaryHardeningProvider.ts | 14 +- src/native/hardening/ElfHardening.ts | 6 +- src/native/hardening/MachoHardening.ts | 2 +- src/native/hardening/PeHardening.ts | 6 +- .../initializers/ElfInitializerSymbols.ts | 2 +- src/native/initializers/ElfInitializers.ts | 2 +- src/native/initializers/MachoInitializers.ts | 2 +- .../NativeInitializersParsers.test.ts | 2 +- .../NativeInitializersProvider.ts | 14 +- src/native/pe/PeBinaryFailure.ts | 8 +- src/native/pe/PeCertificateParser.test.ts | 2 +- src/native/pe/PeCertificateParser.ts | 2 +- src/native/pe/PeCertificatesProvider.ts | 14 +- src/native/pe/PeImportParser.ts | 2 +- src/native/pe/PeImportsProvider.ts | 12 +- src/native/pe/PeLoadConfigParser.test.ts | 2 +- src/native/pe/PeLoadConfigParser.ts | 2 +- src/native/pe/PeLoadConfigProvider.ts | 12 +- src/native/pe/PeResourcesProvider.test.ts | 2 +- src/native/pe/PeResourcesProvider.ts | 16 +- src/native/pwndbg/PwndbgCoreContext.ts | 14 +- src/native/pwntools/PwntoolsDecoder.ts | 18 +- src/native/pwntools/PwntoolsFailures.test.ts | 2 +- src/native/pwntools/PwntoolsLayoutProvider.ts | 2 +- .../pwntools/PwntoolsRecordedCrashProvider.ts | 2 +- .../pwntools/PwntoolsResourceLimits.test.ts | 2 +- src/native/pwntools/PwntoolsResourceLimits.ts | 4 +- src/native/windows/WindowsShortcutParser.ts | 2 +- src/native/windows/WindowsShortcutProvider.ts | 16 +- src/pcap/PcapCommand.ts | 6 +- src/pcap/PcapConfiguration.ts | 2 +- src/pcap/PcapProvider.ts | 8 +- src/pcap/PcapSnapshot.ts | 4 +- .../AnalysisProvider.test.ts | 0 .../AnalysisProvider.ts | 0 .../AnalysisWorkScope.ts | 0 .../BrowserObservationPort.ts | 0 .../BrowserScenarioCapturePort.ts | 0 src/ports/DesktopBuildHost.ts | 149 +++++++ src/ports/DoctorProviderInspection.ts | 44 ++ src/ports/LinuxHopperLauncherVerification.ts | 25 ++ .../OptionalObservationProviders.ts | 0 .../ProgressReporter.test.ts | 0 .../ProgressReporter.ts | 0 .../ProviderInspectionScope.ts | 0 src/{application => ports}/WebModulePorts.ts | 0 src/{application => ports}/WebRuntimePort.ts | 0 .../WebScriptArtifactPort.ts | 0 .../WebSourceLocationPorts.ts | 0 .../android/AndroidAnalysisPort.ts | 0 .../apkSignature/ApkSignaturePort.ts | 0 .../artifacts/DesktopApplicationPort.ts | 0 .../binaryDiagnostics/AppleIpsPort.ts | 0 .../binaryDiagnostics/BinaryHardeningPort.ts | 0 .../binaryDiagnostics/BinaryLayoutPort.ts | 0 .../binaryDiagnostics/DevicetreePort.ts | 0 .../binaryDiagnostics/ElfNotesPort.ts | 0 .../binaryDiagnostics/ElfUnwindRangesPort.ts | 0 .../KernelBuildConfigPort.ts | 0 .../binaryDiagnostics/KernelModulePort.ts | 0 .../binaryDiagnostics/NativeExportsPort.ts | 0 .../NativeInitializersPort.ts | 0 .../binaryDiagnostics/PeCertificatesPort.ts | 0 .../binaryDiagnostics/PeImportsPort.ts | 0 .../binaryDiagnostics/PeLoadConfigPort.ts | 0 .../binaryDiagnostics/PeResourcesPort.ts | 0 .../binaryDiagnostics/RecordedCrashPort.ts | 0 .../binaryDiagnostics/WindowsShortcutPort.ts | 0 src/ports/captures/PacketCapturePort.ts | 21 + .../electron/ElectronFusePort.ts | 0 src/{application => ports}/erlang/BeamPort.ts | 0 .../evm/EvmInterfacePort.ts | 0 .../firmware/FirmwareAnalysisPort.ts | 0 .../frida/FridaInstrumentationPort.ts | 0 src/{application => ports}/go/GoBinaryPort.ts | 0 .../gpu/GpuCodeObjectsPort.ts | 0 .../il2cpp/Il2cppMetadataPort.ts | 0 .../il2cpp/Il2cppSeedWriterPort.ts | 0 .../ElectronActiveObservationPort.ts | 0 .../javascript/ElectronObservationPort.ts | 0 .../javascript/JavaScriptRecoveryPort.ts | 0 .../JavaScriptRuntimeObservationPort.ts | 0 .../jeb/JebAnalysisPort.ts | 0 .../model/ModelArtifactPort.ts | 0 .../playwrightTrace/PlaywrightTracePort.ts | 0 .../python/PythonPycPort.ts | 0 .../releaseExposure/ReleaseExposurePort.ts | 0 .../rust/RustBinaryPort.ts | 0 src/ports/signals/SignalRecordingPort.ts | 21 + .../sqlite/SqliteDatabasePort.ts | 0 .../v8CodeCache/V8CodeCachePort.ts | 0 .../wasm/WasmArtifactPort.ts | 0 src/process/ArtifactAnalysisResources.test.ts | 10 +- src/process/ArtifactAnalysisResources.ts | 8 +- src/process/ArtifactCommandPath.ts | 2 +- src/process/HopperLease.ts | 4 +- src/process/LinuxResourceLimits.test.ts | 6 +- src/process/LinuxResourceLimits.ts | 6 +- src/process/OwnedLease.test.ts | 4 +- src/process/OwnedLease.ts | 6 +- src/process/OwnedMcpStdioTransport.ts | 2 +- src/process/PrivateRuntimeRoot.ts | 2 +- src/process/ProcessInspectionCleanup.test.ts | 2 +- .../RegularFileRead.ts | 12 +- .../capture/FilesystemRootAdmission.test.ts | 4 +- src/process/capture/FilesystemSnapshot.ts | 2 +- .../ProcessCaptureCleanupOutcome.test.ts | 2 +- .../capture/ProcessCaptureError.test.ts | 2 +- src/process/capture/ProcessCaptureError.ts | 2 +- .../capture/ProcessCaptureLifecycle.ts | 2 +- src/process/capture/ProcessCaptureRead.ts | 2 +- src/process/capture/ProcessHarness.test.ts | 2 +- .../AnalysisClientCleanup.test.ts | 14 +- .../AnalysisClientCleanup.ts | 2 +- src/providers/AnalysisClientCreation.ts | 14 +- src/providers/AnalysisClientFailure.ts | 6 +- src/providers/DeferredAnalysisClient.ts | 2 +- src/providers/OwnedCommandCleanup.test.ts | 2 +- src/providers/OwnedCommandCleanup.ts | 8 +- src/providers/ResponseBodyCleanup.ts | 2 +- src/providers/artifactResourceFailure.ts | 8 +- src/providers/classifyProviderFailure.test.ts | 6 +- src/providers/classifyProviderFailure.ts | 8 +- .../ownedProcessAvailability.test.ts | 0 .../ownedProcessAvailability.ts | 2 +- src/providers/runOwned.deadline.test.ts | 2 +- src/providers/runOwned.lifecycle.test.ts | 2 +- src/providers/runOwned.test.ts | 4 +- src/providers/runOwned.ts | 4 +- src/python/PythonPycProvider.ts | 14 +- src/reference/ReferenceSourceReader.ts | 6 +- src/reference/ReferenceSourceReaderEntries.ts | 6 +- src/reference/ReferenceSourceReaderErrors.ts | 2 +- src/reference/ReferenceSourceReaderFile.ts | 2 +- src/reference/ReferenceSourceReaderTypes.ts | 2 +- .../AnalysisCleanupLease.test.ts | 0 .../AnalysisCleanupLease.ts | 0 .../ArtifactFileOperation.ts | 0 .../ArtifactPaths.test.ts | 0 src/{artifacts => resources}/ArtifactPaths.ts | 0 .../ArtifactReader.test.ts | 0 .../ArtifactReader.ts | 0 .../ArtifactResourceScope.test.ts | 2 +- .../ArtifactResourceScope.ts | 20 +- .../SafeOutputTree.ts | 0 .../SafeOutputTreeAdmission.test.ts | 0 .../SafeOutputTreeAdmission.ts | 0 .../SafeOutputTreeCleanup.ts | 0 .../SafeOutputTreeCreationFailure.ts | 0 .../SafeOutputTreeIdentity.ts | 0 .../SafeOutputTreeReadback.ts | 2 +- .../StableArtifactFailure.ts | 0 .../StableArtifactObservation.ts | 0 src/{artifacts => resources}/StreamBytes.ts | 0 src/resources/TextFileWrite.ts | 419 ++++++++++++++++++ src/resources/index.ts | 97 ++++ .../readArtifactFileChunks.ts | 0 .../readStableArtifact.ts | 0 src/rizin/RizinDebugSessionManager.ts | 8 +- src/rust/RustBinaryProvider.ts | 14 +- src/server/BundleResourcesMcp.test.ts | 2 +- src/server/EvidenceMcpServerCore.ts | 2 +- src/server/McpToolRequest.ts | 2 +- src/server/analysisAdmission.ts | 2 +- src/server/contractToolBindings.ts | 2 +- src/server/contractToolHandler.ts | 6 +- .../environment/environmentDataPlane.ts | 2 +- src/server/environment/serveEnvironment.ts | 2 +- .../environment/serveEnvironmentState.test.ts | 2 +- src/server/environment/stateIntake.test.ts | 2 +- src/server/environment/stateIntake.ts | 2 +- src/server/mcpProgress.ts | 4 +- src/server/operationProgress.ts | 2 +- src/server/promptCompletion.ts | 2 +- src/server/registerAnalysisViewTool.ts | 2 +- .../projectMobileApplicationGraph.ts | 2 +- src/server/registerApplicationTools/types.ts | 2 +- .../registerArtifactComparisonTool.test.ts | 2 +- src/server/registerArtifactComparisonTool.ts | 2 +- src/server/registerBrowserScenarioTool.ts | 4 +- src/server/registerBrowserTools.ts | 4 +- src/server/registerBundleComparisonTool.ts | 2 +- src/server/registerDesktopBuildTools.ts | 2 +- src/server/registerElectronTools.ts | 8 +- src/server/registerEnhancedTools.ts | 4 +- src/server/registerEvidenceTools.ts | 2 +- src/server/registerFridaTools.ts | 2 +- src/server/registerGuidanceTools.ts | 2 +- src/server/registerGuidedWorkflowTool.test.ts | 2 +- ...gisterJavaScriptRuntimeObservationTools.ts | 4 +- src/server/registerManagedTools.ts | 2 +- src/server/registerPrompts.ts | 2 +- src/server/registerResetInvestigationTool.ts | 6 +- src/server/registerSessionRecordTools.ts | 2 +- src/server/registerSessionStatusTool.ts | 4 +- src/server/registerSessionTools.ts | 4 +- src/server/registerWebScriptTool.ts | 2 +- src/signals/SigrokRecordingProvider.ts | 10 +- src/sqlite/SqliteDatabaseFailures.ts | 6 +- src/sqlite/SqliteDatabaseProvider.ts | 12 +- src/sqlite/SqliteDatabaseSnapshot.ts | 22 +- .../SqliteDatabaseSnapshotLimits.test.ts | 6 +- src/sqlite/SqliteDatabaseWorkerExecution.ts | 12 +- src/v8/V8CodeCacheProvider.ts | 14 +- src/wasm/WabtArtifactProvider.test.ts | 2 +- src/wasm/WabtArtifactProvider.ts | 14 +- src/wasm/WabtFailures.test.ts | 2 +- src/wasm/WabtFailures.ts | 8 +- src/wasm/WabtRuntime.test.ts | 4 +- src/wasm/WabtRuntime.ts | 6 +- src/windows/WindowsNativeLoader.ts | 2 +- src/windows/WindowsOwnedProcess.test.ts | 2 +- src/windows/WindowsOwnedProcess.ts | 19 +- src/windows/WindowsPrivateRuntime.test.ts | 4 +- src/windows/WindowsPrivateRuntime.ts | 8 +- .../analysisSnapshotDiagnostics.test.ts | 2 +- .../apkSignatureLimitsCliMcp.test.ts | 2 +- tests/acceptance/apkZip64FramingCli.test.ts | 2 +- .../adbNumericDeclarations.test.ts | 2 +- .../browserSourceMapCancellationCli.test.ts | 2 +- .../acceptance/cliFormattingCapacity.test.ts | 2 +- .../pcapCredentialErrorsCliMcp.test.ts | 2 +- .../tools/wabtLauncherIdentity.test.ts | 2 +- .../android/androidJniLibraries.test.ts | 2 +- .../android/androidMappingFile.test.ts | 2 +- .../browser/cdpScriptMetadata.test.ts | 2 +- .../boundary/captures/captureProvider.test.ts | 2 +- tests/boundary/cli/analysisViewCli.test.ts | 6 +- .../cli/browserScenarioSummaryCli.test.ts | 2 +- .../cli/cliJavaScriptResourceClose.test.ts | 2 +- tests/boundary/cli/cliJsonCallerPath.test.ts | 4 +- tests/boundary/cli/cliOwnedResources.test.ts | 2 +- tests/boundary/cli/cliStartupImports.test.ts | 2 +- .../cli/electronFuseCleanupCli.test.ts | 2 +- .../cli/evidenceOutputPublicationCli.test.ts | 2 +- .../cli/firmwareIncompleteRange.test.ts | 2 +- tests/boundary/cli/fridaCli.test.ts | 2 +- .../boundary/cli/jebInputDiagnostics.test.ts | 4 +- tests/boundary/cli/jsonOutput.test.ts | 2 +- .../cli/managedMemberSummaryCli.test.ts | 6 +- .../cli/nativeFeatureTraceDelivery.test.ts | 2 +- .../cli/overnightBatch1CliSchemas.test.ts | 2 +- .../cli/procedureReferencesDelivery.test.ts | 2 +- .../cli/referenceSourceImportStatus.test.ts | 6 +- .../cli/reverseEngineeringTargetInput.test.ts | 2 +- .../traceNativeValuesCompletenessCli.test.ts | 2 +- .../cli/wasmAcquiredInputsCli.test.ts | 2 +- tests/boundary/cli/wasmCleanupCli.test.ts | 2 +- .../cli/webScriptSelectionCli.test.ts | 2 +- .../filesystem/adbInputSnapshot.test.ts | 2 +- .../filesystem/analysisSnapshot.test.ts | 2 +- .../artifactInventorySnapshot.test.ts | 4 +- .../artifactLiteralBackslash.test.ts | 2 +- .../artifactZipRelativePaths.test.ts | 2 +- .../filesystem/asarHeaderAdmission.test.ts | 2 +- .../filesystem/asarInventoryFreshness.test.ts | 2 +- .../filesystem/asarListingAdmission.test.ts | 2 +- .../asarStreamingAllocation.test.ts | 2 +- .../assetCatalogFinalization.test.ts | 2 +- .../filesystem/binaryTargetCleanup.test.ts | 6 +- .../bunStandaloneIntegration.test.ts | 2 +- .../filesystem/cancellationCauseLint.test.ts | 4 +- .../boundary/filesystem/ciChangeScope.test.ts | 36 +- .../claudeDesktopClientConfiguration.test.ts | 2 +- .../clientNativeConnectionAdmission.test.ts | 2 +- .../denoStandaloneIntegration.test.ts | 4 +- .../filesystem/desktopApplication.test.ts | 4 +- .../directAnalysisSnapshotReplay.test.ts | 2 +- .../directoryArtifactReaderOpen.test.ts | 2 +- .../directoryArtifactReaderOwnership.test.ts | 2 +- .../filesystem/dotnetBundleArtifacts.test.ts | 4 +- .../dotnetBundleIntegration.test.ts | 2 +- .../filesystem/evidenceBundleFiles.test.ts | 4 +- .../extractionSourceCancellation.test.ts | 2 +- .../ghidraLanguageCatalogBound.test.ts | 2 +- .../ghidraLanguageCatalogCleanup.test.ts | 4 +- .../ghidraLanguageCatalogEncoding.test.ts | 2 +- .../ghidraProfileArtifactOwnership.test.ts | 2 +- .../filesystem/ghidraPspExtension.test.ts | 2 +- .../filesystem/hopperFatCoordinates.test.ts | 4 +- .../hopperLauncherSelection.test.ts | 2 +- .../boundary/filesystem/inesArtifact.test.ts | 2 +- .../filesystem/inesCancellation.test.ts | 6 +- .../filesystem/interfaceBuilderBundle.test.ts | 2 +- .../javascriptApplicationService.test.ts | 2 +- .../javascriptArtifactReconstruction.test.ts | 2 +- .../javascriptNestedReaderCleanup.test.ts | 4 +- .../jsonFileResourceOwnership.test.ts | 2 +- .../filesystem/jsonOutputOwnership.test.ts | 4 +- .../filesystem/jsonOutputPathCapacity.test.ts | 4 +- .../jsonOutputResourceFailure.test.ts | 4 +- .../filesystem/keyedArchiveSelection.test.ts | 2 +- .../filesystem/keyedArchiveXmlNesting.test.ts | 2 +- .../filesystem/kiloClientLocation.test.ts | 2 +- .../filesystem/mcpAddClientLifecycle.test.ts | 2 +- .../ownedArtifactReaderCleanup.test.ts | 2 +- .../filesystem/processCliFileInput.test.ts | 20 +- .../referenceSourceCleanupOwnership.test.ts | 2 +- .../referenceSourceFilenameBytes.test.ts | 2 +- .../filesystem/referenceSourceImport.test.ts | 4 +- .../referenceSourceMetadataCleanup.test.ts | 2 +- .../regularFileCancellation.test.ts | 4 +- .../filesystem/safeOutputTree.test.ts | 6 +- .../safeOutputTreeCloseFailures.test.ts | 4 +- .../safeOutputTreePublication.test.ts | 2 +- .../filesystem/safeOutputTreeUnicode.test.ts | 2 +- .../setupClientConfigCleanupOwnership.test.ts | 2 +- .../setupSkillCleanupOwnership.test.ts | 2 +- .../filesystem/setupSkillPublication.test.ts | 2 +- .../filesystem/sourceToBundlePaths.test.ts | 2 +- .../filesystem/stableArtifact.test.ts | 6 +- .../filesystem/symlinkParentOwners.test.ts | 2 +- .../filesystem/webModuleArtifacts.test.ts | 2 +- .../filesystem/webScriptExport.test.ts | 10 +- .../filesystem/webScriptManifestPaths.test.ts | 2 +- .../filesystem/wideDirectoryTraversal.test.ts | 2 +- .../firmware/firmwareIntegration.test.ts | 4 +- .../firmware/firmwarePublicationPaths.test.ts | 2 +- .../firmware/firmwareReportFiles.test.ts | 6 +- .../firmwareValidationProjection.test.ts | 2 +- tests/boundary/guidanceSearch.test.ts | 2 +- .../wakaruFileOwnership.test.ts | 2 +- .../wakaruIntegration.test.ts | 4 +- .../wakaruPublicationCancellation.test.ts | 2 +- .../javascriptApplicationCancellation.test.ts | 2 +- .../javascriptPreloadDiscovery.test.ts | 2 +- .../javascriptSourceAnalysisWorker.test.ts | 2 +- .../javascript/nativeTypeBindings.test.ts | 2 +- .../sourceMapRuntimeAvailability.test.ts | 2 +- tests/boundary/mcp/adbMcp.test.ts | 2 +- tests/boundary/mcp/adbStartMcp.test.ts | 2 +- .../mcp/addressContextBookmarks.test.ts | 2 +- .../mcp/addressContextCapacity.test.ts | 2 +- .../mcp/addressContextInputErrors.test.ts | 2 +- .../mcp/analyzeFunctionDetail.test.ts | 2 +- .../mcp/androidPackageSummaryMcp.test.ts | 4 +- tests/boundary/mcp/apktoolMcp.test.ts | 2 +- .../applicationMcpHarnessLifecycle.test.ts | 2 +- .../mcp/batchSourcePublicationCleanup.test.ts | 2 +- .../batchSourcePublicationRecovery.test.ts | 2 +- tests/boundary/mcp/browserMcp.test.ts | 2 +- tests/boundary/mcp/browserScenarioMcp.test.ts | 4 +- .../mcp/buildCaptureFailureMcp.test.ts | 2 +- .../mcp/callGraphCleanupIncomplete.test.ts | 2 +- .../mcp/callRelationshipAvailability.test.ts | 4 +- .../mcp/cleanupPrimaryProjection.test.ts | 2 +- .../mcp/completionInventoryAliasMcp.test.ts | 2 +- .../mcp/contextEvidenceOverflow.test.ts | 2 +- .../boundary/mcp/decompileAllCaveats.test.ts | 2 +- tests/boundary/mcp/electronMcp.test.ts | 4 +- ....01-lists-the-complete-target-open.test.ts | 4 +- ...3-returns-typed-graph-failures-and.test.ts | 2 +- ...4-uses-complete-inventories-inline.test.ts | 2 +- .../enhancedTools.callPathsAndBatches.test.ts | 4 +- .../mcp/enhancedTools.limitations.test.ts | 2 +- ...enhancedTools.traceFeatureCoverage.test.ts | 4 +- tests/boundary/mcp/enhancedToolsHarness.ts | 2 +- .../evidenceAtomicRetentionRecovery.test.ts | 2 +- .../mcp/evidenceRetentionRecovery.test.ts | 2 +- .../boundary/mcp/featureTraceViewsMcp.test.ts | 2 +- .../mcp/fixedEvidenceConsumersMcp.test.ts | 2 +- tests/boundary/mcp/flutterMcp.test.ts | 2 +- tests/boundary/mcp/fridaLifecycleMcp.test.ts | 4 +- tests/boundary/mcp/fridaMcp.test.ts | 2 +- .../mcp/gdbRetirementCancellation.test.ts | 2 +- .../mcp/ghidraFailureDiagnostics.test.ts | 4 +- .../mcp/investigationAnalysisMcp.test.ts | 2 +- .../mcp/investigationLifecycleMcp.test.ts | 2 +- tests/boundary/mcp/jebMcp.test.ts | 6 +- tests/boundary/mcp/largeToolResult.test.ts | 2 +- .../lateAbortApplicationEvidenceMcp.test.ts | 4 +- .../mcp/nativeDispatchAvailability.test.ts | 4 +- .../boundary/mcp/nativeInputContracts.test.ts | 4 +- .../nativeInstructionReferencesView.test.ts | 2 +- .../mcp/nativeInventoryViewsMcp.test.ts | 2 +- .../mcp/nativeLoadImageViewsMcp.test.ts | 2 +- .../mcp/nativeObservationViewsMcp.test.ts | 2 +- .../boundary/mcp/nativeUiAvailability.test.ts | 4 +- tests/boundary/mcp/nativeUiFactsMcp.test.ts | 2 +- .../mcp/nativeUiFinalizationMcp.test.ts | 2 +- .../mcp/nativeUiPartialCallRoutesMcp.test.ts | 4 +- .../mcp/nativeValueFlowAvailability.test.ts | 2 +- .../nativeValueTraceCleanupIncomplete.test.ts | 2 +- .../mcp/nativeValueTraceCompleteness.test.ts | 2 +- tests/boundary/mcp/ntfsJournal.test.ts | 2 +- tests/boundary/mcp/officialArguments.test.ts | 2 +- tests/boundary/mcp/officialTools.test.ts | 2 +- tests/boundary/mcp/pcapMcp.test.ts | 2 +- .../mcp/processTraceAdaptersParity.test.ts | 2 +- tests/boundary/mcp/progressMcp.test.ts | 2 +- tests/boundary/mcp/promptCompletion.test.ts | 2 +- tests/boundary/mcp/promptMcp.test.ts | 2 +- .../boundary/mcp/providerSelectionMcp.test.ts | 2 +- .../mcp/pseudocodeDeliveryMcp.test.ts | 2 +- tests/boundary/mcp/rawBinaryMcp.test.ts | 2 +- .../mcp/registerGuidanceTools.test.ts | 2 +- .../mcp/reverseEngineeringPartialMcp.test.ts | 2 +- ...eEngineeringProviderEnvironmentMcp.test.ts | 2 +- tests/boundary/mcp/serverIdentity.test.ts | 2 +- tests/boundary/mcp/serverLifecycleMcp.test.ts | 4 +- tests/boundary/mcp/serverUnknownsMcp.test.ts | 2 +- tests/boundary/mcp/serverWorkflowMcp.test.ts | 2 +- .../mcp/sessionAvailabilityRecovery.test.ts | 2 +- .../mcp/sessionEvidenceReuseMcp.test.ts | 2 +- tests/boundary/mcp/sessionMcp.test.ts | 4 +- tests/boundary/mcp/sessionMcpHarness.ts | 4 +- .../mcp/sourcePublicationContext.test.ts | 2 +- .../mcp/sourcePublicationRecovery.test.ts | 2 +- tests/boundary/mcp/webModuleTraceMcp.test.ts | 4 +- .../mcp/webScriptSelectionMcp.test.ts | 2 +- .../mcp/workflowSnapshotReplayMcp.test.ts | 2 +- .../boundary/native/PwndbgCoreContext.test.ts | 2 +- .../native/pwndbgReplyFinalization.test.ts | 2 +- .../pcap/pcapProviderCancellation.test.ts | 6 +- .../process/androidAnalysisMcp.test.ts | 2 +- .../process/artifactFileOutcomes.test.ts | 6 +- .../artifactProducerCancellation.test.ts | 6 +- .../process/artifactSelectedCommand.test.ts | 2 +- .../process/binarySessionCleanupRetry.test.ts | 2 +- .../browserScenarioProbeLifecycle.test.ts | 2 +- .../process/desktopBuildOwnedCommand.test.ts | 2 +- .../boundary/process/jadxIntegration.test.ts | 2 +- tests/boundary/process/processCli.test.ts | 6 +- .../processSnapshotHandleOwnership.test.ts | 2 +- .../process/verifierArtifactScope.test.ts | 2 +- .../process/verifierFileResources.test.ts | 10 +- .../android/androidLateCompletion.test.ts | 2 +- .../ghidra/ghidraCheckpointLifecycle.test.ts | 2 +- .../providers/ghidra/ghidraClient.test.ts | 4 +- .../ghidra/ghidraFileFailure.test.ts | 6 +- .../providers/ghidra/ghidraJavaLaunch.test.ts | 6 +- .../ghidra/ghidraLaunchOutcome.test.ts | 2 +- .../ghidra/ghidraOomRetention.test.ts | 2 +- .../ghidra/ghidraProjectSnapshot.test.ts | 2 +- .../providers/hopper/bridgeLauncher.test.ts | 37 +- .../hopper/hopperClient.externalExit.test.ts | 2 +- .../hopper/linuxPrivateDisplay.test.ts | 2 +- .../ida/idaCapabilityInventory.test.ts | 2 +- .../kuna/kunaCommandLifetime.test.ts | 4 +- .../kuna/kunaHashOwnerPropagation.test.ts | 4 +- .../kuna/kunaInstallationLifetime.test.ts | 4 +- .../kuna/kunaInventoryPlacement.test.ts | 2 +- .../providers/kuna/kunaResourceScope.ts | 2 +- .../kuna/kunaSelectedCommand.test.ts | 2 +- .../providers/kuna/kunaSessionFixture.ts | 2 +- .../kuna/kunaSpanCloseOwnership.test.ts | 2 +- .../kuna/kunaVersionProbeOwnership.test.ts | 4 +- .../managed/managedMemberComparison.test.ts | 2 +- .../managed/managedStaticProvider.test.ts | 4 +- .../artifactProvider.archiveSafety.test.ts | 2 +- .../artifactProvider.cleanupRetry.test.ts | 4 +- ...tifactProvider.extractionSelection.test.ts | 2 +- .../artifactProvider.failureDetail.test.ts | 2 +- ...rtifactProvider.sourceCancellation.test.ts | 2 +- ...tifactProvider.universalExtraction.test.ts | 2 +- .../artifactProvider.zipCancellation.test.ts | 4 +- .../native/lipoFieldOwnership.test.ts | 2 +- .../native/lldbCallTracerFailures.test.ts | 2 +- .../native/nativeCallTargetCleanup.test.ts | 2 +- .../native/nativeDmgArtifactReader.test.ts | 4 +- .../native/nativePlistBinarySource.test.ts | 2 +- .../native/nativePlistFileCleanup.test.ts | 6 +- .../native/nativeSelectedArchitecture.test.ts | 2 +- .../nativeSignatureTargetBinding.test.ts | 2 +- .../native/nativeUiFinalization.test.ts | 2 +- .../native/objcClassMetadataFallback.test.ts | 4 +- .../providers/ownedCommandCleanup.test.ts | 2 +- .../readinessRemediationInventory.test.ts | 2 +- .../linuxHopperPublisherVerification.test.ts | 2 +- .../signals/recordingEnvironment.test.ts | 2 +- .../signals/recordingProvider.test.ts | 2 +- .../sqliteDatabaseDescriptorCleanup.test.ts | 4 +- .../sqlite/sqliteDatabaseFailures.test.ts | 2 +- .../sqlite/sqliteDatabaseSnapshot.test.ts | 4 +- .../backwardCallerEvidence.test.ts | 4 +- .../analysis-sessions/binarySession.test.ts | 4 +- .../binarySessionCleanupRetry.test.ts | 4 +- .../compositeProvider.test.ts | 4 +- .../analysis-sessions/providerBinding.test.ts | 2 +- tests/composition/callPathGraphOracle.test.ts | 2 +- .../callPathParserOperation.test.ts | 2 +- .../composition/directAnalysisCleanup.test.ts | 2 +- .../directAnalysisLimitations.test.ts | 2 +- tests/composition/idaProvider.test.ts | 2 +- .../reverseEngineeringCommandPort.test.ts | 2 +- .../reverseEngineeringUnknownFailures.test.ts | 2 +- .../sourcePublicationOneShot.test.ts | 2 +- .../webCaptureDeliveryRedaction.test.ts | 2 +- .../contracts/analysisErrorProjection.test.ts | 6 +- tests/conformance/providerCompletion.test.ts | 2 +- tests/evaluation/moduleBoundaries.test.ts | 174 +++++++- tests/evaluation/moduleLayers.test.ts | 138 +++++- tests/fixtures/analysisExecution.ts | 2 +- tests/fixtures/artifactInventory.ts | 4 +- tests/fixtures/artifactReaderLifecycle.ts | 2 +- tests/fixtures/artifactResourceScope.ts | 2 +- tests/fixtures/binarySession.ts | 2 +- tests/fixtures/composedWorkflowEvidence.ts | 2 +- tests/fixtures/directAnalysisInterrupt.mjs | 2 +- tests/fixtures/evm/interface.ts | 4 +- tests/fixtures/flutterVerifierPreload.mjs | 2 +- tests/fixtures/inspectionResources.ts | 6 +- tests/fixtures/javascriptArtifactAnalysis.ts | 2 +- tests/fixtures/mcpToolCatalog.ts | 2 +- tests/fixtures/mcpToolError.ts | 2 +- .../fixtures/optionalObservationProviders.ts | 4 +- tests/fixtures/outputTreeCommit.ts | 2 +- tests/fixtures/referenceReaderFifoProbe.mjs | 2 +- tests/fixtures/wasm/artifact.ts | 4 +- tests/fixtures/webModuleTrace.ts | 2 +- tests/fixtures/webSourceLocation.ts | 2 +- .../apkSignatureLifecycle.test.ts | 2 +- .../artifactFileSourceLifecycle.test.ts | 4 +- .../artifactReadFailurePrecedence.test.ts | 4 +- .../assetCatalogCancellationReason.test.ts | 2 +- .../binaryTargetAdmissionCancellation.test.ts | 4 +- .../browserScenarioCleanup.test.ts | 2 +- .../bundleComparisonFailures.test.ts | 4 +- .../commandFinalizationCancellation.test.ts | 2 +- .../derivedOperationFailures.test.ts | 2 +- .../dmgCancellationReason.test.ts | 2 +- .../process-global/dylibFileLifetime.test.ts | 6 +- .../firmwareFileLifetime.test.ts | 8 +- .../firmwarePublicationDeadline.test.ts | 2 +- .../ghidraEndpointLifetime.test.ts | 4 +- .../ghidraImportSnapshotLifetime.test.ts | 6 +- .../ghidraProjectReadCancellation.test.ts | 8 +- ...historicalCaptureSnapshotRedaction.test.ts | 4 +- .../historicalCaptureSourceSnapshots.test.ts | 2 +- .../idaWorkspaceCleanup.test.ts | 4 +- .../javascriptAnalysisCancellation.test.ts | 8 +- .../javascriptArtifactVerification.test.ts | 2 +- .../javascriptRuntimeObservationCli.test.ts | 2 +- .../managedBundleReadGuards.test.ts | 2 +- .../mcpDeliveryEnvironment.test.ts | 2 +- .../oneShotSourceClosure.test.ts | 4 +- .../processSnapshotCleanupMcp.test.ts | 2 +- .../pwntoolsStageRetirement.test.ts | 4 +- .../referenceSourceCancellation.test.ts | 2 +- .../referenceSourceSymlinkRace.test.ts | 2 +- .../selectedArtifactSourceLifecycle.test.ts | 2 +- .../setupConfigurationRollback.test.ts | 12 +- tests/process-global/shortFileReads.test.ts | 2 +- .../sourceToBundleReferenceGuards.test.ts | 2 +- .../stableArtifactConsumers.test.ts | 10 +- .../windowsRuntimeAdmission.test.ts | 2 +- tests/support/artifactClientScope.ts | 2 +- tests/support/cli/apktoolCli.ts | 2 +- tests/support/javascriptApplicationScope.ts | 4 +- .../support/publishedDirectoryCloseFailure.ts | 2 +- 1391 files changed, 5011 insertions(+), 3705 deletions(-) create mode 100644 .git-blame-ignore-revs create mode 100644 docs/adr/architecture/provider-entry-files.md delete mode 100644 src/application/HopperLauncherDiscovery.ts rename src/{native/pwntools/PwntoolsInputLimit.test.ts => config/pwntoolsInputLimit.test.ts} (88%) rename src/{native/pwntools/PwntoolsInputLimit.ts => config/pwntoolsInputLimit.ts} (91%) create mode 100644 src/domain/analysisErrorProjectionSchema.ts rename src/{process/PrivateRuntimeRootUnavailableError.ts => domain/privateRuntimeRootUnavailableError.ts} (87%) rename src/{process/RuntimeControlUnavailableError.ts => domain/runtimeControlUnavailableError.ts} (94%) rename src/{application/SetupCancellation.ts => domain/setupCancellation.ts} (84%) rename src/{config/kunaCacheDirectory.ts => filesystem/cacheDirectory.ts} (96%) rename src/{application => }/frida/fridaInputErrors.ts (91%) create mode 100644 src/hopperPaths/HopperLauncherDiscovery.test.ts create mode 100644 src/hopperPaths/HopperLauncherDiscovery.ts create mode 100644 src/hopperPaths/LinuxHopperPaths.ts rename src/{application => hopperPaths}/MacHopperPaths.test.ts (97%) rename src/{application => hopperPaths}/MacHopperPaths.ts (100%) rename src/{application => ports}/AnalysisProvider.test.ts (100%) rename src/{application => ports}/AnalysisProvider.ts (100%) rename src/{application => ports}/AnalysisWorkScope.ts (100%) rename src/{application => ports}/BrowserObservationPort.ts (100%) rename src/{application => ports}/BrowserScenarioCapturePort.ts (100%) create mode 100644 src/ports/DesktopBuildHost.ts create mode 100644 src/ports/DoctorProviderInspection.ts create mode 100644 src/ports/LinuxHopperLauncherVerification.ts rename src/{application => ports}/OptionalObservationProviders.ts (100%) rename src/{application => ports}/ProgressReporter.test.ts (100%) rename src/{application => ports}/ProgressReporter.ts (100%) rename src/{application => ports}/ProviderInspectionScope.ts (100%) rename src/{application => ports}/WebModulePorts.ts (100%) rename src/{application => ports}/WebRuntimePort.ts (100%) rename src/{application => ports}/WebScriptArtifactPort.ts (100%) rename src/{application => ports}/WebSourceLocationPorts.ts (100%) rename src/{application => ports}/android/AndroidAnalysisPort.ts (100%) rename src/{application => ports}/apkSignature/ApkSignaturePort.ts (100%) rename src/{application => ports}/artifacts/DesktopApplicationPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/AppleIpsPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/BinaryHardeningPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/BinaryLayoutPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/DevicetreePort.ts (100%) rename src/{application => ports}/binaryDiagnostics/ElfNotesPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/ElfUnwindRangesPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/KernelBuildConfigPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/KernelModulePort.ts (100%) rename src/{application => ports}/binaryDiagnostics/NativeExportsPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/NativeInitializersPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/PeCertificatesPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/PeImportsPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/PeLoadConfigPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/PeResourcesPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/RecordedCrashPort.ts (100%) rename src/{application => ports}/binaryDiagnostics/WindowsShortcutPort.ts (100%) create mode 100644 src/ports/captures/PacketCapturePort.ts rename src/{application => ports}/electron/ElectronFusePort.ts (100%) rename src/{application => ports}/erlang/BeamPort.ts (100%) rename src/{application => ports}/evm/EvmInterfacePort.ts (100%) rename src/{application => ports}/firmware/FirmwareAnalysisPort.ts (100%) rename src/{application => ports}/frida/FridaInstrumentationPort.ts (100%) rename src/{application => ports}/go/GoBinaryPort.ts (100%) rename src/{application => ports}/gpu/GpuCodeObjectsPort.ts (100%) rename src/{application => ports}/il2cpp/Il2cppMetadataPort.ts (100%) rename src/{application => ports}/il2cpp/Il2cppSeedWriterPort.ts (100%) rename src/{application => ports}/javascript/ElectronActiveObservationPort.ts (100%) rename src/{application => ports}/javascript/ElectronObservationPort.ts (100%) rename src/{application => ports}/javascript/JavaScriptRecoveryPort.ts (100%) rename src/{application => ports}/javascript/JavaScriptRuntimeObservationPort.ts (100%) rename src/{application => ports}/jeb/JebAnalysisPort.ts (100%) rename src/{application => ports}/model/ModelArtifactPort.ts (100%) rename src/{application => ports}/playwrightTrace/PlaywrightTracePort.ts (100%) rename src/{application => ports}/python/PythonPycPort.ts (100%) rename src/{application => ports}/releaseExposure/ReleaseExposurePort.ts (100%) rename src/{application => ports}/rust/RustBinaryPort.ts (100%) create mode 100644 src/ports/signals/SignalRecordingPort.ts rename src/{application => ports}/sqlite/SqliteDatabasePort.ts (100%) rename src/{application => ports}/v8CodeCache/V8CodeCachePort.ts (100%) rename src/{application => ports}/wasm/WasmArtifactPort.ts (100%) rename src/{application => process}/RegularFileRead.ts (97%) rename src/{application/binary => providers}/AnalysisClientCleanup.test.ts (90%) rename src/{application => providers}/AnalysisClientCleanup.ts (95%) rename src/{application => providers}/ownedProcessAvailability.test.ts (100%) rename src/{application => providers}/ownedProcessAvailability.ts (98%) rename src/{artifacts => resources}/AnalysisCleanupLease.test.ts (100%) rename src/{artifacts => resources}/AnalysisCleanupLease.ts (100%) rename src/{artifacts => resources}/ArtifactFileOperation.ts (100%) rename src/{artifacts => resources}/ArtifactPaths.test.ts (100%) rename src/{artifacts => resources}/ArtifactPaths.ts (100%) rename src/{artifacts => resources}/ArtifactReader.test.ts (100%) rename src/{artifacts => resources}/ArtifactReader.ts (100%) rename src/{artifacts => resources}/ArtifactResourceScope.test.ts (99%) rename src/{artifacts => resources}/ArtifactResourceScope.ts (96%) rename src/{artifacts => resources}/SafeOutputTree.ts (100%) rename src/{artifacts => resources}/SafeOutputTreeAdmission.test.ts (100%) rename src/{artifacts => resources}/SafeOutputTreeAdmission.ts (100%) rename src/{artifacts => resources}/SafeOutputTreeCleanup.ts (100%) rename src/{artifacts => resources}/SafeOutputTreeCreationFailure.ts (100%) rename src/{artifacts => resources}/SafeOutputTreeIdentity.ts (100%) rename src/{artifacts => resources}/SafeOutputTreeReadback.ts (100%) rename src/{artifacts => resources}/StableArtifactFailure.ts (100%) rename src/{artifacts => resources}/StableArtifactObservation.ts (100%) rename src/{artifacts => resources}/StreamBytes.ts (100%) create mode 100644 src/resources/TextFileWrite.ts create mode 100644 src/resources/index.ts rename src/{artifacts => resources}/readArtifactFileChunks.ts (100%) rename src/{artifacts => resources}/readStableArtifact.ts (100%) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..5932250207 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,10 @@ +# Commits on main that only move files or rewrite import paths. +# Use with: git config blame.ignoreRevsFile .git-blame-ignore-revs +# +# Each entry is the full SHA of the commit as it landed on main (squash and +# rebase merges give a PR's commits new SHAs), so a move is listed by a later +# change once it has merged. Add a commit only when it contains nothing but +# `git mv` renames, import specifier updates and the matching layer baseline. + +# refactor(domain): move the source map format parser into src/domain (#11348) +97112f14a1f21a21a91578b5371fe4dfbfbb7835 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 063b71c47e..e5d2ea46f0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,6 +23,16 @@ Production factories construct fresh providers without starting engines or acquiring targets; optional adapter failures must preserve successful peers. Run `npm run verify:test-discovery` after adding or moving tests. Resolved import boundaries are checked by `npm run verify:module-boundaries`, included in lint. +It also checks each top-level `src/` unit against its layer in +[`scripts/lib/module-layers.mjs`](scripts/lib/module-layers.mjs) (a new +directory must declare one) and against the counted outward, mutual, +cross-provider and past-entry imports in +`scripts/lib/module-layers.baseline.json`. Application, composition and the +adapters import a provider through the entry files it declares in that table +([decision](docs/adr/architecture/provider-entry-files.md)); a new entry file +widens the provider's public surface. The baseline may only shrink: a +change that removes such imports lowers it with +`node scripts/verify-module-boundaries.mjs --shrink-layer-baseline`. Before retiring an alias or facade, trace runtime registration, dynamic imports, JavaScript verifiers, subprocess scripts, and packaged entrypoints as well as @@ -273,6 +283,12 @@ and version provenance, update license notices when needed, and report which verification was actually repeated. The lab requirements describe a recorded environment; a dependency update does not verify the revised environment. +Commits that only move files or rewrite import paths are listed in +`.git-blame-ignore-revs`; run +`git config blame.ignoreRevsFile .git-blame-ignore-revs` once so `git blame` +attributes lines to the change that wrote them. Move files with `git mv` and +keep such a commit free of other edits. + Repository invariants live in [AGENTS.md](AGENTS.md). Keep provider-specific protocols in adapters and shared CLI/MCP workflows in the application layer. diff --git a/docs/adr/architecture/provider-entry-files.md b/docs/adr/architecture/provider-entry-files.md new file mode 100644 index 0000000000..dbcfba9455 --- /dev/null +++ b/docs/adr/architecture/provider-entry-files.md @@ -0,0 +1,63 @@ +# Declare each provider's entry files instead of a provider barrel + +## Status + +Accepted, 2026-11-15. Decided in issues #11358 and #11360. + +## Context + +Application, composition and the CLI/MCP adapters import provider folders +(`src/ghidra/`, `src/native/`, ...) directly. On 2026-11-15, 238 such imports +reached 167 files in 39 provider folders. Nothing stated which of those files a +provider meant to expose. + +The rule for `src/domain` subsystems in +[domain-subsystems.md](domain-subsystems.md) is one `index.ts` per module. +A prototype with an `index.ts` for each provider showed that this does not fit +providers. Composition, the capability declarations and the CLI load single +provider files on purpose: some through dynamic `import()`, some for metadata +only, so that unused providers are never loaded. A barrel pulls in everything +it re-exports. Static runtime import closure, measured on the prototype: + +| Importer | Single files | Through `index.ts` | +| --------------------------------- | ------------ | ------------------ | +| `capabilityDeclarations` | 55 | 1408 | +| `doctorRuntime.ts` | 1081 | 1255 | +| `javascriptAnalysisWorkerProcess` | 225 | 334 | +| `webSourceLocations` | 161 | 226 | + +A separate metadata entry kept `capabilityDeclarations` at 87 files, but it +would need two entries and a barrel discipline in every provider. + +## Decision + +`ENTRY_FILES` in `scripts/lib/module-layers.mjs` lists each provider's entry +files, relative to `src//`. These are the files that composition and +the adapters wire: provider classes, identities, metadata, worker servers, +doctors and commands. The module-boundary check counts every application, +composition or adapter import of any other provider file in the `entry` map of +`scripts/lib/module-layers.baseline.json`. That count may only shrink. + +- **Seed.** The entry files are the provider files that composition and the + adapters imported when the rule was added. Application imports of other + provider files stay counted (67 imports: 41 into `desktop`, 11 into + `artifacts`, 8 into `reference`, 3 into `dotnet`, 2 into `browser` and 2 + into `frida`), because application should reach that code through ports. +- **Surface growth.** A new entry file is a reviewed change to the provider's + public surface, and it appears in the diff of `module-layers.mjs`. +- **Other units.** `src/resources`, the shared provider toolkit, declares its + `index.ts` as its only entry file. Every other unit reaches it through that + file. +- **Provider to provider.** The entry rule does not apply here. Every import of + another provider folder is already counted in the `crossProvider` map. +- **Not decided here.** No `index.ts` per provider, and no change to the domain + subsystem rule. + +## Consequences + +- Each provider's public surface is written down, and lazy and metadata-only + loading stays as it is. +- A rename of an entry file must update the table. A unit test fails when an + entry file does not exist. +- The table states only which files are public, not which symbols. Symbol + growth inside an entry file is not reported. diff --git a/docs/architecture/architecture.mermaid b/docs/architecture/architecture.mermaid index 825b0c9b4f..58d290b575 100644 --- a/docs/architecture/architecture.mermaid +++ b/docs/architecture/architecture.mermaid @@ -1,6 +1,24 @@ graph TD %% Selected layer owners and dependency/wiring paths, not a directory or import inventory. %% Current deep-provider candidates are wired in src/composition/binary.ts. + %% Layers, innermost first: domain, contracts, foundation, ports (src/ports/: + %% interfaces providers implement), providerCore (src/providers/: the shared + %% provider core), providers, application, composition, adapters. An import may point to the same or an + %% inner layer. scripts/lib/module-layers.mjs declares the layer of every + %% top-level src/ directory and root file; verify:module-boundaries fails on + %% an undeclared unit and ratchets the recorded outward imports and mutual + %% imports in scripts/lib/module-layers.baseline.json. + %% Provider boundary: a provider folder (src/ghidra/, src/native/, ...) + %% imports inner layers, including the shared provider core (src/providers/, + %% which may not import a provider folder), and its own files. Importing another provider folder is recorded debt + %% unless PROVIDER_DEPENDENCIES declares the file (inspector -> browser CDP + %% client); shared pieces belong in + %% ports, foundation or the provider core. Application, composition and + %% adapters reach a provider through the entry files it declares in + %% scripts/lib/module-layers.mjs (ENTRY_FILES; no per-provider barrel). + %% Every unit reaches the shared provider toolkit (src/resources/) through + %% src/resources/index.ts. + %% The baseline counts both kinds of import per unit pair; both only shrink. subgraph "Entry Points" CLI["src/cli.ts + src/cli/
One-shot CLI adapter
setup, diagnostics, analysis, decompilation
cliLoader: recorded registrar per command, complete CLI otherwise"] MAIN["src/main.ts + src/main/
MCP server adapter: stdio default, streamable HTTP opt-in
config, session, process lifetime"] @@ -67,11 +85,13 @@ graph TD WINDOWS["src/windows/
Windows host boundary adapters
package loader, opaque handles, owned jobs and private runtimes"] WINDOWS_NATIVE["native/windows/src/
Node-API implementation
NTFS/ReFS admission, protected DACLs and atomic Job Object assignment"] FILESYSTEM["src/filesystem/
owned file and directory handles
stable reads, staged output, caller paths"] + HOPPER_PATHS["src/hopperPaths/
Hopper install paths and launcher discovery
read by the Hopper provider, doctor and setup"] + RESOURCES["src/resources/
shared analysis resource owners
cleanup leases, artifact reader contract, resource scope, owned file operations, stable reads, atomic text writes"] end subgraph "Contracts Layer" CONTRACTS["src/contracts/
Caller-visible schemas for analysis, reverse engineering, managed, browser, Electron, application, and session tools"] - ERRORS["src/contracts/errorSchemas.ts
Shared analysis error schemas
CLI diagnostics, generated error catalog"] + ERRORS["src/contracts/errorSchemas.ts
CLI error envelope and published error JSON Schema
projection schema owned by src/domain/analysisErrorProjectionSchema.ts"] end subgraph "Domain Layer" @@ -206,5 +226,9 @@ graph TD COMPOSITION --> RUNTIME RUNTIME --> DOMAIN PROCESS --> FILESYSTEM + PROCESS --> RESOURCES + HOPPER --> HOPPER_PATHS + APP --> HOPPER_PATHS + HOPPER_PATHS --> FILESYSTEM AUX --> FILESYSTEM APP --> FILESYSTEM diff --git a/docs/design/rea-limit-inventory.md b/docs/design/rea-limit-inventory.md index b9059f258b..b23250835d 100644 --- a/docs/design/rea-limit-inventory.md +++ b/docs/design/rea-limit-inventory.md @@ -96,22 +96,22 @@ floor, and maximum. The accepted operation snapshot supplies the value. force. An update outside the range is rejected. A hit names the setting and reports the current value, source, and range. A rejected Windows ChangeTime launch value omits `pending_restart`. -| Environment | Owner | Default | Floor | Maximum | Applies | Fields | -| --------------------------------------------- | ------------------------------------------- | ----------------------: | ------: | -----------: | ------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------- | -| `REA_BRIDGE_MAX_REQUEST_BYTES` | `src/config/bridgeMaxRequestBytes.ts` | 16777216 | 7464 | 536870887 | each bridge request, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_BRIDGE_MAX_REPLY_BYTES` | `src/config/bridgeMaxReplyBytes.ts` | 268435456 | 1048576 | 536870888 | each Hopper or Ghidra request, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_CAPTURE_PACKET_JSON_EXPANSION_BYTES` | `src/config/capturePacketJsonExpansion.ts` | 137438953472 | 1048576 | 137438953472 | each packet-capture reply before parsing, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_DEBUGGER_COMMAND_DEADLINE_MS` | `src/domain/analysisResourceLimits.ts` | 120000 | 1 | 2147483647 | each command, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_DEBUGGER_MAX_COMMAND_OUTPUT_BYTES` | `src/domain/analysisResourceLimits.ts` | 16777216 | 1 | 89303718 | each command, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_HOPPER_CALLER_SCAN_BUDGET_MS` | `src/domain/analysisResourceLimits.ts` | 2000 | 1 | 2147483647 | each caller scan, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_JAVASCRIPT_MEMBER_MUTATION_ALIAS_STATES` | `src/domain/analysisResourceLimits.ts` | 524288 | 1 | 8388608 | each JavaScript source's member-mutation phase, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_JEB_MCP_TIMEOUT_MS` | `src/jeb/JebMcpConnection.ts` | 60000 (MCP SDK default) | 1 | 2147483647 | discovery and each tools/call, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_KUNA_PROJECT_TIMEOUT_MS` | `src/kuna/KunaConfiguration.ts` | 1800000 | 1 | 2147483647 | each project export and whole-program scan, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_KUNA_TIMEOUT_MS` | `src/kuna/KunaConfiguration.ts` | 120000 | 1 | 2147483647 | each function decompile, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_PWNTOOLS_MAX_INPUT_BYTES` | `src/native/pwntools/PwntoolsInputLimit.ts` | 33554432 | 1 | 1073741824 | each pwntools decode, unless the call passes `producer_limits.input_bytes`; otherwise the operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | -| `REA_WINDOWS_CHANGE_TIME_DRIFT_MS` | `src/config/windowsChangeTimeSettle.ts` | 2000 | 1 | 60000 | each ChangeTime observation, from the accepted operation snapshot | `update_mode: "runtime"`; invalid launch omits `pending_restart` | -| `REA_WINDOWS_CHANGE_TIME_SETTLE_POLL_MS` | `src/config/windowsChangeTimeSettle.ts` | 25 | 1 | 1000 | each ChangeTime observation, from the accepted operation snapshot | `update_mode: "runtime"`; invalid launch omits `pending_restart` | -| `REA_WINDOWS_CHANGE_TIME_SETTLE_MAX_POLLS` | `src/config/windowsChangeTimeSettle.ts` | 40 | 1 | 1000 | each ChangeTime observation, from the accepted operation snapshot | `update_mode: "runtime"`; invalid launch omits `pending_restart` | +| Environment | Owner | Default | Floor | Maximum | Applies | Fields | +| --------------------------------------------- | ------------------------------------------ | ----------------------: | ------: | -----------: | ------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------- | +| `REA_BRIDGE_MAX_REQUEST_BYTES` | `src/config/bridgeMaxRequestBytes.ts` | 16777216 | 7464 | 536870887 | each bridge request, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_BRIDGE_MAX_REPLY_BYTES` | `src/config/bridgeMaxReplyBytes.ts` | 268435456 | 1048576 | 536870888 | each Hopper or Ghidra request, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_CAPTURE_PACKET_JSON_EXPANSION_BYTES` | `src/config/capturePacketJsonExpansion.ts` | 137438953472 | 1048576 | 137438953472 | each packet-capture reply before parsing, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_DEBUGGER_COMMAND_DEADLINE_MS` | `src/domain/analysisResourceLimits.ts` | 120000 | 1 | 2147483647 | each command, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_DEBUGGER_MAX_COMMAND_OUTPUT_BYTES` | `src/domain/analysisResourceLimits.ts` | 16777216 | 1 | 89303718 | each command, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_HOPPER_CALLER_SCAN_BUDGET_MS` | `src/domain/analysisResourceLimits.ts` | 2000 | 1 | 2147483647 | each caller scan, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_JAVASCRIPT_MEMBER_MUTATION_ALIAS_STATES` | `src/domain/analysisResourceLimits.ts` | 524288 | 1 | 8388608 | each JavaScript source's member-mutation phase, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_JEB_MCP_TIMEOUT_MS` | `src/jeb/JebMcpConnection.ts` | 60000 (MCP SDK default) | 1 | 2147483647 | discovery and each tools/call, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_KUNA_PROJECT_TIMEOUT_MS` | `src/kuna/KunaConfiguration.ts` | 1800000 | 1 | 2147483647 | each project export and whole-program scan, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_KUNA_TIMEOUT_MS` | `src/kuna/KunaConfiguration.ts` | 120000 | 1 | 2147483647 | each function decompile, from the accepted operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_PWNTOOLS_MAX_INPUT_BYTES` | `src/config/pwntoolsInputLimit.ts` | 33554432 | 1 | 1073741824 | each pwntools decode, unless the call passes `producer_limits.input_bytes`; otherwise the operation snapshot | `update_mode: "runtime"`, `pending_restart: false` | +| `REA_WINDOWS_CHANGE_TIME_DRIFT_MS` | `src/config/windowsChangeTimeSettle.ts` | 2000 | 1 | 60000 | each ChangeTime observation, from the accepted operation snapshot | `update_mode: "runtime"`; invalid launch omits `pending_restart` | +| `REA_WINDOWS_CHANGE_TIME_SETTLE_POLL_MS` | `src/config/windowsChangeTimeSettle.ts` | 25 | 1 | 1000 | each ChangeTime observation, from the accepted operation snapshot | `update_mode: "runtime"`; invalid launch omits `pending_restart` | +| `REA_WINDOWS_CHANGE_TIME_SETTLE_MAX_POLLS` | `src/config/windowsChangeTimeSettle.ts` | 40 | 1 | 1000 | each ChangeTime observation, from the accepted operation snapshot | `update_mode: "runtime"`; invalid launch omits `pending_restart` | ## Restart-only numeric limits diff --git a/docs/specs/artifacts/deno-standalone/plan.md b/docs/specs/artifacts/deno-standalone/plan.md index b0ea3b54cf..f616aa1a10 100644 --- a/docs/specs/artifacts/deno-standalone/plan.md +++ b/docs/specs/artifacts/deno-standalone/plan.md @@ -23,7 +23,7 @@ section placement: specifier, redirect and remote tables, and the npm snapshot length. - `DenoVirtualFs.ts` walks directories, files and symlinks into safe logical paths with indexed fallbacks, using `ArtifactPathRegistry.conflicts` in - `src/artifacts/ArtifactPaths.ts` to avoid occupied paths. + `src/resources/ArtifactPaths.ts` to avoid occupied paths. - `DenoStandaloneAdmission.ts` binds the located carrier to the admitted file. `src/artifacts/DenoStandaloneArtifactReader.ts` projects members, metadata, diff --git a/scripts/ci/scopes.mjs b/scripts/ci/scopes.mjs index 4e3c07c7b1..2348181207 100644 --- a/scripts/ci/scopes.mjs +++ b/scripts/ci/scopes.mjs @@ -45,6 +45,7 @@ const PATH_SCOPES = { "src/contracts/pcap/**", "src/domain/captures/**", "src/application/captures/**", + "src/ports/captures/**", "src/contracts/captures/**", "src/composition/captures.ts", "src/cli/captureCommands.ts", @@ -60,6 +61,7 @@ const PATH_SCOPES = { "src/signals/**", "src/domain/signals/**", "src/application/signals/**", + "src/ports/signals/**", "src/contracts/signals/**", "src/composition/signals.ts", "src/cli/signalCommands.ts", @@ -258,6 +260,7 @@ const PATH_SCOPES = { "scripts/lib/runtime-admission.d.mts", "install.sh", "src/config/**", + "src/hopperPaths/**", // The darwin package baseline runs packaged Hopper commands against the // fake bridge, through the reply contracts and the domain schemas they // are built from. Check a change to either side before merge, not after. @@ -342,11 +345,12 @@ const PATH_SCOPES = { "src/domain/sqlite/**", "src/contracts/sqlite/**", "src/application/sqlite/**", + "src/ports/sqlite/**", "src/composition/sqlite.ts", "src/cli/sqliteCommands.ts", "src/application/DirectAnalysisStatus*.ts", "src/application/CapabilityInventory*.ts", - "src/application/AnalysisProvider*.ts", + "src/ports/AnalysisProvider*.ts", "src/contracts/toolContracts.ts", "src/contracts/toolContractTypes.ts", "src/contracts/toolEffects*.ts", @@ -364,9 +368,10 @@ const PATH_SCOPES = { "src/process/ProviderProcess*.ts", "src/process/PrivateRuntimeRoot*.ts", "src/artifacts/ArtifactReader*.ts", - "src/artifacts/ArtifactResourceScope*.ts", - "src/artifacts/ArtifactPaths*.ts", - "src/artifacts/readStableArtifact*.ts", + "src/resources/ArtifactReader*.ts", + "src/resources/ArtifactResourceScope*.ts", + "src/resources/ArtifactPaths*.ts", + "src/resources/readStableArtifact*.ts", "src/filesystem/OwnedFileHandle*.ts", "src/server/EvidenceMcpServer*.ts", "src/server/analysisAdmission*.ts", @@ -408,12 +413,14 @@ const PATH_SCOPES = { "src/domain/analysisView/{EnvironmentManifest*,EnvironmentState*}.ts", "src/domain/analysisView/{scenarioCaptureRecords,recordedResponseBody,recordedExchangeBody,recordedMediaType,webNetworkRouteTemplates,WebNetworkProjectionAccumulator}.ts", "src/application/BrowserScenario*.ts", + "src/ports/BrowserScenario*.ts", "src/application/environment/**", "src/application/WebModule*.ts", + "src/ports/WebModule*.ts", "src/composition/browserScenario.ts", "src/composition/webModules.ts", - "src/artifacts/readStableArtifact.ts", - "src/artifacts/ArtifactPaths.ts", + "src/resources/readStableArtifact.ts", + "src/resources/ArtifactPaths.ts", "src/application/WebScriptExportService.ts", "src/contracts/webScriptToolContracts.ts", "src/server/registerWebScriptTool.ts", @@ -430,8 +437,10 @@ const PATH_SCOPES = { ".github/workflows/real-binary-layout.yml", "bridge/pwntools/**", "src/native/pwntools/**", + "src/config/pwntoolsInputLimit*.ts", "src/domain/native/binaryLayout*", "src/application/binaryDiagnostics/**", + "src/ports/binaryDiagnostics/**", "src/contracts/native/binaryDiagnosticsToolContracts.ts", "src/composition/binaryDiagnostics.ts", "src/server/registerBinaryDiagnosticsTools.ts", @@ -446,8 +455,8 @@ const PATH_SCOPES = { "src/process/ProviderDeadline.ts", "src/process/ProcessOwnership*.ts", "src/process/PrivateRuntimeRoot.ts", - "src/artifacts/readStableArtifact*.ts", - "src/artifacts/ArtifactReader.ts", + "src/resources/readStableArtifact*.ts", + "src/resources/ArtifactReader.ts", "src/domain/analysisError*.ts", "scripts/verify-binary-layout.mjs", "scripts/lib/elf-section-name-fixtures.mjs", @@ -459,6 +468,7 @@ const PATH_SCOPES = { "src/evm/**", "src/domain/evm/**", "src/application/evm/**", + "src/ports/evm/**", "src/contracts/evm/**", "src/composition/evm.ts", "src/cli/evmCommands.ts", @@ -472,8 +482,8 @@ const PATH_SCOPES = { "src/process/ProcessOwnership*.ts", "src/process/ProviderDeadline.ts", "src/process/PrivateRuntimeRoot.ts", - "src/artifacts/readStableArtifact*.ts", - "src/artifacts/ArtifactReader.ts", + "src/resources/readStableArtifact*.ts", + "src/resources/ArtifactReader.ts", "scripts/verify-evm-interface.mjs", "scripts/verify-solidity-metadata.mjs", "scripts/fixtures/evm-interface.sol", @@ -484,6 +494,7 @@ const PATH_SCOPES = { "src/domain/apkSignature/**", "src/apkSignature/**", "src/application/apkSignature/**", + "src/ports/apkSignature/**", "src/composition/apkSignature.ts", "src/contracts/apkSignature/**", "src/cli/apkSignatureCommands.ts", @@ -493,6 +504,7 @@ const PATH_SCOPES = { "src/application/analysisView/**", "src/cli/analysisEvidenceDelivery.ts", "src/artifacts/**", + "src/resources/**", "scripts/verify-apk-signature.mjs", "tests/fixtures/apkSignature/**", "tests/acceptance/apkSignature*.test.ts", @@ -502,6 +514,7 @@ const PATH_SCOPES = { "src/javascript/recovery/**", "src/domain/javascript/**", "src/application/javascript/JavaScriptRecovery*.ts", + "src/ports/javascript/JavaScriptRecovery*.ts", "src/composition/javascriptRecovery.ts", "src/contracts/javascript/javascriptRecoveryToolContracts.ts", "src/cli/javascriptRecoveryCommands.ts", @@ -518,7 +531,7 @@ const PATH_SCOPES = { "scripts/lib/runtime-admission.mjs", "scripts/lib/runtime-admission.d.mts", "src/process/**", - "src/artifacts/SafeOutputTree.ts", + "src/resources/SafeOutputTree.ts", "scripts/verify/javascript/recovery.mjs", "scripts/fixtures/javascript-recovery/**", "third_party/wakaru", @@ -528,9 +541,11 @@ const PATH_SCOPES = { "bridge/pwntools/**", "bridge/pwndbg/**", "src/native/pwntools/**", + "src/config/pwntoolsInputLimit*.ts", "src/native/pwndbg/**", "src/domain/native/recordedCrash*", "src/application/binaryDiagnostics/**", + "src/ports/binaryDiagnostics/**", "src/contracts/native/binaryDiagnosticsToolContracts.ts", "src/contracts/toolEffects.ts", "src/contracts/toolOutputSchemaGroups.ts", @@ -540,7 +555,7 @@ const PATH_SCOPES = { "src/cli/binaryDiagnosticsCommands.ts", "src/cliCommandNames.ts", "src/process/**", - "src/artifacts/readStableArtifact*.ts", + "src/resources/readStableArtifact*.ts", "src/domain/analysisError*.ts", "scripts/verify-recorded-crash.mjs", "scripts/verify/recorded-crash/**", @@ -572,8 +587,8 @@ const PATH_SCOPES = { "src/process/ProcessOwnership*.ts", "src/process/PrivateRuntimeRoot.ts", "src/process/capture/ProcessCaptureLifecycle.ts", - "src/artifacts/readStableArtifact*.ts", - "src/artifacts/ArtifactReader.ts", + "src/resources/readStableArtifact*.ts", + "src/resources/ArtifactReader.ts", "src/contracts/webNetworkCaptureToolContracts.ts", "scripts/verify-web-network-captures.mjs", "scripts/fixtures/generate-mitmproxy-capture.py", @@ -596,6 +611,7 @@ const PATH_SCOPES = { "src/domain/webEventListeners.ts", "src/domain/browserObservationError*.ts", "src/application/WebRuntime*.ts", + "src/ports/WebRuntime*.ts", "src/composition/webRuntime.ts", "src/contracts/webRuntimeToolContracts.ts", "src/contracts/toolEffects.ts", @@ -617,6 +633,7 @@ const PATH_SCOPES = { "src/domain/webSource*.ts", "src/domain/webScript*.ts", "src/application/WebSourceLocation*.ts", + "src/ports/WebSourceLocation*.ts", "src/application/ValidateSelectedWebScript.ts", "src/composition/webSourceLocations.ts", "src/server/createServer.ts", @@ -624,14 +641,16 @@ const PATH_SCOPES = { "src/process/**", "src/cli/webSourceLocationCommands.ts", "src/cli.ts", - "src/artifacts/readStableArtifact.ts", + "src/resources/readStableArtifact.ts", ], agentenv: [ ".github/workflows/real-agentenv.yml", "scripts/verify-agentenv-environment.mjs", "src/{application,server}/environment/**", - "src/application/{JsonInputFile,OwnedJsonInput,RegularFileRead}.ts", - "src/artifacts/{SafeOutputTree*,ArtifactResourceScope,StreamBytes}.ts", + "src/application/{JsonInputFile,OwnedJsonInput}.ts", + "src/resources/{SafeOutputTree*,StreamBytes}.ts", + "src/resources/ArtifactResourceScope.ts", + "src/process/RegularFileRead.ts", "src/cli/cliJsonInput.ts", "src/server/http/**", "src/{cli,cliCommandNames,cli/environmentCommands}.ts", diff --git a/scripts/lib/agent-evaluation-commands.mjs b/scripts/lib/agent-evaluation-commands.mjs index 77619024f2..5ebee1522a 100644 --- a/scripts/lib/agent-evaluation-commands.mjs +++ b/scripts/lib/agent-evaluation-commands.mjs @@ -7,8 +7,8 @@ import { prepareOwnedCommand, runOwnedCommand, } from "../../dist/process/OwnedCommand.js"; -import { ArtifactResourceScope } from "../../dist/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../../dist/artifacts/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../../dist/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../../dist/resources/AnalysisCleanupLease.js"; import { retainOwnedCommandCleanup } from "../../dist/providers/OwnedCommandCleanup.js"; /** Keep command ownership through failure and join cleanup before removing a run. */ diff --git a/scripts/lib/browser-runtime-fixture-lifecycle.mjs b/scripts/lib/browser-runtime-fixture-lifecycle.mjs index df6bfdfc20..f3eeba0258 100644 --- a/scripts/lib/browser-runtime-fixture-lifecycle.mjs +++ b/scripts/lib/browser-runtime-fixture-lifecycle.mjs @@ -8,8 +8,8 @@ import { spawnOwnedProviderProcess, } from "../../dist/process/ProviderProcess.js"; import { cleanupOwnedProcessGroup } from "../../dist/process/ProcessOwnership.js"; -import { ArtifactResourceScope } from "../../dist/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../../dist/artifacts/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../../dist/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../../dist/resources/AnalysisCleanupLease.js"; import { withVerifierCleanup } from "./verifier-cleanup.mjs"; import { discoverCdpEndpoint } from "../../dist/browser/CdpEndpoint.js"; import { BrowserObservationError } from "../../dist/domain/browserObservationError.js"; diff --git a/scripts/lib/mcp-verifier-results.mjs b/scripts/lib/mcp-verifier-results.mjs index 75b1163e4e..3b3dd89a64 100644 --- a/scripts/lib/mcp-verifier-results.mjs +++ b/scripts/lib/mcp-verifier-results.mjs @@ -1,6 +1,6 @@ import { isDeepStrictEqual } from "node:util"; import { authenticateParsedEvidenceBundle } from "../../dist/domain/evidenceBundle.js"; -import { analysisErrorProjectionSchema } from "../../dist/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../dist/domain/analysisErrorProjectionSchema.js"; import { toolContract } from "../../dist/contracts/toolContracts.js"; import { expandProviderCapabilities, diff --git a/scripts/lib/module-boundaries.mjs b/scripts/lib/module-boundaries.mjs index c58b468853..e2102fe21e 100644 --- a/scripts/lib/module-boundaries.mjs +++ b/scripts/lib/module-boundaries.mjs @@ -3,6 +3,7 @@ import { isAbsolute, relative, resolve } from "node:path"; import { fileURLToPath, pathToFileURL } from "node:url"; import { readImportSpecifiers } from "./import-specifiers.mjs"; +import { isLayerException } from "./module-layers.mjs"; const PURE_LAYERS = new Set(["domain", "contracts"]); const MIGRATED_PROVIDER_ROOTS = new Set([ @@ -125,7 +126,7 @@ const failedBoundary = (file, target, typeOnly) => { /^src\/(?:cli|main)\./u.test(target)) ) return "artifact-acquisition"; - if (PURE_LAYERS.has(layer)) { + if (PURE_LAYERS.has(layer) && !isLayerException(file, target)) { if ( (/^src\/[^/]+\//u.test(target) && !PURE_LAYERS.has(targetLayer)) || /^src\/(?:cli|main)\./u.test(target) diff --git a/scripts/lib/module-layers.baseline.json b/scripts/lib/module-layers.baseline.json index c7c0c50187..c432856a59 100644 --- a/scripts/lib/module-layers.baseline.json +++ b/scripts/lib/module-layers.baseline.json @@ -1,70 +1,54 @@ { "upward": { - "adb -> application": 4, - "android -> application": 10, - "apkSignature -> application": 3, - "apktool -> application": 3, "application -> catalogDiscovery.ts": 1, "application -> catalogIdentity.ts": 2, "application -> mcpStartupPolicy.ts": 3, "application -> serverIdentity.ts": 1, - "artifacts -> application": 8, - "browser -> application": 33, - "captures -> application": 2, + "artifacts -> application": 1, "composition -> cliCommandNames.ts": 3, - "config -> application": 2, - "config -> native": 1, - "desktop -> application": 5, - "domain -> contracts": 4, - "dotnet -> application": 4, - "electron -> application": 2, - "erlang -> application": 2, - "evm -> application": 2, - "firmware -> application": 4, - "flutter -> application": 1, - "frida -> application": 4, - "ghidra -> application": 17, - "go -> application": 2, - "gpu -> application": 2, - "hopper -> application": 13, - "ida -> application": 8, - "il2cpp -> application": 5, - "inspector -> application": 3, - "javascript -> application": 6, - "jeb -> application": 4, - "kuna -> application": 7, - "model -> application": 2, - "native -> application": 35, - "pcap -> application": 2, - "process -> artifacts": 20, - "providers -> application": 4, - "python -> application": 2, - "rust -> application": 2, - "signals -> application": 2, - "sqlite -> application": 2, - "v8 -> application": 2, - "wasm -> application": 2, - "windows -> artifacts": 2 + "dotnet -> application": 1 }, "cycles": [ "application <-> artifacts", - "application <-> browser", - "application <-> config", - "application <-> desktop", - "application <-> dotnet", - "application <-> frida", - "application <-> providers", - "artifacts <-> dotnet", - "artifacts <-> javascript", "artifacts <-> native", - "artifacts <-> process", "cli <-> cli.ts", "cli <-> cliBrowserScenarioCommands.ts", "cli <-> cliEvidenceCommands.ts", "cli <-> cliOutput.ts", - "config <-> filesystem", - "contracts <-> domain", - "main <-> server", - "process <-> windows" - ] + "main <-> server" + ], + "crossProvider": { + "android -> artifacts": 2, + "android -> native": 1, + "apktool -> artifacts": 2, + "artifacts -> dotnet": 3, + "artifacts -> javascript": 1, + "artifacts -> native": 2, + "browser -> artifacts": 6, + "browser -> electron": 5, + "browser -> javascript": 1, + "captures -> pcap": 2, + "desktop -> browser": 1, + "desktop -> electron": 1, + "electron -> artifacts": 2, + "flutter -> artifacts": 1, + "go -> native": 2, + "gpu -> artifacts": 2, + "gpu -> native": 5, + "il2cpp -> ghidra": 1, + "il2cpp -> native": 5, + "inspector -> browser": 2, + "kuna -> artifacts": 1, + "kuna -> native": 2, + "model -> artifacts": 1, + "native -> artifacts": 13, + "rust -> native": 2 + }, + "entry": { + "application -> artifacts": 11, + "application -> browser": 2, + "application -> desktop": 41, + "application -> frida": 2, + "application -> reference": 8 + } } diff --git a/scripts/lib/module-layers.d.mts b/scripts/lib/module-layers.d.mts index 242f755b9a..c7791da104 100644 --- a/scripts/lib/module-layers.d.mts +++ b/scripts/lib/module-layers.d.mts @@ -1,15 +1,64 @@ export declare const LAYER_ORDER: readonly string[]; export declare const UNIT_LAYERS: Readonly>; +/** Single file-to-file upward imports declared as deliberate exceptions. */ +export declare const LAYER_EXCEPTIONS: readonly { + readonly file: string; + readonly target: string; + readonly reason: string; +}[]; + +/** Whether one resolved import is a declared layer exception. */ +export function isLayerException(file: string, target: string): boolean; + /** The top-level unit of a production `src/` file, or undefined. */ export function sourceUnit(path: string): string | undefined; -export interface LayerGraphFacts { +/** Whether a unit is a provider folder. */ +export function isProviderUnit(unit: string): boolean; + +/** + * Declared entry files per unit, relative to src//: src/resources is + * reached only through them from every unit, a provider folder from + * application, composition and the CLI/MCP adapters. + */ +export declare const ENTRY_FILES: Readonly>; + +/** + * Declared provider-to-provider dependencies: files of `to`, relative to + * src//, that `from` may import without a crossProvider count. + */ +export declare const PROVIDER_DEPENDENCIES: readonly { + readonly from: string; + readonly to: string; + readonly files: readonly string[]; + readonly reason: string; +}[]; + +export interface ProviderBoundaryFacts { + /** Imports from one provider folder into another, per unit pair. */ + readonly crossProvider: Readonly>; + /** + * Imports past the entry files: application, composition and adapter + * imports of a provider file not in its ENTRY_FILES, and any outside import + * of another non-provider unit's file not in its ENTRY_FILES. + */ + readonly entry: Readonly>; +} + +export function providerBoundaryFacts( + imports: readonly { readonly file: string; readonly target: string }[], +): ProviderBoundaryFacts; + +export interface LayerGraphFacts extends ProviderBoundaryFacts { readonly undeclared: readonly string[]; readonly upward: Readonly>; readonly cycles: readonly string[]; } +export type LayerBaseline = Pick & + Partial; + export function layerGraphFacts( imports: readonly { readonly file: string; readonly target: string }[], files?: readonly string[], @@ -17,5 +66,10 @@ export function layerGraphFacts( export function compareLayerBaseline( facts: LayerGraphFacts, - baseline: Pick, + baseline: LayerBaseline, ): { readonly failures: string[]; readonly lowerable: string[] }; + +export function lowerLayerBaseline( + facts: LayerGraphFacts, + baseline: LayerBaseline, +): Required; diff --git a/scripts/lib/module-layers.mjs b/scripts/lib/module-layers.mjs index 2e592de912..850e7e0198 100644 --- a/scripts/lib/module-layers.mjs +++ b/scripts/lib/module-layers.mjs @@ -5,14 +5,18 @@ * its layer when it is added. * * The order follows docs/architecture/architecture.mermaid: domain and - * contracts at the centre, the process/filesystem foundation, provider - * adapters, shared application workflows, production composition, then the - * CLI and MCP entry points. + * contracts at the centre, the process/filesystem foundation, the ports + * that providers implement and application consumes, the shared provider + * core (src/providers), provider adapters, + * shared application workflows, production composition, then the CLI and + * MCP entry points. */ export const LAYER_ORDER = Object.freeze([ "domain", "contracts", "foundation", + "ports", + "providerCore", "providers", "application", "composition", @@ -29,13 +33,21 @@ export const UNIT_LAYERS = Object.freeze( "compression", "config", "filesystem", + "hopperPaths", "platform", "process", + "resources", "windows", "generatedPackageMetadata.ts", "identity.ts", "logger.ts", ]), + ...units("ports", ["ports"]), + // The shared provider core (src/providers): deferred client owners and + // failure attribution that every provider folder may import. It may not + // import a provider folder. + ...units("providerCore", ["providers"]), + // Every unit here is a provider folder; see providerBoundaryFacts. ...units("providers", [ "adb", "android", @@ -68,7 +80,6 @@ export const UNIT_LAYERS = Object.freeze( "native", "objdump", "pcap", - "providers", "python", "reference", "rizin", @@ -108,6 +119,32 @@ export const UNIT_LAYERS = Object.freeze( ]), ); +/** + * Single file-to-file imports that may point up the layer order. Each one is + * a deliberate decision, not a baseline debt: it is not counted, and any other + * import between the same units still is. Keep the list short and say why. + */ +export const LAYER_EXCEPTIONS = Object.freeze([ + Object.freeze({ + file: "src/domain/localPath.ts", + target: "src/platform/HostPlatform.ts", + // `absoluteLocalPathStringSchema` states which paths are absolute on the + // host running REA; that is a fact about the host's path rules, and + // HostPlatform is its only reader (maintainer decision, W8). + reason: + "the absolute local path schema follows the running host's path rules", + }), +]); + +const sourcePath = (path) => path.replace(/\.js$/u, ".ts"); +/** Whether one resolved import is a declared layer exception. */ +export const isLayerException = (file, target) => + LAYER_EXCEPTIONS.some( + (exception) => + exception.file === sourcePath(file) && + exception.target === sourcePath(target), + ); + const PRODUCTION_SOURCE = /^src\/.+\.(?:ts|js)$/u; const NON_PRODUCTION = /\.(?:test|spec|fixture)\.(?:ts|js)$|\.d\.ts$/u; @@ -148,6 +185,7 @@ export const layerGraphFacts = (imports, files = []) => { const from = sourceUnit(file); const to = sourceUnit(target); if (from === undefined || to === undefined || from === to) continue; + if (isLayerException(file, target)) continue; for (const unit of [from, to]) if (UNIT_LAYERS[unit] === undefined) undeclared.add(unit); const key = `${from} -> ${to}`; @@ -165,13 +203,287 @@ export const layerGraphFacts = (imports, files = []) => { undeclared: [...undeclared].sort(), upward, cycles: mutualPairs(edges), + ...providerBoundaryFacts(imports), }; }; +/** Whether a unit is a provider folder. */ +export const isProviderUnit = (unit) => UNIT_LAYERS[unit] === "providers"; + +const ENTRY_IMPORTER_LAYERS = new Set([ + "application", + "composition", + "adapters", +]); + /** - * Compare facts with the recorded baseline. Growth fails: a new upward pair, - * more imports on a recorded pair, or a cycle group not recorded. Shrinkage is - * returned separately so the baseline can be lowered. + * Declared entry files of each unit, relative to `src//`: the only + * files that outside code may import. + * + * - `src/resources`, the shared provider toolkit (stable reads, artifact + * readers, resource scopes, cleanup leases and their failure projections), + * is reached from every other unit through its `index.ts`. + * - A provider folder is reached from application, composition and the CLI/MCP + * adapters through the files listed here: the provider classes, identities, + * metadata, worker servers, doctors and commands that composition wires. + * There is no per-provider barrel, because composition, the capability + * declarations and the CLI load single provider files lazily or for metadata + * only, and a barrel would pull in the whole provider. + * + * Adding a file here widens that unit's public surface; review it as such. + * Imports of any other file are counted in the baseline's `entry` map. + */ +export const ENTRY_FILES = Object.freeze( + Object.fromEntries( + Object.entries({ + resources: ["index.ts"], + adb: ["AdbProvider.ts", "AdbProviderIdentity.ts"], + android: [ + "JadxDoctor.ts", + "JadxMcpTransport.ts", + "JadxProvider.ts", + "JadxRelease.ts", + ], + apkSignature: ["ApkSignatureProvider.ts", "ApkSignatureRelease.ts"], + apktool: ["ApktoolProvider.ts", "ApktoolProviderIdentity.ts"], + artifacts: [ + "ArtifactProvider.ts", + "ArtifactProviderMetadata.ts", + "DesktopApplicationReader.ts", + "ReleaseExposureReader.ts", + ], + browser: [ + "CdpBrowserProvider.ts", + "CdpElectronProvider.ts", + "IsolatedWebBundleAnalyzer.ts", + "PlaywrightBrowserScenarioProvider.ts", + "PlaywrightElectronActiveProvider.ts", + "PlaywrightScenarioSession.ts", + "WebBundleAnalysisWorkerServer.ts", + "assets/WebSourceLocationArtifacts.ts", + "execution/CdpWebRuntimeProvider.ts", + "history/CaptureProviderIdentities.ts", + "history/HistoricalCaptureDecoder.ts", + "history/MitmproxyCaptureAdapter.ts", + "history/NodeCaptureAdapter.ts", + "history/playwrightTrace/PlaywrightTraceDecoder.ts", + "modules/NativeModuleResolver.ts", + "modules/WebModuleArtifacts.ts", + "providerIdentities.ts", + ], + captures: ["TsharkCaptureProvider.ts", "TsharkProviderIdentity.ts"], + cutter: [ + "CutterBridgeClient.ts", + "CutterBridgeService.ts", + "CutterProviderIdentity.ts", + ], + desktop: [ + "AgentEnvComputer.ts", + "BuildComputerEnvironment.ts", + "DconfDatabaseReader.ts", + "DesktopBuildDoctorFacts.ts", + "DesktopSessionRequests.ts", + ], + dotnet: ["ManagedStaticProvider.ts", "ManagedStaticProviderMetadata.ts"], + electron: ["ElectronFuseProvider.ts", "ElectronFuseProviderIdentity.ts"], + erlang: ["BeamProvider.ts", "ErlangBeamProviderIdentity.ts"], + evm: ["EvmoleInterfaceProvider.ts", "EvmoleProviderIdentity.ts"], + firmware: [ + "FirmwareCommand.ts", + "FirmwareProvider.ts", + "FirmwareProviderIdentities.ts", + "devicetree/DevicetreeProvider.ts", + ], + flutter: ["FlutterBuildProvider.ts", "FlutterProviderIdentity.ts"], + frida: ["FridaInstrumentationManager.ts", "FridaProviderIdentity.ts"], + gdb: ["GdbProviderIdentity.ts", "GdbSessionManager.ts"], + ghidra: [ + "GhidraDoctor.ts", + "GhidraProvider.ts", + "GhidraProviderMetadata.ts", + ], + go: ["GoBinaryProvider.ts", "GoBinaryProviderIdentity.ts"], + gpu: ["GpuCodeObjectsProvider.ts", "GpuCodeObjectsProviderIdentity.ts"], + hopper: [ + "HopperProvider.ts", + "HopperProviderMetadata.ts", + "LinuxPrivateDisplayProbe.ts", + ], + ida: [ + "IdaConfiguration.ts", + "IdaDoctor.ts", + "IdaMcpConnection.ts", + "IdaProvider.ts", + "IdaProviderMetadata.ts", + ], + il2cpp: [ + "Il2CppMetadataProviderIdentity.ts", + "Il2cppGhidraSeedWriter.ts", + "Il2cppMetadataProvider.ts", + ], + inspector: ["V8InspectorProvider.ts", "providerIdentity.ts"], + javascript: [ + "analysis/JavaScriptAnalysisTransfer.ts", + "analysis/JavaScriptAnalysisWorkerServer.ts", + "recovery/WakaruCommand.ts", + "recovery/WakaruProvider.ts", + "recovery/WakaruProviderIdentity.ts", + "sourceMaps/SourceMapDecoder.ts", + ], + jeb: ["JebMcpConnection.ts", "JebProvider.ts", "JebProviderIdentity.ts"], + kuna: ["KunaDoctor.ts", "KunaProvider.ts", "KunaProviderMetadata.ts"], + model: ["ModelArtifactProvider.ts", "ModelArtifactProviderIdentity.ts"], + native: [ + "NativeMacOSProvider.ts", + "NativeMacOSProviderMetadata.ts", + "NativeMacosProviderIdentity.ts", + "apple/AppleIpsProvider.ts", + "elf/ElfNotesProvider.ts", + "elf/ElfUnwindRangesProvider.ts", + "elf/KernelBuildConfigProvider.ts", + "elf/KernelModuleProvider.ts", + "exports/NativeExportsProvider.ts", + "hardening/BinaryHardeningProvider.ts", + "initializers/NativeInitializersProvider.ts", + "pe/PeCertificatesProvider.ts", + "pe/PeImportsProvider.ts", + "pe/PeLoadConfigProvider.ts", + "pe/PeResourcesProvider.ts", + "pwntools/PwntoolsDecoder.ts", + "pwntools/PwntoolsLayoutProvider.ts", + "pwntools/PwntoolsProviderIdentity.ts", + "pwntools/PwntoolsRecordedCrashProvider.ts", + "windows/WindowsShortcutProvider.ts", + ], + objdump: ["ObjdumpCommand.ts", "ObjdumpProviderIdentity.ts"], + pcap: [ + "PcapConfiguration.ts", + "PcapProvider.ts", + "PcapProviderIdentity.ts", + ], + python: ["PythonPycProvider.ts", "PythonPycProviderIdentity.ts"], + reference: [], + rizin: [ + "RizinCommand.ts", + "RizinDebugSessionManager.ts", + "RizinDebuggerProviderIdentity.ts", + "RizinProviderIdentity.ts", + ], + rust: ["RustBinaryProvider.ts", "RustBinaryProviderIdentity.ts"], + signals: ["SigrokProviderIdentity.ts", "SigrokRecordingProvider.ts"], + sqlite: ["SqliteDatabaseProvider.ts"], + v8: ["V8CodeCacheProvider.ts", "V8CodeCacheProviderIdentity.ts"], + wasm: ["WabtArtifactProvider.ts", "WabtRelease.ts"], + }).map(([unit, files]) => [unit, Object.freeze(files)]), + ), +); + +/** + * Whether an import from `from` into `to` must use one of `to`'s entry + * files: every import of a non-provider unit that declares entry files, and + * every application, composition or adapter import of a provider folder (a + * provider without declared entry files has none). + */ +const requiresEntry = (from, to) => + isProviderUnit(to) + ? ENTRY_IMPORTER_LAYERS.has(UNIT_LAYERS[from]) + : ENTRY_FILES[to] !== undefined; + +/** Whether a resolved target is one of its unit's declared entry files. */ +const isEntryFile = (unit, target) => + (ENTRY_FILES[unit] ?? []).some( + (file) => sourcePath(target) === `src/${unit}/${file}`, + ); + +/** + * Declared provider-to-provider dependencies: files of one provider folder, + * relative to `src//`, that another provider folder may import. Each one + * is a deliberate decision, not baseline debt: imports of these files are not + * counted in `crossProvider`, and any other import between the same folders + * still is. Keep the list short and say why. + */ +export const PROVIDER_DEPENDENCIES = Object.freeze([ + Object.freeze({ + from: "inspector", + to: "browser", + files: Object.freeze([ + "CdpCaptureValues.ts", + "CdpConnection.ts", + "CdpDiscoveryTargets.ts", + "CdpEndpoint.ts", + "CdpScriptContextFacts.ts", + "CdpTargetSessionOwner.ts", + "protocol/CdpEvents.ts", + ]), + // The V8 inspector speaks the Chrome DevTools Protocol. It reuses + // browser's CDP client (endpoint discovery, connection, target sessions + // and captured value projection) instead of keeping a second client. + reason: "the V8 inspector reuses the browser provider's CDP client", + }), +]); + +/** Whether one provider-to-provider import is a declared dependency. */ +const isDeclaredProviderDependency = (from, to, target) => + PROVIDER_DEPENDENCIES.some( + (dependency) => + dependency.from === from && + dependency.to === to && + dependency.files.some( + (file) => sourcePath(target) === `src/${to}/${file}`, + ), + ); + +const sortedCounts = (counts) => + Object.fromEntries( + [...counts].sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)), + ); + +/** + * Provider boundary facts, counted per unit pair. + * + * A provider folder may import the domain, contracts, foundation and ports + * layers, the shared provider core (its own layer, below providers) and its + * own files. Any other import of another provider folder is recorded debt + * unless PROVIDER_DEPENDENCIES declares its target file for that pair: + * `crossProvider` counts them per pair, and a pair that is not in the + * baseline fails. Application, composition and the + * CLI/MCP adapters reach a provider only through its declared ENTRY_FILES, and + * every unit reaches src/resources only through its `index.ts`: `entry` counts + * the imports of any other file in such a unit. Both counts may only shrink. + */ +export const providerBoundaryFacts = (imports) => { + const cross = new Map(); + const entry = new Map(); + for (const { file, target } of imports) { + const from = sourceUnit(file); + const to = sourceUnit(target); + if (from === undefined || to === undefined || from === to) continue; + const key = `${from} -> ${to}`; + if (isProviderUnit(from) && isProviderUnit(to)) { + if (!isDeclaredProviderDependency(from, to, target)) + cross.set(key, (cross.get(key) ?? 0) + 1); + } else if (requiresEntry(from, to) && !isEntryFile(to, target)) + entry.set(key, (entry.get(key) ?? 0) + 1); + } + return { + crossProvider: sortedCounts(cross), + entry: sortedCounts(entry), + }; +}; + +/** Counted pair maps a baseline ratchets, with the wording of each finding. */ +const COUNTED = Object.freeze([ + ["upward", "upward import"], + ["crossProvider", "cross-provider import"], + ["entry", "import past the entry file"], +]); + +/** + * Compare facts with the recorded baseline. Growth fails: a new counted pair + * (upward, cross-provider, or past a provider entry), more imports on a + * recorded pair, or a cycle group not recorded. Shrinkage is returned + * separately: the caller fails on it too, so the baseline is lowered in the + * change that removes the imports and can never grow back silently. */ export const compareLayerBaseline = (facts, baseline) => { const failures = []; @@ -180,17 +492,19 @@ export const compareLayerBaseline = (facts, baseline) => { failures.push( `undeclared unit src/${unit}: add it to UNIT_LAYERS in scripts/lib/module-layers.mjs`, ); - for (const [key, count] of Object.entries(facts.upward)) { - const allowed = baseline.upward[key] ?? 0; - if (count > allowed) - failures.push( - `upward import ${key}: ${count} imports, baseline ${allowed}`, - ); - } - for (const [key, allowed] of Object.entries(baseline.upward)) { - const count = facts.upward[key] ?? 0; - if (count < allowed) - lowerable.push(`upward import ${key}: ${count}, baseline ${allowed}`); + for (const [kind, label] of COUNTED) { + const observed = facts[kind] ?? {}; + const recorded = baseline[kind] ?? {}; + for (const [key, count] of Object.entries(observed)) { + const allowed = recorded[key] ?? 0; + if (count > allowed) + failures.push(`${label} ${key}: ${count} imports, baseline ${allowed}`); + } + for (const [key, allowed] of Object.entries(recorded)) { + const count = observed[key] ?? 0; + if (count < allowed) + lowerable.push(`${label} ${key}: ${count}, baseline ${allowed}`); + } } const recordedCycles = new Set(baseline.cycles); for (const group of facts.cycles) @@ -202,3 +516,24 @@ export const compareLayerBaseline = (facts, baseline) => { lowerable.push(`recorded mutual import no longer present: ${group}`); return { failures, lowerable }; }; + +const lowerCounts = (observed = {}, recorded = {}) => + Object.fromEntries( + Object.entries(recorded).flatMap(([key, allowed]) => { + const count = Math.min(allowed, observed[key] ?? 0); + return count > 0 ? [[key, count]] : []; + }), + ); + +/** + * The baseline lowered to the observed facts: each recorded counted pair + * keeps the smaller of its recorded and observed counts, and only recorded + * cycles that are still present remain. Nothing is added, so growth still + * fails. + */ +export const lowerLayerBaseline = (facts, baseline) => ({ + upward: lowerCounts(facts.upward, baseline.upward), + cycles: baseline.cycles.filter((group) => facts.cycles.includes(group)), + crossProvider: lowerCounts(facts.crossProvider, baseline.crossProvider), + entry: lowerCounts(facts.entry, baseline.entry), +}); diff --git a/scripts/lib/native-value-e2e.mjs b/scripts/lib/native-value-e2e.mjs index e26815c1f6..63aa53b9bb 100644 --- a/scripts/lib/native-value-e2e.mjs +++ b/scripts/lib/native-value-e2e.mjs @@ -7,8 +7,8 @@ import { Client } from "@modelcontextprotocol/client"; import { createOwnedMcpStdioTransport } from "./owned-mcp-stdio.mjs"; import { createVerifierCommands } from "./verify-commands.mjs"; -import { ArtifactResourceScope } from "../../dist/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../../dist/artifacts/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../../dist/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../../dist/resources/AnalysisCleanupLease.js"; import { withVerifierCleanup } from "./verifier-cleanup.mjs"; import { parseEvidence } from "../../dist/domain/evidence.js"; diff --git a/scripts/lib/test-projects.mjs b/scripts/lib/test-projects.mjs index 0c52db3af2..572ce7c7e3 100644 --- a/scripts/lib/test-projects.mjs +++ b/scripts/lib/test-projects.mjs @@ -6,7 +6,7 @@ export const SOURCE_TEST_PROJECTS = [ name: "domain", group: "source", isolate: false, - include: ["src/{contracts,domain}/**/*.test.ts"], + include: ["src/{contracts,domain,ports}/**/*.test.ts"], }, { name: "services", @@ -19,7 +19,7 @@ export const SOURCE_TEST_PROJECTS = [ group: "source", include: [ "src/*.test.ts", - "src/{android,apkSignature,apktool,jeb,adb,artifacts,browser,config,cutter,desktop,dotnet,electron,erlang,evm,firmware,flutter,frida,pcap,ghidra,go,gpu,hopper,ida,inspector,javascript,kuna,main,native,process,providers,python,reference,rust,server,sqlite,v8,wasm,windows}/**/*.test.ts", + "src/{android,apkSignature,apktool,jeb,adb,artifacts,browser,config,cutter,desktop,dotnet,electron,erlang,evm,firmware,flutter,frida,pcap,ghidra,go,gpu,hopper,hopperPaths,ida,inspector,javascript,kuna,main,native,process,providers,python,reference,resources,rust,server,sqlite,v8,wasm,windows}/**/*.test.ts", ], }, { diff --git a/scripts/lib/verifier-artifact-scope.d.mts b/scripts/lib/verifier-artifact-scope.d.mts index fdf76198f2..4b276a7571 100644 --- a/scripts/lib/verifier-artifact-scope.d.mts +++ b/scripts/lib/verifier-artifact-scope.d.mts @@ -1,4 +1,4 @@ -import type { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; export class VerifierArtifactCleanupFailure extends AggregateError { readonly _tag: "VerifierArtifactCleanupFailure"; diff --git a/scripts/lib/verifier-artifact-scope.mjs b/scripts/lib/verifier-artifact-scope.mjs index d90976fc38..7075e614c5 100644 --- a/scripts/lib/verifier-artifact-scope.mjs +++ b/scripts/lib/verifier-artifact-scope.mjs @@ -1,4 +1,4 @@ -import { ArtifactResourceScope } from "../../dist/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../dist/resources/ArtifactResourceScope.js"; /** A failed close retains the scope that can retry all of its owners. */ export class VerifierArtifactCleanupFailure extends AggregateError { diff --git a/scripts/lib/verifier-command-owner.mts b/scripts/lib/verifier-command-owner.mts index b549976b4d..d2faf270f7 100644 --- a/scripts/lib/verifier-command-owner.mts +++ b/scripts/lib/verifier-command-owner.mts @@ -1,8 +1,8 @@ import { randomUUID } from "node:crypto"; -import type { RetainedResourceScope } from "../../src/application/AnalysisProvider.js"; -import { AnalysisCleanupLease } from "../../src/artifacts/AnalysisCleanupLease.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import type { RetainedResourceScope } from "../../src/ports/AnalysisProvider.js"; +import { AnalysisCleanupLease } from "../../src/resources/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { prepareOwnedCommand, runOwnedCommand, diff --git a/scripts/lib/verifier-file-resources.d.mts b/scripts/lib/verifier-file-resources.d.mts index 4d7ff58ae4..b19ba65696 100644 --- a/scripts/lib/verifier-file-resources.d.mts +++ b/scripts/lib/verifier-file-resources.d.mts @@ -1,5 +1,5 @@ -import type { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; -import type { RetainedResourceScope } from "../../src/application/AnalysisProvider.js"; +import type { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; +import type { RetainedResourceScope } from "../../src/ports/AnalysisProvider.js"; /** Complete a prerequisite operation, including retained cleanup on failure. */ export function withVerifierResourceOwner( diff --git a/scripts/lib/verifier-file-resources.mjs b/scripts/lib/verifier-file-resources.mjs index 1657890597..2e88c9a08d 100644 --- a/scripts/lib/verifier-file-resources.mjs +++ b/scripts/lib/verifier-file-resources.mjs @@ -1,6 +1,6 @@ import { hashStableFile } from "../../dist/filesystem/StableFileHash.js"; -import { ArtifactResourceScope } from "../../dist/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../../dist/artifacts/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../../dist/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../../dist/resources/AnalysisCleanupLease.js"; import { withVerifierCleanup } from "./verifier-cleanup.mjs"; /** Finish a prerequisite probe and release its exact retained cleanup owners. */ diff --git a/scripts/lib/verifier-file-snapshot-owner.mts b/scripts/lib/verifier-file-snapshot-owner.mts index e32fe9e6ef..a70a8d32bb 100644 --- a/scripts/lib/verifier-file-snapshot-owner.mts +++ b/scripts/lib/verifier-file-snapshot-owner.mts @@ -1,6 +1,6 @@ import { lstat, open } from "node:fs/promises"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js"; import type { VerifierCommands } from "./verifier-command-owner.mjs"; import { withVerifierCleanup } from "./verifier-cleanup.mjs"; diff --git a/scripts/lib/verifier-terminal-owner.mts b/scripts/lib/verifier-terminal-owner.mts index d541c78fb3..3622ee074e 100644 --- a/scripts/lib/verifier-terminal-owner.mts +++ b/scripts/lib/verifier-terminal-owner.mts @@ -1,9 +1,9 @@ import { randomUUID } from "node:crypto"; import type { IDisposable, IPty } from "@lydell/node-pty"; -import type { RetainedResourceScope } from "../../src/application/AnalysisProvider.js"; -import { AnalysisCleanupLease } from "../../src/artifacts/AnalysisCleanupLease.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import type { RetainedResourceScope } from "../../src/ports/AnalysisProvider.js"; +import { AnalysisCleanupLease } from "../../src/resources/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { err, ok, type Result } from "../../src/domain/result.js"; import { cleanupOwnedProcessGroup, diff --git a/scripts/lint/rules/provider-failure-classifier-baseline.json b/scripts/lint/rules/provider-failure-classifier-baseline.json index b16ba854f3..580a20f3b4 100644 --- a/scripts/lint/rules/provider-failure-classifier-baseline.json +++ b/scripts/lint/rules/provider-failure-classifier-baseline.json @@ -20,7 +20,6 @@ "src/application/process/ProcessCli.ts": 1, "src/artifacts/ArtifactOperationFailure.ts": 1, "src/artifacts/ReleaseExposureReader.ts": 1, - "src/artifacts/StableArtifactFailure.ts": 2, "src/browser/BrowserScenarioPartialObservation.ts": 1, "src/browser/CdpBrowserProvider.ts": 1, "src/browser/CdpElectronProvider.ts": 1, @@ -61,6 +60,7 @@ "src/providers/AnalysisClientFailure.ts": 1, "src/providers/OwnedCommandCleanup.ts": 2, "src/providers/runOwned.ts": 1, + "src/resources/StableArtifactFailure.ts": 2, "src/rust/RustBinaryProvider.ts": 1 } } diff --git a/scripts/verify-browser-dom-destinations.mjs b/scripts/verify-browser-dom-destinations.mjs index 5db88b4de2..b47fa1612e 100644 --- a/scripts/verify-browser-dom-destinations.mjs +++ b/scripts/verify-browser-dom-destinations.mjs @@ -3,8 +3,8 @@ import assert from "node:assert/strict"; import { readFile } from "node:fs/promises"; import { join } from "node:path"; import { chromium } from "playwright-core"; -import { ArtifactResourceScope } from "../dist/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../dist/artifacts/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../dist/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../dist/resources/AnalysisCleanupLease.js"; import { newPlaywrightCdpSession } from "../dist/browser/PlaywrightCdpSession.js"; import { startBrowserVerifierSite } from "./fixtures/browser-verifier-site.mjs"; import { verifyBrowserDomDestinations } from "./lib/browser-dom-destinations-e2e.mjs"; diff --git a/scripts/verify-flutter.mjs b/scripts/verify-flutter.mjs index 10104f14d8..2d6656ed94 100644 --- a/scripts/verify-flutter.mjs +++ b/scripts/verify-flutter.mjs @@ -6,7 +6,7 @@ import { promisify } from "node:util"; import { Client } from "@modelcontextprotocol/client"; import { StdioClientTransport } from "@modelcontextprotocol/client/stdio"; import { toolContract } from "../dist/contracts/toolContracts.js"; -import { ArtifactResourceScope } from "../dist/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../dist/resources/ArtifactResourceScope.js"; import { requireMcpOutput } from "./lib/mcp-verifier-results.mjs"; import { closeVerifierResources } from "./lib/verifier-cleanup.mjs"; import { hashVerifierFile } from "./lib/verifier-file-resources.mjs"; diff --git a/scripts/verify-go-binary.mjs b/scripts/verify-go-binary.mjs index f759114586..eed0300d0d 100644 --- a/scripts/verify-go-binary.mjs +++ b/scripts/verify-go-binary.mjs @@ -8,7 +8,7 @@ import { fileURLToPath } from "node:url"; import { Client } from "@modelcontextprotocol/client"; import { parseEvidence } from "../dist/domain/evidence.js"; import { goBinarySchema } from "../dist/domain/go/goBinary.js"; -import { AnalysisCleanupLease } from "../dist/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../dist/resources/AnalysisCleanupLease.js"; import { artifactMcpCall } from "./lib/artifact-e2e.mjs"; import { requireMcpOutput } from "./lib/mcp-verifier-results.mjs"; import { createVerifierRun, completeVerifierRun } from "./lib/verifier-run.mjs"; diff --git a/scripts/verify-il2cpp-metadata.mjs b/scripts/verify-il2cpp-metadata.mjs index 4bf956347c..5d27eb1c1e 100644 --- a/scripts/verify-il2cpp-metadata.mjs +++ b/scripts/verify-il2cpp-metadata.mjs @@ -7,7 +7,7 @@ import { StdioClientTransport } from "@modelcontextprotocol/client/stdio"; import { absoluteCallerPath } from "../dist/filesystem/callerPath.js"; import { toolContract } from "../dist/contracts/toolContracts.js"; import { il2cppMetadataViewRequestSchema } from "../dist/domain/analysisView/il2cppMetadataView.js"; -import { ArtifactResourceScope } from "../dist/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../dist/resources/ArtifactResourceScope.js"; import { requireMcpOutput, requireMcpToolError, diff --git a/scripts/verify-module-boundaries.mjs b/scripts/verify-module-boundaries.mjs index 84d3551f01..c814230a4b 100644 --- a/scripts/verify-module-boundaries.mjs +++ b/scripts/verify-module-boundaries.mjs @@ -1,5 +1,5 @@ import { execFile } from "node:child_process"; -import { readdir, readFile } from "node:fs/promises"; +import { readdir, readFile, writeFile } from "node:fs/promises"; import { join, resolve } from "node:path"; import { promisify } from "node:util"; @@ -7,14 +7,23 @@ import { inspectResolvedModuleBoundaries, resolveModuleImports, } from "./lib/module-boundaries.mjs"; -import { compareLayerBaseline, layerGraphFacts } from "./lib/module-layers.mjs"; +import { + compareLayerBaseline, + layerGraphFacts, + lowerLayerBaseline, +} from "./lib/module-layers.mjs"; const execute = promisify(execFile); const root = process.cwd(); const printLayerBaseline = process.argv.includes("--print-layer-baseline"); +const shrinkLayerBaseline = process.argv.includes("--shrink-layer-baseline"); const selected = process.argv .slice(2) - .filter((argument) => argument !== "--print-layer-baseline"); + .filter( + (argument) => + argument !== "--print-layer-baseline" && + argument !== "--shrink-layer-baseline", + ); for (const file of selected) if (!file.endsWith(".ts")) throw new TypeError(`Expected an exact TypeScript source file: ${file}`); @@ -60,6 +69,9 @@ const files = await enumerateSourceFiles(); let checked = 0; const resolvedImports = []; const checkedFiles = []; +// A file that could not be parsed contributes no imports, so the graph built +// without it undercounts; it must never lower the recorded baseline. +const uninspected = []; for (const file of new Set(files.filter((path) => path.endsWith(".ts")))) { let source; try { @@ -85,6 +97,7 @@ for (const file of new Set(files.filter((path) => path.endsWith(".ts")))) { } } catch (cause) { console.error(`Could not inspect ${file}: ${cause.message}`); + uninspected.push(file); process.exitCode = 1; } } @@ -96,7 +109,16 @@ if (selected.length === 0) { const facts = layerGraphFacts(resolvedImports, checkedFiles); if (printLayerBaseline) { console.log( - JSON.stringify({ upward: facts.upward, cycles: facts.cycles }, null, 2), + JSON.stringify( + { + upward: facts.upward, + cycles: facts.cycles, + crossProvider: facts.crossProvider, + entry: facts.entry, + }, + null, + 2, + ), ); } const { failures, lowerable } = compareLayerBaseline(facts, baseline); @@ -104,10 +126,27 @@ if (selected.length === 0) { console.error(`module layers: ${failure}`); process.exitCode = 1; } - if (lowerable.length > 0) - console.log( - `Module layer baseline can be lowered in scripts/lib/module-layers.baseline.json:\n ${lowerable.join("\n ")}`, + if ( + lowerable.length > 0 && + shrinkLayerBaseline && + failures.length === 0 && + uninspected.length === 0 + ) { + await writeFile( + baselinePath, + `${JSON.stringify(lowerLayerBaseline(facts, baseline), null, 2)}\n`, ); + console.log( + `Lowered scripts/lib/module-layers.baseline.json:\n ${lowerable.join("\n ")}`, + ); + } else if (lowerable.length > 0) { + console.error( + uninspected.length > 0 + ? `module layers: not lowering the baseline while ${uninspected.length} source file(s) could not be inspected` + : `module layers: the baseline records imports that are gone; lower it with \`node scripts/verify-module-boundaries.mjs --shrink-layer-baseline\`:\n ${lowerable.join("\n ")}`, + ); + process.exitCode = 1; + } } if (process.exitCode !== 1) console.log(`Checked resolved module boundaries in ${checked} source files.`); diff --git a/scripts/verify-pcap.mjs b/scripts/verify-pcap.mjs index ae0f108a4e..8b91adfe96 100644 --- a/scripts/verify-pcap.mjs +++ b/scripts/verify-pcap.mjs @@ -6,7 +6,7 @@ import { promisify } from "node:util"; import { Client } from "@modelcontextprotocol/client"; import { StdioClientTransport } from "@modelcontextprotocol/client/stdio"; import { toolContract } from "../dist/contracts/toolContracts.js"; -import { ArtifactResourceScope } from "../dist/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../dist/resources/ArtifactResourceScope.js"; import { requireMcpOutput } from "./lib/mcp-verifier-results.mjs"; import { hashVerifierFile } from "./lib/verifier-file-resources.mjs"; import { diff --git a/scripts/verify-real-hopper-callers.mjs b/scripts/verify-real-hopper-callers.mjs index a5922ad093..bb6a238198 100644 --- a/scripts/verify-real-hopper-callers.mjs +++ b/scripts/verify-real-hopper-callers.mjs @@ -35,9 +35,19 @@ const { StdioClientTransport } = await import( const { parseConfig } = await import( pathToFileURL(join(root, "dist/config/parseConfig.js")) ); +const { selectedHopperLauncherPath } = await import( + pathToFileURL(join(root, "dist/hopperPaths/HopperLauncherDiscovery.js")).href +); const config = parseConfig(process.env); if (!config.ok) throw config.error; -await access(config.value.hopperLauncherPath, constants.X_OK); +await access( + selectedHopperLauncherPath( + config.value.hopperLauncherPath, + process.platform, + process.env, + ), + constants.X_OK, +); const run = promisify(execFile); const clang = (await run("xcrun", ["--find", "clang"])).stdout.trim(); const sdk = ( diff --git a/scripts/verify-real-hopper-deadlines.mjs b/scripts/verify-real-hopper-deadlines.mjs index 5bbf2035fb..ccbc50e0f3 100644 --- a/scripts/verify-real-hopper-deadlines.mjs +++ b/scripts/verify-real-hopper-deadlines.mjs @@ -9,8 +9,8 @@ import { withVerifierFixture, } from "./lib/verifier-fixture.mjs"; import { parseBinaryTarget } from "../dist/application/BinaryTargetResolver.js"; -import { ArtifactResourceScope } from "../dist/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../dist/artifacts/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../dist/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../dist/resources/AnalysisCleanupLease.js"; import { resolveHopperAnalysisProfile } from "../dist/hopper/HopperAnalysisProfile.js"; import { HopperApplicationLauncher } from "../dist/hopper/BridgeLauncher.js"; import { HopperClient } from "../dist/hopper/HopperClient.js"; diff --git a/scripts/verify-real-hopper-fat.mjs b/scripts/verify-real-hopper-fat.mjs index f094c40e49..9ca3d07c1d 100644 --- a/scripts/verify-real-hopper-fat.mjs +++ b/scripts/verify-real-hopper-fat.mjs @@ -19,6 +19,7 @@ import { snapshotHopperRuntime } from "./lib/real-hopper-cleanup.mjs"; import { closeVerifierResources } from "./lib/verifier-cleanup.mjs"; import { HOPPER_TARGET_LEASE_DIRECTORY } from "../dist/process/HopperLease.js"; import { parseConfig } from "../dist/config/parseConfig.js"; +import { selectedHopperLauncherPath } from "../dist/hopperPaths/HopperLauncherDiscovery.js"; import { verifyHopperSourceBinding, relocateSingleFatSlice, @@ -37,9 +38,14 @@ if (process.platform !== "darwin" || !["arm64", "x64"].includes(process.arch)) ); const config = parseConfig(process.env); if (!config.ok) throw config.error; -await access(config.value.hopperLauncherPath, constants.X_OK).catch((cause) => { +const hopperLauncherPath = selectedHopperLauncherPath( + config.value.hopperLauncherPath, + process.platform, + process.env, +); +await access(hopperLauncherPath, constants.X_OK).catch((cause) => { throw new Error( - `Hopper FAT verification requires the configured executable: ${config.value.hopperLauncherPath}`, + `Hopper FAT verification requires the configured executable: ${hopperLauncherPath}`, { cause }, ); }); diff --git a/scripts/verify-real-kuna.mjs b/scripts/verify-real-kuna.mjs index 9e9e283b95..7f9278ece9 100644 --- a/scripts/verify-real-kuna.mjs +++ b/scripts/verify-real-kuna.mjs @@ -22,8 +22,8 @@ import { KUNA_UNVERIFIED_VERSION_REMEDIATION, KUNA_VERIFIED_VERSION, } from "../dist/kuna/KunaRelease.js"; -import { ArtifactResourceScope } from "../dist/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../dist/artifacts/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../dist/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../dist/resources/AnalysisCleanupLease.js"; import { KUNA_XREF_MISSING_NAME_REMEDIATION, missingKunaXrefNameMessage, diff --git a/scripts/verify-windows-native.mjs b/scripts/verify-windows-native.mjs index 7640606b6d..c1bfafa133 100644 --- a/scripts/verify-windows-native.mjs +++ b/scripts/verify-windows-native.mjs @@ -47,7 +47,7 @@ const { PrivateRuntimeRoot } = await import( ); const { PrivateRuntimeRootUnavailableError } = await import( pathToFileURL( - join(packageRoot, "dist/process/PrivateRuntimeRootUnavailableError.js"), + join(packageRoot, "dist/domain/privateRuntimeRootUnavailableError.js"), ) ); // Windows children write beneath the root; a private root's DELETE handle would block them. diff --git a/scripts/verify/android/failure-recovery.mjs b/scripts/verify/android/failure-recovery.mjs index 6c0acf8775..43bcce8acb 100644 --- a/scripts/verify/android/failure-recovery.mjs +++ b/scripts/verify/android/failure-recovery.mjs @@ -9,7 +9,7 @@ import { delimiter, dirname, isAbsolute, join } from "node:path"; import { Client } from "@modelcontextprotocol/client"; import { StdioClientTransport } from "@modelcontextprotocol/client/stdio"; import { TOOL_CONTRACTS } from "../../../dist/contracts/toolContracts.js"; -import { analysisErrorProjectionSchema } from "../../../dist/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../dist/domain/analysisErrorProjectionSchema.js"; import { VerifierFixture, withVerifierFixture, diff --git a/scripts/verify/apple/dispatch.mjs b/scripts/verify/apple/dispatch.mjs index f541fb92e5..2fb9d401a5 100644 --- a/scripts/verify/apple/dispatch.mjs +++ b/scripts/verify/apple/dispatch.mjs @@ -14,7 +14,7 @@ import { withArtifactMcp, } from "../../lib/artifact-e2e.mjs"; import { nativeDispatchMetadataResultSchema } from "../../../dist/domain/native/objcSwiftMetadata.js"; -import { analysisErrorProjectionSchema } from "../../../dist/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../dist/domain/analysisErrorProjectionSchema.js"; import { cliOperationFailurePayload } from "../../../dist/cliLogging.js"; import { requireMcpToolError } from "../../lib/mcp-verifier-results.mjs"; import { diff --git a/scripts/verify/architecture-guards.mjs b/scripts/verify/architecture-guards.mjs index 9fcef6f802..6e01b87855 100644 --- a/scripts/verify/architecture-guards.mjs +++ b/scripts/verify/architecture-guards.mjs @@ -73,7 +73,7 @@ check( // Prerequisite inspection lifetime is an application contract shared by adapters. check( - "provider-owned inspection lifetime (use src/application/ProviderInspectionScope)", + "provider-owned inspection lifetime (use src/ports/ProviderInspectionScope)", files, /providers\/ProviderInspectionScope\.js/, ); diff --git a/scripts/verify/baselines/ambient-host-platform.json b/scripts/verify/baselines/ambient-host-platform.json index 56a89d0890..99e83169dd 100644 --- a/scripts/verify/baselines/ambient-host-platform.json +++ b/scripts/verify/baselines/ambient-host-platform.json @@ -18,11 +18,9 @@ "src/composition/auxiliaryAnalysisProviders.ts": 1, "src/composition/binary.ts": 2, "src/composition/reverseEngineering.ts": 1, - "src/config/parseConfig.ts": 2, "src/cutter/CutterBridgeClient.ts": 1, "src/desktop/BuildComputerEnvironment.ts": 3, "src/desktop/BuildSecretFiles.ts": 1, - "src/domain/localPath.ts": 1, "src/electron/ElectronFusePath.ts": 1, "src/evm/EvmoleInterfaceProvider.ts": 2, "src/filesystem/ChangeTimeBaseline.ts": 2, diff --git a/scripts/verify/firmware/analysis.mjs b/scripts/verify/firmware/analysis.mjs index 0f6d6528f7..50f76b217f 100644 --- a/scripts/verify/firmware/analysis.mjs +++ b/scripts/verify/firmware/analysis.mjs @@ -8,7 +8,7 @@ import { Client } from "@modelcontextprotocol/client"; import { StdioClientTransport } from "@modelcontextprotocol/client/stdio"; import { firmwareResultSchemas } from "../../../dist/domain/firmware/firmwareAnalysis.js"; import { parseEvidence } from "../../../dist/domain/evidence.js"; -import { ArtifactResourceScope } from "../../../dist/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../dist/resources/ArtifactResourceScope.js"; import { hashVerifierFile } from "../../lib/verifier-file-resources.mjs"; import { VerifierFixture, diff --git a/scripts/verify/javascript/runtime-observation.mjs b/scripts/verify/javascript/runtime-observation.mjs index d77d6790fa..0d251a1d95 100644 --- a/scripts/verify/javascript/runtime-observation.mjs +++ b/scripts/verify/javascript/runtime-observation.mjs @@ -3,13 +3,13 @@ import { realpath } from "node:fs/promises"; import { parseArgs } from "node:util"; -import { readStableArtifact } from "../../../dist/artifacts/readStableArtifact.js"; -import { ArtifactReaderFailure } from "../../../dist/artifacts/ArtifactReader.js"; +import { readStableArtifact } from "../../../dist/resources/readStableArtifact.js"; +import { ArtifactReaderFailure } from "../../../dist/resources/ArtifactReader.js"; import { ArtifactFileCleanupFailure, artifactFileCompletion, artifactFilePrimaryFacts, -} from "../../../dist/artifacts/ArtifactFileOperation.js"; +} from "../../../dist/resources/ArtifactFileOperation.js"; import { reconcileJavaScriptRuntimeEvidence } from "../../../dist/application/javascript/JavaScriptRuntimeReconciliationService.js"; import { analyzeJavaScriptApplicationWithOwnedScope } from "../../lib/javascript-application-analysis.mjs"; diff --git a/src/adb/AdbConfiguration.ts b/src/adb/AdbConfiguration.ts index 77281230a9..edaece23a0 100644 --- a/src/adb/AdbConfiguration.ts +++ b/src/adb/AdbConfiguration.ts @@ -16,7 +16,7 @@ import { execFileOutputFailure, spawnCapacityExhausted, } from "../process/ExecFileOutput.js"; -import type { ProviderAvailability } from "../application/AnalysisProvider.js"; +import type { ProviderAvailability } from "../ports/AnalysisProvider.js"; import type { ProviderRejectionCode } from "../domain/providerSelection.js"; import { fixedAllowanceOptions } from "../domain/fixedAllowanceRemediation.js"; import type { JsonValue } from "../domain/jsonValue.js"; diff --git a/src/adb/AdbDeviceOperations.ts b/src/adb/AdbDeviceOperations.ts index d989f98791..075b280ea9 100644 --- a/src/adb/AdbDeviceOperations.ts +++ b/src/adb/AdbDeviceOperations.ts @@ -1,7 +1,7 @@ import { createAnalysisExecution, type AnalysisExecution, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { AnalysisProtocolError } from "../domain/analysisErrorCore.js"; import { err, ok, type Result } from "../domain/result.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; diff --git a/src/adb/AdbInputSnapshot.ts b/src/adb/AdbInputSnapshot.ts index e54371fabc..3c6cd9ffbc 100644 --- a/src/adb/AdbInputSnapshot.ts +++ b/src/adb/AdbInputSnapshot.ts @@ -2,7 +2,7 @@ import { createHash } from "node:crypto"; import { open, stat } from "node:fs/promises"; import { basename, join } from "node:path"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { AnalysisArtifactChangedError, AnalysisOutputError, diff --git a/src/adb/AdbOperationResults.ts b/src/adb/AdbOperationResults.ts index 5dd7002d02..7293836e6a 100644 --- a/src/adb/AdbOperationResults.ts +++ b/src/adb/AdbOperationResults.ts @@ -1,4 +1,4 @@ -import { createAnalysisExecution } from "../application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import type { AdbUnparsedLines } from "./AdbUnparsedLines.js"; import type { AdbBinarySelection, diff --git a/src/adb/AdbProvider.ts b/src/adb/AdbProvider.ts index 72b8905dab..1045ada048 100644 --- a/src/adb/AdbProvider.ts +++ b/src/adb/AdbProvider.ts @@ -33,7 +33,7 @@ import { type ProviderAvailability, createAnalysisExecution, type AnalysisExecution, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { providerConfigurationRefusal } from "../domain/providerConfigurationRefusal.js"; import type { AdbDisplayNumericIssues, @@ -43,15 +43,13 @@ import type { AdbPackagePullPartialObservation, AdbRequest, } from "../domain/adb/adbDeviceAnalysis.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactReaderFailure, ArtifactResourceRetryFailure, ArtifactResourceScope, -} from "../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/index.js"; import { adbDisplayPartialObservationSchema, adbResultSchemas, @@ -99,7 +97,7 @@ import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { RuntimeControlUnavailableError, runtimeControlCapabilityError, -} from "../process/RuntimeControlUnavailableError.js"; +} from "../domain/runtimeControlUnavailableError.js"; import { adbCommandOutputFailure, adbArguments, diff --git a/src/android/AndroidJniLibraries.ts b/src/android/AndroidJniLibraries.ts index 1e3e30e0d0..b58ef36a27 100644 --- a/src/android/AndroidJniLibraries.ts +++ b/src/android/AndroidJniLibraries.ts @@ -1,8 +1,10 @@ import { createHash } from "node:crypto"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../resources/index.js"; import { ZipArtifactReader } from "../artifacts/ZipArtifactReader.js"; -import { streamChunkToBuffer } from "../artifacts/StreamBytes.js"; +import { streamChunkToBuffer } from "../resources/index.js"; import type { AndroidJniLibraryObservation, AndroidJniReport, diff --git a/src/android/AndroidMappingFile.ts b/src/android/AndroidMappingFile.ts index feae218f09..bd74284279 100644 --- a/src/android/AndroidMappingFile.ts +++ b/src/android/AndroidMappingFile.ts @@ -2,14 +2,12 @@ import { artifactFileCancellationCause, artifactFilePrimaryFacts, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, stableArtifactInputRecovery, readerIntegrityFailure, -} from "../artifacts/StableArtifactFailure.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { readStableArtifact } from "../artifacts/readStableArtifact.js"; + type ArtifactResourceScope, + readStableArtifact, +} from "../resources/index.js"; import { ANDROID_MAPPING_LIMITS, type AndroidMappingSource, diff --git a/src/android/JadxConfiguration.ts b/src/android/JadxConfiguration.ts index 39e39a4602..b664fe14c0 100644 --- a/src/android/JadxConfiguration.ts +++ b/src/android/JadxConfiguration.ts @@ -36,21 +36,21 @@ import { import type { AndroidOperation } from "../domain/android/androidAnalysis.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { err, ok, type Result } from "../domain/result.js"; -import type { ProviderAvailability } from "../application/AnalysisProvider.js"; -import { ownedProcessPrerequisiteAvailability } from "../application/ownedProcessAvailability.js"; +import type { ProviderAvailability } from "../ports/AnalysisProvider.js"; +import { ownedProcessPrerequisiteAvailability } from "../providers/ownedProcessAvailability.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupDependencies } from "../domain/analysisErrorCleanup.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactReaderFailure, ArtifactFileCancelled, ArtifactFileCleanupFailure, bindArtifactFileCleanup, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { analysisClientFailureForOperation } from "../providers/AnalysisClientFailure.js"; import { ZipArtifactReader } from "../artifacts/ZipArtifactReader.js"; -import type { DoctorProviderCheck } from "../application/Doctor.js"; +import type { DoctorProviderCheck } from "../ports/DoctorProviderInspection.js"; import { JADX_JAR_CONFIGURATION_REMEDIATION, JADX_JAVA_PROBE_REMEDIATION, diff --git a/src/android/JadxDoctor.ts b/src/android/JadxDoctor.ts index d79ce8317f..b7c6af9272 100644 --- a/src/android/JadxDoctor.ts +++ b/src/android/JadxDoctor.ts @@ -2,11 +2,11 @@ import type { HostPlatform } from "../platform/HostPlatform.js"; import type { RetainedResourceScope, ProviderAvailability, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { DoctorProviderCheck, DoctorProviderInspection, -} from "../application/Doctor.js"; +} from "../ports/DoctorProviderInspection.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { inspectJadxAvailability, diff --git a/src/android/JadxJavaProbe.test.ts b/src/android/JadxJavaProbe.test.ts index cc672b9722..898c5f24aa 100644 --- a/src/android/JadxJavaProbe.test.ts +++ b/src/android/JadxJavaProbe.test.ts @@ -1,6 +1,6 @@ import { validateJadxConfiguration } from "./JadxConfiguration.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import { ArtifactResourceRetryFailure } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceRetryFailure } from "../resources/ArtifactResourceScope.js"; import { expect, it, vi } from "vitest"; import { inspectJadxJava, type JadxJavaProbeOptions } from "./JadxJavaProbe.js"; import { diff --git a/src/android/JadxJavaProbe.ts b/src/android/JadxJavaProbe.ts index fdba5cb896..8aee253e3e 100644 --- a/src/android/JadxJavaProbe.ts +++ b/src/android/JadxJavaProbe.ts @@ -2,7 +2,7 @@ import { capturedProviderOutput } from "../process/capturedProviderOutput.js"; import type { ProcessInspectionFailure } from "../process/ProcessInspectionCleanup.js"; import { classifyLaunchFailureCode } from "../process/launchFailure.js"; import { randomUUID } from "node:crypto"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { AnalysisError, type AnalysisCapturedOutput, diff --git a/src/android/JadxProvider.ts b/src/android/JadxProvider.ts index 980eeefa35..f81a9f83fe 100644 --- a/src/android/JadxProvider.ts +++ b/src/android/JadxProvider.ts @@ -1,18 +1,20 @@ import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { HOST_PLATFORM, type HostPlatform } from "../platform/HostPlatform.js"; import type { AnalysisSettingsReader } from "../domain/analysisSettings.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { + ArtifactResourceScope, + AnalysisCleanupLease, +} from "../resources/index.js"; import type { RetainedResourceScope, ExecutionOptions, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { analysisClientFailureForOperation } from "../providers/AnalysisClientFailure.js"; import { throwIfJadxInterrupted } from "./JadxInterruption.js"; import { chmod, copyFile } from "node:fs/promises"; import { join } from "node:path"; import { fileURLToPath } from "node:url"; -import type { AndroidAnalysisPort } from "../application/android/AndroidAnalysisPort.js"; +import type { AndroidAnalysisPort } from "../ports/android/AndroidAnalysisPort.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisCleanupRelease } from "../domain/analysisCleanupRelease.js"; import { diff --git a/src/android/JadxSession.ts b/src/android/JadxSession.ts index 33903b416d..4bb3faa71f 100644 --- a/src/android/JadxSession.ts +++ b/src/android/JadxSession.ts @@ -1,7 +1,7 @@ import { throwIfJadxInterrupted } from "./JadxInterruption.js"; import { OwnedMcpClient } from "../process/OwnedMcpClient.js"; -import { createAnalysisExecution } from "../application/AnalysisProvider.js"; -import type { AndroidAnalysisExecution } from "../application/android/AndroidAnalysisPort.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; +import type { AndroidAnalysisExecution } from "../ports/android/AndroidAnalysisPort.js"; import type { AndroidRequest } from "../domain/android/androidAnalysis.js"; import { type AndroidMappingSource, @@ -33,7 +33,7 @@ import { readAndroidJniLibraries, type AndroidJniLibraries, } from "./AndroidJniLibraries.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { jadxOperationTimeoutGuidance } from "./JadxOperationTimeout.js"; import { JadxMcpTransport, type JadxLauncher } from "./JadxMcpTransport.js"; import { diff --git a/src/apkSignature/ApkSignatureProvider.test.ts b/src/apkSignature/ApkSignatureProvider.test.ts index 0cfdec4d80..7fb53dbedd 100644 --- a/src/apkSignature/ApkSignatureProvider.test.ts +++ b/src/apkSignature/ApkSignatureProvider.test.ts @@ -20,7 +20,7 @@ import { withSigningBlock, zipWith, } from "../../tests/fixtures/apkSignature/v1SignatureBlock.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { apkSignatureResultSchema } from "../domain/apkSignature/apkSignatureReport.js"; import { ApkSignatureProvider } from "./ApkSignatureProvider.js"; import { apkSignatureFailure } from "./apkSignatureFailures.js"; diff --git a/src/apkSignature/ApkSignatureProvider.ts b/src/apkSignature/ApkSignatureProvider.ts index eb30ffcf5d..b9ebff7560 100644 --- a/src/apkSignature/ApkSignatureProvider.ts +++ b/src/apkSignature/ApkSignatureProvider.ts @@ -1,19 +1,19 @@ import { createHash } from "node:crypto"; import { apkSignatureAdmission } from "./ApkSignatureAdmission.js"; -import { createAnalysisExecution } from "../application/AnalysisProvider.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { ApkSignatureExecution, ApkSignaturePort, -} from "../application/apkSignature/ApkSignaturePort.js"; -import { readStableArtifact } from "../artifacts/readStableArtifact.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +} from "../ports/apkSignature/ApkSignaturePort.js"; import { + readStableArtifact, + ArtifactReaderFailure, assertArtifactReadActive, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; + ArtifactResourceScope, +} from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { diff --git a/src/apkSignature/apkSignatureFailures.ts b/src/apkSignature/apkSignatureFailures.ts index 76d1f84379..073e707c49 100644 --- a/src/apkSignature/apkSignatureFailures.ts +++ b/src/apkSignature/apkSignatureFailures.ts @@ -1,17 +1,15 @@ import { fixedAllowanceOptions } from "../domain/fixedAllowanceRemediation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactReaderFailure, stableArtifactInputFailure, readerIntegrityFailure, -} from "../artifacts/StableArtifactFailure.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, artifactFileCancellationCause, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; + completedStableArtifactObservation, +} from "../resources/index.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; -import { completedStableArtifactObservation } from "../artifacts/StableArtifactObservation.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { diff --git a/src/apktool/ApktoolCommandCleanup.ts b/src/apktool/ApktoolCommandCleanup.ts index 3bff4986cc..013950ffff 100644 --- a/src/apktool/ApktoolCommandCleanup.ts +++ b/src/apktool/ApktoolCommandCleanup.ts @@ -5,12 +5,10 @@ import { import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactResourceRetryFailure, ArtifactResourceScope, -} from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; + ArtifactReaderFailure, +} from "../resources/index.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupDependencies } from "../domain/analysisErrorCleanup.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; diff --git a/src/apktool/ApktoolConfiguration.ts b/src/apktool/ApktoolConfiguration.ts index f49cabcd24..021afc4589 100644 --- a/src/apktool/ApktoolConfiguration.ts +++ b/src/apktool/ApktoolConfiguration.ts @@ -28,7 +28,7 @@ import { runOwnedCommand, prepareOwnedCommand, } from "../process/OwnedCommand.js"; -import type { ProviderAvailability } from "../application/AnalysisProvider.js"; +import type { ProviderAvailability } from "../ports/AnalysisProvider.js"; import type { ProviderRejectionCode } from "../domain/providerSelection.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { parse } from "semver"; diff --git a/src/apktool/ApktoolDecodedInventory.ts b/src/apktool/ApktoolDecodedInventory.ts index d5a64bb7cc..83433804c5 100644 --- a/src/apktool/ApktoolDecodedInventory.ts +++ b/src/apktool/ApktoolDecodedInventory.ts @@ -1,10 +1,10 @@ import { ok, err, type Result } from "../domain/result.js"; -import type { - ArtifactEntry, - ArtifactTraversalOmission, -} from "../artifacts/ArtifactReader.js"; +import { + type ArtifactEntry, + type ArtifactTraversalOmission, + assertArtifactReadActive, +} from "../resources/index.js"; import { DirectoryArtifactTraversalLimit } from "../artifacts/DirectoryArtifactReader.js"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; import { classifyAndroidStringsTable } from "../domain/apktool/apktoolResourceAnalysis.js"; import type { ApktoolWorkspace } from "./ApktoolWorkspace.js"; diff --git a/src/apktool/ApktoolProvider.ts b/src/apktool/ApktoolProvider.ts index 2e22d19e54..fca410a3c1 100644 --- a/src/apktool/ApktoolProvider.ts +++ b/src/apktool/ApktoolProvider.ts @@ -5,17 +5,15 @@ import { processInspectionCancellationError } from "../providers/OwnedCommandCle import { APKTOOL_PROVIDER_IDENTITY } from "./ApktoolProviderIdentity.js"; import { countDecodedFiles } from "./ApktoolDecodedInventory.js"; import { ApktoolWorkspace } from "./ApktoolWorkspace.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { + ArtifactResourceScope, AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, ArtifactFileCleanupFailure, artifactFilePrimaryFacts, artifactFileCancellationCause, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; import { capturedApktoolFailureOutput } from "./ApktoolCommandOutput.js"; import { providerOutcomeOf } from "../process/ProviderOutcome.js"; @@ -35,7 +33,7 @@ import { type ProviderAvailability, createAnalysisExecution, type AnalysisExecution, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { providerConfigurationRefusal } from "../domain/providerConfigurationRefusal.js"; import { createAnalysisExecutionEvidence } from "../domain/analysisObservation.js"; import { @@ -67,7 +65,7 @@ import { import type { RuntimeExhaustionArea } from "../process/RuntimeExhaustion.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { WindowsBatchCommandError } from "../process/WindowsBatchCommand.js"; -import { ownedProcessPrerequisiteAvailability } from "../application/ownedProcessAvailability.js"; +import { ownedProcessPrerequisiteAvailability } from "../providers/ownedProcessAvailability.js"; import { ApktoolConfigurationFailure, apktoolConfigurationAvailability, diff --git a/src/apktool/ApktoolWorkspace.lifecycle.test.ts b/src/apktool/ApktoolWorkspace.lifecycle.test.ts index 9d587bd9dc..4643603d9a 100644 --- a/src/apktool/ApktoolWorkspace.lifecycle.test.ts +++ b/src/apktool/ApktoolWorkspace.lifecycle.test.ts @@ -8,8 +8,8 @@ import { artifactFilePrimaryFacts, ArtifactFileCleanupFailure, ArtifactFileCancelled, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +} from "../resources/ArtifactFileOperation.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; import { ApktoolCommandCleanup } from "./ApktoolCommandCleanup.js"; import { ApktoolWorkspace } from "./ApktoolWorkspace.js"; diff --git a/src/apktool/ApktoolWorkspace.ts b/src/apktool/ApktoolWorkspace.ts index ce12e8ac46..2f57ad1079 100644 --- a/src/apktool/ApktoolWorkspace.ts +++ b/src/apktool/ApktoolWorkspace.ts @@ -1,20 +1,18 @@ -import { readArtifactFileChunks } from "../artifacts/readArtifactFileChunks.js"; +import { readArtifactFileChunks } from "../resources/index.js"; import { ArtifactReaderFailure, type ArtifactTraversalOptions, -} from "../artifacts/ArtifactReader.js"; -import { createHash } from "node:crypto"; -import { chmod, open } from "node:fs/promises"; -import { join } from "node:path"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { DirectoryArtifactReader } from "../artifacts/DirectoryArtifactReader.js"; -import { + ArtifactResourceScope, assertArtifactReadActive, artifactSelectedPathErrno, mapArtifactFileFailure, withArtifactFileHandle, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; +import { createHash } from "node:crypto"; +import { chmod, open } from "node:fs/promises"; +import { join } from "node:path"; +import { DirectoryArtifactReader } from "../artifacts/DirectoryArtifactReader.js"; import { AnalysisInputError, AnalysisAccessDeniedError, diff --git a/src/application/AnalysisContextQueries.test.ts b/src/application/AnalysisContextQueries.test.ts index 49fd81ec6b..736242de64 100644 --- a/src/application/AnalysisContextQueries.test.ts +++ b/src/application/AnalysisContextQueries.test.ts @@ -10,14 +10,14 @@ import { createAnalysisExecution, type AnalysisOperationPort, type AnalysisExecution, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { AnalysisCapabilityUnavailableError, AnalysisCancelledError, AnalysisOutputError, AnalysisProtocolError, } from "../domain/analysisErrorCore.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { primaryAnalysisError, diff --git a/src/application/AnalysisContextQueries.ts b/src/application/AnalysisContextQueries.ts index 183a759e7e..708aa95e59 100644 --- a/src/application/AnalysisContextQueries.ts +++ b/src/application/AnalysisContextQueries.ts @@ -2,7 +2,7 @@ import type { AnalysisExecution, AnalysisOperation, AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisCancelledError, diff --git a/src/application/AnalysisDocument.test.ts b/src/application/AnalysisDocument.test.ts index 67bffabd79..81f9bfb9c6 100644 --- a/src/application/AnalysisDocument.test.ts +++ b/src/application/AnalysisDocument.test.ts @@ -3,7 +3,7 @@ import { resolveAnalysisDocument } from "./AnalysisDocument.js"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisCapabilityUnavailableError, diff --git a/src/application/AnalysisDocument.ts b/src/application/AnalysisDocument.ts index 993d29d470..9052abab3d 100644 --- a/src/application/AnalysisDocument.ts +++ b/src/application/AnalysisDocument.ts @@ -2,7 +2,7 @@ import { permitsCapabilityFallback } from "./CapabilityFallback.js"; import type { AnalysisExecution, AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../domain/analysisObservation.js"; import { AnalysisOutputError, diff --git a/src/application/AnalysisOperationFacts.test.ts b/src/application/AnalysisOperationFacts.test.ts index 861daf54de..08515851b0 100644 --- a/src/application/AnalysisOperationFacts.test.ts +++ b/src/application/AnalysisOperationFacts.test.ts @@ -14,7 +14,7 @@ import { executeFact } from "./AnalysisOperationFacts.js"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; const provider = { id: "fixture", name: "Fixture", version: "1" }; diff --git a/src/application/AnalysisOperationFacts.ts b/src/application/AnalysisOperationFacts.ts index 1054cfd147..6bca89d5d8 100644 --- a/src/application/AnalysisOperationFacts.ts +++ b/src/application/AnalysisOperationFacts.ts @@ -10,7 +10,7 @@ import type { AnalysisOperation, AnalysisOperationPort, ExecutionOptions, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; /** A completed execution and its result parsed once against its named contract. */ export interface AnalysisFactExecution { diff --git a/src/application/AnalysisSettings.test.ts b/src/application/AnalysisSettings.test.ts index 33d03bd43c..05889dbdd0 100644 --- a/src/application/AnalysisSettings.test.ts +++ b/src/application/AnalysisSettings.test.ts @@ -5,7 +5,7 @@ import { applyWindowsChangeTimeSnapshot, resolveWindowsChangeTimeSettle, } from "../config/windowsChangeTimeSettle.js"; -import { pwntoolsInputBytes } from "../native/pwntools/PwntoolsInputLimit.js"; +import { pwntoolsInputBytes } from "../config/pwntoolsInputLimit.js"; import { resolveCaptureDecoderHeap } from "../config/captureDecoderHeap.js"; import { resolveRegexMatchingDeadline } from "../config/regexMatchingDeadline.js"; import { resolveRegexWorkerHeapRequest } from "../config/regexWorkerHeapRequest.js"; diff --git a/src/application/AppBundleExecutable.ts b/src/application/AppBundleExecutable.ts index 0d966c571e..f171cc86cd 100644 --- a/src/application/AppBundleExecutable.ts +++ b/src/application/AppBundleExecutable.ts @@ -10,7 +10,10 @@ import { isPathWithinRoot } from "../domain/localPath.js"; import { parseXmlPropertyList } from "../domain/propertyListKeys.js"; import { decodeXmlPlistText } from "../domain/propertyListXmlText.js"; import { hasBinaryPlistSignature } from "../domain/apple/appleArchiveFormat.js"; -import type { BundleResourceRoot } from "../domain/apple/bundleResourceRoot.js"; +import type { + BundleResourceRoot, + ResolvedAppBundleResourceRoot, +} from "../domain/apple/bundleResourceRoot.js"; import { openableAppleBundleExtension } from "../domain/apple/appleBundleTypes.js"; import { err, ok, type Result } from "../domain/result.js"; import { absoluteCallerPath } from "../filesystem/callerPath.js"; @@ -75,18 +78,6 @@ export interface ResolvedAppBundle { readonly infoPlist?: string; } -/** Resource-only identity for an app directory; it is not a BinaryTarget. */ -export interface ResolvedAppBundleResourceRoot { - /** Path selected by the caller, retained even when it is a symlink alias. */ - readonly callerPath: string; - /** Canonical directory whose resources are inspected. */ - readonly canonicalPath: string; - readonly infoPlistPath: string; - readonly layout: BundleResourceRoot["layout"]; - /** No executable was opened or hashed by resource-root discovery. */ - readonly executableSha256: string | null; -} - /** Filesystem operations used by the resolver, injectable for boundary tests. */ interface AppBundleFileSystem { readonly readFile: (path: string) => Promise; diff --git a/src/application/AppBundleResourceRoot.test.ts b/src/application/AppBundleResourceRoot.test.ts index b322c3d7d2..fbc13b3792 100644 --- a/src/application/AppBundleResourceRoot.test.ts +++ b/src/application/AppBundleResourceRoot.test.ts @@ -12,7 +12,7 @@ import { join } from "node:path"; import { expect, it } from "vitest"; -import { createAnalysisExecution } from "./AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../domain/analysisObservation.js"; import { findAppBundleResourceRoot, diff --git a/src/application/BinaryOverview.test.ts b/src/application/BinaryOverview.test.ts index 5f6f99e9db..485e583f3a 100644 --- a/src/application/BinaryOverview.test.ts +++ b/src/application/BinaryOverview.test.ts @@ -1,6 +1,6 @@ import { expect, it } from "vitest"; import { EnhancedTools } from "./EnhancedTools.js"; -import { createAnalysisExecution } from "./AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisCapabilityUnavailableError, diff --git a/src/application/BinaryTargetResolver.ts b/src/application/BinaryTargetResolver.ts index 8b43d61767..b98f5739d4 100644 --- a/src/application/BinaryTargetResolver.ts +++ b/src/application/BinaryTargetResolver.ts @@ -16,9 +16,11 @@ import { bindRegularFileCleanup, RetainedRegularFileCleanupFailure, retryRegularFileCleanup, -} from "./RegularFileRead.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +} from "../process/RegularFileRead.js"; +import { + type ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import { jsonValueSchema } from "../domain/jsonValue.js"; import { childFailureDiagnostics } from "../domain/analysisErrorProjection.js"; import { constants, type Stats } from "node:fs"; diff --git a/src/application/BrowserEvidence.ts b/src/application/BrowserEvidence.ts index e1e9efebd1..195ce9009f 100644 --- a/src/application/BrowserEvidence.ts +++ b/src/application/BrowserEvidence.ts @@ -1,5 +1,5 @@ import { isDeepStrictEqual } from "node:util"; -import type { ProviderIdentity } from "./AnalysisProvider.js"; +import type { ProviderIdentity } from "../ports/AnalysisProvider.js"; import { createEvidence, type Evidence, diff --git a/src/application/BrowserObservationContracts.test.ts b/src/application/BrowserObservationContracts.test.ts index 3e1a6f99d4..9b6cbc0307 100644 --- a/src/application/BrowserObservationContracts.test.ts +++ b/src/application/BrowserObservationContracts.test.ts @@ -17,7 +17,7 @@ import { import { ok, err } from "../domain/result.js"; import { BrowserObservationError } from "../domain/browserObservationError.js"; import { parseEvidence } from "../domain/evidence.js"; -import type { BrowserObservationPort } from "./BrowserObservationPort.js"; +import type { BrowserObservationPort } from "../ports/BrowserObservationPort.js"; import * as service from "./BrowserObservationService.js"; const pageProvider = ( diff --git a/src/application/BrowserObservationService.test.ts b/src/application/BrowserObservationService.test.ts index 794451d65f..82fbb6d5fc 100644 --- a/src/application/BrowserObservationService.test.ts +++ b/src/application/BrowserObservationService.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import type { BrowserObservationPort } from "./BrowserObservationPort.js"; +import type { BrowserObservationPort } from "../ports/BrowserObservationPort.js"; import { listBrowserTargets, inspectWebPage, diff --git a/src/application/BrowserObservationService.ts b/src/application/BrowserObservationService.ts index c157a3fcdb..ac1d42e8c8 100644 --- a/src/application/BrowserObservationService.ts +++ b/src/application/BrowserObservationService.ts @@ -33,8 +33,8 @@ import { } from "../domain/analysisErrorCore.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { err, ok, type Result } from "../domain/result.js"; -import type { ExecutionOptions } from "./AnalysisProvider.js"; -import type { BrowserObservationPort } from "./BrowserObservationPort.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; +import type { BrowserObservationPort } from "../ports/BrowserObservationPort.js"; import { createBrowserEvidence } from "./BrowserEvidence.js"; import { jsonValueSchema } from "../domain/jsonValue.js"; import { diff --git a/src/application/BrowserScenarioCaptureService.test.ts b/src/application/BrowserScenarioCaptureService.test.ts index c8ad09a100..e02726e141 100644 --- a/src/application/BrowserScenarioCaptureService.test.ts +++ b/src/application/BrowserScenarioCaptureService.test.ts @@ -16,7 +16,7 @@ import type { } from "../domain/browserScenarioCapture.js"; import { err, ok } from "../domain/result.js"; import { scriptScenarioFixture } from "../../tests/fixtures/webScriptCapture.js"; -import type { BrowserScenarioCapturePort } from "./BrowserScenarioCapturePort.js"; +import type { BrowserScenarioCapturePort } from "../ports/BrowserScenarioCapturePort.js"; import { captureBrowserScenario } from "./BrowserScenarioCaptureService.js"; import { expectDroppedPartial, diff --git a/src/application/BrowserScenarioCaptureService.ts b/src/application/BrowserScenarioCaptureService.ts index f16b97f7af..b22f35f41d 100644 --- a/src/application/BrowserScenarioCaptureService.ts +++ b/src/application/BrowserScenarioCaptureService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "./AnalysisProvider.js"; -import type { BrowserScenarioCapturePort } from "./BrowserScenarioCapturePort.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; +import type { BrowserScenarioCapturePort } from "../ports/BrowserScenarioCapturePort.js"; import { createBrowserScenarioEvidence } from "./BrowserScenarioEvidence.js"; import { AnalysisCapabilityUnavailableError, diff --git a/src/application/BrowserScenarioEvidence.ts b/src/application/BrowserScenarioEvidence.ts index 57f3c8931e..adb4384c0e 100644 --- a/src/application/BrowserScenarioEvidence.ts +++ b/src/application/BrowserScenarioEvidence.ts @@ -1,6 +1,6 @@ import { isDeepStrictEqual } from "node:util"; import { digestCanonicalValue } from "../domain/canonicalDigest.js"; -import type { ProviderIdentity } from "./AnalysisProvider.js"; +import type { ProviderIdentity } from "../ports/AnalysisProvider.js"; import type { BrowserScenario } from "../domain/browserScenario.js"; import type { BrowserScenarioCapture } from "../domain/browserScenarioCapture.js"; import { diff --git a/src/application/CallPathTracing.test.ts b/src/application/CallPathTracing.test.ts index fa5b538298..3c4a1b8a9d 100644 --- a/src/application/CallPathTracing.test.ts +++ b/src/application/CallPathTracing.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; import { traceCallPath } from "./CallPathTracing.js"; -import { createAnalysisExecution } from "./AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisOutputError, diff --git a/src/application/CallPathTracing.ts b/src/application/CallPathTracing.ts index 46a50da1ee..cfe2e43e56 100644 --- a/src/application/CallPathTracing.ts +++ b/src/application/CallPathTracing.ts @@ -8,7 +8,7 @@ import { import type { AnalysisOperation, ExecutionOptions, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { isAborted, cancelledBy } from "../domain/analysisErrorCore.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; diff --git a/src/application/CallRelationshipTraversal.test.ts b/src/application/CallRelationshipTraversal.test.ts index c52d6a06d2..bc0e496662 100644 --- a/src/application/CallRelationshipTraversal.test.ts +++ b/src/application/CallRelationshipTraversal.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "vitest"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisCancelledError, @@ -11,7 +11,7 @@ import { err, ok } from "../domain/result.js"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { EnhancedTools } from "./EnhancedTools.js"; const provider = { id: "fixture", name: "Fixture", version: "1" }; diff --git a/src/application/CallRelationshipTraversal.ts b/src/application/CallRelationshipTraversal.ts index 6c53ad2da0..fd248cb81f 100644 --- a/src/application/CallRelationshipTraversal.ts +++ b/src/application/CallRelationshipTraversal.ts @@ -3,7 +3,7 @@ import type { AnalysisExecution, AnalysisOperation, ExecutionOptions, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import type { AnalysisOutputError } from "../domain/analysisErrorCore.js"; import type { JsonValue } from "../domain/jsonValue.js"; diff --git a/src/application/CapabilityAvailability.ts b/src/application/CapabilityAvailability.ts index 78db0c6eef..424fa008cb 100644 --- a/src/application/CapabilityAvailability.ts +++ b/src/application/CapabilityAvailability.ts @@ -1,7 +1,7 @@ -import type { ProviderAvailability } from "./AnalysisProvider.js"; -import type { JebAnalysisAvailability } from "./jeb/JebAnalysisPort.js"; +import type { ProviderAvailability } from "../ports/AnalysisProvider.js"; +import type { JebAnalysisAvailability } from "../ports/jeb/JebAnalysisPort.js"; import type { AvailabilityPolicy } from "./CapabilityInventory.js"; -import type { OptionalProviderLoadFailures } from "./OptionalObservationProviders.js"; +import type { OptionalProviderLoadFailures } from "../ports/OptionalObservationProviders.js"; import type { CommandProviderLaunchFailures } from "./reverse/ReverseEngineeringService.js"; export interface CapabilityAvailabilityFacts { diff --git a/src/application/CapabilityInventory.optionalReads.test.ts b/src/application/CapabilityInventory.optionalReads.test.ts index 855cc30909..1305035e04 100644 --- a/src/application/CapabilityInventory.optionalReads.test.ts +++ b/src/application/CapabilityInventory.optionalReads.test.ts @@ -2,7 +2,7 @@ import { expect, it } from "vitest"; import type { JsonValue } from "../domain/jsonValue.js"; import { AnalysisCapabilityUnavailableError } from "../domain/analysisErrorCore.js"; import { err, ok } from "../domain/result.js"; -import { createAnalysisExecution } from "./AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import { buildCapabilityInventory } from "./CapabilityInventory.js"; import { EnhancedTools } from "./EnhancedTools.js"; diff --git a/src/application/CapabilityInventory.ts b/src/application/CapabilityInventory.ts index efe2ded189..75f803aa08 100644 --- a/src/application/CapabilityInventory.ts +++ b/src/application/CapabilityInventory.ts @@ -15,7 +15,7 @@ import { sqliteDatabaseCapability } from "./sqlite/SqliteDatabaseCapability.js"; import type { OptionalProviderLoadFailures, OptionalProviderLoadFailure, -} from "./OptionalObservationProviders.js"; +} from "../ports/OptionalObservationProviders.js"; import type { CommandProviderLaunchFailures, ReverseEngineeringOperation, @@ -48,8 +48,8 @@ import { isMachOFormat } from "../domain/binaryTargetTypes.js"; import type { AnalysisOperation, ProviderAvailability, -} from "./AnalysisProvider.js"; -import type { JebAnalysisAvailability } from "./jeb/JebAnalysisPort.js"; +} from "../ports/AnalysisProvider.js"; +import type { JebAnalysisAvailability } from "../ports/jeb/JebAnalysisPort.js"; import { FRIDA_TOOL_CONTRACTS } from "../contracts/fridaToolContracts.js"; import { TOOL_CONTRACTS } from "../contracts/toolContracts.js"; import { compareUnicodeCodePoints } from "../domain/unicodeCodePointOrder.js"; diff --git a/src/application/ClientConfigurationCleanup.ts b/src/application/ClientConfigurationCleanup.ts index cbcfe9315d..be819dcd6c 100644 --- a/src/application/ClientConfigurationCleanup.ts +++ b/src/application/ClientConfigurationCleanup.ts @@ -2,15 +2,15 @@ import { ArtifactResourceRetryFailure, type ArtifactResourceOwner, type ArtifactResourceScope, -} from "../artifacts/ArtifactResourceScope.js"; -import type { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; + type AnalysisCleanupLease, + ArtifactReaderFailure, +} from "../resources/index.js"; import type { AnalysisCleanupObservation } from "../domain/analysisErrorBase.js"; import { RegularFileCleanupFailure, type RegularFileOperationOutcome, } from "../filesystem/OwnedRegularFile.js"; -import { retryRegularFileCleanupFailures } from "./RegularFileRead.js"; +import { retryRegularFileCleanupFailures } from "../process/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 07503baccf..b26021db77 100644 --- a/src/application/ClientConfigurationFiles.ts +++ b/src/application/ClientConfigurationFiles.ts @@ -1,6 +1,6 @@ import { err, ok, type Result } from "../domain/result.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; -import { readRegularFileText } from "./RegularFileRead.js"; +import { readRegularFileText } from "../process/RegularFileRead.js"; import { effectiveClientServer, parseClientConfiguration, @@ -12,7 +12,7 @@ import { } from "./ClientConfigurationDocument.js"; import type { SetupClient } from "./SupportedClients.js"; import { clientRegistrationEnvironment } from "./ClientRegistrationEnvironment.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import type { ConfigurationError } from "../domain/configurationErrors.js"; import { mergeEnvironmentOverrides } from "../process/snapshotEnvironment.js"; import { PRODUCT_IDENTITY } from "../identity.js"; diff --git a/src/application/ClientConfigurationPublication.ts b/src/application/ClientConfigurationPublication.ts index 07f97a70cf..333bd9d1d2 100644 --- a/src/application/ClientConfigurationPublication.ts +++ b/src/application/ClientConfigurationPublication.ts @@ -3,7 +3,7 @@ import { constants, type Stats } from "node:fs"; import { link, lstat, mkdtemp, open, realpath, rename } from "node:fs/promises"; import { basename, dirname, join, resolve, sep } from "node:path"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; import { fileHandleMatchesBytes } from "../filesystem/fileHandleMatchesBytes.js"; import { absoluteCallerPath } from "../filesystem/callerPath.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; @@ -13,7 +13,7 @@ import { sameRegularFileState, } from "../filesystem/RegularFile.js"; import type { RegularFileOperationOutcome } from "../filesystem/OwnedRegularFile.js"; -import { readRegularFileTextSnapshot } from "./RegularFileRead.js"; +import { readRegularFileTextSnapshot } from "../process/RegularFileRead.js"; import { ClientConfigurationPublicationFailure } from "./ClientConfigurationCleanup.js"; import { resolveClientConfigTransactionPath } from "./ClientConfigPath.js"; import { ConfigurationError } from "../domain/configurationErrors.js"; diff --git a/src/application/ClientPrivateProfile.ts b/src/application/ClientPrivateProfile.ts index 6b751817e7..d76a317938 100644 --- a/src/application/ClientPrivateProfile.ts +++ b/src/application/ClientPrivateProfile.ts @@ -5,8 +5,8 @@ import { dirname } from "node:path"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; + type ArtifactResourceScope, +} from "../resources/index.js"; import { ConfigurationError } from "../domain/configurationErrors.js"; import { RegularFileChangedError } from "../filesystem/RegularFile.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; diff --git a/src/application/ClientRegistrationEnvironment.ts b/src/application/ClientRegistrationEnvironment.ts index f43bcc26a6..dc46b3e28a 100644 --- a/src/application/ClientRegistrationEnvironment.ts +++ b/src/application/ClientRegistrationEnvironment.ts @@ -1,3 +1,7 @@ +import type { + OwnedProviderSetting, + RecordedProviderSettings, +} from "../ports/DesktopBuildHost.js"; import { validateRegistrationEnvironment } from "./RegistrationEnvironmentValidation.js"; import { clientRegistrationSource, @@ -179,21 +183,6 @@ export const clientRegistrationEnvironmentDetails = ( ); }; -/** Setting names a registration does not carry as the value selected here. */ -export interface RecordedProviderSettings { - /** Selected here and absent from the registration's recorded environment. */ - readonly unrecorded: readonly string[]; - /** Recorded with text other than the value selected here. */ - readonly differing: readonly string[]; - /** Recorded as an expression, or in a map REA could not read. */ - readonly unresolved: readonly string[]; - /** Recorded with a value the caller owns, as an archive setup packed for another version. */ - readonly owned?: readonly string[]; -} - -/** Whether a recorded value is the caller's own, which it may replace; the value never leaves the reader. */ -export type OwnedProviderSetting = (name: string, value: string) => boolean; - /** Consume a resolved setting inside its reader without including its value in diagnostics. */ export type ProviderSettingObserver = (name: string, value: string) => void; diff --git a/src/application/ClientRegistrationStatus.ts b/src/application/ClientRegistrationStatus.ts index b210f32612..84a06a48c4 100644 --- a/src/application/ClientRegistrationStatus.ts +++ b/src/application/ClientRegistrationStatus.ts @@ -40,12 +40,12 @@ import { clientRegistrationEnvironmentDetailsWithBudget, recordedProviderSettings, } from "./ClientRegistrationEnvironment.js"; +import type { ProviderRequestBudgetResolver } from "./ClientRegistrationEnvironment.js"; import type { OwnedProviderSetting, - ProviderRequestBudgetResolver, RecordedProviderSettings, -} from "./ClientRegistrationEnvironment.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +} from "../ports/DesktopBuildHost.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { parseClientRegistrationPolicy, diff --git a/src/application/DesktopBuildDoctor.test.ts b/src/application/DesktopBuildDoctor.test.ts index adefe24d5c..0800813c9c 100644 --- a/src/application/DesktopBuildDoctor.test.ts +++ b/src/application/DesktopBuildDoctor.test.ts @@ -2,8 +2,9 @@ import { describe, expect, it, vi } from "vitest"; import { SUPPORTED_NODE_VERSION_PROSE } from "../domain/runtimeVersion.js"; import { createDoctorHostFixture } from "./Doctor.fixture.js"; -import { runDoctor, type DoctorCheck, type DoctorHost } from "./Doctor.js"; -import type { DesktopBuildFacts } from "./DesktopBuildDoctor.js"; +import { runDoctor, type DoctorHost } from "./Doctor.js"; +import type { DoctorCheck } from "../ports/DoctorProviderInspection.js"; +import type { DesktopBuildFacts } from "../ports/DesktopBuildHost.js"; const ready: DesktopBuildFacts = { ps: { found: true, detail: "/usr/bin/ps" }, diff --git a/src/application/DesktopBuildDoctor.ts b/src/application/DesktopBuildDoctor.ts index 69fe18c102..7136c41b18 100644 --- a/src/application/DesktopBuildDoctor.ts +++ b/src/application/DesktopBuildDoctor.ts @@ -1,8 +1,10 @@ import { DESKTOP_EXPORT_FRAMEWORK_VERSION } from "../domain/desktop/appExport.js"; -import type { execFileOutput } from "../process/ExecFileOutput.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import type { ClientRegistrationStatus } from "./ClientRegistrationStatus.js"; -import type { DoctorCheck, DoctorHost, DoctorSkillState } from "./Doctor.js"; +import type { DoctorHost, DoctorSkillState } from "./Doctor.js"; +import type { DoctorCheck } from "../ports/DoctorProviderInspection.js"; +import type { + DesktopBuildCommand, + DesktopBuildFacts, +} from "../ports/DesktopBuildHost.js"; import { nodeCheck } from "./DoctorDiagnostics.js"; import { DESKTOP_BUILD_PROVIDER_ID } from "../domain/doctorProviderIds.js"; import type { DoctorScopeReport } from "./DoctorScope.js"; @@ -13,77 +15,6 @@ export const DESKTOP_BUILD_MIN_FREE_BYTES = 20 * 1000 ** 3; /** The command that installs the agentenv-framework release bundles target. */ export const AGENTENV_INSTALL_COMMAND = `uv tool install agentenv-framework==${DESKTOP_EXPORT_FRAMEWORK_VERSION}`; -/** How a build setting's program was found: set in the environment, or on PATH. */ -export type DesktopBuildCommand = - | { - readonly status: "found"; - readonly path: string; - readonly source: "environment" | "path"; - } - | { readonly status: "missing" } - | { readonly status: "invalid"; readonly value: string }; - -/** What a desktop build host has, read without changing anything. */ -export interface DesktopBuildFacts { - readonly ps: { readonly found: boolean; readonly detail: string }; - readonly docker: DesktopBuildCommand; - readonly daemon: - | { readonly status: "reachable"; readonly rootDirectory: string } - | { - readonly status: "permission_denied" | "unreachable"; - readonly detail: string; - } - | { readonly status: "unchecked" }; - readonly disk: - | { readonly path: string; readonly freeBytes: number } - | { readonly path: string; readonly error: string }; - readonly agentEnv: DesktopBuildCommand & { - readonly version?: string | undefined; - }; - readonly archive: { - readonly path: string; - readonly source: "environment" | "cache"; - readonly status: "current" | "missing" | "stale" | "unknown"; - readonly detail?: string; - }; - /** Each considered client's registration, by setting names only. */ - readonly registrations: readonly { - readonly client: string; - readonly registered: boolean; - readonly unrecorded: readonly string[]; - readonly unresolved: readonly string[]; - readonly differing?: readonly string[]; - readonly unchecked?: readonly string[]; - /** Version check of this client's recorded runner, without the recorded path. */ - readonly runner?: { - readonly status: "current" | "stale" | "invalid" | "unknown"; - readonly version?: string; - }; - }[]; - /** Build settings this terminal's environment sets. */ - readonly environmentSettings: readonly string[]; - /** Where a solve endpoint is configured; null means its configuration is unknown. */ - readonly solveEndpoint: string | null | undefined; - /** Names of agentenv sandbox containers; undefined when Docker was not reachable. */ - readonly leftoverContainers: readonly string[] | undefined; -} - -/** What a facts reader gets from doctor: its environment, bounded runner and registration reader. */ -export interface DesktopBuildFactsInput { - readonly signal: AbortSignal; - readonly resources: ArtifactResourceScope; - readonly environment: Readonly; - readonly platform: NodeJS.Platform; - readonly run: typeof execFileOutput; - readonly clientIds: readonly string[]; - readonly registrations: ( - clientIds: readonly string[] | undefined, - settings: Readonly>, - owned?: undefined, - observe?: (client: string, name: string, value: string) => void, - ) => Promise; -} - /** What doctor already knows that the build checks reuse. */ export interface DesktopBuildContext { readonly host: Pick; diff --git a/src/application/DirectAnalysis.ts b/src/application/DirectAnalysis.ts index 767f2b12fe..aec6733895 100644 --- a/src/application/DirectAnalysis.ts +++ b/src/application/DirectAnalysis.ts @@ -67,7 +67,7 @@ import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js"; import { profilelessNativeDispatchProfile } from "./binary/ProfilelessNativeWorkflowSnapshot.js"; import { err, ok, type Result } from "../domain/result.js"; import type { AnalysisSnapshot } from "../domain/analysisSnapshot.js"; -import type { AnalysisExecution } from "./AnalysisProvider.js"; +import type { AnalysisExecution } from "../ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../domain/analysisObservation.js"; import { REA_WORKFLOW_PROVIDER } from "../domain/investigationProviders.js"; import { workflowAnalysisProfile } from "./WorkflowAnalysisProfile.js"; diff --git a/src/application/DirectAnalysisCleanup.ts b/src/application/DirectAnalysisCleanup.ts index e39ab6338a..22c0f1a321 100644 --- a/src/application/DirectAnalysisCleanup.ts +++ b/src/application/DirectAnalysisCleanup.ts @@ -13,7 +13,7 @@ import { import { jsonValueSchema, type JsonValue } from "../domain/jsonValue.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; import { err, type Result } from "../domain/result.js"; -import type { AnalysisExecution } from "./AnalysisProvider.js"; +import type { AnalysisExecution } from "../ports/AnalysisProvider.js"; import type { BinarySession } from "./binary/BinarySession.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { diff --git a/src/application/Doctor.test.ts b/src/application/Doctor.test.ts index 1a4b97830e..b9dd30bf3c 100644 --- a/src/application/Doctor.test.ts +++ b/src/application/Doctor.test.ts @@ -2,14 +2,14 @@ import { mkdir } from "node:fs/promises"; import { join, posix } from "node:path"; import { describe, expect, it } from "vitest"; -import { defaultHopperLauncherPath } from "../config/parseConfig.js"; +import { defaultHopperLauncherPath } from "../hopperPaths/HopperLauncherDiscovery.js"; import { SUPPORTED_NODE_VERSION_PROSE } from "../domain/runtimeVersion.js"; import type { ClientRegistrationStatus } from "./ClientRegistrationStatus.js"; import { createDoctorHostFixture as host } from "./Doctor.fixture.js"; import { runDoctor, systemDoctorHost, type DoctorHost } from "./Doctor.js"; import { err } from "../domain/result.js"; import { HopperReleaseError } from "./HopperReleaseFeed.js"; -import { MAC_HOPPER_SYSTEM_LAUNCHER } from "./MacHopperPaths.js"; +import { MAC_HOPPER_SYSTEM_LAUNCHER } from "../hopperPaths/MacHopperPaths.js"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; const configurationHost = ( diff --git a/src/application/Doctor.ts b/src/application/Doctor.ts index 1720059863..04314373bd 100644 --- a/src/application/Doctor.ts +++ b/src/application/Doctor.ts @@ -9,14 +9,20 @@ import { } from "../domain/analysisErrorCore.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { analysisErrorWithCleanupDependencies } from "../domain/analysisErrorCleanup.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { + bindArtifactFileCleanup, + ArtifactReaderFailure, + AnalysisCleanupLease, + ArtifactResourceScope, +} from "../resources/index.js"; import { constants } from "node:fs"; import { access, realpath, stat } from "node:fs/promises"; import { posix, win32 } from "node:path"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import type { RetainedResourceScope } from "./AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; +import type { + DoctorCheck, + DoctorProviderInspection, +} from "../ports/DoctorProviderInspection.js"; import { inspectNativeAnalysisConfiguration, type NativeAnalysisConfigurationInspection, @@ -34,13 +40,13 @@ import { execFileOutputFailure, execFileFailureCapturedOutput, } from "../process/ExecFileOutput.js"; -import { jsonValueSchema, type JsonValue } from "../domain/jsonValue.js"; +import { jsonValueSchema } from "../domain/jsonValue.js"; import { javaScriptRuntime, type JavaScriptRuntime, } from "../domain/runtimeVersion.js"; import { installedCaskAppdir, probeHomebrew } from "./homebrew.js"; -import { readMacHopperRenamedLauncherCandidates } from "./MacHopperPaths.js"; +import { readMacHopperRenamedLauncherCandidates } from "../hopperPaths/MacHopperPaths.js"; import { inspectLinuxHopperLauncher, linuxSharedLibrariesAvailable, @@ -62,10 +68,7 @@ import { type ClientRegistrationStatus, type UnhealthyClientRegistrationStatus, } from "./ClientRegistrationStatus.js"; -import type { - OwnedProviderSetting, - ProviderRequestBudgetResolver, -} from "./ClientRegistrationEnvironment.js"; +import type { ProviderRequestBudgetResolver } from "./ClientRegistrationEnvironment.js"; import { registrationSpelledSettings } from "./SetupRegistrationEnvironment.js"; import { collectDoctorDiagnostics, @@ -76,54 +79,13 @@ import { scopeDoctorChecks, type DoctorScopeReport, } from "./DoctorScope.js"; -import { - selectedDesktopBuildChecks, - type DesktopBuildFacts, - type DesktopBuildFactsInput, -} from "./DesktopBuildDoctor.js"; +import { selectedDesktopBuildChecks } from "./DesktopBuildDoctor.js"; +import type { + DesktopBuildFacts, + DesktopBuildFactsInput, + OwnedProviderSetting, +} from "../ports/DesktopBuildHost.js"; -/** One actionable environment diagnostic. */ -export interface DoctorCheck { - readonly name: string; - readonly ok: boolean; - readonly classification: - | "healthy" - | "missing_dependency" - | "runtime_failure" - | "unsupported_host" - | "unsupported_target" - | "missing_analysis_engine" - | "unknown" - | "config_drift"; - readonly detail?: string; - readonly details?: Readonly>; - readonly remediation?: string; -} - -/** One provider-owned check projected without importing its adapter types. */ -export interface DoctorProviderCheck { - readonly name: string; - readonly ok: boolean; - readonly code: string | null; - readonly detail: string; - readonly remediation: string | null; - readonly classification: Exclude; - readonly details?: Readonly>; -} - -/** Read-only provider inspection supplied by an outer composition adapter. */ -export interface DoctorProviderInspection { - readonly id: string; - /** Null means the selected client's setting could not be determined. */ - readonly configured: boolean | null; - /** Null means readiness cannot be established for the selected client. */ - readonly available: boolean | null; - readonly providerVersion: string | null; - /** Validated discoveries used as registration defaults. Setup preserves - * caller-selected configuration separately from these readiness facts. */ - readonly registrationEnvironment: Readonly>; - readonly checks: readonly DoctorProviderCheck[]; -} /** Read-only host capabilities required by diagnostics. */ export interface DoctorHost { readonly signal?: AbortSignal; diff --git a/src/application/DoctorDiagnostics.ts b/src/application/DoctorDiagnostics.ts index c0897590ce..f45056a17a 100644 --- a/src/application/DoctorDiagnostics.ts +++ b/src/application/DoctorDiagnostics.ts @@ -3,15 +3,15 @@ import { SUPPORTED_NODE_VERSION_PROSE, supportsJavaScriptRuntime, } from "../domain/runtimeVersion.js"; -import { hopperLauncherDiscovery } from "./HopperLauncherDiscovery.js"; +import { hopperLauncherDiscovery } from "../hopperPaths/HopperLauncherDiscovery.js"; import { macosMajorVersion } from "../domain/macosVersion.js"; import { LINUX_HOPPER_SETUP_HOSTS, supportsReaHost } from "./LinuxHopper.js"; import { isDesktopBuildCheck } from "../domain/doctorProviderIds.js"; +import type { DoctorHost } from "./Doctor.js"; import type { DoctorCheck, - DoctorHost, DoctorProviderInspection, -} from "./Doctor.js"; +} from "../ports/DoctorProviderInspection.js"; /** Ordered environment diagnostics consumed by the Doctor report assembler. */ export interface DoctorDiagnostics { diff --git a/src/application/DoctorScope.ts b/src/application/DoctorScope.ts index eb0a85eacf..16ad77a5b5 100644 --- a/src/application/DoctorScope.ts +++ b/src/application/DoctorScope.ts @@ -10,12 +10,11 @@ import { DESKTOP_BUILD_PROVIDER_ID, isDesktopBuildCheck, } from "../domain/doctorProviderIds.js"; +import type { DoctorScope, DoctorSkillState } from "./Doctor.js"; import type { DoctorCheck, DoctorProviderInspection, - DoctorScope, - DoctorSkillState, -} from "./Doctor.js"; +} from "../ports/DoctorProviderInspection.js"; /** Normalized readiness boundary included in every doctor response. */ export interface DoctorScopeReport { diff --git a/src/application/EnhancedLiteralTracing.test.ts b/src/application/EnhancedLiteralTracing.test.ts index 77f7eee5da..c8e9fa19db 100644 --- a/src/application/EnhancedLiteralTracing.test.ts +++ b/src/application/EnhancedLiteralTracing.test.ts @@ -4,7 +4,7 @@ import { ok } from "../domain/result.js"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { traceLiteralFeature } from "./EnhancedLiteralTracing.js"; const provider = { id: "fixture", name: "Fixture", version: "1" }; diff --git a/src/application/EnhancedLiteralTracing.ts b/src/application/EnhancedLiteralTracing.ts index c03ab33c60..836c05c439 100644 --- a/src/application/EnhancedLiteralTracing.ts +++ b/src/application/EnhancedLiteralTracing.ts @@ -8,7 +8,7 @@ import type { AnalysisExecution, AnalysisOperation, AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { AnalysisCapabilityUnavailableError, AnalysisOutputError, diff --git a/src/application/EnhancedToolSelectorOrigin.test.ts b/src/application/EnhancedToolSelectorOrigin.test.ts index 60af106439..7246c8d08c 100644 --- a/src/application/EnhancedToolSelectorOrigin.test.ts +++ b/src/application/EnhancedToolSelectorOrigin.test.ts @@ -3,7 +3,7 @@ import { createAnalysisExecution, type AnalysisOperation, type AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisInputError, diff --git a/src/application/EnhancedTools.batchCleanup.test.ts b/src/application/EnhancedTools.batchCleanup.test.ts index 8e012a32db..30dc249a09 100644 --- a/src/application/EnhancedTools.batchCleanup.test.ts +++ b/src/application/EnhancedTools.batchCleanup.test.ts @@ -1,11 +1,11 @@ import { expect, it } from "vitest"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { AnalysisCancelledError, AnalysisCapabilityUnavailableError, } from "../domain/analysisErrorCore.js"; import { err, ok } from "../domain/result.js"; -import { createAnalysisExecution } from "./AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import { EnhancedTools } from "./EnhancedTools.js"; it.each([ diff --git a/src/application/EnhancedTools.input.test.ts b/src/application/EnhancedTools.input.test.ts index 263b9429b0..83bf0b6db9 100644 --- a/src/application/EnhancedTools.input.test.ts +++ b/src/application/EnhancedTools.input.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; import { z } from "zod"; -import type { AnalysisOperationPort } from "./AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../ports/AnalysisProvider.js"; import { EnhancedTools } from "./EnhancedTools.js"; import { AnalysisInputError } from "../domain/analysisErrorCore.js"; import { MAX_ENHANCED_RECORDS } from "../contracts/enhancedInputs.js"; diff --git a/src/application/EnhancedTools.inputValidation.test.ts b/src/application/EnhancedTools.inputValidation.test.ts index 643ae1ca32..1431b19d59 100644 --- a/src/application/EnhancedTools.inputValidation.test.ts +++ b/src/application/EnhancedTools.inputValidation.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it, vi } from "vitest"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { EnhancedTools } from "./EnhancedTools.js"; import { ok } from "../domain/result.js"; diff --git a/src/application/EnhancedTools.objcClasses.test.ts b/src/application/EnhancedTools.objcClasses.test.ts index 9067eb3c90..271caf7e8b 100644 --- a/src/application/EnhancedTools.objcClasses.test.ts +++ b/src/application/EnhancedTools.objcClasses.test.ts @@ -4,7 +4,7 @@ import { createAnalysisExecution, type AnalysisOperation, type AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { EnhancedTools } from "./EnhancedTools.js"; import type { BinaryArchitecture } from "../domain/binaryTargetTypes.js"; diff --git a/src/application/EnhancedTools.ts b/src/application/EnhancedTools.ts index 70f31506ba..a30a0fa24d 100644 --- a/src/application/EnhancedTools.ts +++ b/src/application/EnhancedTools.ts @@ -18,7 +18,7 @@ import type { AnalysisOperation, AnalysisOperationPort, ExecutionOptions, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { enhancedInputSchemas, type CallRelationshipDirection, diff --git a/src/application/EvidenceBundleCommands.ts b/src/application/EvidenceBundleCommands.ts index 7bd14845d2..cdf1d28517 100644 --- a/src/application/EvidenceBundleCommands.ts +++ b/src/application/EvidenceBundleCommands.ts @@ -19,7 +19,7 @@ import { compareBundles, type BundleRecordPair, } from "../domain/bundleComparison.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { readEvidenceBundle, readImmutableEvidenceBundle, diff --git a/src/application/EvidenceBundleFiles.ts b/src/application/EvidenceBundleFiles.ts index b6116d5565..969afd4940 100644 --- a/src/application/EvidenceBundleFiles.ts +++ b/src/application/EvidenceBundleFiles.ts @@ -29,8 +29,11 @@ import { bufferedJsonParts, canonicalJsonParts, } from "../domain/jsonSerialization.js"; -import { readJsonFile, writeTextParts } from "./JsonFiles.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { readJsonFile } from "./JsonFiles.js"; +import { + writeTextParts, + type ArtifactResourceScope, +} from "../resources/index.js"; type EvidenceBundleFileFailure = | EvidenceFileError diff --git a/src/application/FunctionAnalysisEvidence.test.ts b/src/application/FunctionAnalysisEvidence.test.ts index 9a8cee9ab4..6c3cfe12a6 100644 --- a/src/application/FunctionAnalysisEvidence.test.ts +++ b/src/application/FunctionAnalysisEvidence.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import { createAnalysisExecution } from "./AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import { executeFunctionAnalysisEvidence } from "./FunctionAnalysisEvidence.js"; import { AnalysisOutputError } from "../domain/analysisErrorCore.js"; import { createEvidence, parseEvidence } from "../domain/evidence.js"; diff --git a/src/application/FunctionAnalysisEvidence.ts b/src/application/FunctionAnalysisEvidence.ts index 2b0d97ea1b..42e8150b03 100644 --- a/src/application/FunctionAnalysisEvidence.ts +++ b/src/application/FunctionAnalysisEvidence.ts @@ -2,7 +2,7 @@ import { parseAnalysisInput } from "./AnalysisInput.js"; import type { AnalysisOperationPort, ExecutionOptions, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { nativeProcedureInputSchema } from "../domain/native/nativeProcedureInput.js"; import type { BinaryTarget } from "../domain/binaryTargetTypes.js"; import { createAnalysisExecutionEvidence } from "../domain/analysisObservation.js"; diff --git a/src/application/GeminiClientSettings.ts b/src/application/GeminiClientSettings.ts index 974a27a7cc..f5d84e808e 100644 --- a/src/application/GeminiClientSettings.ts +++ b/src/application/GeminiClientSettings.ts @@ -5,7 +5,7 @@ import { z } from "zod"; import { jsonRecordSchema } from "../domain/jsonRecord.js"; import { err, ok, type Result } from "../domain/result.js"; import { PRODUCT_IDENTITY } from "../identity.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { currentClientRegistrationCommand } from "./ClientRegistrationIdentity.js"; import { clientConfigurationValuesEqual, diff --git a/src/application/GuidanceAccess.boundaries.test.ts b/src/application/GuidanceAccess.boundaries.test.ts index 2602c6986e..ff7cb6371a 100644 --- a/src/application/GuidanceAccess.boundaries.test.ts +++ b/src/application/GuidanceAccess.boundaries.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { readGuidanceSectionInputSchema } from "../contracts/guidanceContracts.js"; import { MANAGED_SKILL_FILES } from "./SetupSkill.js"; import { diff --git a/src/application/GuidanceAccess.lifecycle.test.ts b/src/application/GuidanceAccess.lifecycle.test.ts index 3f8a029dd9..7d5f669da2 100644 --- a/src/application/GuidanceAccess.lifecycle.test.ts +++ b/src/application/GuidanceAccess.lifecycle.test.ts @@ -4,9 +4,9 @@ import { phaseGate, settledCause, } from "../../tests/support/lifecycleHarness.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; -import { RetainedRegularFileCleanupFailure } from "./RegularFileRead.js"; +import { RetainedRegularFileCleanupFailure } from "../process/RegularFileRead.js"; import { MANAGED_SKILL_FILES } from "./SetupSkill.js"; import { readGuidanceSectionWithReader, diff --git a/src/application/GuidanceAccess.test.ts b/src/application/GuidanceAccess.test.ts index 17b2c88ce2..a77db53c2e 100644 --- a/src/application/GuidanceAccess.test.ts +++ b/src/application/GuidanceAccess.test.ts @@ -1,9 +1,9 @@ import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; import { MANAGED_SKILL_FILES } from "./SetupSkill.js"; import { searchGuidanceOutputSchema } from "../contracts/guidanceContracts.js"; -import { RetainedRegularFileCleanupFailure } from "./RegularFileRead.js"; +import { RetainedRegularFileCleanupFailure } from "../process/RegularFileRead.js"; import { readGuidanceSectionWithReader, searchGuidanceWithReader, diff --git a/src/application/GuidanceAccess.ts b/src/application/GuidanceAccess.ts index 6b823ec30d..d734bafa24 100644 --- a/src/application/GuidanceAccess.ts +++ b/src/application/GuidanceAccess.ts @@ -1,8 +1,11 @@ import { createHash } from "node:crypto"; import { fileURLToPath } from "node:url"; import type { z } from "zod"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { + ArtifactResourceScope, + AnalysisCleanupLease, + ArtifactReaderFailure, +} from "../resources/index.js"; import { MANAGED_SKILL_FILES, readSkillFile } from "./SetupSkill.js"; import { PRODUCT_IDENTITY } from "../identity.js"; import { @@ -16,11 +19,10 @@ import { } from "../contracts/guidanceContracts.js"; import { AnalysisInputError } from "../domain/analysisErrorCore.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { bindRegularFileCleanup, RetainedRegularFileCleanupFailure, -} from "./RegularFileRead.js"; +} from "../process/RegularFileRead.js"; import { analysisInputErrorFromIssues } from "../domain/inputIssueProjection.js"; import { err, ok, type Result } from "../domain/result.js"; import { diff --git a/src/application/HopperLauncherDiscovery.ts b/src/application/HopperLauncherDiscovery.ts deleted file mode 100644 index 2d9ba3cd34..0000000000 --- a/src/application/HopperLauncherDiscovery.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { - linuxHopperLauncherCandidates, - REA_MANAGED_LINUX_HOPPER_LAUNCHER, -} from "./LinuxHopper.js"; -import { - MAC_HOPPER_SYSTEM_LAUNCHER, - macHopperCanonicalLauncherCandidates, -} from "./MacHopperPaths.js"; - -/** - * Where automatic Hopper discovery looks on one platform. Runtime configuration - * and doctor both read it, so doctor checks the same candidates, in the same - * order, as CLI/MCP startup. - */ -export interface HopperLauncherDiscovery { - /** Fixed launcher paths, probed in order. */ - readonly candidates: readonly string[]; - /** - * Whether renamed `Hopper*.app` bundles are probed after the fixed paths. - * Doctor also reports the Homebrew cask application only when this is set. - */ - readonly probesMacApplicationBundles: boolean; - /** Launcher runtime configures when no candidate is executable. */ - readonly fallback: string; -} - -/** Select the automatic Hopper launcher candidates for one platform. */ -export const hopperLauncherDiscovery = ( - platform: NodeJS.Platform, - homeDirectory: string, -): HopperLauncherDiscovery => { - if (platform === "darwin") - return { - candidates: macHopperCanonicalLauncherCandidates(homeDirectory), - probesMacApplicationBundles: true, - fallback: MAC_HOPPER_SYSTEM_LAUNCHER, - }; - if (platform === "linux") - return { - candidates: linuxHopperLauncherCandidates(homeDirectory), - probesMacApplicationBundles: false, - fallback: REA_MANAGED_LINUX_HOPPER_LAUNCHER, - }; - return { - candidates: [], - probesMacApplicationBundles: false, - fallback: MAC_HOPPER_SYSTEM_LAUNCHER, - }; -}; diff --git a/src/application/InventoryProjectionEvidence.ts b/src/application/InventoryProjectionEvidence.ts index 48285acd5a..c54079719b 100644 --- a/src/application/InventoryProjectionEvidence.ts +++ b/src/application/InventoryProjectionEvidence.ts @@ -2,7 +2,7 @@ import { resolveEvidenceRequest, type EvidenceLookup, } from "./EvidenceInputResolver.js"; -import type { ExecutionOptions } from "./AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { AnalysisInputError } from "../domain/analysisErrorCore.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { diff --git a/src/application/JsonFiles.ts b/src/application/JsonFiles.ts index 25549a1ef5..2248d7be57 100644 --- a/src/application/JsonFiles.ts +++ b/src/application/JsonFiles.ts @@ -1,20 +1,4 @@ -import { HOST_PLATFORM } from "../platform/HostPlatform.js"; -import { - link, - lstat, - mkdtemp, - open, - realpath, - rename, - stat, - type FileHandle, -} from "node:fs/promises"; -import { basename, dirname, resolve } from "node:path"; - -import { - EvidenceFileError, - type PublishedEvidenceFile, -} from "../domain/evidenceErrors.js"; +import { EvidenceFileError } from "../domain/evidenceErrors.js"; import { AnalysisCancelledError, type AnalysisInputError, @@ -41,28 +25,15 @@ import { import { bindRegularFileCleanup, regularFileCleanupLeases, -} from "./RegularFileRead.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +} from "../process/RegularFileRead.js"; import { + type ArtifactResourceScope, + ArtifactReaderFailure, type AnalysisCleanupLease, - AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; -import { OwnedStagedOutput } from "../filesystem/OwnedStagedOutput.js"; -import { StagedOutputError } from "../filesystem/StagedOutputError.js"; + fileAccessFailureReason, +} from "../resources/index.js"; import { absoluteCallerPath } from "../filesystem/callerPath.js"; -/** Request control and its owning operation for an interruptible atomic write. */ -export interface TextWriteCancellation { - readonly signal: AbortSignal; - readonly operation: string; -} - -type TextWriteResult = - Result<{ readonly path: string; readonly bytes: number }, Failure>; - // The JSON read owner records the exact leases it binds; consumers never // infer cleanup ownership from matching resource labels. const jsonReadLeases = new WeakMap< @@ -318,379 +289,3 @@ const isJsonReadCancellation = ( cause.cause === signal.reason ); }; - -/** Atomically write text to the caller-supplied path. */ -export const writeTextFile = async ( - encoded: string, - path: string, - overwrite: boolean, - resources: ArtifactResourceScope, -): Promise> => - writeTextParts([encoded], path, overwrite, resources); - -/** Publish streamed text atomically unless cancellation wins before publication. */ -export function writeTextParts( - parts: Iterable, - path: string, - overwrite: boolean, - resources: ArtifactResourceScope, -): Promise>; -export function writeTextParts( - parts: Iterable, - path: string, - overwrite: boolean, - resources: ArtifactResourceScope, - cancellation: TextWriteCancellation | undefined, -): Promise; -export function writeTextParts( - parts: Iterable, - path: string, - overwrite: boolean, - resources: ArtifactResourceScope, - cancellation?: TextWriteCancellation, -): Promise { - return resources - .run(() => - writeTextPartsOwned(parts, path, overwrite, resources, cancellation), - ) - .catch((cause: unknown) => { - const cleanup = - cause instanceof ArtifactReaderFailure && cause.cleanup !== undefined - ? cause.cleanup - : undefined; - const error = new EvidenceFileError("write", "io", { - cause, - path: absoluteCallerPath(path), - ...(cleanup === undefined ? {} : { cleanup }), - }); - // A failed admission retry names its exact retained leases. - bindArtifactFileCleanup(cause, error); - return err(error); - }); -} - -const writeTextPartsOwned = async ( - parts: Iterable, - path: string, - overwrite: boolean, - resources: ArtifactResourceScope, - cancellation?: TextWriteCancellation, -): Promise => { - const requestedPath = absoluteCallerPath(path); - try { - assertWriteActive(cancellation); - if (HOST_PLATFORM.platform !== "win32" && requestedPath.endsWith("/")) - return err( - new EvidenceFileError("write", "not-file", { path: requestedPath }), - ); - const selectedParent = dirname(requestedPath); - // Native lookup must accept the parent before realpath can collapse it. - // On macOS realpath(file/..) succeeds even though that traversal is ENOTDIR. - if (!(await stat(selectedParent)).isDirectory()) - return err( - new EvidenceFileError("write", "missing", { path: requestedPath }), - ); - const canonicalParent = await realpath(selectedParent); - const destination = resolve(canonicalParent, basename(requestedPath)); - const existing = await lstat(destination).catch((cause: unknown) => { - if (fileErrorCode(cause) === "ENOENT") return undefined; - throw cause; - }); - if (existing !== undefined) { - if (!existing.isFile() || existing.isSymbolicLink()) - return err( - new EvidenceFileError("write", "not-file", { path: requestedPath }), - ); - if (!overwrite) - return err( - new EvidenceFileError("write", "exists", { path: requestedPath }), - ); - } - assertWriteActive(cancellation); - const bytes = await publishFile( - destination, - parts, - overwrite, - resources, - cancellation, - ); - return ok({ path: requestedPath, bytes }); - } catch (cause: unknown) { - if (cause instanceof StagedOutputCleanupFailure) { - const cleanup = { - reason: failureMessage(cause.cleanupCause), - resources: [cause.owner.directory], - }; - if (cause.outcome.ok) - return stagedCleanupFailure( - new EvidenceFileError("write", "io", { - cause, - path: requestedPath, - cleanup, - published: { ...cause.outcome.value, path: requestedPath }, - ...stagedOutputDiagnostics(cause.cleanupCause), - }), - cause.lease, - ); - if (cause.outcome.error instanceof AnalysisCancelledError) - return stagedCleanupFailure( - cancelledBy( - cause.outcome.error.operation, - carriedReason(cause.outcome.error.cause), - { cleanupPrimary: cause.outcome.error, cleanup }, - ), - cause.lease, - ); - const failure = classifyWriteFailure(cause.outcome.error); - return stagedCleanupFailure( - new EvidenceFileError("write", failure.reason, { - cause, - path: requestedPath, - cleanup, - ...(failure.systemCode === undefined - ? {} - : { systemCode: failure.systemCode }), - ...stagedOutputDiagnostics( - !cause.outcome.ok && - cause.outcome.error instanceof StagedOutputError - ? cause.outcome.error - : cause.cleanupCause, - ), - }), - cause.lease, - ); - } - if ( - cancellation?.signal.aborted === true && - cause instanceof AnalysisCancelledError && - cause.operation === cancellation.operation - ) - return err(cause); - if (!overwrite && fileErrorCode(cause) === "EEXIST") - return err( - new EvidenceFileError("write", "exists", { - cause, - path: requestedPath, - }), - ); - const failure = classifyWriteFailure(cause); - return err( - new EvidenceFileError("write", failure.reason, { - cause, - path: requestedPath, - ...(failure.systemCode === undefined - ? {} - : { systemCode: failure.systemCode }), - ...stagedOutputDiagnostics(cause), - }), - ); - } -}; - -/** Recognize only host codes that establish a publication resource refusal. */ -const classifyWriteFailure = ( - cause: unknown, -): { - readonly reason: EvidenceFileError["reason"]; - readonly systemCode?: "EFBIG" | "ENOSPC" | "EDQUOT"; -} => { - const code = fileErrorCode(cause); - return code === "EFBIG" || code === "ENOSPC" || code === "EDQUOT" - ? { reason: "storage-limit", systemCode: code } - : { reason: fileAccessFailureReason(cause) }; -}; - -/** The retained staging lease clears this error only when a retry confirms release. */ -const stagedCleanupFailure = < - Failure extends EvidenceFileError | AnalysisCancelledError, ->( - error: Failure, - lease: AnalysisCleanupLease, -): Result => { - new AnalysisCleanupLeaseGroup(error, [lease]); - return err(error); -}; - -/** A missing path or parent is a selection error, not a permission failure. */ -const fileAccessFailureReason = ( - cause: unknown, -): "missing" | "io" | "path-limit" | "symlink-traversal" => { - const code = fileErrorCode(cause); - if (code === "ENAMETOOLONG") return "path-limit"; - if (code === "ELOOP") return "symlink-traversal"; - return code === "ENOENT" || code === "ENOTDIR" ? "missing" : "io"; -}; - -const publishFile = async ( - destination: string, - parts: Iterable, - overwrite: boolean, - resources: ArtifactResourceScope, - cancellation?: TextWriteCancellation, -): Promise => { - const { owner, staged, file } = await acquireStagedFile( - dirname(destination), - resources, - cancellation, - ); - let outcome: Result; - try { - let written: Result; - try { - const bytes = await writeStagedParts(file, parts, cancellation); - assertWriteActive(cancellation); - await file.sync(); - written = ok(bytes); - } catch (cause: unknown) { - written = err(cause); - } - try { - await owner.closeFile(); - } catch (cause: unknown) { - if (written.ok) written = err(cause); - } - if (!written.ok) throw written.error; - // Once submitted, atomic publication can win a later cancellation race. - assertWriteActive(cancellation); - await owner.assertReadyForPublication(staged); - assertWriteActive(cancellation); - if (overwrite) { - await rename(staged, destination); - owner.recordPublishedRename(); - } - // A hard link publishes complete bytes atomically and cannot replace an existing name. - else await link(staged, destination); - outcome = ok({ path: destination, bytes: written.value }); - } catch (cause: unknown) { - outcome = err(cause); - } - - // One cleanup phase owns both the open descriptor (if any) and its staging directory. - const released = await resources.release({ - kind: "staged-output", - resource: owner.directory, - output: owner, - }); - if (released.kind === "failed") - throw new StagedOutputCleanupFailure( - outcome, - released.cause, - owner, - released.lease, - ); - if (!outcome.ok) throw outcome.error; - return outcome.value.bytes; -}; - -/** Keep staging on the destination filesystem without imposing a shorter path ceiling. */ -const acquireStagedFile = async ( - destinationParent: string, - resources: ArtifactResourceScope, - cancellation?: TextWriteCancellation, -): Promise<{ - readonly owner: OwnedStagedOutput; - readonly staged: string; - readonly file: FileHandle; -}> => { - const destinationDevice = (await lstat(destinationParent)).dev; - let parent = destinationParent; - for (;;) { - assertWriteActive(cancellation); - let failure: unknown; - let directory: string | undefined; - try { - directory = await mkdtemp(resolve(parent, ".rea-write-")); - } catch (cause: unknown) { - if (fileErrorCode(cause) !== "ENAMETOOLONG") throw cause; - failure = cause; - } - if (directory !== undefined) { - const owner = await OwnedStagedOutput.create(directory); - const staged = resolve(directory, "content"); - try { - const file = await open(staged, "wx", 0o600); - owner.setFile(new OwnedFileHandle(file)); - return { owner, staged, file }; - } catch (cause: unknown) { - const released = await resources.release({ - kind: "staged-output", - resource: owner.directory, - output: owner, - }); - if (released.kind === "failed") - throw new StagedOutputCleanupFailure( - err(cause), - released.cause, - owner, - released.lease, - ); - if (fileErrorCode(cause) !== "ENAMETOOLONG") throw cause; - failure = cause; - } - } - const ancestor = dirname(parent); - if (ancestor === parent) throw failure; - const metadata = await lstat(ancestor); - if (metadata.dev !== destinationDevice) throw failure; - parent = ancestor; - } -}; - -class StagedOutputCleanupFailure extends Error { - constructor( - readonly outcome: Result, - readonly cleanupCause: unknown, - readonly owner: OwnedStagedOutput, - readonly lease: AnalysisCleanupLease, - ) { - super("Staged output cleanup failed", { - cause: outcome.ok ? cleanupCause : outcome.error, - }); - } -} - -const stagedOutputDiagnostics = ( - cause: unknown, -): { - readonly diagnostics?: Readonly>; -} => { - if (!(cause instanceof StagedOutputError)) return {}; - return { diagnostics: { code: cause.code, ...cause.detail } }; -}; - -const failureMessage = (cause: unknown): string => - cause instanceof Error ? cause.message || cause.name : String(cause); - -const writeStagedParts = async ( - file: FileHandle, - parts: Iterable, - cancellation?: TextWriteCancellation, -): Promise => { - assertWriteActive(cancellation); - const iterator = parts[Symbol.iterator](); - let exhausted = false; - let bytes = 0; - try { - for (;;) { - assertWriteActive(cancellation); - const part = iterator.next(); - if (part.done) exhausted = true; - assertWriteActive(cancellation); - if (part.done) return bytes; - await file.writeFile(part.value, { encoding: "utf8" }); - bytes += Buffer.byteLength(part.value, "utf8"); - } - } finally { - if (!exhausted) iterator.return?.(); - } -}; - -const assertWriteActive = (cancellation?: TextWriteCancellation): void => { - if (cancellation?.signal.aborted === true) - throw cancelledBy(cancellation.operation, cancellation.signal); -}; - -const fileErrorCode = (cause: unknown): unknown => - typeof cause === "object" && cause !== null && "code" in cause - ? cause.code - : undefined; diff --git a/src/application/JsonInputFile.ts b/src/application/JsonInputFile.ts index 9853de559e..bf2f8fb9b5 100644 --- a/src/application/JsonInputFile.ts +++ b/src/application/JsonInputFile.ts @@ -24,13 +24,13 @@ import { RegularFileChangedError, RegularFileOperationCancelled, } from "../filesystem/RegularFile.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { sealOwnedJsonInput } from "./OwnedJsonInput.js"; import { RegularFileReadFailure, withRegularFile, type RegularFileReadOptions, -} from "./RegularFileRead.js"; +} from "../process/RegularFileRead.js"; import { JSON_BYTE_ORDER_MARK_MESSAGE, JSON_INPUT_RESOURCE_REMEDIATION, diff --git a/src/application/JunieClientSettings.ts b/src/application/JunieClientSettings.ts index 762310bc9e..7fb8b1db0e 100644 --- a/src/application/JunieClientSettings.ts +++ b/src/application/JunieClientSettings.ts @@ -1,4 +1,4 @@ -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { err, ok, type Result } from "../domain/result.js"; import { clientConfigurationRecordSchema } from "./ClientConfigurationDocument.js"; import { diff --git a/src/application/LinuxHopper.ts b/src/application/LinuxHopper.ts index 0eb5604590..2982de2def 100644 --- a/src/application/LinuxHopper.ts +++ b/src/application/LinuxHopper.ts @@ -1,6 +1,5 @@ import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { isAborted } from "../domain/analysisErrorCore.js"; -import { appendCallerPath } from "../filesystem/callerPath.js"; import type { AnalysisCleanupObservation } from "../domain/analysisErrorBase.js"; import type { HopperInstallFailureReason } from "./SetupInstallFailure.js"; import { access, mkdtemp, readFile, rm, writeFile } from "node:fs/promises"; @@ -9,7 +8,7 @@ import { join, posix } from "node:path"; import { execFileBoundedOutput } from "../process/ExecFileBoundedOutput.js"; import { execFileOutput } from "../process/ExecFileOutput.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { downloadHopperPackage, isHopperRequestCancellation, @@ -38,6 +37,7 @@ import { type VerifiedLinuxHopperPackage, type VerifiedLinuxHopperLauncher, } from "./LinuxHopperPublisher.js"; +import type { LinuxHopperLauncherVerification } from "../ports/LinuxHopperLauncherVerification.js"; /** Package-manager output retained per stream without stopping the command. */ const PACKAGE_MANAGER_OUTPUT_BYTES = 64 * 1024; @@ -513,28 +513,6 @@ export const installLinuxHopper = async ( } }; -/** Canonical launcher path for a legacy user-local Linux Hopper installation. */ -const linuxHopperLauncherPath = (home: string): string => - appendCallerPath(home, ".local/share/rea/hopper/bin/Hopper", "linux"); - -/** REA's managed Linux install path, preferred when no explicit launcher is set. */ -export const REA_MANAGED_LINUX_HOPPER_LAUNCHER = "/opt/hopper/bin/Hopper"; - -/** Other system-wide Hopper paths used by package installations. */ -const systemLinuxHopperLauncherCandidates: readonly string[] = [ - "/opt/hopper-v4/bin/hopper", - "/usr/bin/hopper", -]; - -/** Probe REA-managed and user-local installs before arbitrary system builds. */ -export const linuxHopperLauncherCandidates = ( - home: string, -): readonly string[] => [ - REA_MANAGED_LINUX_HOPPER_LAUNCHER, - linuxHopperLauncherPath(home), - ...systemLinuxHopperLauncherCandidates, -]; - /** * Compose package-manager and linker checks from the selected caller * environment. The distribution comes from the caller's host-fact owner, so @@ -640,6 +618,13 @@ export const inspectLinuxHopperLauncher = async ( } }; +/** The Linux launcher authentication production composition gives the Hopper provider. */ +export const LINUX_HOPPER_LAUNCHER_VERIFICATION: LinuxHopperLauncherVerification = + { + inspect: inspectLinuxHopperLauncher, + retryCleanup: retryLinuxHopperPublisherCleanup, + }; + /** The publisher retains a failed close before throwing; retry every retained owner. */ const closePublisherAndRetainedScopes = async ( publisher: LinuxHopperPublisher, diff --git a/src/application/LinuxHopperPublisher.ts b/src/application/LinuxHopperPublisher.ts index 36e84b7d1a..007c25edf5 100644 --- a/src/application/LinuxHopperPublisher.ts +++ b/src/application/LinuxHopperPublisher.ts @@ -7,12 +7,10 @@ import { z } from "zod"; import { ArtifactResourceScope, type ArtifactResourceOwner, -} from "../artifacts/ArtifactResourceScope.js"; -import type { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import { + type AnalysisCleanupLease, ArtifactReaderFailure, artifactPrimaryCleanupLeases, -} from "../artifacts/ArtifactReader.js"; +} from "../resources/index.js"; import { linuxHopperReleaseCacheDirectory } from "./LinuxHopperCacheDirectory.js"; import { err, ok, type Result } from "../domain/result.js"; import { @@ -53,7 +51,7 @@ import { type LinuxHopperRelease, type LinuxPackageFamily, } from "./HopperReleaseFeed.js"; -import { withRegularFile } from "./RegularFileRead.js"; +import { withRegularFile } from "../process/RegularFileRead.js"; import { decodeStrictUtf8 } from "../domain/strictUtf8.js"; /** Metadata/key inspection budget, independent of the compressed package budget. */ diff --git a/src/application/MacHopper.ts b/src/application/MacHopper.ts index 17471e504d..d64080381c 100644 --- a/src/application/MacHopper.ts +++ b/src/application/MacHopper.ts @@ -19,7 +19,7 @@ import { appendCallerPath } from "../filesystem/callerPath.js"; import type { AnalysisCleanupObservation } from "../domain/analysisErrorBase.js"; import { HOPPER_PUBLISHER } from "../domain/hopperPublisher.js"; import { macDeveloperIdRequirement } from "../process/MacCodeSignature.js"; -import { macHopperUserApplicationPath } from "./MacHopperPaths.js"; +import { macHopperUserApplicationPath } from "../hopperPaths/MacHopperPaths.js"; import { downloadHopperPackage, isHopperRequestCancellation, diff --git a/src/application/McpClientRegistration.formats.test.ts b/src/application/McpClientRegistration.formats.test.ts index c1ce310dd6..a1d78b543c 100644 --- a/src/application/McpClientRegistration.formats.test.ts +++ b/src/application/McpClientRegistration.formats.test.ts @@ -4,7 +4,7 @@ import { basename, dirname, join } from "node:path"; import { afterEach, beforeEach, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { registerMcpClient } from "./McpClientRegistration.js"; import { parseGooseConfigurationYaml } from "./GooseConfigurationYaml.js"; import { clientConfigurationRecordSchema } from "./ClientConfigurationDocument.js"; diff --git a/src/application/McpClientRegistration.layers.test.ts b/src/application/McpClientRegistration.layers.test.ts index 2420e750a2..dce01dd53e 100644 --- a/src/application/McpClientRegistration.layers.test.ts +++ b/src/application/McpClientRegistration.layers.test.ts @@ -4,7 +4,7 @@ import { dirname, join } from "node:path"; import { afterEach, beforeEach, expect, it } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { effectiveClientServer, parseClientConfiguration, diff --git a/src/application/McpClientRegistration.nativeFields.test.ts b/src/application/McpClientRegistration.nativeFields.test.ts index 228e4dca84..0801c0a0d8 100644 --- a/src/application/McpClientRegistration.nativeFields.test.ts +++ b/src/application/McpClientRegistration.nativeFields.test.ts @@ -2,7 +2,7 @@ import { readFile, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { beforeEach, afterEach, expect, it } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { clientConfigurationRecordSchema } from "./ClientConfigurationDocument.js"; import { parseGooseConfigurationYaml } from "./GooseConfigurationYaml.js"; import { registerMcpClient } from "./McpClientRegistration.js"; diff --git a/src/application/McpClientRegistration.test.ts b/src/application/McpClientRegistration.test.ts index 81670533ad..e222944d83 100644 --- a/src/application/McpClientRegistration.test.ts +++ b/src/application/McpClientRegistration.test.ts @@ -15,7 +15,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { phaseGate } from "../../tests/support/lifecycleHarness.js"; import { ok } from "../domain/result.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; let resources: ArtifactResourceScope; beforeEach(() => { resources = new ArtifactResourceScope(); @@ -51,7 +51,7 @@ const register = ( signal?: AbortSignal, ) => registerMcpClient(clientFor(path), launcher, signal, resources); import { ClientConfigurationPublication } from "./ClientConfigurationPublication.js"; -import * as regularReads from "./RegularFileRead.js"; +import * as regularReads from "../process/RegularFileRead.js"; const launcher = { command: "/fixture/server path", diff --git a/src/application/McpClientRegistration.ts b/src/application/McpClientRegistration.ts index dac805c4d0..26583c630e 100644 --- a/src/application/McpClientRegistration.ts +++ b/src/application/McpClientRegistration.ts @@ -2,8 +2,10 @@ import { mkdir } from "node:fs/promises"; import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { dirname } from "node:path"; -import { AnalysisCleanupLeaseGroup } from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + AnalysisCleanupLeaseGroup, + ArtifactResourceScope, +} from "../resources/index.js"; import { AnalysisCancelledError, cancelledBy, @@ -40,7 +42,7 @@ import type { McpRegistrationClient } from "./McpRegistrationCatalog.js"; import { readRegularFileText, readRegularFileTextSnapshot, -} from "./RegularFileRead.js"; +} from "../process/RegularFileRead.js"; export interface McpClientRegistrationReceipt { readonly status: "configured" | "unchanged"; diff --git a/src/application/McpRegistrationCatalog.test.ts b/src/application/McpRegistrationCatalog.test.ts index a822dc11e0..5e4596a211 100644 --- a/src/application/McpRegistrationCatalog.test.ts +++ b/src/application/McpRegistrationCatalog.test.ts @@ -6,7 +6,7 @@ import { z } from "zod"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { createTestProcessRegistry } from "../../tests/support/process/processFixture.js"; import { resolveMcpRegistrationClients } from "./McpRegistrationCatalog.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; const selectAgent = async (agent: string) => { const root = await createTestTempDirectory("rea-mcp-alias-"); @@ -134,7 +134,7 @@ const CATALOG_PROGRAM = ` if (path.startsWith('..') || isAbsolute(path)) throw Error('Fixture location escaped: ' + key); } const { resolveMcpRegistrationClients } = await import(${JSON.stringify(new URL("./McpRegistrationCatalog.ts", import.meta.url).href)}); - const { ArtifactResourceScope } = await import(${JSON.stringify(new URL("../artifacts/ArtifactResourceScope.ts", import.meta.url).href)}); + const { ArtifactResourceScope } = await import(${JSON.stringify(new URL("../resources/ArtifactResourceScope.ts", import.meta.url).href)}); const resources = new ArtifactResourceScope(); try { const posix = process.platform !== 'win32'; diff --git a/src/application/McpRegistrationCatalog.ts b/src/application/McpRegistrationCatalog.ts index 0766e468bb..09a8a7f4b4 100644 --- a/src/application/McpRegistrationCatalog.ts +++ b/src/application/McpRegistrationCatalog.ts @@ -22,7 +22,7 @@ import { } from "./SupportedClients.js"; import { redirectedWriteBlocker } from "./MsixPackageStorage.js"; import type { ClientRegistrationProfile } from "./ClientRegistrationProfile.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { selectedPath, present, diff --git a/src/application/McpRegistrationConfiguration.ts b/src/application/McpRegistrationConfiguration.ts index 22c73e1820..284044347d 100644 --- a/src/application/McpRegistrationConfiguration.ts +++ b/src/application/McpRegistrationConfiguration.ts @@ -22,7 +22,7 @@ import { replaceClientRegistrationLauncher } from "./ClientRegistration.js"; import { readClientPolicyBlock } from "./GeminiClientSettings.js"; import { admitClientStdioConnection } from "./ClientRegistrationConnection.js"; import type { McpRegistrationClient } from "./McpRegistrationCatalog.js"; -import { readRegularFileTextSnapshot } from "./RegularFileRead.js"; +import { readRegularFileTextSnapshot } from "../process/RegularFileRead.js"; // `rea mcp add` writes and verifies this host's client files. const { platform } = HOST_PLATFORM; diff --git a/src/application/McpRegistrationGit.test.ts b/src/application/McpRegistrationGit.test.ts index c328787ec8..dd36c9a79f 100644 --- a/src/application/McpRegistrationGit.test.ts +++ b/src/application/McpRegistrationGit.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { afterEach, beforeEach, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; import { ConfigurationError } from "../domain/configurationErrors.js"; import * as exec from "../process/ExecFileOutput.js"; diff --git a/src/application/McpRegistrationLocations.ts b/src/application/McpRegistrationLocations.ts index df7f618e1a..7a33d7d6af 100644 --- a/src/application/McpRegistrationLocations.ts +++ b/src/application/McpRegistrationLocations.ts @@ -5,7 +5,7 @@ import { absoluteCallerPath } from "../filesystem/callerPath.js"; import type { ClientRootContext } from "./ClientConfigRoots.js"; // Type-only: the client table imports project-location owners from here. import type { SetupClient } from "./SupportedClients.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import type { ClientInlineConfiguration } from "./ClientConfigurationDocument.js"; export interface McpRegistrationLocationContext { diff --git a/src/application/OperationAlternatives.ts b/src/application/OperationAlternatives.ts index d98cc78d76..e720001382 100644 --- a/src/application/OperationAlternatives.ts +++ b/src/application/OperationAlternatives.ts @@ -1,4 +1,4 @@ -import type { AnalysisOperation } from "./AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; /** One operation that observes part of what a missing operation answers. */ interface OperationAlternative { diff --git a/src/application/ProcedureAddressResolution.ts b/src/application/ProcedureAddressResolution.ts index 5b81d7a933..895382859d 100644 --- a/src/application/ProcedureAddressResolution.ts +++ b/src/application/ProcedureAddressResolution.ts @@ -1,4 +1,4 @@ -import type { AnalysisOperation } from "./AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; import { AnalysisOutputError } from "../domain/analysisErrorCore.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import type { JsonValue } from "../domain/jsonValue.js"; diff --git a/src/application/ProviderOperationExecution.ts b/src/application/ProviderOperationExecution.ts index 1ecce6f073..23a33e628f 100644 --- a/src/application/ProviderOperationExecution.ts +++ b/src/application/ProviderOperationExecution.ts @@ -20,7 +20,7 @@ import { err, ok, type Result } from "../domain/result.js"; import type { AnalysisExecution, ExecutionOptions, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../domain/analysisObservation.js"; /** Validated caller-selected request carrying its operation input. */ diff --git a/src/application/ReferenceSourceImport.ts b/src/application/ReferenceSourceImport.ts index 55faa1d910..1d2fb6fdd0 100644 --- a/src/application/ReferenceSourceImport.ts +++ b/src/application/ReferenceSourceImport.ts @@ -11,7 +11,7 @@ import { type HistoricalSourceGraphInput, } from "../domain/referenceSourceGraph.js"; import { err, ok, type Result } from "../domain/result.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import type { AnalysisCleanupObservation } from "../domain/analysisErrorBase.js"; import { readReferenceSource } from "../reference/ReferenceSourceReader.js"; import type { diff --git a/src/application/ReferenceSourceImportPolicy.ts b/src/application/ReferenceSourceImportPolicy.ts index e0a495854f..f2cf550225 100644 --- a/src/application/ReferenceSourceImportPolicy.ts +++ b/src/application/ReferenceSourceImportPolicy.ts @@ -13,11 +13,13 @@ import { readRegularFileText, RegularFileReadFailure, retryRegularFileCleanup, -} from "./RegularFileRead.js"; +} from "../process/RegularFileRead.js"; import { err, ok, type Result } from "../domain/result.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + type ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import { DEFAULT_REFERENCE_SOURCE_IGNORE_PATTERNS, type ReferenceSourceImportError, diff --git a/src/application/ReferenceSourceImportTypes.test.ts b/src/application/ReferenceSourceImportTypes.test.ts index cfdb6625c2..8f19062dbb 100644 --- a/src/application/ReferenceSourceImportTypes.test.ts +++ b/src/application/ReferenceSourceImportTypes.test.ts @@ -4,7 +4,7 @@ import { referenceSourceImportAnalysisError, type ReferenceSourceImportError, } from "./ReferenceSourceImportTypes.js"; -import { analysisErrorProjectionSchema } from "../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../domain/analysisErrorProjectionSchema.js"; import type { ReferenceSourceRead } from "../reference/ReferenceSourceReaderTypes.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { redactExplicitFailure } from "../domain/explicitSensitiveFailure.js"; diff --git a/src/application/ReferenceSourceVcsAdapter.ts b/src/application/ReferenceSourceVcsAdapter.ts index 2620519686..21bcec7dc2 100644 --- a/src/application/ReferenceSourceVcsAdapter.ts +++ b/src/application/ReferenceSourceVcsAdapter.ts @@ -6,8 +6,10 @@ import { ReferenceSourceGitDirectoryCancelled, } from "./ReferenceSourceGitDirectory.js"; import { err, ok, type Result } from "../domain/result.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + type ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import { RegularFileCleanupFailure, regularFileCancellation, @@ -16,7 +18,7 @@ import { readRegularFile, RegularFileReadFailure, retryRegularFileCleanup, -} from "./RegularFileRead.js"; +} from "../process/RegularFileRead.js"; import { referenceSourceResourceFailure } from "../reference/ReferenceSourceReaderErrors.js"; import type { ReferenceSourceReaderError } from "../reference/ReferenceSourceReaderTypes.js"; diff --git a/src/application/Setup.desktopBuild.test.ts b/src/application/Setup.desktopBuild.test.ts index 9b4ac8e812..6cc8181c59 100644 --- a/src/application/Setup.desktopBuild.test.ts +++ b/src/application/Setup.desktopBuild.test.ts @@ -6,7 +6,7 @@ import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; import type { DesktopBuildSetupFacts, DesktopBuildSetupHost, -} from "./SetupDesktopBuild.js"; +} from "../ports/DesktopBuildHost.js"; import type { SetupOptions, SetupProviderEnvironment } from "./SetupTypes.js"; import { supportedClientRegistrationProfile } from "./SupportedClients.js"; diff --git a/src/application/Setup.fixture.ts b/src/application/Setup.fixture.ts index 8a164e45d1..ec2ccf4400 100644 --- a/src/application/Setup.fixture.ts +++ b/src/application/Setup.fixture.ts @@ -12,12 +12,11 @@ import type { SetupHopperInstallResult, } from "./SetupInstallFailure.js"; import { err, ok, type Result } from "../domain/result.js"; +import type { DoctorReport, DoctorScope } from "./Doctor.js"; import type { DoctorCheck, DoctorProviderInspection, - DoctorReport, - DoctorScope, -} from "./Doctor.js"; +} from "../ports/DoctorProviderInspection.js"; import type { LinuxDistribution } from "./LinuxHopper.js"; import { PRODUCT_IDENTITY, SDK_IDENTITY } from "../identity.js"; import { DEFAULT_CATALOG_IDENTITY } from "../catalogIdentity.js"; diff --git a/src/application/Setup.ts b/src/application/Setup.ts index 94ab6abcb6..21f0c2df6b 100644 --- a/src/application/Setup.ts +++ b/src/application/Setup.ts @@ -38,7 +38,7 @@ import { cancelledBy, } from "../domain/analysisErrorCore.js"; import { jsonValueSchema } from "../domain/jsonValue.js"; -import { assertSetupActive } from "./SetupCancellation.js"; +import { assertSetupActive } from "../domain/setupCancellation.js"; import type { SetupSkillInstallError, SkillInstallResult, diff --git a/src/application/SetupCleanupOwner.test.ts b/src/application/SetupCleanupOwner.test.ts index 0804406aba..6423aa9a1d 100644 --- a/src/application/SetupCleanupOwner.test.ts +++ b/src/application/SetupCleanupOwner.test.ts @@ -4,9 +4,9 @@ import { SetupCleanupOwner } from "./SetupCleanupOwner.js"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/AnalysisCleanupLease.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; const errorSources = (error: unknown): ReadonlySet => { diff --git a/src/application/SetupCleanupOwner.ts b/src/application/SetupCleanupOwner.ts index f915b46db5..3c43ac2b97 100644 --- a/src/application/SetupCleanupOwner.ts +++ b/src/application/SetupCleanupOwner.ts @@ -1,14 +1,14 @@ import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; + ArtifactReaderFailure, +} from "../resources/index.js"; import { AnalysisError, type AnalysisCleanupObservation, } from "../domain/analysisErrorBase.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import { bindRegularFileCleanup } from "./RegularFileRead.js"; +import { bindRegularFileCleanup } from "../process/RegularFileRead.js"; interface SetupCleanupTask { readonly rejectedPrefix?: string; diff --git a/src/application/SetupClientConfiguration.ts b/src/application/SetupClientConfiguration.ts index 4aa9b916cf..cdca350ec3 100644 --- a/src/application/SetupClientConfiguration.ts +++ b/src/application/SetupClientConfiguration.ts @@ -1,4 +1,4 @@ -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { readClientPolicyBlock } from "./GeminiClientSettings.js"; import { @@ -69,7 +69,7 @@ import { readRegularFileText, readRegularFileTextSnapshot, InvalidUtf8FileError, -} from "./RegularFileRead.js"; +} from "../process/RegularFileRead.js"; import { preserveCurrentRecoveryBackup, selectCurrentRecoveryBackup, diff --git a/src/application/SetupClients.ts b/src/application/SetupClients.ts index da6c385c4e..5c90058d1c 100644 --- a/src/application/SetupClients.ts +++ b/src/application/SetupClients.ts @@ -6,7 +6,7 @@ import type { } from "./SetupTypes.js"; import type { SetupClient } from "./SupportedClients.js"; import { clientEnvironment } from "./SetupPlan.js"; -import { assertSetupActive } from "./SetupCancellation.js"; +import { assertSetupActive } from "../domain/setupCancellation.js"; export const failedConfigurationMessage = ( result: Extract, diff --git a/src/application/SetupDesktopBuild.ts b/src/application/SetupDesktopBuild.ts index d580fbc90a..452d46dfb9 100644 --- a/src/application/SetupDesktopBuild.ts +++ b/src/application/SetupDesktopBuild.ts @@ -1,45 +1,17 @@ import { DESKTOP_EXPORT_FRAMEWORK_VERSION } from "../domain/desktop/appExport.js"; import { AGENTENV_INSTALL_COMMAND } from "./DesktopBuildDoctor.js"; import { DESKTOP_BUILD_PROVIDER_ID } from "../domain/doctorProviderIds.js"; -import { assertSetupActive } from "./SetupCancellation.js"; +import { assertSetupActive } from "../domain/setupCancellation.js"; import type { SetupAction, SetupOptions, SetupProgressEvent, SetupProviderEnvironment, } from "./SetupTypes.js"; - -/** What setup reads from a host before it plans a desktop build setup. */ -export interface DesktopBuildSetupFacts { - /** Each build setting resolved to an absolute path; absent when none resolves. */ - readonly settings: SetupProviderEnvironment; - /** Settings the caller's environment selected, which setup records as they are. */ - readonly selected: readonly string[]; - readonly archive: string; - readonly archivePacked: boolean; - /** Why this REA cannot pack its runtime, when it cannot. */ - readonly packBlocker?: string; - readonly agentEnvVersion?: string | undefined; - /** uv on PATH and the agent-env its tool install places. */ - readonly uv?: { readonly path: string; readonly agentEnv: string }; - /** Per client, the build settings its registration already records with a value of its own. */ - readonly recorded: Readonly>; -} - -/** Effects `rea setup --desktop-build` needs from its host. */ -export interface DesktopBuildSetupHost { - facts(clientIds: readonly string[]): Promise; - /** Pack this REA as the build-computer runtime; the reason when it failed. */ - packRuntime( - archive: string, - signal?: AbortSignal, - ): Promise; - /** Install the pinned agentenv-framework with uv; the reason when it failed. */ - installAgentenv( - uv: string, - signal?: AbortSignal, - ): Promise; -} +import type { + DesktopBuildSetupFacts, + DesktopBuildSetupHost, +} from "../ports/DesktopBuildHost.js"; /** A desktop build setup as runSetup drives it; inert when it was not selected. */ export interface DesktopBuildSetup { diff --git a/src/application/SetupHost.ts b/src/application/SetupHost.ts index 3351b30977..4df30e16d5 100644 --- a/src/application/SetupHost.ts +++ b/src/application/SetupHost.ts @@ -5,8 +5,12 @@ import { } from "./ClientConfigurationCleanup.js"; import { access } from "node:fs/promises"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + ArtifactResourceScope, + ArtifactReaderFailure, + AnalysisCleanupLeaseGroup, + type AnalysisCleanupLease, +} from "../resources/index.js"; import { ConfigurationError } from "../domain/configurationErrors.js"; import { currentClientRegistrationCommand } from "./ClientRegistrationIdentity.js"; import { @@ -62,11 +66,7 @@ import type { SetupProviderEnvironment, } from "./SetupTypes.js"; import { SetupCleanupOwner } from "./SetupCleanupOwner.js"; -import { - AnalysisCleanupLeaseGroup, - type AnalysisCleanupLease, -} from "../artifacts/AnalysisCleanupLease.js"; -import { bindRegularFileCleanup } from "./RegularFileRead.js"; +import { bindRegularFileCleanup } from "../process/RegularFileRead.js"; import { CURRENT_ENTRYPOINT_PATH } from "../process/CurrentEntrypointPath.js"; import { analysisProviderSelectorSchema } from "../domain/providerSelection.js"; import { systemDesktopBuildSetupHost } from "../desktop/DesktopBuildSetupHost.js"; diff --git a/src/application/SetupPlan.ts b/src/application/SetupPlan.ts index 7beb04df34..c16595318b 100644 --- a/src/application/SetupPlan.ts +++ b/src/application/SetupPlan.ts @@ -8,7 +8,7 @@ import { type LinuxDistribution, } from "./LinuxHopper.js"; import { macHopperInstallDisclosure } from "./MacHopper.js"; -import { macHopperUserApplicationPath } from "./MacHopperPaths.js"; +import { macHopperUserApplicationPath } from "../hopperPaths/MacHopperPaths.js"; import type { ClientConfigurationInspection, SetupAction, diff --git a/src/application/SetupRecoveryBackup.ts b/src/application/SetupRecoveryBackup.ts index 74ebb2ffab..543464949f 100644 --- a/src/application/SetupRecoveryBackup.ts +++ b/src/application/SetupRecoveryBackup.ts @@ -3,8 +3,8 @@ import { constants as fsConstants } from "node:fs"; import { copyFile } from "node:fs/promises"; import { err, ok, type Result } from "../domain/result.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; -import { readRegularFile } from "./RegularFileRead.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { readRegularFile } from "../process/RegularFileRead.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; export interface RecoveryBackupSelection { readonly backupPath: string; diff --git a/src/application/SetupRegistrationEnvironment.ts b/src/application/SetupRegistrationEnvironment.ts index 5a98eb9985..bb7177a7c4 100644 --- a/src/application/SetupRegistrationEnvironment.ts +++ b/src/application/SetupRegistrationEnvironment.ts @@ -1,4 +1,4 @@ -import type { DoctorProviderInspection } from "./Doctor.js"; +import type { DoctorProviderInspection } from "../ports/DoctorProviderInspection.js"; import { compareUnicodeCodePoints } from "../domain/unicodeCodePointOrder.js"; const SELECTED_REGISTRATION_SETTINGS = [ diff --git a/src/application/SetupSkill.ts b/src/application/SetupSkill.ts index bd487a7977..1759933849 100644 --- a/src/application/SetupSkill.ts +++ b/src/application/SetupSkill.ts @@ -5,8 +5,10 @@ import { appendCallerPath } from "../filesystem/callerPath.js"; import { err, ok, type Result } from "../domain/result.js"; import { parseSkillManifestMetadata } from "../domain/skillManifest.js"; import { readBoundedFileBytes } from "../process/BoundedFileBytes.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + type ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import { PRODUCT_IDENTITY } from "../identity.js"; import { @@ -14,7 +16,7 @@ import { RegularFileChangedError, } from "../filesystem/RegularFile.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; -import { withRegularFile } from "./RegularFileRead.js"; +import { withRegularFile } from "../process/RegularFileRead.js"; import { clientSkillDirectories } from "./SupportedClients.js"; import { preserveCurrentRecoveryBackup } from "./SetupRecoveryBackup.js"; import { diff --git a/src/application/SetupTypes.ts b/src/application/SetupTypes.ts index 6980f6c913..6d1756f9b3 100644 --- a/src/application/SetupTypes.ts +++ b/src/application/SetupTypes.ts @@ -15,7 +15,7 @@ import type { AnalysisError, } from "../domain/analysisErrorBase.js"; import type { SetupClient } from "./SupportedClients.js"; -import type { DesktopBuildSetupHost } from "./SetupDesktopBuild.js"; +import type { DesktopBuildSetupHost } from "../ports/DesktopBuildHost.js"; import type { SetupFailureCode, SetupHopperInstallResult, diff --git a/src/application/SkillFilePublication.ts b/src/application/SkillFilePublication.ts index 9ecce4f4b9..a725f04b44 100644 --- a/src/application/SkillFilePublication.ts +++ b/src/application/SkillFilePublication.ts @@ -2,7 +2,7 @@ import { constants, type Stats } from "node:fs"; import { link, lstat, mkdtemp, open, realpath, rename } from "node:fs/promises"; import { basename, dirname, join } from "node:path"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; import { fileHandleMatchesBytes } from "../filesystem/fileHandleMatchesBytes.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { OwnedStagedOutput } from "../filesystem/OwnedStagedOutput.js"; diff --git a/src/application/SourceLimitations.ts b/src/application/SourceLimitations.ts index 2f40961f82..33a268413c 100644 --- a/src/application/SourceLimitations.ts +++ b/src/application/SourceLimitations.ts @@ -1,7 +1,7 @@ import type { AnalysisOperation, ProviderIdentity, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { compareUnicodeCodePoints } from "../domain/unicodeCodePointOrder.js"; /** One provider-owned caveat tied to the operation that reported it. */ diff --git a/src/application/Uninstall.ts b/src/application/Uninstall.ts index 39d42ae7fe..7c91c941b3 100644 --- a/src/application/Uninstall.ts +++ b/src/application/Uninstall.ts @@ -34,7 +34,7 @@ import { hasParentTraversal, sameLexicalDirectory, withinLexicalDirectory, -} from "../config/kunaCacheDirectory.js"; +} from "../filesystem/cacheDirectory.js"; import { defaultDarwinHelperCacheDirectory } from "../process/DarwinHelperCache.js"; import { linuxHopperReleaseCacheDirectory } from "./LinuxHopperCacheDirectory.js"; @@ -64,9 +64,11 @@ import { InvalidUtf8FileError, readRegularFileText, bindRegularFileCleanup, -} from "./RegularFileRead.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +} from "../process/RegularFileRead.js"; +import { + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../resources/index.js"; import { appDataRedirection, clientOwnershipEvidencePaths, diff --git a/src/application/UpdateCommandRunner.ts b/src/application/UpdateCommandRunner.ts index f1e21ab69a..c5339b9a72 100644 --- a/src/application/UpdateCommandRunner.ts +++ b/src/application/UpdateCommandRunner.ts @@ -8,7 +8,7 @@ import { isWindowsBatchFile, windowsBatchCommand, } from "../process/WindowsBatchCommand.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { ProviderProcessSupervisor, type ProviderProcessSnapshot, diff --git a/src/application/UpdateMaintenance.ts b/src/application/UpdateMaintenance.ts index ee6b51a0b3..c385274d61 100644 --- a/src/application/UpdateMaintenance.ts +++ b/src/application/UpdateMaintenance.ts @@ -14,7 +14,7 @@ import { } from "./SetupSkill.js"; import type { SetupAction } from "./SetupTypes.js"; import type { Result } from "../domain/result.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import type { ClientSystemPaths } from "./SupportedClients.js"; /** diff --git a/src/application/UpdateRuntime.ts b/src/application/UpdateRuntime.ts index a3d87672ae..38f31dd600 100644 --- a/src/application/UpdateRuntime.ts +++ b/src/application/UpdateRuntime.ts @@ -7,7 +7,7 @@ import { fileURLToPath } from "node:url"; import { lt, valid } from "semver"; import { PRODUCT_IDENTITY } from "../identity.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { err, ok, type Result } from "../domain/result.js"; import { safeParseJson } from "../domain/safeJson.js"; import { diff --git a/src/application/WebModuleTraceService.ts b/src/application/WebModuleTraceService.ts index 42f4da6674..aae56f0b97 100644 --- a/src/application/WebModuleTraceService.ts +++ b/src/application/WebModuleTraceService.ts @@ -34,11 +34,11 @@ import { capturedWebManifestIdentity, validateSelectedWebScript, } from "./ValidateSelectedWebScript.js"; -import type { ExecutionOptions } from "./AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { WebModuleArtifactPort, WebModuleResolutionPort, -} from "./WebModulePorts.js"; +} from "../ports/WebModulePorts.js"; import { completeProviderEvidence } from "./ProviderOperationExecution.js"; import { parseAnalysisInput } from "./AnalysisInput.js"; diff --git a/src/application/WebNetworkCapturePort.ts b/src/application/WebNetworkCapturePort.ts index 2bd0f19687..e5fbd2f9b9 100644 --- a/src/application/WebNetworkCapturePort.ts +++ b/src/application/WebNetworkCapturePort.ts @@ -1,4 +1,4 @@ -import type { ExecutionOptions } from "./AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import type { Result } from "../domain/result.js"; import type { diff --git a/src/application/WebNetworkCaptureService.test.ts b/src/application/WebNetworkCaptureService.test.ts index fa66539487..5d669e092a 100644 --- a/src/application/WebNetworkCaptureService.test.ts +++ b/src/application/WebNetworkCaptureService.test.ts @@ -15,7 +15,7 @@ import { import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/AnalysisCleanupLease.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; diff --git a/src/application/WebNetworkCaptureService.ts b/src/application/WebNetworkCaptureService.ts index 315f8ce1d6..3ee5176944 100644 --- a/src/application/WebNetworkCaptureService.ts +++ b/src/application/WebNetworkCaptureService.ts @@ -1,7 +1,7 @@ import { redactExplicitFailure } from "../domain/explicitSensitiveFailure.js"; import { excludeCaptureCoordinates } from "../domain/webNetworkCaptureCoordinates.js"; import { redactExplicitText } from "../domain/explicitSensitiveValues.js"; -import type { ExecutionOptions } from "./AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { WebNetworkCapturePort } from "./WebNetworkCapturePort.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { diff --git a/src/application/WebRuntimeService.fixture.ts b/src/application/WebRuntimeService.fixture.ts index 877edf6b60..9e6ca8a499 100644 --- a/src/application/WebRuntimeService.fixture.ts +++ b/src/application/WebRuntimeService.fixture.ts @@ -1,4 +1,4 @@ -import type { WebRuntimePort } from "./WebRuntimePort.js"; +import type { WebRuntimePort } from "../ports/WebRuntimePort.js"; import { ok } from "../domain/result.js"; import type { WebExecution } from "../domain/webExecution.js"; import type { WebEventListeners } from "../domain/webEventListeners.js"; diff --git a/src/application/WebRuntimeService.ts b/src/application/WebRuntimeService.ts index b30a6097a0..a944bf72e2 100644 --- a/src/application/WebRuntimeService.ts +++ b/src/application/WebRuntimeService.ts @@ -1,6 +1,6 @@ import { z } from "zod"; -import type { ExecutionOptions } from "./AnalysisProvider.js"; -import type { WebRuntimePort } from "./WebRuntimePort.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; +import type { WebRuntimePort } from "../ports/WebRuntimePort.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../domain/evidence.js"; diff --git a/src/application/WebScriptExportService.ts b/src/application/WebScriptExportService.ts index d40458d264..26258635ae 100644 --- a/src/application/WebScriptExportService.ts +++ b/src/application/WebScriptExportService.ts @@ -3,12 +3,13 @@ import { createHash } from "node:crypto"; import { z } from "zod"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactReaderFailure, AnalysisCleanupLeaseGroup, type AnalysisCleanupLease, -} from "../artifacts/AnalysisCleanupLease.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; + type ArtifactResourceScope, + bindArtifactFileCleanup, +} from "../resources/index.js"; import { publishWebScripts } from "../browser/assets/PublishWebScripts.js"; import { selectScriptCapture } from "../browser/assets/ScriptCaptureAdapters.js"; import { @@ -32,19 +33,18 @@ import { type ExportWebScriptsInput, } from "../domain/webScriptExport.js"; import { WebScriptExportError } from "../domain/webScriptExportError.js"; -import type { ExecutionOptions } from "./AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import { WEB_SCRIPT_EXPORT_PROVIDER as PROVIDER } from "../domain/investigationProviders.js"; import { readRegularFile, RegularFileReadFailure, retryRegularFileCleanup, -} from "./RegularFileRead.js"; +} from "../process/RegularFileRead.js"; import { NonRegularFileReadError, RegularFileChangedError, RegularFileOperationCancelled, } from "../filesystem/RegularFile.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; import { RegularFileCleanupFailure, regularFileCancellation, diff --git a/src/application/WebSourceLocationService.test.ts b/src/application/WebSourceLocationService.test.ts index 9f4cfeffba..fecefc0ecd 100644 --- a/src/application/WebSourceLocationService.test.ts +++ b/src/application/WebSourceLocationService.test.ts @@ -17,7 +17,7 @@ import { webSourceLocationResultSchema, } from "../domain/webSourceLocation.js"; import { WebSourceLocationService } from "./WebSourceLocationService.js"; -import type { WebSourceMapPort } from "./WebSourceLocationPorts.js"; +import type { WebSourceMapPort } from "../ports/WebSourceLocationPorts.js"; const service = (data = webSourceLocationFixture(), port = decoder) => new WebSourceLocationService({ load: () => Promise.resolve(ok(data)) }, port); diff --git a/src/application/WebSourceLocationService.ts b/src/application/WebSourceLocationService.ts index 1a751c48c4..c82028851f 100644 --- a/src/application/WebSourceLocationService.ts +++ b/src/application/WebSourceLocationService.ts @@ -31,7 +31,7 @@ import { } from "../domain/webSourceLocation.js"; import type { WebTraceObservation } from "../domain/webTraceObservation.js"; import { resolveWebSourcePosition } from "../domain/webSourcePosition.js"; -import type { ExecutionOptions } from "./AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import { capturedWebManifestIdentity, validateSelectedWebScript, @@ -39,7 +39,7 @@ import { import type { WebSourceLocationArtifactPort, WebSourceMapPort, -} from "./WebSourceLocationPorts.js"; +} from "../ports/WebSourceLocationPorts.js"; import { completeProviderEvidence } from "./ProviderOperationExecution.js"; import { parseAnalysisInput } from "./AnalysisInput.js"; diff --git a/src/application/WorkflowAnalysisProfile.ts b/src/application/WorkflowAnalysisProfile.ts index cb0afd0c91..9683a80c61 100644 --- a/src/application/WorkflowAnalysisProfile.ts +++ b/src/application/WorkflowAnalysisProfile.ts @@ -1,4 +1,4 @@ -import type { AnalysisOperation } from "./AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; import { createAnalysisProfile, type AnalysisProfileCommitment, diff --git a/src/application/WorkflowEvidence.test.ts b/src/application/WorkflowEvidence.test.ts index 19d12a17a4..63e590e109 100644 --- a/src/application/WorkflowEvidence.test.ts +++ b/src/application/WorkflowEvidence.test.ts @@ -15,7 +15,7 @@ import { err, ok } from "../domain/result.js"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisResourceConstraintError, @@ -875,7 +875,9 @@ it.each([ it("shares temporary provider state only within a single completed workflow", async () => { const owner = {}; const scopes: Array< - NonNullable + NonNullable< + import("../ports/AnalysisProvider.js").ExecutionOptions["workScope"] + > > = []; const provider = { id: "fixture", name: "Fixture", version: "1" }; const analysis: AnalysisOperationPort = { @@ -906,7 +908,7 @@ it("shares temporary provider state only within a single completed workflow", as it("clears workflow state when its callback throws", async () => { const owner = {}; - let captured: import("./AnalysisProvider.js").ExecutionOptions["workScope"]; + let captured: import("../ports/AnalysisProvider.js").ExecutionOptions["workScope"]; const analysis: AnalysisOperationPort = { execute: async (_operation, _parameters, options) => { captured = options?.workScope; diff --git a/src/application/WorkflowEvidence.ts b/src/application/WorkflowEvidence.ts index 6d6127f0e8..a146fba59e 100644 --- a/src/application/WorkflowEvidence.ts +++ b/src/application/WorkflowEvidence.ts @@ -1,4 +1,4 @@ -import { AnalysisWorkScope } from "./AnalysisWorkScope.js"; +import { AnalysisWorkScope } from "../ports/AnalysisWorkScope.js"; import { compareUnicodeCodePoints } from "../domain/unicodeCodePointOrder.js"; import { jsonStringByteLength } from "../domain/jsonStringByteLength.js"; import { createAnalysisExecutionEvidence } from "../domain/analysisObservation.js"; @@ -10,7 +10,7 @@ import { import type { AnalysisOperation, AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { err, ok } from "../domain/result.js"; import type { EnhancedResult } from "./EnhancedToolTypes.js"; import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js"; diff --git a/src/application/XrefsAddressResolution.test.ts b/src/application/XrefsAddressResolution.test.ts index 89ae072da1..ef9489a6e7 100644 --- a/src/application/XrefsAddressResolution.test.ts +++ b/src/application/XrefsAddressResolution.test.ts @@ -5,7 +5,7 @@ import { ok } from "../domain/result.js"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "./AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { resolveXrefsName } from "./XrefsAddressResolution.js"; const names = (rows: JsonValue): AnalysisOperationPort => ({ diff --git a/src/application/XrefsAddressResolution.ts b/src/application/XrefsAddressResolution.ts index e4ff0c4c1b..9a4b72b01e 100644 --- a/src/application/XrefsAddressResolution.ts +++ b/src/application/XrefsAddressResolution.ts @@ -8,7 +8,7 @@ import { cancelledBy, } from "../domain/analysisErrorCore.js"; import { err, ok, type Result } from "../domain/result.js"; -import type { AnalysisOperationPort } from "./AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../ports/AnalysisProvider.js"; import { resolveProcedureAddress } from "./ProcedureAddressResolution.js"; /** Resolve an exact symbol after the provider rejects the caller address format. */ diff --git a/src/application/adb/AdbDeviceAnalysisPort.ts b/src/application/adb/AdbDeviceAnalysisPort.ts index 3547537a96..c0024ece2c 100644 --- a/src/application/adb/AdbDeviceAnalysisPort.ts +++ b/src/application/adb/AdbDeviceAnalysisPort.ts @@ -2,7 +2,7 @@ import type { AnalysisExecution, ExecutionOptions, ProviderAvailability, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import type { AdbRequest } from "../../domain/adb/adbDeviceAnalysis.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import type { Result } from "../../domain/result.js"; diff --git a/src/application/adb/AdbDeviceAnalysisService.test.ts b/src/application/adb/AdbDeviceAnalysisService.test.ts index 7f6b35c851..efc58ec206 100644 --- a/src/application/adb/AdbDeviceAnalysisService.test.ts +++ b/src/application/adb/AdbDeviceAnalysisService.test.ts @@ -8,7 +8,7 @@ import { AdbProvider } from "../../adb/AdbProvider.js"; import { AdbDeviceAnalysisService } from "./AdbDeviceAnalysisService.js"; import type { AdbDeviceAnalysisPort } from "./AdbDeviceAnalysisPort.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisInputError, diff --git a/src/application/adb/AdbDeviceAnalysisService.ts b/src/application/adb/AdbDeviceAnalysisService.ts index 2fbef7134f..0a4fcd3536 100644 --- a/src/application/adb/AdbDeviceAnalysisService.ts +++ b/src/application/adb/AdbDeviceAnalysisService.ts @@ -2,7 +2,7 @@ import type { AdbDeviceAnalysisPort } from "./AdbDeviceAnalysisPort.js"; import type { AnalysisExecution, ExecutionOptions, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { adbRequestSchema, adbDeviceListObservationSchema, diff --git a/src/application/analysisView/AnalysisViewService.test.ts b/src/application/analysisView/AnalysisViewService.test.ts index 83733c50bb..526304d07b 100644 --- a/src/application/analysisView/AnalysisViewService.test.ts +++ b/src/application/analysisView/AnalysisViewService.test.ts @@ -45,7 +45,7 @@ import { } from "../../../tests/fixtures/browserScenarioCapture.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import * as queuedInterrupts from "../../process/queuedInterrupts.js"; import { createEvidenceBundle } from "../../domain/evidenceBundle.js"; import * as evidenceFileSource from "./evidenceFileSource.js"; diff --git a/src/application/analysisView/evidenceFileSource.test.ts b/src/application/analysisView/evidenceFileSource.test.ts index 3ee02f3138..01f8980c24 100644 --- a/src/application/analysisView/evidenceFileSource.test.ts +++ b/src/application/analysisView/evidenceFileSource.test.ts @@ -8,7 +8,7 @@ import { analysisViewNativeEvidence, } from "../../../tests/fixtures/analysisView.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js"; import { JsonInputPhysicalReadFailure } from "../JsonInputFile.js"; import { failFileReadAfterAbort } from "../../../tests/support/failFileReadAfterAbort.js"; diff --git a/src/application/analysisView/evidenceFileSource.ts b/src/application/analysisView/evidenceFileSource.ts index 641fa7b045..73062a481c 100644 --- a/src/application/analysisView/evidenceFileSource.ts +++ b/src/application/analysisView/evidenceFileSource.ts @@ -1,7 +1,7 @@ import type { z } from "zod"; import { requireAuthenticationHeadroom } from "../JsonAuthenticationHeadroom.js"; import { authenticateEvidenceBundleValue } from "../EvidenceBundleFiles.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisInputError, diff --git a/src/application/android/AndroidAnalysisService.test.ts b/src/application/android/AndroidAnalysisService.test.ts index b81dea765c..0763a975c2 100644 --- a/src/application/android/AndroidAnalysisService.test.ts +++ b/src/application/android/AndroidAnalysisService.test.ts @@ -1,6 +1,6 @@ import { expect, it, vi } from "vitest"; import { AndroidAnalysisService } from "./AndroidAnalysisService.js"; -import type { AndroidAnalysisPort } from "./AndroidAnalysisPort.js"; +import type { AndroidAnalysisPort } from "../../ports/android/AndroidAnalysisPort.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { createEvidence } from "../../domain/evidence.js"; import { ok } from "../../domain/result.js"; @@ -9,7 +9,7 @@ import { createAnalysisProfile } from "../../domain/analysisProfile.js"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; it("retains the selected subject in bounded search Evidence", () => { const provider = { id: "fixture", name: "Fixture", version: "1" }; diff --git a/src/application/android/AndroidAnalysisService.ts b/src/application/android/AndroidAnalysisService.ts index be16a79eab..4488f6e772 100644 --- a/src/application/android/AndroidAnalysisService.ts +++ b/src/application/android/AndroidAnalysisService.ts @@ -1,8 +1,8 @@ import { analysisOperationInputErrorFromIssues } from "../../domain/inputIssueProjection.js"; import type { EvidenceWriter } from "../investigation/InvestigationRecordPort.js"; import { summarizeRetainedAndroidSearch } from "./AndroidSearchEvidenceSummary.js"; -import type { AndroidAnalysisPort } from "./AndroidAnalysisPort.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { AndroidAnalysisPort } from "../../ports/android/AndroidAnalysisPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { parseBinaryTarget } from "../BinaryTargetResolver.js"; import { androidRequestSchema, diff --git a/src/application/android/AndroidApplicationService.ts b/src/application/android/AndroidApplicationService.ts index 907e2851ca..a7d2214575 100644 --- a/src/application/android/AndroidApplicationService.ts +++ b/src/application/android/AndroidApplicationService.ts @@ -1,5 +1,5 @@ import type { EvidenceLookup } from "../EvidenceInputResolver.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { projectAndroidInventory } from "../../domain/android/androidApplication.js"; import type { Result } from "../../domain/result.js"; diff --git a/src/application/android/AndroidJniInspection.ts b/src/application/android/AndroidJniInspection.ts index bb1d8b0094..65c5aaceee 100644 --- a/src/application/android/AndroidJniInspection.ts +++ b/src/application/android/AndroidJniInspection.ts @@ -1,4 +1,4 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AndroidAnalysisService } from "./AndroidAnalysisService.js"; import { requireAnalysisViewRetention, diff --git a/src/application/android/AndroidPackageInspection.ts b/src/application/android/AndroidPackageInspection.ts index 8c65a8109b..d22baae46c 100644 --- a/src/application/android/AndroidPackageInspection.ts +++ b/src/application/android/AndroidPackageInspection.ts @@ -1,4 +1,4 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AndroidAnalysisService } from "./AndroidAnalysisService.js"; import { requireAnalysisViewRetention, diff --git a/src/application/android/AndroidSymbolInspection.ts b/src/application/android/AndroidSymbolInspection.ts index 08b6c4ca7f..3a933436d3 100644 --- a/src/application/android/AndroidSymbolInspection.ts +++ b/src/application/android/AndroidSymbolInspection.ts @@ -1,5 +1,5 @@ import type { z } from "zod"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AndroidAnalysisService } from "./AndroidAnalysisService.js"; import { requireAnalysisViewRetention, diff --git a/src/application/apiContract/ApiContractRead.ts b/src/application/apiContract/ApiContractRead.ts index e4e72e30fd..a1d8bb1daa 100644 --- a/src/application/apiContract/ApiContractRead.ts +++ b/src/application/apiContract/ApiContractRead.ts @@ -1,15 +1,13 @@ import { artifactFileCancellationCause, artifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { readStableArtifact } from "../../artifacts/readStableArtifact.js"; -import { + ArtifactReaderFailure, + type ArtifactResourceScope, + readStableArtifact, projectStableArtifactFailure, stableArtifactInputRecovery, readerIntegrityFailure, -} from "../../artifacts/StableArtifactFailure.js"; +} from "../../resources/index.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisAccessDeniedError, diff --git a/src/application/apiContract/ApiContractService.test.ts b/src/application/apiContract/ApiContractService.test.ts index b053d8f912..2c2aec2ca5 100644 --- a/src/application/apiContract/ApiContractService.test.ts +++ b/src/application/apiContract/ApiContractService.test.ts @@ -2,7 +2,7 @@ import { createHash } from "node:crypto"; import { mkdir, readFile, symlink, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { API_CONTRACT_FACT_BYTES, apiContractSchema, diff --git a/src/application/apiContract/ApiContractService.ts b/src/application/apiContract/ApiContractService.ts index d6d9e0e84b..8d5f6c07b2 100644 --- a/src/application/apiContract/ApiContractService.ts +++ b/src/application/apiContract/ApiContractService.ts @@ -1,5 +1,5 @@ import { getHeapStatistics } from "node:v8"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisInputError, diff --git a/src/application/apiContract/GraphqlContractImport.ts b/src/application/apiContract/GraphqlContractImport.ts index fa823b9f19..219a274a18 100644 --- a/src/application/apiContract/GraphqlContractImport.ts +++ b/src/application/apiContract/GraphqlContractImport.ts @@ -1,7 +1,7 @@ import { decodeStrictUtf8 } from "../../domain/strictUtf8.js"; import { getHeapStatistics } from "node:v8"; import { version } from "graphql"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import { primaryAnalysisError, type AnalysisError, diff --git a/src/application/apiContract/GraphqlContractService.test.ts b/src/application/apiContract/GraphqlContractService.test.ts index 4a975e1fd7..525697e5c6 100644 --- a/src/application/apiContract/GraphqlContractService.test.ts +++ b/src/application/apiContract/GraphqlContractService.test.ts @@ -3,7 +3,7 @@ import { createHash } from "node:crypto"; import { readFile, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { parseEvidence } from "../../domain/evidence.js"; import { graphqlContractSchema } from "../../domain/apiContract/graphqlContract.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; diff --git a/src/application/apkSignature/ApkSignatureService.ts b/src/application/apkSignature/ApkSignatureService.ts index 4d49515e22..532198a8c6 100644 --- a/src/application/apkSignature/ApkSignatureService.ts +++ b/src/application/apkSignature/ApkSignatureService.ts @@ -5,8 +5,8 @@ import { type AnalysisViewRetention, } from "../analysisView/AnalysisViewService.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { ApkSignaturePort } from "./ApkSignaturePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { ApkSignaturePort } from "../../ports/apkSignature/ApkSignaturePort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { diff --git a/src/application/apktool/ApktoolResourceAnalysisPort.ts b/src/application/apktool/ApktoolResourceAnalysisPort.ts index d9c89225be..590c83dece 100644 --- a/src/application/apktool/ApktoolResourceAnalysisPort.ts +++ b/src/application/apktool/ApktoolResourceAnalysisPort.ts @@ -2,7 +2,7 @@ import type { AnalysisExecution, ExecutionOptions, ProviderAvailability, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import type { ApktoolRequest } from "../../domain/apktool/apktoolResourceAnalysis.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import type { Result } from "../../domain/result.js"; diff --git a/src/application/apktool/ApktoolResourceAnalysisService.test.ts b/src/application/apktool/ApktoolResourceAnalysisService.test.ts index 97088fb671..987d4de04f 100644 --- a/src/application/apktool/ApktoolResourceAnalysisService.test.ts +++ b/src/application/apktool/ApktoolResourceAnalysisService.test.ts @@ -2,7 +2,7 @@ import { expect, it } from "vitest"; import { ApktoolResourceAnalysisService } from "./ApktoolResourceAnalysisService.js"; import type { ApktoolResourceAnalysisPort } from "./ApktoolResourceAnalysisPort.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js"; import { parseEvidence } from "../../domain/evidence.js"; import { ok } from "../../domain/result.js"; diff --git a/src/application/apktool/ApktoolResourceAnalysisService.ts b/src/application/apktool/ApktoolResourceAnalysisService.ts index 147376a70e..97b5a59e80 100644 --- a/src/application/apktool/ApktoolResourceAnalysisService.ts +++ b/src/application/apktool/ApktoolResourceAnalysisService.ts @@ -1,5 +1,5 @@ import type { ApktoolResourceAnalysisPort } from "./ApktoolResourceAnalysisPort.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { apktoolRequestSchema, type ApktoolOperation, diff --git a/src/application/apple/AppleApplicationService.ts b/src/application/apple/AppleApplicationService.ts index d0a2c040b4..d0a64b17c3 100644 --- a/src/application/apple/AppleApplicationService.ts +++ b/src/application/apple/AppleApplicationService.ts @@ -1,5 +1,5 @@ import type { EvidenceLookup } from "../EvidenceInputResolver.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { projectAppleInventory } from "../../domain/apple/appleApplication.js"; import type { Result } from "../../domain/result.js"; diff --git a/src/application/artifacts/DesktopApplicationService.ts b/src/application/artifacts/DesktopApplicationService.ts index 865bdbaf5b..4f3dd882f9 100644 --- a/src/application/artifacts/DesktopApplicationService.ts +++ b/src/application/artifacts/DesktopApplicationService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { DesktopApplicationPort } from "./DesktopApplicationPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { DesktopApplicationPort } from "../../ports/artifacts/DesktopApplicationPort.js"; import { ARTIFACT_GRAPH_PROVIDER } from "../../domain/investigationProviders.js"; import { completeProviderEvidence } from "../ProviderOperationExecution.js"; import { parseAnalysisInput } from "../AnalysisInput.js"; diff --git a/src/application/binary/AnalysisProviderEvaluation.ts b/src/application/binary/AnalysisProviderEvaluation.ts index b6c0e789a5..bffad59d16 100644 --- a/src/application/binary/AnalysisProviderEvaluation.ts +++ b/src/application/binary/AnalysisProviderEvaluation.ts @@ -16,7 +16,7 @@ import type { AnalysisProviderBoundClientFactory, AnalysisProfileResolutionOptions, AnalysisProviderCandidate, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import type { AnalysisProviderCandidateStatus } from "./AnalysisProviderRegistry.js"; import { withCandidateRejections } from "./AnalysisProviderCandidateDiagnostics.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; diff --git a/src/application/binary/AnalysisProviderRegistry.test.ts b/src/application/binary/AnalysisProviderRegistry.test.ts index f65346d06f..f86367370a 100644 --- a/src/application/binary/AnalysisProviderRegistry.test.ts +++ b/src/application/binary/AnalysisProviderRegistry.test.ts @@ -13,7 +13,7 @@ import { type ProviderAvailability, type ProviderIdentity, type ProviderTargetSupport, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { createAnalysisProfile } from "../../domain/analysisProfile.js"; import type { BinaryTarget } from "../../domain/binaryTargetTypes.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; diff --git a/src/application/binary/AnalysisProviderRegistry.ts b/src/application/binary/AnalysisProviderRegistry.ts index 70a9707e61..947b874dad 100644 --- a/src/application/binary/AnalysisProviderRegistry.ts +++ b/src/application/binary/AnalysisProviderRegistry.ts @@ -1,8 +1,10 @@ -import { ProviderInspectionScope } from "../ProviderInspectionScope.js"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../../artifacts/ArtifactFileOperation.js"; +import { ProviderInspectionScope } from "../../ports/ProviderInspectionScope.js"; +import { + AnalysisCleanupLease, + ArtifactResourceScope, + ArtifactReaderFailure, + bindArtifactFileCleanup, +} from "../../resources/index.js"; import { SharedStartupAttempt } from "../../process/SharedStartupAttempt.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; @@ -46,14 +48,14 @@ import type { ProviderIdentity, ProviderTargetSupport, RetainedResourceScope, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { evaluateAnalysisProviderCandidate, type AnalysisProviderCandidateEvaluation, } from "./AnalysisProviderEvaluation.js"; import { withCandidateRejections } from "./AnalysisProviderCandidateDiagnostics.js"; import { compareUnicodeCodePoints } from "../../domain/unicodeCodePointOrder.js"; -import { ownedProcessPrerequisiteAvailability } from "../ownedProcessAvailability.js"; +import { ownedProcessPrerequisiteAvailability } from "../../providers/ownedProcessAvailability.js"; /** Where a selected provider's choice came from; never a priority or fallback. */ export type AnalysisProviderSelectionSource = diff --git a/src/application/binary/AnalysisSnapshotCache.test.ts b/src/application/binary/AnalysisSnapshotCache.test.ts index 97566e5f0f..db6c542c81 100644 --- a/src/application/binary/AnalysisSnapshotCache.test.ts +++ b/src/application/binary/AnalysisSnapshotCache.test.ts @@ -14,7 +14,7 @@ import { evidenceBundleForTarget, } from "../../domain/evidenceBundle.js"; import { ok } from "../../domain/result.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { createAnalysisSnapshotWorkflowEntry, parseAnalysisSnapshot, @@ -28,7 +28,7 @@ import { workflowAnalysisProfile } from "../WorkflowAnalysisProfile.js"; import type { AnalysisOperation, CapabilityDescriptor, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { AnalysisSnapshotCache, isSnapshotCacheable, diff --git a/src/application/binary/AnalysisSnapshotCache.ts b/src/application/binary/AnalysisSnapshotCache.ts index 1bb4ecc7f0..f52fa29726 100644 --- a/src/application/binary/AnalysisSnapshotCache.ts +++ b/src/application/binary/AnalysisSnapshotCache.ts @@ -39,7 +39,7 @@ import type { AnalysisOperation, CapabilityDescriptor, ExecutionOptions, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { OFFICIAL_TOOL_CONTRACTS } from "../../contracts/officialToolContracts.js"; import { compareUnicodeCodePoints } from "../../domain/unicodeCodePointOrder.js"; diff --git a/src/application/binary/AnalysisSnapshotFiles.ts b/src/application/binary/AnalysisSnapshotFiles.ts index 3c22a1831b..d7b40e9865 100644 --- a/src/application/binary/AnalysisSnapshotFiles.ts +++ b/src/application/binary/AnalysisSnapshotFiles.ts @@ -21,9 +21,12 @@ import { AnalysisCancelledError, cancelledBy, } from "../../domain/analysisErrorCore.js"; -import { readJsonObjectMembersFile, writeTextFile } from "../JsonFiles.js"; +import { readJsonObjectMembersFile } from "../JsonFiles.js"; +import { + writeTextFile, + type ArtifactResourceScope, +} from "../../resources/index.js"; import type { JsonObjectMemberReader } from "../JsonInputFile.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; type SnapshotFailure = EvidenceFileError | EvidenceIntegrityError; const READ_OPERATION = "open_binary"; diff --git a/src/application/binary/BinarySession.openEffects.test.ts b/src/application/binary/BinarySession.openEffects.test.ts index 0e3994ed27..d37a447c9f 100644 --- a/src/application/binary/BinarySession.openEffects.test.ts +++ b/src/application/binary/BinarySession.openEffects.test.ts @@ -2,7 +2,7 @@ import { mkdir, readFile, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, onTestFinished } from "vitest"; -import type { AnalysisProvider } from "../AnalysisProvider.js"; +import type { AnalysisProvider } from "../../ports/AnalysisProvider.js"; import { BinarySession } from "./BinarySession.js"; import { SESSION_TOOL_CONTRACTS } from "../../contracts/sessionToolContracts.js"; import { ok } from "../../domain/result.js"; diff --git a/src/application/binary/BinarySession.ts b/src/application/binary/BinarySession.ts index c7f2bdd9d4..dd163ca2b7 100644 --- a/src/application/binary/BinarySession.ts +++ b/src/application/binary/BinarySession.ts @@ -41,7 +41,7 @@ import type { AnalysisOperationPort, ProviderIdentity, AnalysisOperation, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import type { BinarySessionPort, BinaryOpenResult, @@ -79,7 +79,7 @@ import { commitExecutionProfile, prepareSessionExecution, } from "./BinarySessionExecution.js"; -import { closeAnalysisClient } from "../AnalysisClientCleanup.js"; +import { closeAnalysisClient } from "../../providers/AnalysisClientCleanup.js"; import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; import { ConfigurationError } from "../../domain/configurationErrors.js"; import type { AnalysisCleanupRetry } from "../../domain/analysisErrorRecovery.js"; @@ -92,10 +92,8 @@ import { parseBinaryTarget, type BinaryTargetResolverOptions, } from "../BinaryTargetResolver.js"; -import { - resolveAppBundleResourceRoot, - type ResolvedAppBundleResourceRoot, -} from "../AppBundleExecutable.js"; +import { resolveAppBundleResourceRoot } from "../AppBundleExecutable.js"; +import type { ResolvedAppBundleResourceRoot } from "../../domain/apple/bundleResourceRoot.js"; import { BUNDLE_RESOURCE_OPERATIONS, type ActiveBundleResourceSession, diff --git a/src/application/binary/BinarySessionBundleResources.test.ts b/src/application/binary/BinarySessionBundleResources.test.ts index da7c4e05dc..1727fda008 100644 --- a/src/application/binary/BinarySessionBundleResources.test.ts +++ b/src/application/binary/BinarySessionBundleResources.test.ts @@ -7,7 +7,7 @@ import { createAnalysisExecution, type AnalysisClient, type ProviderIdentity, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { parseBinaryTarget } from "../BinaryTargetResolver.js"; import { InvestigationRecords } from "../investigation/InvestigationRecords.js"; import { AnalysisProviderRegistry } from "./AnalysisProviderRegistry.js"; diff --git a/src/application/binary/BinarySessionComposition.ts b/src/application/binary/BinarySessionComposition.ts index 233754696a..4bfb3f2775 100644 --- a/src/application/binary/BinarySessionComposition.ts +++ b/src/application/binary/BinarySessionComposition.ts @@ -1,5 +1,5 @@ import { InvestigationRecords } from "../investigation/InvestigationRecords.js"; -import type { AnalysisProvider } from "../AnalysisProvider.js"; +import type { AnalysisProvider } from "../../ports/AnalysisProvider.js"; import { AnalysisProviderRegistry } from "./AnalysisProviderRegistry.js"; import { BinarySession } from "./BinarySession.js"; import { SessionProviderRouter } from "./SessionProviderRouter.js"; diff --git a/src/application/binary/BinarySessionExecution.ts b/src/application/binary/BinarySessionExecution.ts index 97fc8d83b2..d6086c982b 100644 --- a/src/application/binary/BinarySessionExecution.ts +++ b/src/application/binary/BinarySessionExecution.ts @@ -16,7 +16,7 @@ import type { AnalysisOperation, CapabilityDescriptor, ExecutionOptions, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { offeredOperationAlternatives } from "../OperationAlternatives.js"; import { isSnapshotCacheable, diff --git a/src/application/binary/BinarySessionInvestigation.test.ts b/src/application/binary/BinarySessionInvestigation.test.ts index a3a2916651..6f36281b6e 100644 --- a/src/application/binary/BinarySessionInvestigation.test.ts +++ b/src/application/binary/BinarySessionInvestigation.test.ts @@ -12,7 +12,7 @@ import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; import { err, ok } from "../../domain/result.js"; import type { RecordUnknownInput } from "../../domain/residualUnknown.js"; import { OwnedStagedOutput } from "../../filesystem/OwnedStagedOutput.js"; -import type { AnalysisProviderCandidate } from "../AnalysisProvider.js"; +import type { AnalysisProviderCandidate } from "../../ports/AnalysisProvider.js"; import { AnalysisProviderRegistry } from "./AnalysisProviderRegistry.js"; import { BinarySession } from "./BinarySession.js"; import { SessionProviderRouter } from "./SessionProviderRouter.js"; diff --git a/src/application/binary/BinarySessionLiveness.test.ts b/src/application/binary/BinarySessionLiveness.test.ts index ee72cf77bd..d323d39257 100644 --- a/src/application/binary/BinarySessionLiveness.test.ts +++ b/src/application/binary/BinarySessionLiveness.test.ts @@ -16,7 +16,7 @@ import { type ProviderAvailability, type ProviderIdentity, type ProviderTargetSupport, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { createAnalysisProfile } from "../../domain/analysisProfile.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; import type { ProviderOperationHealth } from "../../domain/providerOperationHealth.js"; diff --git a/src/application/binary/BinarySessionOpen.ts b/src/application/binary/BinarySessionOpen.ts index 32cb1787aa..3aa0d87a60 100644 --- a/src/application/binary/BinarySessionOpen.ts +++ b/src/application/binary/BinarySessionOpen.ts @@ -15,7 +15,7 @@ import { type AnalysisSnapshot, } from "../../domain/analysisSnapshot.js"; import { parseBinaryTarget } from "../BinaryTargetResolver.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import { EvidenceIntegrityError, AnalysisSnapshotMismatchError, diff --git a/src/application/binary/BinarySessionPort.ts b/src/application/binary/BinarySessionPort.ts index b96a4ba8a9..4228560053 100644 --- a/src/application/binary/BinarySessionPort.ts +++ b/src/application/binary/BinarySessionPort.ts @@ -18,7 +18,7 @@ import type { Result } from "../../domain/result.js"; import type { EvidenceIntegrityError } from "../../domain/evidenceErrors.js"; import type { AnalysisSnapshotLoader } from "./BinarySessionOpen.js"; import type { WorkflowSnapshotRecordInput } from "./BinarySessionRecords.js"; -import type { ResolvedAppBundleResourceRoot } from "../AppBundleExecutable.js"; +import type { ResolvedAppBundleResourceRoot } from "../../domain/apple/bundleResourceRoot.js"; import type { binaryTargetSummary } from "./BinaryTargetSummary.js"; import type { @@ -27,7 +27,7 @@ import type { AnalysisOperationPort, ExecutionOptions, ProviderIdentity, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import type { SavedAnalysisSnapshot } from "../../domain/savedAnalysisSnapshot.js"; diff --git a/src/application/binary/BinarySessionRecords.ts b/src/application/binary/BinarySessionRecords.ts index 9526b7dd81..271025c942 100644 --- a/src/application/binary/BinarySessionRecords.ts +++ b/src/application/binary/BinarySessionRecords.ts @@ -34,12 +34,14 @@ import type { AnalysisExecution, AnalysisOperation, RetainedResourceScope, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { AnalysisSnapshotCache } from "./AnalysisSnapshotCache.js"; import { InvestigationRecords } from "../investigation/InvestigationRecords.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { bindRegularFileCleanup } from "../RegularFileRead.js"; +import { + ArtifactResourceScope, + ArtifactReaderFailure, +} from "../../resources/index.js"; +import { bindRegularFileCleanup } from "../../process/RegularFileRead.js"; import { writeAnalysisSnapshot as writeSnapshotFile, readAnalysisSnapshot as readSnapshotFile, diff --git a/src/application/binary/BinarySessionRefusalAlternatives.test.ts b/src/application/binary/BinarySessionRefusalAlternatives.test.ts index 8f0ca826ac..31d5eb4342 100644 --- a/src/application/binary/BinarySessionRefusalAlternatives.test.ts +++ b/src/application/binary/BinarySessionRefusalAlternatives.test.ts @@ -13,7 +13,7 @@ import type { AnalysisProvider, CapabilityDescriptor, ExecutionOptions, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { buildCapabilityInventory } from "../CapabilityInventory.js"; import { offeredOperationAlternatives } from "../OperationAlternatives.js"; diff --git a/src/application/binary/BinarySessionRestoration.test.ts b/src/application/binary/BinarySessionRestoration.test.ts index 4e6074fb7e..5335222b12 100644 --- a/src/application/binary/BinarySessionRestoration.test.ts +++ b/src/application/binary/BinarySessionRestoration.test.ts @@ -12,7 +12,7 @@ import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { createAnalysisProfile } from "../../domain/analysisProfile.js"; import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; import { err, ok } from "../../domain/result.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { AnalysisProviderRegistry } from "./AnalysisProviderRegistry.js"; import { BinarySession } from "./BinarySession.js"; import { binaryTargetSummary } from "./BinaryTargetSummary.js"; diff --git a/src/application/binary/BinarySessionStatus.test.ts b/src/application/binary/BinarySessionStatus.test.ts index 712ee49180..579d99bde1 100644 --- a/src/application/binary/BinarySessionStatus.test.ts +++ b/src/application/binary/BinarySessionStatus.test.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from "vitest"; import type { CapabilityDescriptor, ProviderIdentity, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { z } from "zod"; import { analysisProviderCandidate, diff --git a/src/application/binary/BinarySessionStatus.ts b/src/application/binary/BinarySessionStatus.ts index 6abb6561ba..930a395bd1 100644 --- a/src/application/binary/BinarySessionStatus.ts +++ b/src/application/binary/BinarySessionStatus.ts @@ -3,7 +3,7 @@ import type { InvestigationStatistics } from "../../domain/investigationLifecycl import { artifactTargetRefusal } from "../../domain/apple/artifactTargetApplicability.js"; import { targetApplicabilityRefusal } from "../../domain/targetApplicability.js"; import type { BinaryTarget } from "../../domain/binaryTargetTypes.js"; -import type { ResolvedAppBundleResourceRoot } from "../AppBundleExecutable.js"; +import type { ResolvedAppBundleResourceRoot } from "../../domain/apple/bundleResourceRoot.js"; import { binaryTargetSummary } from "./BinaryTargetSummary.js"; import { jsonObjectSchema, type JsonValue } from "../../domain/jsonValue.js"; import type { ProviderOperationHealth } from "../../domain/providerOperationHealth.js"; @@ -12,7 +12,7 @@ import type { ProviderIdentity, ProviderRequestActivitySnapshot, ProviderRuntimeLineageSnapshot, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { PROVIDER_EFFECT_NAMES, providerCapabilitySet, diff --git a/src/application/binary/BundleResourceSession.test.ts b/src/application/binary/BundleResourceSession.test.ts index aaa356a8fa..0141abb124 100644 --- a/src/application/binary/BundleResourceSession.test.ts +++ b/src/application/binary/BundleResourceSession.test.ts @@ -5,7 +5,7 @@ import { createAnalysisExecution, type AnalysisClient, type ProviderIdentity, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { AnalysisInputError } from "../../domain/analysisErrorCore.js"; import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; import { err, ok } from "../../domain/result.js"; diff --git a/src/application/binary/BundleResourceSession.ts b/src/application/binary/BundleResourceSession.ts index cecca90a94..447a491fa7 100644 --- a/src/application/binary/BundleResourceSession.ts +++ b/src/application/binary/BundleResourceSession.ts @@ -2,12 +2,12 @@ import type { AnalysisClient, AnalysisOperation, CapabilityDescriptor, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { AnalysisCapabilityUnavailableError } from "../../domain/analysisErrorCore.js"; import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; import { err, ok } from "../../domain/result.js"; -import type { ResolvedAppBundleResourceRoot } from "../AppBundleExecutable.js"; -import { closeAnalysisClient } from "../AnalysisClientCleanup.js"; +import type { ResolvedAppBundleResourceRoot } from "../../domain/apple/bundleResourceRoot.js"; +import { closeAnalysisClient } from "../../providers/AnalysisClientCleanup.js"; export const BUNDLE_NATIVE_RESOURCE_OPERATIONS = new Set([ "inspect_plist", diff --git a/src/application/binary/CompositeProvider.test.ts b/src/application/binary/CompositeProvider.test.ts index 5ce37cf672..74be4e2bb3 100644 --- a/src/application/binary/CompositeProvider.test.ts +++ b/src/application/binary/CompositeProvider.test.ts @@ -7,12 +7,12 @@ import { type AnalysisProvider, type CapabilityDescriptor, type ProviderIdentity, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { err, ok } from "../../domain/result.js"; import { CompositeProvider } from "./CompositeProvider.js"; -import { closeAnalysisClient } from "../AnalysisClientCleanup.js"; +import { closeAnalysisClient } from "../../providers/AnalysisClientCleanup.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; const identity = (id: string): ProviderIdentity => ({ diff --git a/src/application/binary/CompositeProvider.ts b/src/application/binary/CompositeProvider.ts index 38098fbaca..c1d28c0ffe 100644 --- a/src/application/binary/CompositeProvider.ts +++ b/src/application/binary/CompositeProvider.ts @@ -16,8 +16,8 @@ import type { CapabilityDescriptor, ExecutionOptions, ProviderIdentity, -} from "../AnalysisProvider.js"; -import { closeAnalysisClient } from "../AnalysisClientCleanup.js"; +} from "../../ports/AnalysisProvider.js"; +import { closeAnalysisClient } from "../../providers/AnalysisClientCleanup.js"; import { compareUnicodeCodePoints } from "../../domain/unicodeCodePointOrder.js"; /** Synthetic identity for a deterministic provider set. */ diff --git a/src/application/binary/DeferredAnalysisClient.test.ts b/src/application/binary/DeferredAnalysisClient.test.ts index b4d911f836..401ab78ccb 100644 --- a/src/application/binary/DeferredAnalysisClient.test.ts +++ b/src/application/binary/DeferredAnalysisClient.test.ts @@ -5,7 +5,7 @@ import { DeferredAnalysisClient } from "../../providers/DeferredAnalysisClient.j import { createAnalysisExecution, type AnalysisClient, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisAccessDeniedError, diff --git a/src/application/binary/LazyAnalysisProvider.test.ts b/src/application/binary/LazyAnalysisProvider.test.ts index 8ab929b5aa..91d34fad26 100644 --- a/src/application/binary/LazyAnalysisProvider.test.ts +++ b/src/application/binary/LazyAnalysisProvider.test.ts @@ -6,8 +6,8 @@ import { parseBinaryTarget } from "../BinaryTargetResolver.js"; import type { AnalysisProvider, ProviderIdentity, -} from "../AnalysisProvider.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { LazyAnalysisProvider } from "./LazyAnalysisProvider.js"; import { ok as resultOk } from "../../domain/result.js"; diff --git a/src/application/binary/LazyAnalysisProvider.ts b/src/application/binary/LazyAnalysisProvider.ts index bdc9527eda..574f27cfc6 100644 --- a/src/application/binary/LazyAnalysisProvider.ts +++ b/src/application/binary/LazyAnalysisProvider.ts @@ -8,7 +8,7 @@ import type { AnalysisProvider, CapabilityDescriptor, ProviderIdentity, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; type LoadAnalysisProvider = () => Promise; diff --git a/src/application/binary/SessionEvidenceReuse.ts b/src/application/binary/SessionEvidenceReuse.ts index bb2aaebdf3..fdb39a5d97 100644 --- a/src/application/binary/SessionEvidenceReuse.ts +++ b/src/application/binary/SessionEvidenceReuse.ts @@ -1,5 +1,5 @@ import { basename } from "node:path"; -import type { AnalysisExecution } from "../AnalysisProvider.js"; +import type { AnalysisExecution } from "../../ports/AnalysisProvider.js"; import type { Evidence } from "../../domain/evidence.js"; import type { JsonValue } from "../../domain/jsonValue.js"; import { equalJsonText } from "../../domain/jsonSerialization.js"; diff --git a/src/application/binary/SessionProviderPolicy.ts b/src/application/binary/SessionProviderPolicy.ts index c5858af224..caaec63834 100644 --- a/src/application/binary/SessionProviderPolicy.ts +++ b/src/application/binary/SessionProviderPolicy.ts @@ -1,6 +1,6 @@ import { ENHANCED_TOOL_CONTRACTS } from "../../contracts/enhancedToolContracts.js"; import { OFFICIAL_TOOL_CONTRACTS } from "../../contracts/officialToolContracts.js"; -import type { ProviderIdentity } from "../AnalysisProvider.js"; +import type { ProviderIdentity } from "../../ports/AnalysisProvider.js"; import type { SessionProviderRoute } from "./SessionProviderRouter.js"; const OFFICIAL_OPERATIONS: ReadonlySet = new Set( diff --git a/src/application/binary/SessionProviderRouter.ts b/src/application/binary/SessionProviderRouter.ts index e7571ffb01..8647184fd0 100644 --- a/src/application/binary/SessionProviderRouter.ts +++ b/src/application/binary/SessionProviderRouter.ts @@ -11,7 +11,7 @@ import type { AnalysisProvider, CapabilityDescriptor, ProviderIdentity, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { AnalysisProviderRegistry, type AnalysisProviderBinding, diff --git a/src/application/binary/SessionRuntimeAvailability.ts b/src/application/binary/SessionRuntimeAvailability.ts index 38d4e5b463..880e2fd25f 100644 --- a/src/application/binary/SessionRuntimeAvailability.ts +++ b/src/application/binary/SessionRuntimeAvailability.ts @@ -1,7 +1,7 @@ import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisCapabilityUnavailableError } from "../../domain/analysisErrorCore.js"; import type { Result } from "../../domain/result.js"; -import type { CapabilityDescriptor } from "../AnalysisProvider.js"; +import type { CapabilityDescriptor } from "../../ports/AnalysisProvider.js"; /** Failures of the provider adapter or process rather than of one request. */ const PROVIDER_WIDE_FAILURES: ReadonlySet = new Set([ diff --git a/src/application/binaryDiagnostics/AppleIpsService.ts b/src/application/binaryDiagnostics/AppleIpsService.ts index 160f3a2eba..3877e30dda 100644 --- a/src/application/binaryDiagnostics/AppleIpsService.ts +++ b/src/application/binaryDiagnostics/AppleIpsService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { AppleIpsPort } from "./AppleIpsPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { AppleIpsPort } from "../../ports/binaryDiagnostics/AppleIpsPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/BinaryHardeningService.ts b/src/application/binaryDiagnostics/BinaryHardeningService.ts index 2c77fa1d87..a2b13143cf 100644 --- a/src/application/binaryDiagnostics/BinaryHardeningService.ts +++ b/src/application/binaryDiagnostics/BinaryHardeningService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { BinaryHardeningPort } from "./BinaryHardeningPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { BinaryHardeningPort } from "../../ports/binaryDiagnostics/BinaryHardeningPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/BinaryLayoutService.ts b/src/application/binaryDiagnostics/BinaryLayoutService.ts index 689e3a7582..49b1dd91bc 100644 --- a/src/application/binaryDiagnostics/BinaryLayoutService.ts +++ b/src/application/binaryDiagnostics/BinaryLayoutService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { BinaryLayoutPort } from "./BinaryLayoutPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { BinaryLayoutPort } from "../../ports/binaryDiagnostics/BinaryLayoutPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/ByteEntropyService.ts b/src/application/binaryDiagnostics/ByteEntropyService.ts index 79106bcd0f..f75b257862 100644 --- a/src/application/binaryDiagnostics/ByteEntropyService.ts +++ b/src/application/binaryDiagnostics/ByteEntropyService.ts @@ -3,7 +3,7 @@ import { absoluteCallerPath } from "../../filesystem/callerPath.js"; import { createHash } from "node:crypto"; import { constants } from "node:fs"; import { open, realpath, stat } from "node:fs/promises"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { BYTE_ENTROPY_PROVIDER } from "../../domain/investigationProviders.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { @@ -29,8 +29,8 @@ import { type ByteEntropy, } from "../../domain/native/byteEntropy.js"; import { err, type Result } from "../../domain/result.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; import { + ArtifactResourceScope, withArtifactFileHandle, bindArtifactFileCleanup, ArtifactFileCleanupFailure, @@ -38,9 +38,9 @@ import { assertArtifactReadActive, artifactFileCancellationCause, artifactSelectedPathErrno, -} from "../../artifacts/ArtifactFileOperation.js"; + ArtifactReaderFailure, +} from "../../resources/index.js"; import { analysisErrorWithCleanupDependencies } from "../../domain/analysisErrorCleanup.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; import { sameRegularFileState } from "../../filesystem/RegularFile.js"; import { completeProviderEvidence } from "../ProviderOperationExecution.js"; import { parseAnalysisInput } from "../AnalysisInput.js"; diff --git a/src/application/binaryDiagnostics/DevicetreeService.ts b/src/application/binaryDiagnostics/DevicetreeService.ts index b5b54dde5e..2677f3914b 100644 --- a/src/application/binaryDiagnostics/DevicetreeService.ts +++ b/src/application/binaryDiagnostics/DevicetreeService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { DevicetreePort } from "./DevicetreePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { DevicetreePort } from "../../ports/binaryDiagnostics/DevicetreePort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/ElfNotesService.ts b/src/application/binaryDiagnostics/ElfNotesService.ts index 6ba2fe0705..0a17cea2e0 100644 --- a/src/application/binaryDiagnostics/ElfNotesService.ts +++ b/src/application/binaryDiagnostics/ElfNotesService.ts @@ -1,6 +1,6 @@ import { insideArtifact } from "./artifactRange.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { ElfNotesPort } from "./ElfNotesPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { ElfNotesPort } from "../../ports/binaryDiagnostics/ElfNotesPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/ElfUnwindRangesService.ts b/src/application/binaryDiagnostics/ElfUnwindRangesService.ts index 588c27975e..28ec9fb477 100644 --- a/src/application/binaryDiagnostics/ElfUnwindRangesService.ts +++ b/src/application/binaryDiagnostics/ElfUnwindRangesService.ts @@ -1,6 +1,6 @@ import { insideArtifact } from "./artifactRange.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { ElfUnwindRangesPort } from "./ElfUnwindRangesPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { ElfUnwindRangesPort } from "../../ports/binaryDiagnostics/ElfUnwindRangesPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/KernelBuildConfigService.ts b/src/application/binaryDiagnostics/KernelBuildConfigService.ts index 57e0597fae..e2de30a59f 100644 --- a/src/application/binaryDiagnostics/KernelBuildConfigService.ts +++ b/src/application/binaryDiagnostics/KernelBuildConfigService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { KernelBuildConfigPort } from "./KernelBuildConfigPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { KernelBuildConfigPort } from "../../ports/binaryDiagnostics/KernelBuildConfigPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/KernelModuleService.ts b/src/application/binaryDiagnostics/KernelModuleService.ts index 0c822628a3..736919ac6d 100644 --- a/src/application/binaryDiagnostics/KernelModuleService.ts +++ b/src/application/binaryDiagnostics/KernelModuleService.ts @@ -1,6 +1,6 @@ import { insideArtifact } from "./artifactRange.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { KernelModulePort } from "./KernelModulePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { KernelModulePort } from "../../ports/binaryDiagnostics/KernelModulePort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/NativeExportsService.ts b/src/application/binaryDiagnostics/NativeExportsService.ts index 590ccbc3af..3c182775d3 100644 --- a/src/application/binaryDiagnostics/NativeExportsService.ts +++ b/src/application/binaryDiagnostics/NativeExportsService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { NativeExportsPort } from "./NativeExportsPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { NativeExportsPort } from "../../ports/binaryDiagnostics/NativeExportsPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/NativeInitializersService.ts b/src/application/binaryDiagnostics/NativeInitializersService.ts index 8f3525847a..b0c9bf2700 100644 --- a/src/application/binaryDiagnostics/NativeInitializersService.ts +++ b/src/application/binaryDiagnostics/NativeInitializersService.ts @@ -1,6 +1,6 @@ import { insideArtifact } from "./artifactRange.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { NativeInitializersPort } from "./NativeInitializersPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { NativeInitializersPort } from "../../ports/binaryDiagnostics/NativeInitializersPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/PeCertificatesService.ts b/src/application/binaryDiagnostics/PeCertificatesService.ts index 2f3752a559..66e68817c2 100644 --- a/src/application/binaryDiagnostics/PeCertificatesService.ts +++ b/src/application/binaryDiagnostics/PeCertificatesService.ts @@ -1,6 +1,6 @@ import { insideArtifact } from "./artifactRange.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { PeCertificatesPort } from "./PeCertificatesPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { PeCertificatesPort } from "../../ports/binaryDiagnostics/PeCertificatesPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/PeImportsService.ts b/src/application/binaryDiagnostics/PeImportsService.ts index c84e188b5d..71c5109755 100644 --- a/src/application/binaryDiagnostics/PeImportsService.ts +++ b/src/application/binaryDiagnostics/PeImportsService.ts @@ -1,6 +1,6 @@ import { insideArtifact } from "./artifactRange.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { PeImportsPort } from "./PeImportsPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { PeImportsPort } from "../../ports/binaryDiagnostics/PeImportsPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/PeLoadConfigService.ts b/src/application/binaryDiagnostics/PeLoadConfigService.ts index 3f56621fef..c884128a48 100644 --- a/src/application/binaryDiagnostics/PeLoadConfigService.ts +++ b/src/application/binaryDiagnostics/PeLoadConfigService.ts @@ -1,6 +1,6 @@ import { insideArtifact } from "./artifactRange.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { PeLoadConfigPort } from "./PeLoadConfigPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { PeLoadConfigPort } from "../../ports/binaryDiagnostics/PeLoadConfigPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/PeResourcesService.ts b/src/application/binaryDiagnostics/PeResourcesService.ts index e559ee9a50..a8734dee39 100644 --- a/src/application/binaryDiagnostics/PeResourcesService.ts +++ b/src/application/binaryDiagnostics/PeResourcesService.ts @@ -1,6 +1,6 @@ import { insideArtifact } from "./artifactRange.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { PeResourcesPort } from "./PeResourcesPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { PeResourcesPort } from "../../ports/binaryDiagnostics/PeResourcesPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/RecordedCrashService.ts b/src/application/binaryDiagnostics/RecordedCrashService.ts index d866d2ac5d..958b6dc027 100644 --- a/src/application/binaryDiagnostics/RecordedCrashService.ts +++ b/src/application/binaryDiagnostics/RecordedCrashService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { RecordedCrashPort } from "./RecordedCrashPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { RecordedCrashPort } from "../../ports/binaryDiagnostics/RecordedCrashPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/binaryDiagnostics/WindowsShortcutService.ts b/src/application/binaryDiagnostics/WindowsShortcutService.ts index 49a4c31ee2..192fe1db08 100644 --- a/src/application/binaryDiagnostics/WindowsShortcutService.ts +++ b/src/application/binaryDiagnostics/WindowsShortcutService.ts @@ -1,6 +1,6 @@ import { insideArtifact } from "./artifactRange.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { WindowsShortcutPort } from "./WindowsShortcutPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { WindowsShortcutPort } from "../../ports/binaryDiagnostics/WindowsShortcutPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/captures/PacketCaptureService.test.ts b/src/application/captures/PacketCaptureService.test.ts index 224b3cc965..d73ab6f267 100644 --- a/src/application/captures/PacketCaptureService.test.ts +++ b/src/application/captures/PacketCaptureService.test.ts @@ -3,7 +3,7 @@ import { expect, it } from "vitest"; import { createAnalysisExecution, type ExecutionOptions, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { PacketCaptureService } from "./PacketCaptureService.js"; import { createAnalysisProfile } from "../../domain/analysisProfile.js"; import { inspectPacketCaptureInputSchema } from "../../domain/captures/packetCapture.js"; diff --git a/src/application/captures/PacketCaptureService.ts b/src/application/captures/PacketCaptureService.ts index 832fe95e92..a6e8144144 100644 --- a/src/application/captures/PacketCaptureService.ts +++ b/src/application/captures/PacketCaptureService.ts @@ -1,12 +1,8 @@ import { inspectPacketFieldsInputSchema, packetFieldsCatalogSchema, - type InspectPacketFieldsInput, } from "../../domain/captures/packetFields.js"; -import type { - AnalysisExecution, - ExecutionOptions, -} from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../../domain/analysisObservation.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; @@ -14,24 +10,11 @@ import type { Evidence } from "../../domain/evidence.js"; import { inspectPacketCaptureInputSchema, packetCaptureSchema, - type InspectPacketCaptureInput, } from "../../domain/captures/packetCapture.js"; import { err, type Result } from "../../domain/result.js"; import { completeProviderEvidence } from "../ProviderOperationExecution.js"; import { parseAnalysisInput } from "../AnalysisInput.js"; - -export interface PacketCapturePort { - /** Release per-call resources before returning, or retain failed cleanup for close/retry. */ - inspect( - input: InspectPacketCaptureInput, - options?: ExecutionOptions, - ): Promise>; - inspectFields( - input: InspectPacketFieldsInput, - options?: ExecutionOptions, - ): Promise>; - close(): Promise; -} +import type { PacketCapturePort } from "../../ports/captures/PacketCapturePort.js"; /** One shared validation and Evidence owner for CLI and MCP. */ export class PacketCaptureService { diff --git a/src/application/decompileDirectory/decompileAll.test.ts b/src/application/decompileDirectory/decompileAll.test.ts index 34120d6cc4..32e89af1fa 100644 --- a/src/application/decompileDirectory/decompileAll.test.ts +++ b/src/application/decompileDirectory/decompileAll.test.ts @@ -15,8 +15,8 @@ import { createAnalysisExecution, type AnalysisOperation, type AnalysisOperationPort, -} from "../AnalysisProvider.js"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; +} from "../../ports/AnalysisProvider.js"; +import { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; import { EnhancedTools } from "../EnhancedTools.js"; import { DecompileExport } from "./exportTree.js"; import { ExportResources } from "./exportResources.js"; diff --git a/src/application/decompileDirectory/decompileAll.ts b/src/application/decompileDirectory/decompileAll.ts index cd83fe3df5..ce60711de1 100644 --- a/src/application/decompileDirectory/decompileAll.ts +++ b/src/application/decompileDirectory/decompileAll.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { z } from "zod"; import type { PseudocodeAbsence } from "../../domain/native/pseudocodeAbsence.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { DECOMPILE_DIRECTORY_INDEX_NAME, @@ -19,7 +19,7 @@ import { digestSchema } from "../../domain/digests.js"; import type { AnalysisExecution, AnalysisOperationPort, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisCapabilityUnavailableError, diff --git a/src/application/decompileDirectory/exportResources.test.ts b/src/application/decompileDirectory/exportResources.test.ts index 9ddaf7f2fb..0b93dce3b7 100644 --- a/src/application/decompileDirectory/exportResources.test.ts +++ b/src/application/decompileDirectory/exportResources.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { OwnedStagedOutput } from "../../filesystem/OwnedStagedOutput.js"; import { ExportPublishedCleanupFailure, diff --git a/src/application/decompileDirectory/exportResources.ts b/src/application/decompileDirectory/exportResources.ts index 0c4d7f1adf..fe429590d1 100644 --- a/src/application/decompileDirectory/exportResources.ts +++ b/src/application/decompileDirectory/exportResources.ts @@ -10,11 +10,13 @@ import { } from "node:fs/promises"; import { join } from "node:path"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; -import { ArtifactFileCleanupFailure } from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { + AnalysisCleanupLease, + ArtifactFileCleanupFailure, + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../../resources/index.js"; import { RegularFileCleanupFailure } from "../../filesystem/OwnedRegularFile.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; import { DECOMPILE_DIRECTORY_JOURNAL_NAME } from "../../contracts/decompileDirectory.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; @@ -27,7 +29,7 @@ import { stableFileHashCause, } from "../../filesystem/StableFileHash.js"; import type { OwnedLease } from "../../process/OwnedLease.js"; -import type { RetainedResourceScope } from "../AnalysisProvider.js"; +import type { RetainedResourceScope } from "../../ports/AnalysisProvider.js"; /** Publication committed before its staging cleanup failed. */ export class ExportPublishedCleanupFailure extends ArtifactReaderFailure { diff --git a/src/application/decompileDirectory/exportTree.ts b/src/application/decompileDirectory/exportTree.ts index 7a8eef0279..17e940cd12 100644 --- a/src/application/decompileDirectory/exportTree.ts +++ b/src/application/decompileDirectory/exportTree.ts @@ -14,9 +14,9 @@ import { basename, dirname, join } from "node:path"; import { ArtifactFileCleanupFailure, bindArtifactFileCleanup, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../../resources/index.js"; import { DECOMPILE_DIRECTORY_FUNCTIONS_DIRECTORY, @@ -44,7 +44,7 @@ import { type LeaseFailure, type OwnedLease, } from "../../process/OwnedLease.js"; -import type { RetainedResourceScope } from "../AnalysisProvider.js"; +import type { RetainedResourceScope } from "../../ports/AnalysisProvider.js"; import { ExportResources } from "./exportResources.js"; import { decompileInputError } from "./inputError.js"; import { compareProcedureAddresses } from "./selection.js"; diff --git a/src/application/desktop/DesktopApplicationCapture.test.ts b/src/application/desktop/DesktopApplicationCapture.test.ts index 6190cb243f..49b9c1d984 100644 --- a/src/application/desktop/DesktopApplicationCapture.test.ts +++ b/src/application/desktop/DesktopApplicationCapture.test.ts @@ -42,7 +42,7 @@ import * as captureFailures from "./DesktopCaptureFailure.js"; import * as providerProcess from "../../process/ProviderProcess.js"; import { systemProcessOwnershipHost } from "../../process/ProcessOwnershipObservation.js"; import { ProcessOwnershipInspectionCancelled } from "../../process/ProcessInspectionCancellation.js"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; import { desktopApplicationCaptureSchema, desktopCaptureEventSchema, diff --git a/src/application/desktop/DesktopApplicationExport.test.ts b/src/application/desktop/DesktopApplicationExport.test.ts index e4811bebdc..4304f2fbba 100644 --- a/src/application/desktop/DesktopApplicationExport.test.ts +++ b/src/application/desktop/DesktopApplicationExport.test.ts @@ -8,9 +8,9 @@ import { afterEach, describe, expect, it, vi } from "vitest"; import { z } from "zod"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; -import { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; +import { SafeOutputTree } from "../../resources/SafeOutputTree.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; +import type { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisCancelledError, diff --git a/src/application/desktop/DesktopApplicationState.test.ts b/src/application/desktop/DesktopApplicationState.test.ts index 7332e01a9f..8e40ecdad8 100644 --- a/src/application/desktop/DesktopApplicationState.test.ts +++ b/src/application/desktop/DesktopApplicationState.test.ts @@ -14,7 +14,7 @@ import { primaryAnalysisError, } from "../../domain/analysisErrorBase.js"; import { EvidenceFileError } from "../../domain/evidenceErrors.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { PrivateRuntimeRoot } from "../../process/PrivateRuntimeRoot.js"; import type { diff --git a/src/application/desktop/DesktopApplicationState.ts b/src/application/desktop/DesktopApplicationState.ts index 5eca62043c..606376bd3a 100644 --- a/src/application/desktop/DesktopApplicationState.ts +++ b/src/application/desktop/DesktopApplicationState.ts @@ -7,7 +7,7 @@ import { import { writeFile } from "node:fs/promises"; import { join } from "node:path"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/index.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisInputError, diff --git a/src/application/desktop/DesktopArchiveTask.test.ts b/src/application/desktop/DesktopArchiveTask.test.ts index bc89e5cc02..d212567a78 100644 --- a/src/application/desktop/DesktopArchiveTask.test.ts +++ b/src/application/desktop/DesktopArchiveTask.test.ts @@ -13,7 +13,7 @@ import { } from "../../domain/desktop/zipArchive.fixture.js"; import { exportDesktopApplication } from "./DesktopApplicationExport.js"; import { inspectDesktopApplicationState } from "./DesktopApplicationState.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { readZipView } from "./DesktopZipView.js"; import { DESKTOP_OPERATION } from "./DesktopCaptureRefusals.js"; import { draftDesktopApplicationTask } from "./DesktopTaskDraft.js"; diff --git a/src/application/desktop/DesktopBuildBundle.ts b/src/application/desktop/DesktopBuildBundle.ts index 6998e8b30d..4adb15a744 100644 --- a/src/application/desktop/DesktopBuildBundle.ts +++ b/src/application/desktop/DesktopBuildBundle.ts @@ -20,8 +20,10 @@ import { import { isLockFile } from "../../domain/desktop/appExportUnowned.js"; import { AGENTENV_PROVIDER } from "../../desktop/AgentEnvComputerHelper.js"; import { PrivateRuntimeRoot } from "../../process/PrivateRuntimeRoot.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { bindArtifactFileCleanup } from "../../artifacts/ArtifactFileOperation.js"; +import { + type ArtifactResourceScope, + bindArtifactFileCleanup, +} from "../../resources/index.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; const START = "start_build_computer"; diff --git a/src/application/desktop/DesktopBuildComputers.ts b/src/application/desktop/DesktopBuildComputers.ts index bf0ae6152f..2cdbfd81e0 100644 --- a/src/application/desktop/DesktopBuildComputers.ts +++ b/src/application/desktop/DesktopBuildComputers.ts @@ -46,7 +46,7 @@ import { } from "../../desktop/BuildComputerEnvironment.js"; import { buildSecretsDirectory } from "../../desktop/BuildSecretFiles.js"; import type { PrivateRuntimeRoot } from "../../process/PrivateRuntimeRoot.js"; -import type { ProgressReporter } from "../ProgressReporter.js"; +import type { ProgressReporter } from "../../ports/ProgressReporter.js"; import { BuildComputerActionLog, type ReadonlyActionLog, diff --git a/src/application/desktop/DesktopBuildOwnedWork.ts b/src/application/desktop/DesktopBuildOwnedWork.ts index edb1b74d05..4bb2c02e05 100644 --- a/src/application/desktop/DesktopBuildOwnedWork.ts +++ b/src/application/desktop/DesktopBuildOwnedWork.ts @@ -1,4 +1,4 @@ -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/index.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { cancelledBy, diff --git a/src/application/desktop/DesktopBuildSecrets.ts b/src/application/desktop/DesktopBuildSecrets.ts index 7218345fd6..adf99e697d 100644 --- a/src/application/desktop/DesktopBuildSecrets.ts +++ b/src/application/desktop/DesktopBuildSecrets.ts @@ -2,8 +2,8 @@ import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { ArtifactResourceScope, ArtifactResourceRetryFailure, -} from "../../artifacts/ArtifactResourceScope.js"; -import { bindArtifactFileCleanup } from "../../artifacts/ArtifactFileOperation.js"; + bindArtifactFileCleanup, +} from "../../resources/index.js"; import type { BuildSource } from "../../domain/desktop/appBuild.js"; import { AnalysisInputError, diff --git a/src/application/desktop/DesktopBuildSolves.test.ts b/src/application/desktop/DesktopBuildSolves.test.ts index f19a4c9bcc..fa54354ec7 100644 --- a/src/application/desktop/DesktopBuildSolves.test.ts +++ b/src/application/desktop/DesktopBuildSolves.test.ts @@ -1,5 +1,5 @@ import * as buildEnvironment from "../../desktop/BuildComputerEnvironment.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { renderSmokeTask } from "../../domain/desktop/appExport.js"; import { MEASURE_BUILD_TASK_CONTRACT } from "../../contracts/desktopBuildMeasureContract.js"; import { diff --git a/src/application/desktop/DesktopBuildSolves.ts b/src/application/desktop/DesktopBuildSolves.ts index 4f8521bae6..c84db25336 100644 --- a/src/application/desktop/DesktopBuildSolves.ts +++ b/src/application/desktop/DesktopBuildSolves.ts @@ -4,17 +4,17 @@ import { PORTABLE_BUNDLE_NAME_CONSTRAINT, } from "../../domain/portableBundleName.js"; import { createHash } from "node:crypto"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; import { + ArtifactResourceScope, ArtifactFileCleanupFailure, bindArtifactFileCleanup, -} from "../../artifacts/ArtifactFileOperation.js"; + writeTextFile, +} from "../../resources/index.js"; import { RegularFileCapacityError } from "../../filesystem/readStableFileBytes.js"; import { guestFileAnswerCeiling, guestFileAnswerWorkingBytes, } from "../../desktop/AgentEnvComputer.js"; -import { writeTextFile } from "../JsonFiles.js"; import { join, resolve } from "node:path"; import { z } from "zod"; @@ -55,7 +55,7 @@ import { PRODUCT_IDENTITY } from "../../identity.js"; import { silentProgressReporter, type ProgressReporter, -} from "../ProgressReporter.js"; +} from "../../ports/ProgressReporter.js"; import { errorText } from "./DesktopBuildCommands.js"; const MEASURE = "measure_build_task"; diff --git a/src/application/desktop/DesktopBuildSteps.ts b/src/application/desktop/DesktopBuildSteps.ts index b44aa99afa..c6014a61d9 100644 --- a/src/application/desktop/DesktopBuildSteps.ts +++ b/src/application/desktop/DesktopBuildSteps.ts @@ -5,7 +5,7 @@ import { } from "../../domain/analysisErrorCore.js"; import type { JsonValue } from "../../domain/jsonValue.js"; import { err, ok, type Result } from "../../domain/result.js"; -import type { ProgressReporter } from "../ProgressReporter.js"; +import type { ProgressReporter } from "../../ports/ProgressReporter.js"; import type { StoppedCapture } from "./DesktopBuildSummary.js"; import type { BuildComputerSteps, diff --git a/src/application/desktop/DesktopBuildWitness.test.ts b/src/application/desktop/DesktopBuildWitness.test.ts index 23cb914cf1..4fd1421d70 100644 --- a/src/application/desktop/DesktopBuildWitness.test.ts +++ b/src/application/desktop/DesktopBuildWitness.test.ts @@ -14,7 +14,7 @@ import { AnalysisCancelledError, AnalysisInputError, } from "../../domain/analysisErrorCore.js"; -import { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../resources/SafeOutputTree.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import * as stableFile from "../../filesystem/readStableFileBytes.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; diff --git a/src/application/desktop/DesktopBuildWitness.ts b/src/application/desktop/DesktopBuildWitness.ts index 9d079ba53a..0d181f6e44 100644 --- a/src/application/desktop/DesktopBuildWitness.ts +++ b/src/application/desktop/DesktopBuildWitness.ts @@ -38,7 +38,7 @@ import { AGENTENV_PROVIDER } from "../../desktop/AgentEnvComputerHelper.js"; import { silentProgressReporter, type ProgressReporter, -} from "../ProgressReporter.js"; +} from "../../ports/ProgressReporter.js"; import type { ReadonlyActionLog } from "./DesktopBuildActionLog.js"; import { errorText } from "./DesktopBuildCommands.js"; import { desktopOperationFailure } from "./DesktopCaptureRefusals.js"; diff --git a/src/application/desktop/DesktopBuildWitnessRecord.test.ts b/src/application/desktop/DesktopBuildWitnessRecord.test.ts index e21b7a6f89..92d5c527cf 100644 --- a/src/application/desktop/DesktopBuildWitnessRecord.test.ts +++ b/src/application/desktop/DesktopBuildWitnessRecord.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { describe, expect, it, vi } from "vitest"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; import { retryPublishedCleanup } from "./DesktopBuildWitness.js"; diff --git a/src/application/desktop/DesktopCaptureFailure.test.ts b/src/application/desktop/DesktopCaptureFailure.test.ts index 1b2414fd7b..f2628e99ec 100644 --- a/src/application/desktop/DesktopCaptureFailure.test.ts +++ b/src/application/desktop/DesktopCaptureFailure.test.ts @@ -4,8 +4,8 @@ import { join } from "node:path"; import { afterEach, describe, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { AnalysisInputError } from "../../domain/analysisErrorCore.js"; import type { Evidence } from "../../domain/evidence.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; diff --git a/src/application/desktop/DesktopCaptureFailure.ts b/src/application/desktop/DesktopCaptureFailure.ts index 0c46fbbfaa..4f97470408 100644 --- a/src/application/desktop/DesktopCaptureFailure.ts +++ b/src/application/desktop/DesktopCaptureFailure.ts @@ -2,11 +2,9 @@ import type { ProviderProcessInspectionCleanup } from "../../process/ProviderPro import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../../artifacts/AnalysisCleanupLease.js"; -import { ArtifactResourceRetryFailure, ArtifactResourceScope, -} from "../../artifacts/ArtifactResourceScope.js"; +} from "../../resources/index.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupDependencies } from "../../domain/analysisErrorCleanup.js"; import { diff --git a/src/application/desktop/DesktopCaptureOutput.ts b/src/application/desktop/DesktopCaptureOutput.ts index bf04913e8a..c7b7b77535 100644 --- a/src/application/desktop/DesktopCaptureOutput.ts +++ b/src/application/desktop/DesktopCaptureOutput.ts @@ -10,7 +10,7 @@ import { } from "node:fs/promises"; import { join } from "node:path"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/index.js"; import type { Evidence } from "../../domain/evidence.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; diff --git a/src/application/desktop/DesktopCaptureRefusals.test.ts b/src/application/desktop/DesktopCaptureRefusals.test.ts index 5be3a409c3..b10a865ed4 100644 --- a/src/application/desktop/DesktopCaptureRefusals.test.ts +++ b/src/application/desktop/DesktopCaptureRefusals.test.ts @@ -1,11 +1,11 @@ import { describe, expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; import { RegularFileCleanupFailure } from "../../filesystem/OwnedRegularFile.js"; -import { RetainedRegularFileCleanupFailure } from "../RegularFileRead.js"; +import { RetainedRegularFileCleanupFailure } from "../../process/RegularFileRead.js"; import { desktopOperationFailure } from "./DesktopCaptureRefusals.js"; describe("desktopOperationFailure", () => { diff --git a/src/application/desktop/DesktopCaptureRefusals.ts b/src/application/desktop/DesktopCaptureRefusals.ts index 6a222b0c35..604950b951 100644 --- a/src/application/desktop/DesktopCaptureRefusals.ts +++ b/src/application/desktop/DesktopCaptureRefusals.ts @@ -1,11 +1,11 @@ import { readdir } from "node:fs/promises"; import { isAbsolute } from "node:path"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; import { + ArtifactReaderFailure, artifactFileCancellationCause, bindArtifactFileCleanup, -} from "../../artifacts/ArtifactFileOperation.js"; +} from "../../resources/index.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { analysisErrorWithCancellation } from "../../domain/analysisErrorCancellation.js"; import { @@ -20,7 +20,7 @@ import { regularFileCancellation } from "../../filesystem/OwnedRegularFile.js"; import { bindRegularFileCleanup, RetainedRegularFileCleanupFailure, -} from "../RegularFileRead.js"; +} from "../../process/RegularFileRead.js"; import type { LinuxApplicationRefusal } from "../../desktop/LinuxApplicationInventory.js"; import { resolveProgram } from "../../desktop/ProgramLookup.js"; import type { ObservedWindow } from "../../desktop/X11WindowObserver.js"; diff --git a/src/application/desktop/DesktopExportFiles.ts b/src/application/desktop/DesktopExportFiles.ts index cc5724ffa7..7451d4f0a1 100644 --- a/src/application/desktop/DesktopExportFiles.ts +++ b/src/application/desktop/DesktopExportFiles.ts @@ -7,7 +7,7 @@ import { import { createHash } from "node:crypto"; import { Readable } from "node:stream"; -import type { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; +import type { SafeOutputTree } from "../../resources/index.js"; import type { DesktopAppExportPlan, SeedScrubReport, diff --git a/src/application/desktop/DesktopExportInstall.ts b/src/application/desktop/DesktopExportInstall.ts index eeb87329ca..56ed0262f8 100644 --- a/src/application/desktop/DesktopExportInstall.ts +++ b/src/application/desktop/DesktopExportInstall.ts @@ -8,7 +8,7 @@ import { RegularFileCleanupFailure } from "../../filesystem/OwnedRegularFile.js" import { readRegularFileText, RegularFileReadFailure, -} from "../RegularFileRead.js"; +} from "../../process/RegularFileRead.js"; import { downloadInstallFiles, downloadInstallSchema, diff --git a/src/application/desktop/DesktopExportWithheld.test.ts b/src/application/desktop/DesktopExportWithheld.test.ts index aacc530fba..66ee5b91ee 100644 --- a/src/application/desktop/DesktopExportWithheld.test.ts +++ b/src/application/desktop/DesktopExportWithheld.test.ts @@ -12,11 +12,11 @@ import { join } from "node:path"; import { afterEach, describe, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; -import { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../resources/SafeOutputTree.js"; import { ArtifactResourceScope, type ArtifactCleanupAttempt, -} from "../../artifacts/ArtifactResourceScope.js"; +} from "../../resources/ArtifactResourceScope.js"; import type { DesktopApplicationCapture } from "../../domain/desktop/desktopCapture.js"; import type { Evidence } from "../../domain/evidence.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; @@ -374,7 +374,10 @@ it.skipIf(process.platform === "win32")( const release = ArtifactResourceScope.prototype.release; vi.spyOn(ArtifactResourceScope.prototype, "release").mockImplementation( async function (this: ArtifactResourceScope, owner) { - if (owner.kind === "output-tree") { + if ( + owner.kind === "output-tree" && + owner.tree instanceof SafeOutputTree + ) { const tree = owner.tree; isPublished = () => tree.published; closingPublished = true; @@ -409,7 +412,9 @@ it.skipIf(process.platform === "win32")( for (const { owner } of failures) { expect(owner.kind).toBe("output-tree"); if (owner.kind === "output-tree") - expect(owner.tree.published).toBe(true); + expect( + owner.tree instanceof SafeOutputTree && owner.tree.published, + ).toBe(true); } for (const cause of [bundleClose, copyClose]) expect( diff --git a/src/application/desktop/DesktopOutputTree.ts b/src/application/desktop/DesktopOutputTree.ts index abf080b201..f44dd100a2 100644 --- a/src/application/desktop/DesktopOutputTree.ts +++ b/src/application/desktop/DesktopOutputTree.ts @@ -6,13 +6,13 @@ import { basename, dirname, isAbsolute } from "node:path"; import { ArtifactResourceScope, type ArtifactCleanupAttempt, -} from "../../artifacts/ArtifactResourceScope.js"; -import { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; +} from "../../resources/index.js"; import { + SafeOutputTree, outputDirectoryAdmissionRefusal, SafeOutputTreeDestinationRefusal, -} from "../../artifacts/SafeOutputTreeAdmission.js"; -import { SafeOutputTreeCreationFailure } from "../../artifacts/SafeOutputTreeCreationFailure.js"; + SafeOutputTreeCreationFailure, +} from "../../resources/index.js"; import { canonicalCallerPath } from "../../filesystem/canonicalCallerPath.js"; import { absoluteCallerPath } from "../../filesystem/callerPath.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; diff --git a/src/application/desktop/DesktopRetainedContent.cleanup.test.ts b/src/application/desktop/DesktopRetainedContent.cleanup.test.ts index 904e060d28..a43ed8a05a 100644 --- a/src/application/desktop/DesktopRetainedContent.cleanup.test.ts +++ b/src/application/desktop/DesktopRetainedContent.cleanup.test.ts @@ -2,10 +2,10 @@ import { createHash } from "node:crypto"; import { mkdir, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; -import type { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; +import type { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { OwnedCommandFailure } from "../../process/OwnedCommand.js"; import { processWorkerCleanup } from "../../process/OwnedWorkerRuntime.js"; diff --git a/src/application/desktop/DesktopRetainedContent.ts b/src/application/desktop/DesktopRetainedContent.ts index 440e6edea7..66f3cf2d13 100644 --- a/src/application/desktop/DesktopRetainedContent.ts +++ b/src/application/desktop/DesktopRetainedContent.ts @@ -2,12 +2,12 @@ import { DESKTOP_VIEW_DEFAULTS } from "../../domain/desktop/desktopViewPolicy.js import { createHash } from "node:crypto"; import { join } from "node:path"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../../artifacts/ArtifactFileOperation.js"; import { + ArtifactReaderFailure, + bindArtifactFileCleanup, ArtifactResourceScope, type ArtifactCleanupAttempt, -} from "../../artifacts/ArtifactResourceScope.js"; +} from "../../resources/index.js"; import { err, ok, type Result } from "../../domain/result.js"; import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; diff --git a/src/application/desktop/DesktopTaskExport.ts b/src/application/desktop/DesktopTaskExport.ts index 2ce100e717..eeba486b4e 100644 --- a/src/application/desktop/DesktopTaskExport.ts +++ b/src/application/desktop/DesktopTaskExport.ts @@ -1,5 +1,5 @@ import { ellipsisExcerpt } from "../../domain/excerpt.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/index.js"; import { isPointerCheck, parseDesktopTask, diff --git a/src/application/desktop/DesktopZipView.ts b/src/application/desktop/DesktopZipView.ts index 61aa001e5e..b85df6b3fa 100644 --- a/src/application/desktop/DesktopZipView.ts +++ b/src/application/desktop/DesktopZipView.ts @@ -9,7 +9,7 @@ import { type FileEntry, } from "@zip.js/zip.js"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../../resources/index.js"; import { decodeZipEntryText, ZIP_READER_OPTIONS, diff --git a/src/application/electron/ElectronFuseService.ts b/src/application/electron/ElectronFuseService.ts index 5862b903a3..1211e051a7 100644 --- a/src/application/electron/ElectronFuseService.ts +++ b/src/application/electron/ElectronFuseService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { ElectronFusePort } from "./ElectronFusePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { ElectronFusePort } from "../../ports/electron/ElectronFusePort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { diff --git a/src/application/environment/environmentBuild.test.ts b/src/application/environment/environmentBuild.test.ts index d5be921e09..3e196f776d 100644 --- a/src/application/environment/environmentBuild.test.ts +++ b/src/application/environment/environmentBuild.test.ts @@ -23,7 +23,7 @@ import { } from "../../../tests/fixtures/browserScenarioCapture.js"; import { environmentManifestHar } from "../../../tests/fixtures/historicalHar.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactFileCleanupFailure } from "../../artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../../resources/ArtifactFileOperation.js"; import { writeJsonOutput } from "../../cli/jsonOutput.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { analysisViewRequestSchema } from "../../domain/analysisView/analysisViewRequest.js"; diff --git a/src/application/environment/environmentBundleTool.ts b/src/application/environment/environmentBundleTool.ts index bdcf75bd24..4806dfd3b4 100644 --- a/src/application/environment/environmentBundleTool.ts +++ b/src/application/environment/environmentBundleTool.ts @@ -1,6 +1,8 @@ import { AnalysisError } from "../../domain/analysisErrorBase.js"; -import { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; -import { outputDirectoryAdmissionRefusal } from "../../artifacts/SafeOutputTreeAdmission.js"; +import { + SafeOutputTree, + outputDirectoryAdmissionRefusal, +} from "../../resources/index.js"; import type { EnvironmentBuildReport, ExportEnvironmentBundleInput, diff --git a/src/application/environment/environmentBundleWrite.test.ts b/src/application/environment/environmentBundleWrite.test.ts index 68caea24f2..b8841955de 100644 --- a/src/application/environment/environmentBundleWrite.test.ts +++ b/src/application/environment/environmentBundleWrite.test.ts @@ -18,8 +18,8 @@ import { environmentServeSource, writeEnvironmentServeFiles, } from "../../../tests/fixtures/environmentServe.js"; -import { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { SafeOutputTree } from "../../resources/SafeOutputTree.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { diff --git a/src/application/environment/environmentBundleWrite.ts b/src/application/environment/environmentBundleWrite.ts index 3d580d41a5..7e1c8802ee 100644 --- a/src/application/environment/environmentBundleWrite.ts +++ b/src/application/environment/environmentBundleWrite.ts @@ -11,18 +11,22 @@ import { } from "../../domain/analysisErrorCore.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import type { EnvironmentBundlePublication } from "../../domain/environmentBundleExport.js"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; -import { ArtifactFileCleanupFailure } from "../../artifacts/ArtifactFileOperation.js"; +import { + AnalysisCleanupLease, + ArtifactFileCleanupFailure, + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../../resources/index.js"; import { RegularFileCleanupFailure } from "../../filesystem/OwnedRegularFile.js"; import { readFileHandleChunks } from "../../filesystem/readFileHandleChunks.js"; -import { streamChunkToBuffer } from "../../artifacts/StreamBytes.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; -import { outputDirectoryAdmissionRefusal } from "../../artifacts/SafeOutputTreeAdmission.js"; -import { SafeOutputTreeCreationFailure } from "../../artifacts/SafeOutputTreeCreationFailure.js"; +import { + streamChunkToBuffer, + SafeOutputTree, + outputDirectoryAdmissionRefusal, + SafeOutputTreeCreationFailure, +} from "../../resources/index.js"; import { RegularFileChangedError } from "../../filesystem/RegularFile.js"; -import { withRegularFile } from "../RegularFileRead.js"; +import { withRegularFile } from "../../process/RegularFileRead.js"; import { ENVIRONMENT_EXPORT_OPERATION, type EnvironmentBundlePlan, diff --git a/src/application/environment/environmentExport.ts b/src/application/environment/environmentExport.ts index 3df8b0cd47..f67ef9af6e 100644 --- a/src/application/environment/environmentExport.ts +++ b/src/application/environment/environmentExport.ts @@ -18,11 +18,11 @@ import { RegularFileChangedError } from "../../filesystem/RegularFile.js"; import { bindArtifactFileCleanup, ArtifactFileCleanupFailure, -} from "../../artifacts/ArtifactFileOperation.js"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; + AnalysisCleanupLease, + ArtifactResourceScope, + ArtifactReaderFailure, +} from "../../resources/index.js"; import { RegularFileCleanupFailure } from "../../filesystem/OwnedRegularFile.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; import { BundleFileHostFailure, bundleTarballDigest, @@ -33,7 +33,7 @@ import { } from "./environmentBundleWrite.js"; import { sealOwnedJsonInput } from "../OwnedJsonInput.js"; import { nativeJsonParseRequiredBytes } from "../JsonInputFile.js"; -import { readRegularFile } from "../RegularFileRead.js"; +import { readRegularFile } from "../../process/RegularFileRead.js"; import { JSON_INPUT_RESOURCE_REMEDIATION, parseUtf8Json, diff --git a/src/application/environment/environmentInputCleanup.test.ts b/src/application/environment/environmentInputCleanup.test.ts index 2e26cc31ce..c5d1c8856f 100644 --- a/src/application/environment/environmentInputCleanup.test.ts +++ b/src/application/environment/environmentInputCleanup.test.ts @@ -2,7 +2,7 @@ import { expect, it, vi } from "vitest"; import { writeEnvironmentServeFiles } from "../../../tests/fixtures/environmentServe.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactFileCleanupFailure } from "../../artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../../resources/ArtifactFileOperation.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { readEnvironmentExportInputs } from "./environmentExport.js"; diff --git a/src/application/erlang/BeamService.ts b/src/application/erlang/BeamService.ts index 610aec6619..0046392412 100644 --- a/src/application/erlang/BeamService.ts +++ b/src/application/erlang/BeamService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { BeamPort } from "./BeamPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { BeamPort } from "../../ports/erlang/BeamPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/evm/EvmInterfaceService.test.ts b/src/application/evm/EvmInterfaceService.test.ts index 70adf734a5..c67ca8301a 100644 --- a/src/application/evm/EvmInterfaceService.test.ts +++ b/src/application/evm/EvmInterfaceService.test.ts @@ -1,6 +1,6 @@ import { expect, it } from "vitest"; import { EvmInterfaceService } from "./EvmInterfaceService.js"; -import type { EvmInterfaceExecution } from "./EvmInterfacePort.js"; +import type { EvmInterfaceExecution } from "../../ports/evm/EvmInterfacePort.js"; import { evmInterfaceExecution, evmInterfaceFixture, diff --git a/src/application/evm/EvmInterfaceService.ts b/src/application/evm/EvmInterfaceService.ts index 99fb060598..ab8a213c82 100644 --- a/src/application/evm/EvmInterfaceService.ts +++ b/src/application/evm/EvmInterfaceService.ts @@ -1,6 +1,6 @@ import { z } from "zod"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { EvmInterfacePort } from "./EvmInterfacePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { EvmInterfacePort } from "../../ports/evm/EvmInterfacePort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import type { Evidence } from "../../domain/evidence.js"; diff --git a/src/application/firmware/FirmwareAnalysisService.test.ts b/src/application/firmware/FirmwareAnalysisService.test.ts index 0fa7673d8f..e31416996f 100644 --- a/src/application/firmware/FirmwareAnalysisService.test.ts +++ b/src/application/firmware/FirmwareAnalysisService.test.ts @@ -2,7 +2,7 @@ import { expect, it, vi } from "vitest"; import { ZodError } from "zod"; import { FirmwareAnalysisService } from "./FirmwareAnalysisService.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { firmwareResultSchemas, type FirmwareOperation, diff --git a/src/application/firmware/FirmwareAnalysisService.ts b/src/application/firmware/FirmwareAnalysisService.ts index 390a1c6560..7a9fb09e5b 100644 --- a/src/application/firmware/FirmwareAnalysisService.ts +++ b/src/application/firmware/FirmwareAnalysisService.ts @@ -1,6 +1,6 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../../domain/analysisObservation.js"; -import type { FirmwareAnalysisPort } from "./FirmwareAnalysisPort.js"; +import type { FirmwareAnalysisPort } from "../../ports/firmware/FirmwareAnalysisPort.js"; import { firmwareRequestSchema, firmwareExecutionBudgetSchema, diff --git a/src/application/flutter/DartAotInspection.ts b/src/application/flutter/DartAotInspection.ts index 1d4b48f236..a9a3be6d56 100644 --- a/src/application/flutter/DartAotInspection.ts +++ b/src/application/flutter/DartAotInspection.ts @@ -1,4 +1,4 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { FlutterBuildAnalysisService } from "./FlutterBuildAnalysisService.js"; import { requireAnalysisViewRetention, diff --git a/src/application/flutter/FlutterBuildAnalysisPort.ts b/src/application/flutter/FlutterBuildAnalysisPort.ts index 2a52d060ef..1f5541fbe2 100644 --- a/src/application/flutter/FlutterBuildAnalysisPort.ts +++ b/src/application/flutter/FlutterBuildAnalysisPort.ts @@ -2,7 +2,7 @@ import type { AnalysisExecution, ExecutionOptions, ProviderAvailability, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import type { FlutterRequest } from "../../domain/flutter/flutterBuildAnalysis.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import type { Result } from "../../domain/result.js"; diff --git a/src/application/flutter/FlutterBuildAnalysisService.test.ts b/src/application/flutter/FlutterBuildAnalysisService.test.ts index 1ecf31483a..d5ae3d6a43 100644 --- a/src/application/flutter/FlutterBuildAnalysisService.test.ts +++ b/src/application/flutter/FlutterBuildAnalysisService.test.ts @@ -2,7 +2,7 @@ import { expect, it } from "vitest"; import { FlutterBuildAnalysisService } from "./FlutterBuildAnalysisService.js"; import type { FlutterBuildAnalysisPort } from "./FlutterBuildAnalysisPort.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js"; import { parseEvidence } from "../../domain/evidence.js"; import { ok } from "../../domain/result.js"; diff --git a/src/application/flutter/FlutterBuildAnalysisService.ts b/src/application/flutter/FlutterBuildAnalysisService.ts index 13ddfbba4e..98db566c8c 100644 --- a/src/application/flutter/FlutterBuildAnalysisService.ts +++ b/src/application/flutter/FlutterBuildAnalysisService.ts @@ -1,5 +1,5 @@ import type { FlutterBuildAnalysisPort } from "./FlutterBuildAnalysisPort.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { flutterRequestSchema, type FlutterOperation, diff --git a/src/application/frida/FridaInstrumentationService.test.ts b/src/application/frida/FridaInstrumentationService.test.ts index ac77c4ec38..9ac269e3d2 100644 --- a/src/application/frida/FridaInstrumentationService.test.ts +++ b/src/application/frida/FridaInstrumentationService.test.ts @@ -4,8 +4,8 @@ import { join } from "node:path"; import { expect, it } from "vitest"; -import { FridaScriptLoadCancelledError } from "./FridaInstrumentationPort.js"; -import type { FridaInstrumentationPort } from "./FridaInstrumentationPort.js"; +import { FridaScriptLoadCancelledError } from "../../ports/frida/FridaInstrumentationPort.js"; +import type { FridaInstrumentationPort } from "../../ports/frida/FridaInstrumentationPort.js"; import { FridaInstrumentationService } from "./FridaInstrumentationService.js"; import { AnalysisCancelledError, diff --git a/src/application/frida/FridaInstrumentationService.ts b/src/application/frida/FridaInstrumentationService.ts index 52ec207943..0bafd438a3 100644 --- a/src/application/frida/FridaInstrumentationService.ts +++ b/src/application/frida/FridaInstrumentationService.ts @@ -26,8 +26,8 @@ import { type AnalysisViewRetention, } from "../analysisView/AnalysisViewService.js"; import { fridaCaptureLimitations } from "../../frida/fridaCaptureLimits.js"; -import { unknownFridaSession } from "./fridaInputErrors.js"; -import { FridaScriptLoadCancelledError } from "./FridaInstrumentationPort.js"; +import { unknownFridaSession } from "../../frida/fridaInputErrors.js"; +import { FridaScriptLoadCancelledError } from "../../ports/frida/FridaInstrumentationPort.js"; import type { FridaDeviceList, FridaProcessList, @@ -41,7 +41,7 @@ import type { FridaSessionObservation, FridaSessionStatus, StartFridaSessionInput, -} from "./FridaInstrumentationPort.js"; +} from "../../ports/frida/FridaInstrumentationPort.js"; type FridaSessionCloseResult = Awaited< ReturnType diff --git a/src/application/frida/fridaContractRequests.ts b/src/application/frida/fridaContractRequests.ts index d78c1f239c..77fbfb1571 100644 --- a/src/application/frida/fridaContractRequests.ts +++ b/src/application/frida/fridaContractRequests.ts @@ -7,7 +7,7 @@ import type { FridaRemoteConnection, FridaScriptSource, StartFridaSessionInput, -} from "./FridaInstrumentationPort.js"; +} from "../../ports/frida/FridaInstrumentationPort.js"; /** A Frida contract's `remote` member, as its input schema admits it. */ export interface FridaRemoteInput { diff --git a/src/application/go/GoBinaryService.ts b/src/application/go/GoBinaryService.ts index 09b6cd96b5..3b7d43e00d 100644 --- a/src/application/go/GoBinaryService.ts +++ b/src/application/go/GoBinaryService.ts @@ -3,8 +3,8 @@ import { machoSelectionAnswersArchitecture, metadataReportSubjectFormat, } from "../../domain/apple/machoTargetSelection.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { GoBinaryPort } from "./GoBinaryPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { GoBinaryPort } from "../../ports/go/GoBinaryPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/gpu/GpuCodeObjectsService.ts b/src/application/gpu/GpuCodeObjectsService.ts index d8984a4bc0..eefd899d41 100644 --- a/src/application/gpu/GpuCodeObjectsService.ts +++ b/src/application/gpu/GpuCodeObjectsService.ts @@ -2,8 +2,8 @@ import { inspectGpuCodeObjectsInputSchema, gpuCodeObjectsSchema, } from "../../domain/gpu/gpuCodeObjects.js"; -import type { GpuCodeObjectsPort } from "./GpuCodeObjectsPort.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { GpuCodeObjectsPort } from "../../ports/gpu/GpuCodeObjectsPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { diff --git a/src/application/harmony/HarmonyApplicationService.ts b/src/application/harmony/HarmonyApplicationService.ts index 8248b21ff8..b8eeb9523f 100644 --- a/src/application/harmony/HarmonyApplicationService.ts +++ b/src/application/harmony/HarmonyApplicationService.ts @@ -1,5 +1,5 @@ import type { EvidenceLookup } from "../EvidenceInputResolver.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { projectHarmonyInventory } from "../../domain/harmony/harmonyApplication.js"; import type { Result } from "../../domain/result.js"; diff --git a/src/application/il2cpp/Il2cppMetadataService.test.ts b/src/application/il2cpp/Il2cppMetadataService.test.ts index 444a8b3d0f..9aeef5c3a0 100644 --- a/src/application/il2cpp/Il2cppMetadataService.test.ts +++ b/src/application/il2cpp/Il2cppMetadataService.test.ts @@ -12,7 +12,7 @@ import type { Il2cppMetadata } from "../../domain/il2cpp/il2cppMetadata.js"; import { err, ok } from "../../domain/result.js"; import { EvidenceFileError } from "../../domain/evidenceErrors.js"; import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; -import type { Il2cppSeedWriterPort } from "./Il2cppSeedWriterPort.js"; +import type { Il2cppSeedWriterPort } from "../../ports/il2cpp/Il2cppSeedWriterPort.js"; import { toolContract } from "../../contracts/toolContracts.js"; import { z } from "zod"; import { Ajv2020 } from "ajv/dist/2020.js"; diff --git a/src/application/il2cpp/Il2cppMetadataService.ts b/src/application/il2cpp/Il2cppMetadataService.ts index be548db8c4..af086432bf 100644 --- a/src/application/il2cpp/Il2cppMetadataService.ts +++ b/src/application/il2cpp/Il2cppMetadataService.ts @@ -5,14 +5,14 @@ import type { Il2cppSeedOutput, Il2cppSeedWriterPort, Il2cppSeedReceipt, -} from "./Il2cppSeedWriterPort.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +} from "../../ports/il2cpp/Il2cppSeedWriterPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { requireAnalysisViewRetention, summarizeRetainedAnalysis, type AnalysisViewRetention, } from "../analysisView/AnalysisViewService.js"; -import type { Il2cppMetadataPort } from "./Il2cppMetadataPort.js"; +import type { Il2cppMetadataPort } from "../../ports/il2cpp/Il2cppMetadataPort.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisInputError, diff --git a/src/application/investigation/InvestigationEvidence.test.ts b/src/application/investigation/InvestigationEvidence.test.ts index 36f6753f88..27f85cec02 100644 --- a/src/application/investigation/InvestigationEvidence.test.ts +++ b/src/application/investigation/InvestigationEvidence.test.ts @@ -3,7 +3,7 @@ import { expect, it } from "vitest"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; import { createEvidenceBundle } from "../../domain/evidenceBundle.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; -import { analysisErrorProjectionSchema } from "../../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../domain/analysisErrorProjectionSchema.js"; import { InvestigationRecords } from "./InvestigationRecords.js"; import { createInvestigationEvidenceClosureChecker, diff --git a/src/application/investigation/UnknownEvidence.ts b/src/application/investigation/UnknownEvidence.ts index b1d4955e75..219663b8a2 100644 --- a/src/application/investigation/UnknownEvidence.ts +++ b/src/application/investigation/UnknownEvidence.ts @@ -4,7 +4,7 @@ import type { RecordUnknownInput, UpdateUnknownInput, } from "../../domain/residualUnknown.js"; -import type { ProviderIdentity } from "../AnalysisProvider.js"; +import type { ProviderIdentity } from "../../ports/AnalysisProvider.js"; /** Provider identity for analyst-authored residual-unknown mutations. */ const UNKNOWN_REGISTRY_PROVIDER: ProviderIdentity = { diff --git a/src/application/investigation/sourcePublicationRecovery.ts b/src/application/investigation/sourcePublicationRecovery.ts index 13c9c36213..752b4eefa7 100644 --- a/src/application/investigation/sourcePublicationRecovery.ts +++ b/src/application/investigation/sourcePublicationRecovery.ts @@ -12,7 +12,7 @@ import { safeParseImmutableEvidence } from "../../domain/evidenceValidation.js"; import { freezeJsonSnapshot } from "../../domain/immutableJson.js"; import { jsonObjectSchema, type JsonValue } from "../../domain/jsonValue.js"; import type { Result } from "../../domain/result.js"; -import type { AnalysisExecution } from "../AnalysisProvider.js"; +import type { AnalysisExecution } from "../../ports/AnalysisProvider.js"; import { estimateJsonArrayScalarEntry, estimateJsonStorage, diff --git a/src/application/javascript/ElectronActiveEvidence.ts b/src/application/javascript/ElectronActiveEvidence.ts index a05c815e15..ace6ebaef7 100644 --- a/src/application/javascript/ElectronActiveEvidence.ts +++ b/src/application/javascript/ElectronActiveEvidence.ts @@ -1,5 +1,5 @@ import { digestCanonicalValue } from "../../domain/canonicalDigest.js"; -import type { ProviderIdentity } from "../AnalysisProvider.js"; +import type { ProviderIdentity } from "../../ports/AnalysisProvider.js"; import type { Evidence, EvidenceObservation } from "../../domain/evidence.js"; import { createEvidence } from "../../domain/evidence.js"; import type { @@ -7,7 +7,7 @@ import type { ElectronActiveObservationResult, } from "../../domain/javascript/electronActiveObservation.js"; import { jsonObjectSchema } from "../../domain/jsonValue.js"; -import type { CanonicalElectronActiveObservationInput } from "./ElectronActiveObservationPort.js"; +import type { CanonicalElectronActiveObservationInput } from "../../ports/javascript/ElectronActiveObservationPort.js"; /** Commit the selected Electron experiment and its observed result. */ export const createElectronActiveEvidence = ( diff --git a/src/application/javascript/ElectronActiveObservationService.test.ts b/src/application/javascript/ElectronActiveObservationService.test.ts index 7c139bb897..77f1c05fa4 100644 --- a/src/application/javascript/ElectronActiveObservationService.test.ts +++ b/src/application/javascript/ElectronActiveObservationService.test.ts @@ -9,7 +9,7 @@ import { err, ok } from "../../domain/result.js"; import { digestCanonicalValue } from "../../domain/canonicalDigest.js"; import { createElectronActiveObservationFixtureResult } from "../../domain/javascript/electronActiveObservation.fixture.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; -import type { ElectronActiveObservationPort } from "./ElectronActiveObservationPort.js"; +import type { ElectronActiveObservationPort } from "../../ports/javascript/ElectronActiveObservationPort.js"; import { captureElectronScenario } from "./ElectronActiveObservationService.js"; const SKIP_PERMISSIONS = diff --git a/src/application/javascript/ElectronActiveObservationService.ts b/src/application/javascript/ElectronActiveObservationService.ts index 9bf43f4620..3436bd6e06 100644 --- a/src/application/javascript/ElectronActiveObservationService.ts +++ b/src/application/javascript/ElectronActiveObservationService.ts @@ -3,11 +3,11 @@ import { dirname } from "node:path"; import { constants, type Stats } from "node:fs"; import { access, realpath, stat } from "node:fs/promises"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { CanonicalElectronActiveObservationInput, ElectronActiveObservationPort, -} from "./ElectronActiveObservationPort.js"; +} from "../../ports/javascript/ElectronActiveObservationPort.js"; import { AnalysisAccessDeniedError, AnalysisCapabilityUnavailableError, diff --git a/src/application/javascript/ElectronEvidence.ts b/src/application/javascript/ElectronEvidence.ts index b789c093f3..5d03845fa4 100644 --- a/src/application/javascript/ElectronEvidence.ts +++ b/src/application/javascript/ElectronEvidence.ts @@ -1,6 +1,6 @@ import { isDeepStrictEqual } from "node:util"; import type { JsonValue } from "../../domain/jsonValue.js"; -import type { ProviderIdentity } from "../AnalysisProvider.js"; +import type { ProviderIdentity } from "../../ports/AnalysisProvider.js"; import { createEvidence, type Evidence, diff --git a/src/application/javascript/ElectronObservationService.test.ts b/src/application/javascript/ElectronObservationService.test.ts index e690f2d19b..edf0801403 100644 --- a/src/application/javascript/ElectronObservationService.test.ts +++ b/src/application/javascript/ElectronObservationService.test.ts @@ -14,7 +14,7 @@ import { import { emptyElectronPageCoverage } from "../../domain/javascript/electronPageInspection.fixture.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { err, ok } from "../../domain/result.js"; -import type { ElectronObservationPort } from "./ElectronObservationPort.js"; +import type { ElectronObservationPort } from "../../ports/javascript/ElectronObservationPort.js"; import { inspectElectronPage, listElectronTargets, diff --git a/src/application/javascript/ElectronObservationService.ts b/src/application/javascript/ElectronObservationService.ts index a6b1cbbd57..7d7fad3322 100644 --- a/src/application/javascript/ElectronObservationService.ts +++ b/src/application/javascript/ElectronObservationService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { ElectronObservationPort } from "./ElectronObservationPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { ElectronObservationPort } from "../../ports/javascript/ElectronObservationPort.js"; import type { Evidence } from "../../domain/evidence.js"; import type { ElectronPageInspection, diff --git a/src/application/javascript/JavaScriptAnalysisControl.test.ts b/src/application/javascript/JavaScriptAnalysisControl.test.ts index 0dc60c78a0..f7d0c3d578 100644 --- a/src/application/javascript/JavaScriptAnalysisControl.test.ts +++ b/src/application/javascript/JavaScriptAnalysisControl.test.ts @@ -1,6 +1,6 @@ import { setImmediate } from "node:timers/promises"; import { describe, expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { completeJavaScriptAnalysisSteps } from "./JavaScriptAnalysisControl.js"; describe("JavaScript cooperative computation lifecycle", () => { diff --git a/src/application/javascript/JavaScriptAnalysisControl.ts b/src/application/javascript/JavaScriptAnalysisControl.ts index 64746c2261..d90be58e08 100644 --- a/src/application/javascript/JavaScriptAnalysisControl.ts +++ b/src/application/javascript/JavaScriptAnalysisControl.ts @@ -1,5 +1,5 @@ import { setImmediate } from "node:timers/promises"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; /** Reject cancelled application work before computing or publishing more results. */ export const assertJavaScriptAnalysisActive = (signal?: AbortSignal): void => { diff --git a/src/application/javascript/JavaScriptApplicationEvidence.ts b/src/application/javascript/JavaScriptApplicationEvidence.ts index bc24688ced..7f321073a3 100644 --- a/src/application/javascript/JavaScriptApplicationEvidence.ts +++ b/src/application/javascript/JavaScriptApplicationEvidence.ts @@ -12,7 +12,7 @@ import { freezeOwnedJsonSnapshotSteps } from "../../domain/immutableJson.js"; import { rememberOwnedApplicationGraphEvidence } from "./JavaScriptApplicationEvidenceGraph.js"; import { completeJavaScriptAnalysisSteps } from "./JavaScriptAnalysisControl.js"; import { jsonValueValidationSteps } from "../../domain/jsonValue.js"; -import type { ProgressReporter } from "../ProgressReporter.js"; +import type { ProgressReporter } from "../../ports/ProgressReporter.js"; /** Create owned analysis Evidence while allowing request cancellation during sealing and hashing. */ export const createOwnedJavaScriptApplicationEvidenceCooperatively = async ( diff --git a/src/application/javascript/JavaScriptApplicationService.ts b/src/application/javascript/JavaScriptApplicationService.ts index 36fa323e0b..ed4159ef25 100644 --- a/src/application/javascript/JavaScriptApplicationService.ts +++ b/src/application/javascript/JavaScriptApplicationService.ts @@ -8,9 +8,11 @@ import { parseAsarListingAdmission } from "../../config/asarListingAdmission.js" import { resolveJavaScriptMemberMutationAllowance } from "../../config/javascriptMemberMutationAllowance.js"; import { z } from "zod"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../../resources/index.js"; import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailure.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; import { analyzeJavaScriptApplicationInputSchema, type JavaScriptApplicationAnalysisResult, @@ -26,7 +28,7 @@ import type { Evidence } from "../../domain/evidence.js"; import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js"; import { err, ok, type Result } from "../../domain/result.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { createOwnedJavaScriptApplicationEvidenceCooperatively } from "./JavaScriptApplicationEvidence.js"; import { assertJavaScriptAnalysisActive, diff --git a/src/application/javascript/JavaScriptApplicationWorkflowService.ts b/src/application/javascript/JavaScriptApplicationWorkflowService.ts index 1dfc553927..0d9548e02d 100644 --- a/src/application/javascript/JavaScriptApplicationWorkflowService.ts +++ b/src/application/javascript/JavaScriptApplicationWorkflowService.ts @@ -1,4 +1,4 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { resolveEvidenceRequest, type EvidenceLookup, @@ -10,7 +10,7 @@ import { traceApplicationFeatureRequestSchema, } from "../../contracts/javascript/applicationWorkflowInputContracts.js"; import type { EvidenceWorkflowExecution } from "../investigation/EvidenceWorkflowExecution.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import type { ResolvedSourceToBundleReference } from "./SourceToBundleReference.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; diff --git a/src/application/javascript/JavaScriptArtifactAnalysis.ts b/src/application/javascript/JavaScriptArtifactAnalysis.ts index a01a30bac8..59c5053738 100644 --- a/src/application/javascript/JavaScriptArtifactAnalysis.ts +++ b/src/application/javascript/JavaScriptArtifactAnalysis.ts @@ -45,7 +45,7 @@ import { htmlArtifactReferences } from "../../domain/javascript/htmlArtifactRefe import type { JavaScriptSourceAnalysisPort } from "../../domain/javascript/javascriptSourceAnalysis.js"; import type { JavaScriptSemanticGraphProjection } from "./JavaScriptSemanticGraphBuilder.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailure.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { diff --git a/src/application/javascript/JavaScriptArtifactReconstruction.ts b/src/application/javascript/JavaScriptArtifactReconstruction.ts index f11dc4b527..52ce71e895 100644 --- a/src/application/javascript/JavaScriptArtifactReconstruction.ts +++ b/src/application/javascript/JavaScriptArtifactReconstruction.ts @@ -16,7 +16,10 @@ import { import { access, realpath, stat } from "node:fs/promises"; import { setImmediate } from "node:timers/promises"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../../resources/index.js"; import { AnalysisAccessDeniedError, AnalysisInputError, @@ -36,7 +39,6 @@ import { analysisErrorWithCleanupDependencies } from "../../domain/analysisError import { ArtifactOperationError } from "../../domain/artifactOperationError.js"; import type { ArtifactInventorySnapshot } from "../../domain/artifactInventorySnapshot.js"; import type { ArtifactInventoryPartialObservation } from "../../domain/artifactPartialObservation.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; import { analyzeAndAdoptJavaScriptArtifactFiles } from "./JavaScriptArtifactAnalysis.js"; import { isSkippedJavaScriptAnalysis, @@ -50,7 +52,7 @@ import { buildImmutableJavaScriptArtifactGraphSteps } from "./JavaScriptArtifact import { scanCanonicalArtifactInventoryInScope } from "../../artifacts/inventory/scanCanonical.js"; import { createJavaScriptNextAppContext } from "./JavaScriptNextAppContext.js"; import { createJavaScriptSemanticGraphProjection } from "./JavaScriptSemanticGraphBuilder.js"; -import type { ProgressReporter } from "../ProgressReporter.js"; +import type { ProgressReporter } from "../../ports/ProgressReporter.js"; import { checkpointJavaScriptAnalysis, completeJavaScriptAnalysisSteps, diff --git a/src/application/javascript/JavaScriptPreloadDiscovery.ts b/src/application/javascript/JavaScriptPreloadDiscovery.ts index d45d7cf5f1..13ef45b2f6 100644 --- a/src/application/javascript/JavaScriptPreloadDiscovery.ts +++ b/src/application/javascript/JavaScriptPreloadDiscovery.ts @@ -9,7 +9,7 @@ import { import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailure.js"; import type { JavaScriptArtifactFileSet } from "../../domain/javascript/javascriptArtifactFiles.js"; import type { JavaScriptSourceAnalysisLimits } from "../../domain/javascript/javascriptSourceAnalysis.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import { createJavaScriptSourceAnalysis } from "../../artifacts/javascript/JavaScriptSourceAnalysis.js"; import { createJavaScriptPackageTypeLookup } from "./JavaScriptArtifactAnalysis.js"; import { JavaScriptJsonDocuments } from "./JavaScriptJsonDocuments.js"; diff --git a/src/application/javascript/JavaScriptRecoveryService.test.ts b/src/application/javascript/JavaScriptRecoveryService.test.ts index 41282994c0..ce52326465 100644 --- a/src/application/javascript/JavaScriptRecoveryService.test.ts +++ b/src/application/javascript/JavaScriptRecoveryService.test.ts @@ -3,7 +3,7 @@ import { AnalysisCapabilityUnavailableError } from "../../domain/analysisErrorCo import { err, ok } from "../../domain/result.js"; import { parseEvidence } from "../../domain/evidence.js"; import type { JavaScriptRecoveryResult } from "../../domain/javascript/javascriptRecovery.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { JavaScriptRecoveryService } from "./JavaScriptRecoveryService.js"; const artifact = { path: "/tmp/bundle.js", sha256: "a".repeat(64), bytes: 20 }; diff --git a/src/application/javascript/JavaScriptRecoveryService.ts b/src/application/javascript/JavaScriptRecoveryService.ts index d57c1a9abc..96338b477d 100644 --- a/src/application/javascript/JavaScriptRecoveryService.ts +++ b/src/application/javascript/JavaScriptRecoveryService.ts @@ -8,9 +8,9 @@ import { javascriptRecoveryResultSchema, } from "../../domain/javascript/javascriptRecovery.js"; import { err, type Result } from "../../domain/result.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { completeProviderEvidence } from "../ProviderOperationExecution.js"; -import type { JavaScriptRecoveryPort } from "./JavaScriptRecoveryPort.js"; +import type { JavaScriptRecoveryPort } from "../../ports/javascript/JavaScriptRecoveryPort.js"; const OPERATION = "recover_javascript_sources"; diff --git a/src/application/javascript/JavaScriptRuntimeObservationEvidence.ts b/src/application/javascript/JavaScriptRuntimeObservationEvidence.ts index 399f20b3f1..41769053ab 100644 --- a/src/application/javascript/JavaScriptRuntimeObservationEvidence.ts +++ b/src/application/javascript/JavaScriptRuntimeObservationEvidence.ts @@ -1,4 +1,4 @@ -import type { ProviderIdentity } from "../AnalysisProvider.js"; +import type { ProviderIdentity } from "../../ports/AnalysisProvider.js"; import { createEvidence, type Evidence, diff --git a/src/application/javascript/JavaScriptRuntimeObservationService.test.ts b/src/application/javascript/JavaScriptRuntimeObservationService.test.ts index a9339d7a92..55229a040e 100644 --- a/src/application/javascript/JavaScriptRuntimeObservationService.test.ts +++ b/src/application/javascript/JavaScriptRuntimeObservationService.test.ts @@ -6,7 +6,7 @@ import { err, ok } from "../../domain/result.js"; import { parseEvidence } from "../../domain/evidence.js"; import type { JavaScriptRuntimeTargetList } from "../../domain/javascript/javascriptRuntimeObservation.js"; import { javascriptRuntimeObservationSchema } from "../../domain/javascript/javascriptRuntimeObservation.js"; -import type { JavaScriptRuntimeObservationPort } from "./JavaScriptRuntimeObservationPort.js"; +import type { JavaScriptRuntimeObservationPort } from "../../ports/javascript/JavaScriptRuntimeObservationPort.js"; import { listJavaScriptRuntimeTargets, observeJavaScriptRuntime, diff --git a/src/application/javascript/JavaScriptRuntimeObservationService.ts b/src/application/javascript/JavaScriptRuntimeObservationService.ts index 75e50c0545..2b13d5e80a 100644 --- a/src/application/javascript/JavaScriptRuntimeObservationService.ts +++ b/src/application/javascript/JavaScriptRuntimeObservationService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { JavaScriptRuntimeObservationPort } from "./JavaScriptRuntimeObservationPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { JavaScriptRuntimeObservationPort } from "../../ports/javascript/JavaScriptRuntimeObservationPort.js"; import { createJavaScriptRuntimeObservationEvidence } from "./JavaScriptRuntimeObservationEvidence.js"; import type { Evidence } from "../../domain/evidence.js"; import { diff --git a/src/application/javascript/JavaScriptRuntimeReconciliationService.ts b/src/application/javascript/JavaScriptRuntimeReconciliationService.ts index 320c91171f..abe76fc98c 100644 --- a/src/application/javascript/JavaScriptRuntimeReconciliationService.ts +++ b/src/application/javascript/JavaScriptRuntimeReconciliationService.ts @@ -1,4 +1,4 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { resolve } from "node:path"; import type { z } from "zod"; import { diff --git a/src/application/javascript/JavaScriptSemanticTraceService.ts b/src/application/javascript/JavaScriptSemanticTraceService.ts index d656abd861..3ff280ecb3 100644 --- a/src/application/javascript/JavaScriptSemanticTraceService.ts +++ b/src/application/javascript/JavaScriptSemanticTraceService.ts @@ -1,4 +1,4 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { resolveEvidenceRequest, type EvidenceLookup, diff --git a/src/application/javascript/SourceToBundleReference.ts b/src/application/javascript/SourceToBundleReference.ts index 7f19daa138..3581cd8804 100644 --- a/src/application/javascript/SourceToBundleReference.ts +++ b/src/application/javascript/SourceToBundleReference.ts @@ -6,7 +6,7 @@ import { historicalSourceGraphSchema, type HistoricalSourceGraph, } from "../../domain/referenceSourceGraph.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import { cancelledBy, isAborted } from "../../domain/analysisErrorCore.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js"; diff --git a/src/application/jeb/JebAnalysisService.test.ts b/src/application/jeb/JebAnalysisService.test.ts index f4b3f0f01d..3fefdc6290 100644 --- a/src/application/jeb/JebAnalysisService.test.ts +++ b/src/application/jeb/JebAnalysisService.test.ts @@ -1,9 +1,9 @@ import { describe, expect, it } from "vitest"; import { JebAnalysisService } from "./JebAnalysisService.js"; -import type { JebAnalysisPort } from "./JebAnalysisPort.js"; +import type { JebAnalysisPort } from "../../ports/jeb/JebAnalysisPort.js"; import type { JebRequest } from "../../domain/jeb/jebAnalysis.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisInputError, diff --git a/src/application/jeb/JebAnalysisService.ts b/src/application/jeb/JebAnalysisService.ts index 3a43970c8f..780ef2131a 100644 --- a/src/application/jeb/JebAnalysisService.ts +++ b/src/application/jeb/JebAnalysisService.ts @@ -1,5 +1,5 @@ -import type { JebAnalysisPort } from "./JebAnalysisPort.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { JebAnalysisPort } from "../../ports/jeb/JebAnalysisPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { jebRequestSchema, type JebOperation, diff --git a/src/application/managed/ManagedApplicationGraphService.ts b/src/application/managed/ManagedApplicationGraphService.ts index 1a2b43cdca..302208c735 100644 --- a/src/application/managed/ManagedApplicationGraphService.ts +++ b/src/application/managed/ManagedApplicationGraphService.ts @@ -2,7 +2,7 @@ import { resolveEvidenceRequest, type EvidenceLookup, } from "../EvidenceInputResolver.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { createEvidence, diff --git a/src/application/managed/ManagedMemberComparisonService.ts b/src/application/managed/ManagedMemberComparisonService.ts index 47a38de977..18e50d89c5 100644 --- a/src/application/managed/ManagedMemberComparisonService.ts +++ b/src/application/managed/ManagedMemberComparisonService.ts @@ -2,7 +2,7 @@ import { resolveEvidenceRequest, type EvidenceLookup, } from "../EvidenceInputResolver.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { compareManagedMembers, diff --git a/src/application/managed/ManagedNativeVerificationService.ts b/src/application/managed/ManagedNativeVerificationService.ts index 6842714e1a..cfc28ac0ba 100644 --- a/src/application/managed/ManagedNativeVerificationService.ts +++ b/src/application/managed/ManagedNativeVerificationService.ts @@ -2,7 +2,7 @@ import { resolveEvidenceRequest, type EvidenceLookup, } from "../EvidenceInputResolver.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; import { ok, type Result } from "../../domain/result.js"; diff --git a/src/application/managed/ManagedReconstructionService.ts b/src/application/managed/ManagedReconstructionService.ts index f2578876ea..a30f880909 100644 --- a/src/application/managed/ManagedReconstructionService.ts +++ b/src/application/managed/ManagedReconstructionService.ts @@ -14,7 +14,7 @@ import { resolveEvidenceRequest, type EvidenceLookup, } from "../EvidenceInputResolver.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; const OPERATION = "import_managed_reconstruction" as const; diff --git a/src/application/model/ModelArtifactService.ts b/src/application/model/ModelArtifactService.ts index 44ca9dacd8..7c7e252072 100644 --- a/src/application/model/ModelArtifactService.ts +++ b/src/application/model/ModelArtifactService.ts @@ -1,6 +1,6 @@ import { inspectModelArtifactInputSchema } from "../../domain/model/modelArtifactQuery.js"; -import type { ModelArtifactPort } from "./ModelArtifactPort.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ModelArtifactPort } from "../../ports/model/ModelArtifactPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { modelArtifactSchema } from "../../domain/model/modelArtifact.js"; import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; diff --git a/src/application/native/EnhancedNativeInvestigation.test.ts b/src/application/native/EnhancedNativeInvestigation.test.ts index 7be7aeedc5..edaba15b59 100644 --- a/src/application/native/EnhancedNativeInvestigation.test.ts +++ b/src/application/native/EnhancedNativeInvestigation.test.ts @@ -1,4 +1,4 @@ -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; // Fake-backed composition coverage; real provider verification lives in // `npm run verify:hopper` and `npm run verify:ghidra`. import { describe, expect, it } from "vitest"; @@ -8,7 +8,7 @@ import { createAnalysisExecution, type AnalysisExecution, type AnalysisOperation, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisCancelledError, diff --git a/src/application/native/NativeCallRoutes.test.ts b/src/application/native/NativeCallRoutes.test.ts index ae8cf850ca..44047d0c31 100644 --- a/src/application/native/NativeCallRoutes.test.ts +++ b/src/application/native/NativeCallRoutes.test.ts @@ -1,10 +1,10 @@ -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; import { describe, expect, it } from "vitest"; import { readNativeCallRoutes } from "./NativeCallRoutes.js"; import { createAnalysisExecution, type AnalysisOperation, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { ghidraReferenceEdge } from "../../domain/ghidraValues.fixture.js"; import { jsonValueSchema } from "../../domain/jsonValue.js"; import { err, ok } from "../../domain/result.js"; diff --git a/src/application/native/NativeCallRoutes.ts b/src/application/native/NativeCallRoutes.ts index c8d21c6772..25d0e981e8 100644 --- a/src/application/native/NativeCallRoutes.ts +++ b/src/application/native/NativeCallRoutes.ts @@ -5,7 +5,7 @@ import type { AnalysisOperationPort, ExecutionOptions, ProviderIdentity, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { parseRelatedAddresses } from "../../domain/native/nativeObservation.js"; import { referenceKindSchema } from "../../domain/native/nativeReference.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; diff --git a/src/application/native/NativeDispatchMetadataInspection.fallback.test.ts b/src/application/native/NativeDispatchMetadataInspection.fallback.test.ts index 5b3b726d07..6f3ecd39aa 100644 --- a/src/application/native/NativeDispatchMetadataInspection.fallback.test.ts +++ b/src/application/native/NativeDispatchMetadataInspection.fallback.test.ts @@ -9,7 +9,7 @@ import { err, ok } from "../../domain/result.js"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { inspectNativeDispatch } from "./NativeDispatchMetadataInspection.js"; it("retains the binary reader refusal when the symbol fallback also fails", async () => { diff --git a/src/application/native/NativeDispatchMetadataInspection.ts b/src/application/native/NativeDispatchMetadataInspection.ts index 4ffefaea53..886ee54e38 100644 --- a/src/application/native/NativeDispatchMetadataInspection.ts +++ b/src/application/native/NativeDispatchMetadataInspection.ts @@ -10,7 +10,7 @@ import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { jsonValueSchema } from "../../domain/jsonValue.js"; import { err, ok } from "../../domain/result.js"; import { executeFact } from "../AnalysisOperationFacts.js"; -import type { AnalysisOperationPort } from "../AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../ports/AnalysisProvider.js"; import type { EnhancedResult } from "../EnhancedToolTypes.js"; /** Source operations for this workflow, shared with capability discovery. */ diff --git a/src/application/native/NativeFunctionMatchingService.ts b/src/application/native/NativeFunctionMatchingService.ts index 52ea86c22e..72ac58667c 100644 --- a/src/application/native/NativeFunctionMatchingService.ts +++ b/src/application/native/NativeFunctionMatchingService.ts @@ -2,7 +2,7 @@ import { NativeMatchingAdmission } from "./NativeMatchingAdmission.js"; import { loadNativeMatchingBundleSources } from "./NativeMatchingBundleSources.js"; import { RegularFileCleanupFailure } from "../../filesystem/OwnedRegularFile.js"; import { matchFunctionInventories } from "../../domain/native/matchFunctionInventories.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import { setImmediate } from "node:timers/promises"; import { matchNativeFunctionsInputSchema, @@ -21,7 +21,7 @@ import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection. import { err, ok, type Result } from "../../domain/result.js"; import type { EvidenceLookup } from "../EvidenceInputResolver.js"; import { resolveNativeMatchingSources } from "./NativeMatchingSources.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { NativeMatchingAllowance } from "../../config/nativeMatchingAllowance.js"; import { FUNCTION_COMPARISON_PROVIDER } from "../../domain/comparisonEvidenceIdentity.js"; diff --git a/src/application/native/NativeMatchingBundleSources.ts b/src/application/native/NativeMatchingBundleSources.ts index 0cc18c7b32..379ceff660 100644 --- a/src/application/native/NativeMatchingBundleSources.ts +++ b/src/application/native/NativeMatchingBundleSources.ts @@ -1,5 +1,5 @@ import { createHash } from "node:crypto"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import type { EvidenceBundle } from "../../domain/evidenceBundle.js"; import type { Evidence } from "../../domain/evidence.js"; import { readImmutableEvidence } from "../../domain/evidenceValidation.js"; diff --git a/src/application/native/NativeReaderEvidence.test.ts b/src/application/native/NativeReaderEvidence.test.ts index 54e01f67c3..0b4225fc0f 100644 --- a/src/application/native/NativeReaderEvidence.test.ts +++ b/src/application/native/NativeReaderEvidence.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../../domain/analysisObservation.js"; import { AnalysisCapabilityUnavailableError } from "../../domain/analysisErrorCore.js"; import { err, ok } from "../../domain/result.js"; diff --git a/src/application/native/NativeUiActionTrace.ts b/src/application/native/NativeUiActionTrace.ts index e0c1174a1a..1244c62021 100644 --- a/src/application/native/NativeUiActionTrace.ts +++ b/src/application/native/NativeUiActionTrace.ts @@ -3,7 +3,7 @@ import { permitsCapabilityFallback } from "../CapabilityFallback.js"; import { stopsTraversal } from "../CallRelationshipTraversal.js"; import { z } from "zod"; -import type { AnalysisOperationPort } from "../AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../ports/AnalysisProvider.js"; import type { EnhancedResult } from "../EnhancedToolTypes.js"; import type { enhancedInputSchemas } from "../../contracts/enhancedInputs.js"; import { interfaceBuilderAnalysisSchema } from "../../domain/apple/interfaceBuilderGraph.js"; diff --git a/src/application/native/NativeValueTrace.fixture.ts b/src/application/native/NativeValueTrace.fixture.ts index 42c16fe295..ece2da7b39 100644 --- a/src/application/native/NativeValueTrace.fixture.ts +++ b/src/application/native/NativeValueTrace.fixture.ts @@ -1,7 +1,7 @@ import { createAnalysisExecution, type AnalysisOperationPort, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { ghidraFunctionDossier } from "../../domain/ghidraValues.fixture.js"; import { functionDossierSchema } from "../../domain/native/functionDossier.js"; import { jsonValueSchema } from "../../domain/jsonValue.js"; diff --git a/src/application/native/NativeValueTrace.test.ts b/src/application/native/NativeValueTrace.test.ts index c2c560fbf8..14ebe43f3c 100644 --- a/src/application/native/NativeValueTrace.test.ts +++ b/src/application/native/NativeValueTrace.test.ts @@ -5,7 +5,7 @@ import { executeComposedWorkflow } from "../WorkflowEvidence.js"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { ghidraFunctionDossier } from "../../domain/ghidraValues.fixture.js"; import { functionDossierSchema } from "../../domain/native/functionDossier.js"; import { jsonValueSchema } from "../../domain/jsonValue.js"; diff --git a/src/application/native/NativeValueTrace.ts b/src/application/native/NativeValueTrace.ts index a93de0c038..dad996215f 100644 --- a/src/application/native/NativeValueTrace.ts +++ b/src/application/native/NativeValueTrace.ts @@ -11,7 +11,7 @@ import { cancelledBy, } from "../../domain/analysisErrorCore.js"; import { err, ok } from "../../domain/result.js"; -import type { AnalysisOperationPort } from "../AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../ports/AnalysisProvider.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { stopsTraversal } from "../CallRelationshipTraversal.js"; import { diff --git a/src/application/native/NativeValueTraceStops.test.ts b/src/application/native/NativeValueTraceStops.test.ts index 9408f93431..fab9d49b1b 100644 --- a/src/application/native/NativeValueTraceStops.test.ts +++ b/src/application/native/NativeValueTraceStops.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from "vitest"; -import type { AnalysisOperationPort } from "../AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../ports/AnalysisProvider.js"; import { ok } from "../../domain/result.js"; import { AnalysisCancelledError, diff --git a/src/application/ntfs/NtfsJournalCache.ts b/src/application/ntfs/NtfsJournalCache.ts index 86b0d091b4..0950cb9b3b 100644 --- a/src/application/ntfs/NtfsJournalCache.ts +++ b/src/application/ntfs/NtfsJournalCache.ts @@ -1,6 +1,8 @@ import type { BigIntStats } from "node:fs"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { StableArtifactSnapshot } from "../../artifacts/readStableArtifact.js"; +import type { + ArtifactResourceScope, + StableArtifactSnapshot, +} from "../../resources/index.js"; import type { MftIndex } from "../../domain/windows/ntfsMft.js"; import { createUsnMftCorrelator } from "../../domain/windows/ntfsJournalCorrelation.js"; diff --git a/src/application/ntfs/NtfsJournalPaging.test.ts b/src/application/ntfs/NtfsJournalPaging.test.ts index e377937f30..e97510592c 100644 --- a/src/application/ntfs/NtfsJournalPaging.test.ts +++ b/src/application/ntfs/NtfsJournalPaging.test.ts @@ -8,8 +8,8 @@ import { } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import * as stableArtifact from "../../artifacts/readStableArtifact.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; +import * as stableArtifact from "../../resources/readStableArtifact.js"; import * as mftDecoder from "../../domain/windows/ntfsMft.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { parseEvidence } from "../../domain/evidence.js"; diff --git a/src/application/ntfs/NtfsJournalService.test.ts b/src/application/ntfs/NtfsJournalService.test.ts index cbf7e557b5..4288f8b905 100644 --- a/src/application/ntfs/NtfsJournalService.test.ts +++ b/src/application/ntfs/NtfsJournalService.test.ts @@ -5,8 +5,8 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import * as stableArtifact from "../../artifacts/readStableArtifact.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; +import * as stableArtifact from "../../resources/readStableArtifact.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { inspectNtfsJournalEvidence } from "./NtfsJournalService.js"; import { parseEvidence } from "../../domain/evidence.js"; diff --git a/src/application/ntfs/NtfsJournalService.ts b/src/application/ntfs/NtfsJournalService.ts index 9d59c1ba49..f4e2a9bdf1 100644 --- a/src/application/ntfs/NtfsJournalService.ts +++ b/src/application/ntfs/NtfsJournalService.ts @@ -5,21 +5,17 @@ import { type NtfsJournalCache, type NtfsAcquisition, } from "./NtfsJournalCache.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; import { + ArtifactReaderFailure, + type ArtifactResourceScope, artifactFileCancellationCause, artifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import { readStableArtifact, assertStableArtifactState, -} from "../../artifacts/readStableArtifact.js"; -import { projectStableArtifactFailure, stableArtifactInputRecovery, readerIntegrityFailure, -} from "../../artifacts/StableArtifactFailure.js"; +} from "../../resources/index.js"; import { primaryAnalysisError, type AnalysisError, diff --git a/src/application/pcap/PcapAnalysisPort.ts b/src/application/pcap/PcapAnalysisPort.ts index c5acecd382..c8cc8fc519 100644 --- a/src/application/pcap/PcapAnalysisPort.ts +++ b/src/application/pcap/PcapAnalysisPort.ts @@ -2,7 +2,7 @@ import type { AnalysisExecution, ExecutionOptions, ProviderAvailability, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import type { PcapRequest } from "../../domain/pcap/pcapAnalysis.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import type { Result } from "../../domain/result.js"; diff --git a/src/application/pcap/PcapAnalysisService.test.ts b/src/application/pcap/PcapAnalysisService.test.ts index bf94fc6158..ad93b69d3a 100644 --- a/src/application/pcap/PcapAnalysisService.test.ts +++ b/src/application/pcap/PcapAnalysisService.test.ts @@ -1,7 +1,7 @@ import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { expect, it } from "vitest"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { parseEvidence } from "../../domain/evidence.js"; import { pcapResultSchemas } from "../../domain/pcap/pcapAnalysis.js"; diff --git a/src/application/pcap/PcapAnalysisService.ts b/src/application/pcap/PcapAnalysisService.ts index bcbabd93d7..bb820ec562 100644 --- a/src/application/pcap/PcapAnalysisService.ts +++ b/src/application/pcap/PcapAnalysisService.ts @@ -1,6 +1,6 @@ import { analysisOperationInputErrorFromIssues } from "../../domain/inputIssueProjection.js"; import type { PcapAnalysisPort } from "./PcapAnalysisPort.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { pcapRequestSchema, type PcapOperation, diff --git a/src/application/playwrightTrace/PlaywrightTraceService.ts b/src/application/playwrightTrace/PlaywrightTraceService.ts index 64a6f2d7be..4d82754b3c 100644 --- a/src/application/playwrightTrace/PlaywrightTraceService.ts +++ b/src/application/playwrightTrace/PlaywrightTraceService.ts @@ -12,7 +12,7 @@ import { } from "../../domain/playwrightTrace/playwrightTrace.js"; import { parseAnalysisInput } from "../AnalysisInput.js"; import { completeProviderEvidence } from "../ProviderOperationExecution.js"; -import type { PlaywrightTracePort } from "./PlaywrightTracePort.js"; +import type { PlaywrightTracePort } from "../../ports/playwrightTrace/PlaywrightTracePort.js"; const evidence = (report: PlaywrightTrace) => createEvidence( diff --git a/src/application/process/ProcessCli.ts b/src/application/process/ProcessCli.ts index 6671f22829..2d37d09941 100644 --- a/src/application/process/ProcessCli.ts +++ b/src/application/process/ProcessCli.ts @@ -21,7 +21,7 @@ import { PROCESS_PROVIDER } from "../../domain/process/processEvidenceProvider.j import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js"; import { processScenarioSchema } from "../../domain/process/processScenario.js"; import { unsupportedProcessCaptureProvider } from "./ProcessComparisonService.js"; -import { createProgressReporter } from "../ProgressReporter.js"; +import { createProgressReporter } from "../../ports/ProgressReporter.js"; import { captureProcessScenario } from "../../process/capture/ProcessHarness.js"; import { ProcessCaptureResourceScope } from "../../process/capture/ProcessCaptureLifecycle.js"; import { ProcessCaptureError } from "../../process/capture/ProcessCaptureError.js"; @@ -36,10 +36,10 @@ import { readJsonFile, jsonFileReadCleanupLeases } from "../JsonFiles.js"; import { ArtifactReaderFailure, artifactPrimaryCleanupLeases, -} from "../../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../../artifacts/ArtifactFileOperation.js"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; + bindArtifactFileCleanup, + AnalysisCleanupLease, + ArtifactResourceScope, +} from "../../resources/index.js"; import { EvidenceFileError } from "../../domain/evidenceErrors.js"; import type { Evidence } from "../../domain/evidence.js"; import { completeProviderEvidence } from "../ProviderOperationExecution.js"; diff --git a/src/application/python/PythonPycService.ts b/src/application/python/PythonPycService.ts index 99d4aafd6d..8fedbea43b 100644 --- a/src/application/python/PythonPycService.ts +++ b/src/application/python/PythonPycService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { PythonPycPort } from "./PythonPycPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { PythonPycPort } from "../../ports/python/PythonPycPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/releaseExposure/ReleaseExposureService.test.ts b/src/application/releaseExposure/ReleaseExposureService.test.ts index 9df8ec3a2e..818979164f 100644 --- a/src/application/releaseExposure/ReleaseExposureService.test.ts +++ b/src/application/releaseExposure/ReleaseExposureService.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from "vitest"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisCancelledError, @@ -25,8 +25,8 @@ import { import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; import { err, ok, type Result } from "../../domain/result.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { ReleaseExposurePort } from "./ReleaseExposurePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { ReleaseExposurePort } from "../../ports/releaseExposure/ReleaseExposurePort.js"; import { ReleaseExposureService } from "./ReleaseExposureService.js"; import { releaseOwnedCleanup } from "../../../tests/support/cleanupRelease.js"; diff --git a/src/application/releaseExposure/ReleaseExposureService.ts b/src/application/releaseExposure/ReleaseExposureService.ts index 2effb076da..0c81629e55 100644 --- a/src/application/releaseExposure/ReleaseExposureService.ts +++ b/src/application/releaseExposure/ReleaseExposureService.ts @@ -1,8 +1,8 @@ import { basename, dirname, posix, win32 } from "node:path"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { appendCallerPath } from "../../filesystem/callerPath.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { DesktopApplicationService } from "../artifacts/DesktopApplicationService.js"; import type { ElectronFuseService } from "../electron/ElectronFuseService.js"; import type { GoBinaryService } from "../go/GoBinaryService.js"; @@ -54,7 +54,7 @@ import { import { err, ok, type Result } from "../../domain/result.js"; import { goBuildPaths } from "../../domain/releaseExposureGoPaths.js"; import { rustBinarySchema } from "../../domain/rust/rustBinary.js"; -import type { ReleaseExposurePort } from "./ReleaseExposurePort.js"; +import type { ReleaseExposurePort } from "../../ports/releaseExposure/ReleaseExposurePort.js"; export interface ReleaseExposureOwners { readonly reader: ReleaseExposurePort; diff --git a/src/application/reverse/ReverseEngineeringService.ts b/src/application/reverse/ReverseEngineeringService.ts index 812f608df5..15dba731d6 100644 --- a/src/application/reverse/ReverseEngineeringService.ts +++ b/src/application/reverse/ReverseEngineeringService.ts @@ -1,8 +1,10 @@ import { HOST_PLATFORM } from "../../platform/HostPlatform.js"; import { MAX_NODE_TIMER_DELAY_MS } from "../../domain/analysisResourceLimits.js"; import { Budget } from "../../domain/budget.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { bindArtifactFileCleanup } from "../../artifacts/ArtifactFileOperation.js"; +import { + ArtifactResourceScope, + bindArtifactFileCleanup, +} from "../../resources/index.js"; import { ProcessOwnershipInspectionCancelled, ProcessOwnershipIdentityBatchFailure, @@ -76,7 +78,7 @@ import { } from "../../process/ProcessOwnershipObservation.js"; import { ProcessAdmissionError } from "../../process/ProcessAdmissionError.js"; import type { ProviderProcessSupervisor } from "../../process/ProviderProcess.js"; -import { RuntimeControlUnavailableError } from "../../process/RuntimeControlUnavailableError.js"; +import { RuntimeControlUnavailableError } from "../../domain/runtimeControlUnavailableError.js"; import { WindowsNativeAuthorityUnavailableError } from "../../windows/WindowsNativeLoader.js"; import { WindowsNativeSpawnControlError, diff --git a/src/application/rust/RustBinaryService.ts b/src/application/rust/RustBinaryService.ts index 052ac3ca37..bf0836312f 100644 --- a/src/application/rust/RustBinaryService.ts +++ b/src/application/rust/RustBinaryService.ts @@ -3,8 +3,8 @@ import { machoSelectionAnswersArchitecture, metadataReportSubjectFormat, } from "../../domain/apple/machoTargetSelection.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { RustBinaryPort } from "./RustBinaryPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { RustBinaryPort } from "../../ports/rust/RustBinaryPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/signals/SignalRecordingService.test.ts b/src/application/signals/SignalRecordingService.test.ts index 1fd3a30ccd..8513b9a072 100644 --- a/src/application/signals/SignalRecordingService.test.ts +++ b/src/application/signals/SignalRecordingService.test.ts @@ -3,7 +3,7 @@ import { expect, it } from "vitest"; import { createAnalysisExecution, type ExecutionOptions, -} from "../AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import { SignalRecordingService } from "./SignalRecordingService.js"; import { createAnalysisProfile } from "../../domain/analysisProfile.js"; import { decodeSignalRecordingInputSchema } from "../../domain/signals/signalRecording.js"; diff --git a/src/application/signals/SignalRecordingService.ts b/src/application/signals/SignalRecordingService.ts index 9173f6e859..7e83d2450f 100644 --- a/src/application/signals/SignalRecordingService.ts +++ b/src/application/signals/SignalRecordingService.ts @@ -1,12 +1,8 @@ import { inspectSignalDecodersInputSchema, signalDecodersSchema, - type InspectSignalDecodersInput, } from "../../domain/signals/signalDecoders.js"; -import type { - AnalysisExecution, - ExecutionOptions, -} from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../../domain/analysisObservation.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; @@ -14,24 +10,11 @@ import type { Evidence } from "../../domain/evidence.js"; import { decodeSignalRecordingInputSchema, signalRecordingSchema, - type DecodeSignalRecordingInput, } from "../../domain/signals/signalRecording.js"; import { err, type Result } from "../../domain/result.js"; import { completeProviderEvidence } from "../ProviderOperationExecution.js"; import { parseAnalysisInput } from "../AnalysisInput.js"; - -export interface SignalRecordingPort { - /** Release per-call resources before returning, or retain failed cleanup for close/retry. */ - decode( - input: DecodeSignalRecordingInput, - options?: ExecutionOptions, - ): Promise>; - inspectDecoders( - input: InspectSignalDecodersInput, - options?: ExecutionOptions, - ): Promise>; - close(): Promise; -} +import type { SignalRecordingPort } from "../../ports/signals/SignalRecordingPort.js"; /** One shared validation and Evidence owner for CLI and MCP. */ export class SignalRecordingService { diff --git a/src/application/sqlite/SqliteDatabaseService.test.ts b/src/application/sqlite/SqliteDatabaseService.test.ts index 3fd7f42278..c8edfd2a94 100644 --- a/src/application/sqlite/SqliteDatabaseService.test.ts +++ b/src/application/sqlite/SqliteDatabaseService.test.ts @@ -2,7 +2,7 @@ import { expect, it } from "vitest"; import { SqliteDatabaseService } from "./SqliteDatabaseService.js"; import { AnalysisCapabilityUnavailableError } from "../../domain/analysisErrorCore.js"; import { err, ok } from "../../domain/result.js"; -import { createAnalysisExecution } from "../AnalysisProvider.js"; +import { createAnalysisExecution } from "../../ports/AnalysisProvider.js"; import { sqliteDatabaseSchema } from "../../domain/sqlite/sqliteDatabase.js"; import { createAnalysisProfile } from "../../domain/analysisProfile.js"; diff --git a/src/application/sqlite/SqliteDatabaseService.ts b/src/application/sqlite/SqliteDatabaseService.ts index bed99f8527..d20f22dcb9 100644 --- a/src/application/sqlite/SqliteDatabaseService.ts +++ b/src/application/sqlite/SqliteDatabaseService.ts @@ -1,6 +1,6 @@ import { parseAnalysisInput } from "../AnalysisInput.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { SqliteDatabasePort } from "./SqliteDatabasePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { SqliteDatabasePort } from "../../ports/sqlite/SqliteDatabasePort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import type { Evidence, EvidenceSubjectTarget } from "../../domain/evidence.js"; diff --git a/src/application/v8CodeCache/V8CodeCacheService.ts b/src/application/v8CodeCache/V8CodeCacheService.ts index f927acf23f..f0bb7e3fa8 100644 --- a/src/application/v8CodeCache/V8CodeCacheService.ts +++ b/src/application/v8CodeCache/V8CodeCacheService.ts @@ -1,5 +1,5 @@ -import type { ExecutionOptions } from "../AnalysisProvider.js"; -import type { V8CodeCachePort } from "./V8CodeCachePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { V8CodeCachePort } from "../../ports/v8CodeCache/V8CodeCachePort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { createEvidence, type Evidence } from "../../domain/evidence.js"; diff --git a/src/application/wasm/WasmArtifactService.ts b/src/application/wasm/WasmArtifactService.ts index 5960e44ce3..773175a89d 100644 --- a/src/application/wasm/WasmArtifactService.ts +++ b/src/application/wasm/WasmArtifactService.ts @@ -1,12 +1,12 @@ import type { AnalysisSettingsReader } from "../../domain/analysisSettings.js"; import { selectedAnalysisSetting } from "../../domain/analysisSettingDefinitions.js"; import { constants as bufferConstants } from "node:buffer"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { analysisExecutionEnvelopeForAdmission, createAnalysisExecutionEvidence, } from "../../domain/analysisObservation.js"; -import type { WasmArtifactPort } from "./WasmArtifactPort.js"; +import type { WasmArtifactPort } from "../../ports/wasm/WasmArtifactPort.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisOutputError, diff --git a/src/application/wasm/WasmInterfaceComparisonService.ts b/src/application/wasm/WasmInterfaceComparisonService.ts index fad6e1ea08..b4e186b7e4 100644 --- a/src/application/wasm/WasmInterfaceComparisonService.ts +++ b/src/application/wasm/WasmInterfaceComparisonService.ts @@ -33,7 +33,7 @@ import { resolveEvidenceRequest, type EvidenceLookup, } from "../EvidenceInputResolver.js"; -import type { ExecutionOptions } from "../AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { z } from "zod"; import { safeParseEvidence } from "../../domain/evidenceValidation.js"; import { completeProviderEvidence } from "../ProviderOperationExecution.js"; diff --git a/src/artifacts/ArtifactEmbeddedFormatProbes.ts b/src/artifacts/ArtifactEmbeddedFormatProbes.ts index 194a0edbb9..256ca89f1d 100644 --- a/src/artifacts/ArtifactEmbeddedFormatProbes.ts +++ b/src/artifacts/ArtifactEmbeddedFormatProbes.ts @@ -19,7 +19,7 @@ import { sameRegularFileState, } from "../filesystem/RegularFile.js"; import { findDotnetBundleHeader } from "./dotnet/DotnetBundle.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { abortIfNeeded } from "./ArtifactHash.js"; import { locateGodotPck, type GodotPckLocation } from "./GodotPckLocation.js"; import { diff --git a/src/artifacts/ArtifactFileAdmission.ts b/src/artifacts/ArtifactFileAdmission.ts index 159a869612..05f761a984 100644 --- a/src/artifacts/ArtifactFileAdmission.ts +++ b/src/artifacts/ArtifactFileAdmission.ts @@ -4,7 +4,7 @@ import { RegularFileChangedError, RegularFileOperationCancelled, } from "../filesystem/RegularFile.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; /** Project physical admission failures without taking the caller's descriptor ownership. */ export const artifactFileAdmissionFailure = ( diff --git a/src/artifacts/ArtifactFileRange.ts b/src/artifacts/ArtifactFileRange.ts index 9555d7fd31..93dfbe03b7 100644 --- a/src/artifacts/ArtifactFileRange.ts +++ b/src/artifacts/ArtifactFileRange.ts @@ -1,6 +1,8 @@ import type { FileHandle } from "node:fs/promises"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + assertArtifactReadActive, +} from "../resources/index.js"; /** Validate a physical extent before callers apply independent capacity limits. */ export const assertArtifactFileRange = ( diff --git a/src/artifacts/ArtifactFileSource.ts b/src/artifacts/ArtifactFileSource.ts index ab0d18ce7c..08f56cfbf7 100644 --- a/src/artifacts/ArtifactFileSource.ts +++ b/src/artifacts/ArtifactFileSource.ts @@ -12,11 +12,11 @@ import { artifactSelectedPathErrno, artifactReadCancelledBy, assertArtifactReadActive, -} from "./ArtifactFileOperation.js"; + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../resources/index.js"; import { artifactFileAdmissionFailure } from "./ArtifactFileAdmission.js"; import { hashReadable } from "./ArtifactHash.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; /** Verify an admitted descriptor against the regular file still named by its path. */ export const assertArtifactFileSelectedSource = async ( diff --git a/src/artifacts/ArtifactHash.ts b/src/artifacts/ArtifactHash.ts index b00497f373..68557ed0a3 100644 --- a/src/artifacts/ArtifactHash.ts +++ b/src/artifacts/ArtifactHash.ts @@ -2,8 +2,8 @@ import type { AsarHeaderAdmission } from "../config/asarHeaderAdmission.js"; import { createHash } from "node:crypto"; import type { Readable } from "node:stream"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; -import { streamChunkToBuffer } from "./StreamBytes.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; +import { streamChunkToBuffer } from "../resources/index.js"; import { createArtifactClassificationProbe, type ArtifactClassificationEvidence, diff --git a/src/artifacts/ArtifactOperationFailure.test.ts b/src/artifacts/ArtifactOperationFailure.test.ts index 27258bcfdb..f8370a9d00 100644 --- a/src/artifacts/ArtifactOperationFailure.test.ts +++ b/src/artifacts/ArtifactOperationFailure.test.ts @@ -1,6 +1,6 @@ import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { artifactReaderLimitFailure } from "./ArtifactReaderLimits.js"; @@ -8,10 +8,10 @@ import { constants as bufferConstants } from "node:buffer"; import { imageFileSizeRemediation, readerIntegrityFailure, -} from "./StableArtifactFailure.js"; +} from "../resources/StableArtifactFailure.js"; import { artifactIntegrityDetails } from "../domain/artifactIntegrity.js"; -import { ArtifactFileCleanupFailure } from "./ArtifactFileOperation.js"; -import { AnalysisCleanupLease } from "./AnalysisCleanupLease.js"; +import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; // The provider ceiling test uses a sparse file and is skipped on Windows. diff --git a/src/artifacts/ArtifactOperationFailure.ts b/src/artifacts/ArtifactOperationFailure.ts index 7ec0a5f4e3..51c5bbb3e8 100644 --- a/src/artifacts/ArtifactOperationFailure.ts +++ b/src/artifacts/ArtifactOperationFailure.ts @@ -2,11 +2,11 @@ import { analysisSettingLimit } from "../domain/analysisSettingDefinitions.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { ArtifactOperationError } from "../domain/artifactOperationError.js"; import { InternalInvariantError } from "../domain/internalInvariant.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; import { + ArtifactReaderFailure, artifactFileCancellationCause, bindArtifactFileCleanup, -} from "./ArtifactFileOperation.js"; +} from "../resources/index.js"; /** * Translate one artifact boundary failure while retaining cleanup evidence. A diff --git a/src/artifacts/ArtifactPreparation.test.ts b/src/artifacts/ArtifactPreparation.test.ts index 7445815348..12b17e92ee 100644 --- a/src/artifacts/ArtifactPreparation.test.ts +++ b/src/artifacts/ArtifactPreparation.test.ts @@ -1,6 +1,6 @@ import { expect, it, vi } from "vitest"; import { ArtifactPreparation } from "./ArtifactPreparation.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; it.each(["physical", "cleanup", "waiter-cancelled"] as const)( "does not retry another caller's %s failure", diff --git a/src/artifacts/ArtifactPreparation.ts b/src/artifacts/ArtifactPreparation.ts index 4401bb07e3..8e8c034ff6 100644 --- a/src/artifacts/ArtifactPreparation.ts +++ b/src/artifacts/ArtifactPreparation.ts @@ -1,4 +1,4 @@ -import { artifactReadCancelledBy } from "./ArtifactFileOperation.js"; +import { artifactReadCancelledBy } from "../resources/index.js"; /** Share one preparation while allowing another caller to retry its cancellation. */ export class ArtifactPreparation { diff --git a/src/artifacts/ArtifactProvider.ts b/src/artifacts/ArtifactProvider.ts index 793b77ff14..bc5d0c78ec 100644 --- a/src/artifacts/ArtifactProvider.ts +++ b/src/artifacts/ArtifactProvider.ts @@ -7,7 +7,11 @@ import { import type { AnalysisSettingsReader } from "../domain/analysisSettings.js"; import { runtimeAsarHeaderAdmission } from "../config/runtimeAnalysisSettings.js"; import { artifactTargetRefusal } from "../domain/apple/artifactTargetApplicability.js"; -import { bindArtifactFileCleanup } from "./ArtifactFileOperation.js"; +import { + bindArtifactFileCleanup, + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../resources/index.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; @@ -19,7 +23,7 @@ import { type CapabilityDescriptor, type ProviderIdentity, type ExecutionOptions, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { inspectBundleKeyedArchive, inspectStandaloneKeyedArchive, @@ -48,8 +52,6 @@ import { import type { JsonValue } from "../domain/jsonValue.js"; import { interfaceBuilderLimitsSchema } from "../domain/apple/interfaceBuilderGraph.js"; import { err, ok, type Result } from "../domain/result.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; import { artifactCapabilities } from "./ArtifactProviderMetadata.js"; import { ARTIFACT_GRAPH_PROVIDER } from "../domain/investigationProviders.js"; import { createEvidence } from "../domain/evidence.js"; @@ -59,8 +61,10 @@ import { createArtifactInspection, } from "../domain/artifactInspection.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import type { ResolvedAppBundleResourceRoot } from "../application/AppBundleExecutable.js"; -import type { BundleResourceRoot } from "../domain/apple/bundleResourceRoot.js"; +import type { + ResolvedAppBundleResourceRoot, + BundleResourceRoot, +} from "../domain/apple/bundleResourceRoot.js"; import { BUNDLE_ARTIFACT_RESOURCE_OPERATIONS } from "../application/binary/BundleResourceSession.js"; /** Read-only inventory and exclusively owned extraction provider. */ diff --git a/src/artifacts/ArtifactProviderCleanup.test.ts b/src/artifacts/ArtifactProviderCleanup.test.ts index dac273138a..3df358b51e 100644 --- a/src/artifacts/ArtifactProviderCleanup.test.ts +++ b/src/artifacts/ArtifactProviderCleanup.test.ts @@ -1,7 +1,7 @@ import { expect, it, vi } from "vitest"; import { ArtifactProvider } from "./ArtifactProvider.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import * as interfaceBuilder from "./apple/InterfaceBuilderAnalysis.js"; it("updates a bundle resource client's returned cleanup error after close retry", async () => { diff --git a/src/artifacts/ArtifactProviderMetadata.ts b/src/artifacts/ArtifactProviderMetadata.ts index 657eabe7f3..5216a73dce 100644 --- a/src/artifacts/ArtifactProviderMetadata.ts +++ b/src/artifacts/ArtifactProviderMetadata.ts @@ -1,4 +1,4 @@ -import type { CapabilityDescriptor } from "../application/AnalysisProvider.js"; +import type { CapabilityDescriptor } from "../ports/AnalysisProvider.js"; import { ARTIFACT_GRAPH_PROVIDER } from "../domain/investigationProviders.js"; import { ARTIFACT_ANALYSIS_OPERATIONS } from "../contracts/artifactToolContracts.js"; diff --git a/src/artifacts/ArtifactReaderLimits.ts b/src/artifacts/ArtifactReaderLimits.ts index 4feaa41641..454dce9c9a 100644 --- a/src/artifacts/ArtifactReaderLimits.ts +++ b/src/artifacts/ArtifactReaderLimits.ts @@ -1,5 +1,5 @@ import type { ArtifactLimitBoundary } from "../domain/artifactOperationError.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { artifactReaderLimitMaximum } from "../domain/artifactReaderLimits.js"; /** Construct exact next-call recovery at the enforcing resource owner. */ diff --git a/src/artifacts/ArtifactSelectedSource.ts b/src/artifacts/ArtifactSelectedSource.ts index 1f7dbc27bf..e075877313 100644 --- a/src/artifacts/ArtifactSelectedSource.ts +++ b/src/artifacts/ArtifactSelectedSource.ts @@ -1,6 +1,8 @@ import { realpath, stat } from "node:fs/promises"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; -import { artifactSelectedPathErrno } from "./ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + artifactSelectedPathErrno, +} from "../resources/index.js"; /** Canonicalize only a path that native filesystem lookup actually accepts. */ export const resolveArtifactSourcePath = async ( diff --git a/src/artifacts/ArtifactSourceResolution.test.ts b/src/artifacts/ArtifactSourceResolution.test.ts index f124893f63..cde1bfa44c 100644 --- a/src/artifacts/ArtifactSourceResolution.test.ts +++ b/src/artifacts/ArtifactSourceResolution.test.ts @@ -6,7 +6,7 @@ import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory import { openRegularFile } from "../filesystem/RegularFile.js"; import { assertArtifactFileSelectedSource } from "./ArtifactFileSource.js"; import { assertArtifactSelectedSource } from "./ArtifactSelectedSource.js"; -import { readStableArtifact } from "./readStableArtifact.js"; +import { readStableArtifact } from "../resources/readStableArtifact.js"; import { DirectoryArtifactReader } from "./DirectoryArtifactReader.js"; import { createDesktopApplicationService } from "../composition/desktop.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; diff --git a/src/artifacts/ArtifactTraversalObservation.test.ts b/src/artifacts/ArtifactTraversalObservation.test.ts index 2f02638d52..2d590d4ec1 100644 --- a/src/artifacts/ArtifactTraversalObservation.test.ts +++ b/src/artifacts/ArtifactTraversalObservation.test.ts @@ -4,7 +4,7 @@ import type { ArtifactEntry, ArtifactReader, ArtifactReaderTraversal, -} from "./ArtifactReader.js"; +} from "../resources/ArtifactReader.js"; import { ArtifactTraversalObservation } from "./ArtifactTraversalObservation.js"; const entry = (path: string): ArtifactEntry => ({ diff --git a/src/artifacts/ArtifactTraversalObservation.ts b/src/artifacts/ArtifactTraversalObservation.ts index 25dd1446b5..242fbb7540 100644 --- a/src/artifacts/ArtifactTraversalObservation.ts +++ b/src/artifacts/ArtifactTraversalObservation.ts @@ -1,11 +1,11 @@ import { compareUnicodeCodePoints } from "../domain/unicodeCodePointOrder.js"; -import { normalizeArtifactPath } from "./ArtifactPaths.js"; +import { normalizeArtifactPath } from "../resources/index.js"; import type { ArtifactReader, ArtifactReaderTraversal, ArtifactTraversalOmission, ArtifactTraversalSink, -} from "./ArtifactReader.js"; +} from "../resources/index.js"; /** A reader whose traversal reports through a sink; its format names it in limitations. */ interface TraversableArtifactReader { diff --git a/src/artifacts/AsarArtifactReader.ts b/src/artifacts/AsarArtifactReader.ts index 1c6398433d..16452a459f 100644 --- a/src/artifacts/AsarArtifactReader.ts +++ b/src/artifacts/AsarArtifactReader.ts @@ -25,7 +25,7 @@ import { type ArtifactEntry, type ArtifactReader, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; +} from "../resources/index.js"; import { closeAsarHandle, readValidatedAsarEntry } from "./AsarEntryStream.js"; import { admitAsarHeader, @@ -34,7 +34,7 @@ import { } from "./AsarHeader.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import type { FileHandleChunkStream } from "../filesystem/readFileHandleChunks.js"; -import { readArtifactFileChunks } from "./readArtifactFileChunks.js"; +import { readArtifactFileChunks } from "../resources/index.js"; import { assertAsarReadActive, asarCancellationFailure, diff --git a/src/artifacts/AsarEntryStream.test.ts b/src/artifacts/AsarEntryStream.test.ts index 7579bb3cc1..9b20d9c7ac 100644 --- a/src/artifacts/AsarEntryStream.test.ts +++ b/src/artifacts/AsarEntryStream.test.ts @@ -1,7 +1,7 @@ import type { FileHandle } from "node:fs/promises"; import { Readable } from "node:stream"; import { expect, it } from "vitest"; -import { readArtifactFileChunks } from "./readArtifactFileChunks.js"; +import { readArtifactFileChunks } from "../resources/readArtifactFileChunks.js"; import { readValidatedAsarEntry } from "./AsarEntryStream.js"; it.each(["complete", "truncated"])( diff --git a/src/artifacts/AsarEntryStream.ts b/src/artifacts/AsarEntryStream.ts index b5ffbe5879..4349e980ef 100644 --- a/src/artifacts/AsarEntryStream.ts +++ b/src/artifacts/AsarEntryStream.ts @@ -1,7 +1,7 @@ import type { FileHandleChunkStream } from "../filesystem/readFileHandleChunks.js"; import { Readable } from "node:stream"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { assertAsarReadActive, asarCancellationFailure, diff --git a/src/artifacts/AsarFailure.ts b/src/artifacts/AsarFailure.ts index 49db12d974..72b738cf54 100644 --- a/src/artifacts/AsarFailure.ts +++ b/src/artifacts/AsarFailure.ts @@ -1,4 +1,4 @@ -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; /** Preserve cancellation at the ASAR boundary with its original abort reason. */ export const asarCancellationFailure = ( diff --git a/src/artifacts/AsarHeader.ts b/src/artifacts/AsarHeader.ts index 421e3ac7ef..4f259b4809 100644 --- a/src/artifacts/AsarHeader.ts +++ b/src/artifacts/AsarHeader.ts @@ -3,8 +3,10 @@ import type { FileHandle } from "node:fs/promises"; import { readFileHandleRange } from "../filesystem/readFileHandleRange.js"; import { findDuplicateJsonMember } from "../domain/jsonDuplicateMember.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, +} from "../resources/index.js"; import { err, ok, type Result } from "../domain/result.js"; import { ASAR_HEADER_ADMISSION_SETTING, diff --git a/src/artifacts/AsarListing.ts b/src/artifacts/AsarListing.ts index c629cfa7dd..2399c77321 100644 --- a/src/artifacts/AsarListing.ts +++ b/src/artifacts/AsarListing.ts @@ -3,7 +3,10 @@ import { setImmediate } from "node:timers/promises"; import { z } from "zod"; import { asarDeclaredSizeSchema, asarNodeSchema } from "./AsarNode.js"; -import { ArtifactReaderFailure, type ArtifactEntry } from "./ArtifactReader.js"; +import { + ArtifactReaderFailure, + type ArtifactEntry, +} from "../resources/index.js"; import { assertAsarReadActive } from "./AsarFailure.js"; import { compareUnicodeCodePoints } from "../domain/unicodeCodePointOrder.js"; import { quotedExcerpt } from "../domain/excerpt.js"; diff --git a/src/artifacts/BunStandaloneArtifactReader.ts b/src/artifacts/BunStandaloneArtifactReader.ts index d564fbc76b..944035cc46 100644 --- a/src/artifacts/BunStandaloneArtifactReader.ts +++ b/src/artifacts/BunStandaloneArtifactReader.ts @@ -16,21 +16,21 @@ import type { import { jsonValueByteLength } from "../domain/jsonValueByteLength.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { readFileHandleChunks } from "../filesystem/readFileHandleChunks.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; -import { - normalizeArtifactPath, - ArtifactPathRegistry, -} from "./ArtifactPaths.js"; import { + assertArtifactReadActive, ArtifactReaderFailure, copyArtifactEntry, assertProducedEntry, type ArtifactEntry, type ArtifactReader, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; + ArtifactResourceScope, +} from "../resources/index.js"; +import { + normalizeArtifactPath, + ArtifactPathRegistry, +} from "../resources/index.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; import { ownArtifactStream } from "./OwnedArtifactStream.js"; import { bunFormatFailure, diff --git a/src/artifacts/DecodedRegionArtifactReader.ts b/src/artifacts/DecodedRegionArtifactReader.ts index 8b2a5eab73..34e1be4893 100644 --- a/src/artifacts/DecodedRegionArtifactReader.ts +++ b/src/artifacts/DecodedRegionArtifactReader.ts @@ -17,9 +17,9 @@ import { type ArtifactReader, type ArtifactReaderTraversal, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; + ArtifactResourceScope, + assertArtifactReadActive, +} from "../resources/index.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; import { readFileHandleChunks } from "../filesystem/readFileHandleChunks.js"; import type { StableRegularFileDescriptor } from "../filesystem/RegularFile.js"; diff --git a/src/artifacts/DenoStandaloneArtifactReader.ts b/src/artifacts/DenoStandaloneArtifactReader.ts index 73409b732d..94a417b8cf 100644 --- a/src/artifacts/DenoStandaloneArtifactReader.ts +++ b/src/artifacts/DenoStandaloneArtifactReader.ts @@ -12,21 +12,21 @@ import type { } from "../domain/artifactFormatMetadata.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { jsonValueByteLength } from "../domain/jsonValueByteLength.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; -import { ArtifactFileSource } from "./ArtifactFileSource.js"; -import { - ArtifactPathRegistry, - normalizeArtifactPath, -} from "./ArtifactPaths.js"; import { + assertArtifactReadActive, ArtifactReaderFailure, copyArtifactEntry, assertProducedEntry, type ArtifactEntry, type ArtifactReader, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; + ArtifactResourceScope, +} from "../resources/index.js"; +import { ArtifactFileSource } from "./ArtifactFileSource.js"; +import { + ArtifactPathRegistry, + normalizeArtifactPath, +} from "../resources/index.js"; import { ownArtifactStream } from "./OwnedArtifactStream.js"; import type { DenoStandaloneAdmission } from "./deno/DenoStandaloneAdmission.js"; import { diff --git a/src/artifacts/DesktopApplicationReader.ts b/src/artifacts/DesktopApplicationReader.ts index bc1cb2f75b..8b4bc71042 100644 --- a/src/artifacts/DesktopApplicationReader.ts +++ b/src/artifacts/DesktopApplicationReader.ts @@ -6,12 +6,12 @@ import { DirectoryArtifactTraversalLimit, type DirectoryArtifactEntry, } from "./DirectoryArtifactReader.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; -import { artifactFileCompletion } from "./ArtifactFileOperation.js"; import { + ArtifactReaderFailure, + artifactFileCompletion, ArtifactResourceScope, type ArtifactResourceOwner, -} from "./ArtifactResourceScope.js"; +} from "../resources/index.js"; import { abortIfNeeded } from "./ArtifactHash.js"; import { declaredArtifactEntries } from "./ArtifactTraversalObservation.js"; import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; @@ -22,8 +22,8 @@ import { retainedTextBytes, type DesktopReadBudget, } from "./DesktopFileInspection.js"; -import type { DesktopApplicationPort } from "../application/artifacts/DesktopApplicationPort.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { DesktopApplicationPort } from "../ports/artifacts/DesktopApplicationPort.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { DesktopApplication, DesktopFact, diff --git a/src/artifacts/DesktopFileInspection.ts b/src/artifacts/DesktopFileInspection.ts index 284e5a841f..a47e8ebcc6 100644 --- a/src/artifacts/DesktopFileInspection.ts +++ b/src/artifacts/DesktopFileInspection.ts @@ -21,7 +21,7 @@ import { readManagedMetadataLayout } from "../dotnet/ManagedMetadataLayout.js"; import { readManagedCliHeaderPrefix } from "../domain/managed/managedCliHeaderPrefix.js"; import { readAssemblyReferenceName } from "../dotnet/ManagedMetadataInventoryRows.js"; import { ManagedReaderFailure } from "../dotnet/ManagedReaderFailure.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { abortIfNeeded } from "./ArtifactHash.js"; import { hasMachoMagic } from "../domain/apple/machoContainer.js"; import { diff --git a/src/artifacts/DfuSeArtifactReader.test.ts b/src/artifacts/DfuSeArtifactReader.test.ts index 92cb624b74..765685bbac 100644 --- a/src/artifacts/DfuSeArtifactReader.test.ts +++ b/src/artifacts/DfuSeArtifactReader.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { extractArtifact } from "./extraction/ArtifactExtraction.js"; import { dfuseFile, diff --git a/src/artifacts/DirectoryArtifactReader.ts b/src/artifacts/DirectoryArtifactReader.ts index b631f1a3ec..c4956c7d2d 100644 --- a/src/artifacts/DirectoryArtifactReader.ts +++ b/src/artifacts/DirectoryArtifactReader.ts @@ -17,22 +17,20 @@ import { type ArtifactReaderFailureOptions, type ArtifactTraversalOmission, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; + ArtifactFileCancelled, + ArtifactFileCleanupFailure, + AnalysisCleanupLease, +} from "../resources/index.js"; import { hostExecutableMarking } from "./hostExecutableMarking.js"; import { OwnedDirectoryHandle } from "../filesystem/OwnedDirectoryHandle.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; -import { readArtifactFileChunks } from "./readArtifactFileChunks.js"; +import { readArtifactFileChunks } from "../resources/index.js"; import { withOwnedFileHandle, RegularFileCleanupFailure, RegularFileCancelled, } from "../filesystem/OwnedRegularFile.js"; import { RegularFileOperationCancelled } from "../filesystem/RegularFile.js"; -import { - ArtifactFileCancelled, - ArtifactFileCleanupFailure, -} from "./ArtifactFileOperation.js"; -import { AnalysisCleanupLease } from "./AnalysisCleanupLease.js"; import { decodeDirectoryEntryName } from "../filesystem/decodeDirectoryEntryName.js"; import { resolveArtifactSourcePath } from "./ArtifactSelectedSource.js"; import { invariantViolation } from "../domain/internalInvariant.js"; diff --git a/src/artifacts/DotnetBundleArtifactReader.ts b/src/artifacts/DotnetBundleArtifactReader.ts index bac09ef193..2a62e183be 100644 --- a/src/artifacts/DotnetBundleArtifactReader.ts +++ b/src/artifacts/DotnetBundleArtifactReader.ts @@ -8,18 +8,18 @@ import { import type { StableRegularFileDescriptor } from "../filesystem/RegularFile.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; -import type { DotnetBundleAdmission } from "./dotnet/DotnetBundleAdmission.js"; -import { readArtifactFileChunks } from "./readArtifactFileChunks.js"; -import { abortIfNeeded } from "./ArtifactHash.js"; import { + ArtifactResourceScope, ArtifactReaderFailure, copyArtifactEntry, sameArtifactEntry, type ArtifactEntry, type ArtifactReader, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; +} from "../resources/index.js"; +import type { DotnetBundleAdmission } from "./dotnet/DotnetBundleAdmission.js"; +import { readArtifactFileChunks } from "../resources/index.js"; +import { abortIfNeeded } from "./ArtifactHash.js"; import { findDotnetBundleHeader, readDotnetBundle, diff --git a/src/artifacts/EspFlashImageArtifactReader.test.ts b/src/artifacts/EspFlashImageArtifactReader.test.ts index 7f7cd4b3c2..20046ac9aa 100644 --- a/src/artifacts/EspFlashImageArtifactReader.test.ts +++ b/src/artifacts/EspFlashImageArtifactReader.test.ts @@ -4,11 +4,11 @@ import { join } from "node:path"; import { describe, expect, it, vi } from "vitest"; import { EspFlashImageArtifactReader } from "./EspFlashImageArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import type { ArtifactEntry, ArtifactReaderTraversal, -} from "./ArtifactReader.js"; +} from "../resources/ArtifactReader.js"; import { openRegularFile } from "../filesystem/RegularFile.js"; import { extractArtifact } from "./extraction/ArtifactExtraction.js"; import * as regionReads from "./EspFlashRegionReads.js"; diff --git a/src/artifacts/EspFlashImageArtifactReader.ts b/src/artifacts/EspFlashImageArtifactReader.ts index 92f794dc5f..60cfa181df 100644 --- a/src/artifacts/EspFlashImageArtifactReader.ts +++ b/src/artifacts/EspFlashImageArtifactReader.ts @@ -20,7 +20,7 @@ import { import { offsetText } from "../domain/firmware/espImageStructures.js"; import { ESP_OTA_SELECT_ENTRY_BYTES } from "../domain/firmware/espOtaData.js"; import { isEspAppPartition } from "../domain/firmware/espPartitionTable.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { decodeEspFlashImage, firstUnerasedInRange, diff --git a/src/artifacts/EspFlashRegionReads.ts b/src/artifacts/EspFlashRegionReads.ts index 551dfe1b01..9bdd81ad31 100644 --- a/src/artifacts/EspFlashRegionReads.ts +++ b/src/artifacts/EspFlashRegionReads.ts @@ -9,7 +9,7 @@ import { } from "../domain/firmware/espImage.js"; import { firstUnerased } from "../domain/firmware/espImageStructures.js"; import { readFileHandleChunks } from "../filesystem/readFileHandleChunks.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; const LABEL = "ESP flash image"; const HEADER_BYTES = 24; diff --git a/src/artifacts/EspImageArtifactReader.test.ts b/src/artifacts/EspImageArtifactReader.test.ts index ad8048fa2c..a8db186a9d 100644 --- a/src/artifacts/EspImageArtifactReader.test.ts +++ b/src/artifacts/EspImageArtifactReader.test.ts @@ -5,8 +5,8 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { EspImageArtifactReader } from "./EspImageArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; -import type { ArtifactEntry } from "./ArtifactReader.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; +import type { ArtifactEntry } from "../resources/ArtifactReader.js"; import { extractArtifact } from "./extraction/ArtifactExtraction.js"; import * as espImageDecoding from "../domain/firmware/espImage.js"; import { diff --git a/src/artifacts/EspImageArtifactReader.ts b/src/artifacts/EspImageArtifactReader.ts index 54108b5773..e4b380f5d4 100644 --- a/src/artifacts/EspImageArtifactReader.ts +++ b/src/artifacts/EspImageArtifactReader.ts @@ -16,7 +16,7 @@ import { ESP_SIGNATURE_BLOCK_BYTES, offsetText, } from "../domain/firmware/espImageStructures.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { readEspFlashRange } from "./EspFlashRegionReads.js"; import { PositionalArtifactReader, diff --git a/src/artifacts/FitArtifactReader.test.ts b/src/artifacts/FitArtifactReader.test.ts index a40ffbd58b..807d3a089d 100644 --- a/src/artifacts/FitArtifactReader.test.ts +++ b/src/artifacts/FitArtifactReader.test.ts @@ -6,9 +6,9 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { FitArtifactReader } from "./FitArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { extractArtifact } from "./extraction/ArtifactExtraction.js"; import * as fitStructure from "./fit/FitStructure.js"; import * as fileChunks from "../filesystem/readFileHandleChunks.js"; diff --git a/src/artifacts/FitArtifactReader.ts b/src/artifacts/FitArtifactReader.ts index bd4a6a517c..1bcd6d01ca 100644 --- a/src/artifacts/FitArtifactReader.ts +++ b/src/artifacts/FitArtifactReader.ts @@ -12,10 +12,10 @@ import { type ArtifactReader, type ArtifactReaderTraversal, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; + ArtifactResourceScope, + assertArtifactReadActive, +} from "../resources/index.js"; import { ownArtifactStream } from "./OwnedArtifactStream.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; import { createFitDigest, diff --git a/src/artifacts/GodotPckArtifactReader.test.ts b/src/artifacts/GodotPckArtifactReader.test.ts index f4d76ce9c9..d8ea5825e8 100644 --- a/src/artifacts/GodotPckArtifactReader.test.ts +++ b/src/artifacts/GodotPckArtifactReader.test.ts @@ -18,7 +18,7 @@ import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory import { renameOpenParent } from "../../tests/fixtures/renameOpenParent.js"; import { openRegularFile } from "../filesystem/RegularFile.js"; -import type { ArtifactEntry } from "./ArtifactReader.js"; +import type { ArtifactEntry } from "../resources/ArtifactReader.js"; import { ArtifactEmbeddedFormatProbes } from "./ArtifactEmbeddedFormatProbes.js"; import { GodotPckArtifactReader } from "./GodotPckArtifactReader.js"; import { DEFAULT_GODOT_READER_LIMITS } from "../domain/artifactReaderLimits.js"; diff --git a/src/artifacts/GodotPckArtifactReader.ts b/src/artifacts/GodotPckArtifactReader.ts index abef031c0a..2d0c97dae9 100644 --- a/src/artifacts/GodotPckArtifactReader.ts +++ b/src/artifacts/GodotPckArtifactReader.ts @@ -8,8 +8,10 @@ import { readGodotPckHeaderFacts } from "../domain/godotPckFormat.js"; import { artifactExpansionBudgetBytes } from "../domain/artifactExpansionBudget.js"; import type { FileHandle } from "node:fs/promises"; import { setImmediate } from "node:timers/promises"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + assertArtifactReadActive, +} from "../resources/index.js"; import { locateGodotPck, type GodotPckAdmission, diff --git a/src/artifacts/GodotPckLocation.ts b/src/artifacts/GodotPckLocation.ts index b42adc730b..efff835456 100644 --- a/src/artifacts/GodotPckLocation.ts +++ b/src/artifacts/GodotPckLocation.ts @@ -6,7 +6,7 @@ import { type GodotPckTrailerFacts, } from "../domain/godotPckFormat.js"; import { readArtifactFileBytes } from "./ArtifactFileRange.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; export interface GodotPckLocation { readonly start: number; diff --git a/src/artifacts/HexRecordArtifactReader.test.ts b/src/artifacts/HexRecordArtifactReader.test.ts index de2202b077..6c92da5a4a 100644 --- a/src/artifacts/HexRecordArtifactReader.test.ts +++ b/src/artifacts/HexRecordArtifactReader.test.ts @@ -8,9 +8,9 @@ import { expect, it, vi } from "vitest"; import * as hexRecordDecoding from "../domain/firmware/hexRecords.js"; import { awaitAcknowledgement } from "../../tests/fixtures/lifecycleAcknowledgement.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { HexRecordArtifactReader } from "./HexRecordArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { extractArtifact } from "./extraction/ArtifactExtraction.js"; import { INTEL_HEX_I32_GAP, diff --git a/src/artifacts/InesArtifactReader.ts b/src/artifacts/InesArtifactReader.ts index a2b7fd51d7..971fc4adb6 100644 --- a/src/artifacts/InesArtifactReader.ts +++ b/src/artifacts/InesArtifactReader.ts @@ -1,4 +1,12 @@ -import { artifactOperationCause } from "./ArtifactFileOperation.js"; +import { + artifactOperationCause, + ArtifactReaderFailure, + copyArtifactEntry, + assertProducedEntry, + type ArtifactEntry, + type ArtifactReader, + type ArtifactTraversalOptions, +} from "../resources/index.js"; import { readFileHandlePrefix } from "../filesystem/readFileHandlePrefix.js"; import { Readable } from "node:stream"; import { @@ -12,18 +20,12 @@ import { assertStableRegularFileIdentity, type StableRegularFileDescriptor, } from "../filesystem/RegularFile.js"; -import { readArtifactFileChunks } from "./readArtifactFileChunks.js"; -import type { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { - ArtifactReaderFailure, - copyArtifactEntry, - assertProducedEntry, - type ArtifactEntry, - type ArtifactReader, - type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; + readArtifactFileChunks, + streamChunkToBuffer, +} from "../resources/index.js"; +import type { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { abortIfNeeded } from "./ArtifactHash.js"; -import { streamChunkToBuffer } from "./StreamBytes.js"; export const INES_LIMITATION = "Classic iNES file regions are observed; mapper execution, CPU bank mappings, CHR-RAM contents, 6502 analysis and emulator behavior are not observed. Trailing bytes are retained without interpretation. NES 2.0 and UNIF are unsupported."; diff --git a/src/artifacts/Lz4Block.ts b/src/artifacts/Lz4Block.ts index de63e75906..8bc08d411c 100644 --- a/src/artifacts/Lz4Block.ts +++ b/src/artifacts/Lz4Block.ts @@ -1,5 +1,5 @@ import { scheduler } from "node:timers/promises"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import { BinaryFormatFailure, BinaryResourceFailure, diff --git a/src/artifacts/MachOSliceArtifactReader.test.ts b/src/artifacts/MachOSliceArtifactReader.test.ts index 1cfcb4a8ef..1b5be285f6 100644 --- a/src/artifacts/MachOSliceArtifactReader.test.ts +++ b/src/artifacts/MachOSliceArtifactReader.test.ts @@ -16,7 +16,7 @@ import type { NativeCommandRunner } from "../native/CommandRunner.js"; import { NativeCommandFailure } from "../native/CommandRunner.js"; import { phaseGate } from "../../tests/support/lifecycleHarness.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; -import type { ArtifactEntry } from "./ArtifactReader.js"; +import type { ArtifactEntry } from "../resources/ArtifactReader.js"; const sliceOwnershipFixture = async (secondSlice = false) => { const root = await createTestTempDirectory("rea-slice-ownership-"); diff --git a/src/artifacts/MachOSliceArtifactReader.ts b/src/artifacts/MachOSliceArtifactReader.ts index 244de2f85b..83cc67988d 100644 --- a/src/artifacts/MachOSliceArtifactReader.ts +++ b/src/artifacts/MachOSliceArtifactReader.ts @@ -1,4 +1,13 @@ -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, + copyArtifactEntry, + assertProducedEntry, + type ArtifactEntry, + type ArtifactReader, + type ArtifactReaderTraversal, + type ArtifactTraversalOptions, +} from "../resources/index.js"; import type { FileHandle } from "node:fs/promises"; import { Readable } from "node:stream"; @@ -20,17 +29,10 @@ import { } from "../domain/apple/machoCpuIdentity.js"; import { readMachoImage, type ReadAt } from "./apple/MachoLoadCommandReader.js"; import { - ArtifactReaderFailure, - copyArtifactEntry, - assertProducedEntry, - type ArtifactEntry, - type ArtifactReader, - type ArtifactReaderTraversal, - type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; -import { streamChunkToBuffer } from "./StreamBytes.js"; + streamChunkToBuffer, + readArtifactFileChunks, +} from "../resources/index.js"; import type { StableRegularFileDescriptor } from "../filesystem/RegularFile.js"; -import { readArtifactFileChunks } from "./readArtifactFileChunks.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; import { readFileHandleRange } from "../filesystem/readFileHandleRange.js"; import type { ArtifactIntegrityPolicyName } from "../domain/artifactIntegrityPolicy.js"; diff --git a/src/artifacts/NativeDmgArtifactReader.ts b/src/artifacts/NativeDmgArtifactReader.ts index d2fbd8f9f3..0b1f746627 100644 --- a/src/artifacts/NativeDmgArtifactReader.ts +++ b/src/artifacts/NativeDmgArtifactReader.ts @@ -11,7 +11,7 @@ import { type ArtifactEntry, type ArtifactReader, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; +} from "../resources/index.js"; import { DirectoryArtifactReader } from "./DirectoryArtifactReader.js"; import { declaredArtifactEntries } from "./ArtifactTraversalObservation.js"; import { diff --git a/src/artifacts/NativeDmgProtocol.test.ts b/src/artifacts/NativeDmgProtocol.test.ts index 4db82029a7..5cf0123570 100644 --- a/src/artifacts/NativeDmgProtocol.test.ts +++ b/src/artifacts/NativeDmgProtocol.test.ts @@ -1,5 +1,5 @@ import { ExecFileOutputCancelledError } from "../process/ExecFileOutput.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { build } from "plist"; import { expect, it, vi } from "vitest"; import { @@ -10,7 +10,7 @@ import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { mkdir, writeFile } from "node:fs/promises"; import { join } from "node:path"; -import type { ArtifactReaderTraversal } from "./ArtifactReader.js"; +import type { ArtifactReaderTraversal } from "../resources/ArtifactReader.js"; import { DirectoryArtifactReader } from "./DirectoryArtifactReader.js"; it.skipIf(process.platform === "win32").each([false, true])( diff --git a/src/artifacts/NodeSeaArtifactReader.test.ts b/src/artifacts/NodeSeaArtifactReader.test.ts index 813e6f4e25..b3a700b547 100644 --- a/src/artifacts/NodeSeaArtifactReader.test.ts +++ b/src/artifacts/NodeSeaArtifactReader.test.ts @@ -15,12 +15,12 @@ import { setImmediate } from "node:timers"; import { expect, it, vi } from "vitest"; -import * as artifactPaths from "./ArtifactPaths.js"; +import * as artifactPaths from "../resources/ArtifactPaths.js"; import { NodeSeaArtifactReader } from "./NodeSeaArtifactReader.js"; -import type { ArtifactEntry } from "./ArtifactReader.js"; +import type { ArtifactEntry } from "../resources/ArtifactReader.js"; import { artifactFormatDescriptor } from "./artifactFormats.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { extractArtifact } from "./extraction/ArtifactExtraction.js"; import { NODE_SEA_FUSE_HASH, diff --git a/src/artifacts/NodeSeaArtifactReader.ts b/src/artifacts/NodeSeaArtifactReader.ts index aa4e815ed7..e30de6ff6b 100644 --- a/src/artifacts/NodeSeaArtifactReader.ts +++ b/src/artifacts/NodeSeaArtifactReader.ts @@ -10,8 +10,8 @@ import type { NodeSeaMetadata } from "../domain/artifactFormatMetadata.js"; import { ArtifactPathRegistry, normalizeArtifactPath, -} from "./ArtifactPaths.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +} from "../resources/index.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { artifactReaderLimitFailure } from "./ArtifactReaderLimits.js"; import { decodeNodeSeaBlob, diff --git a/src/artifacts/NtfsMftArtifactReader.test.ts b/src/artifacts/NtfsMftArtifactReader.test.ts index 288404d613..c73835cc3d 100644 --- a/src/artifacts/NtfsMftArtifactReader.test.ts +++ b/src/artifacts/NtfsMftArtifactReader.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/ArtifactFileOperation.js"; import { NtfsMftArtifactReader } from "./NtfsMftArtifactReader.js"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; diff --git a/src/artifacts/NtfsMftArtifactReader.ts b/src/artifacts/NtfsMftArtifactReader.ts index 0989f9e421..e85a2b2a27 100644 --- a/src/artifacts/NtfsMftArtifactReader.ts +++ b/src/artifacts/NtfsMftArtifactReader.ts @@ -16,9 +16,9 @@ import { type ArtifactReader, type ArtifactReaderTraversal, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; + ArtifactResourceScope, + assertArtifactReadActive, +} from "../resources/index.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; import { readFileHandleChunks } from "../filesystem/readFileHandleChunks.js"; import type { StableRegularFileDescriptor } from "../filesystem/RegularFile.js"; diff --git a/src/artifacts/OwnedArtifactStream.ts b/src/artifacts/OwnedArtifactStream.ts index 1f1ebce415..11792043d4 100644 --- a/src/artifacts/OwnedArtifactStream.ts +++ b/src/artifacts/OwnedArtifactStream.ts @@ -1,6 +1,6 @@ import { pipeline, type Readable, type Transform } from "node:stream"; -import type { ArtifactResourceScope } from "./ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; /** Keep the carrier and buffered output owned through production and retirement. */ export const ownArtifactStream = ( diff --git a/src/artifacts/OwnedAsyncArtifactStream.ts b/src/artifacts/OwnedAsyncArtifactStream.ts index 16f0b3675e..9f00439f2e 100644 --- a/src/artifacts/OwnedAsyncArtifactStream.ts +++ b/src/artifacts/OwnedAsyncArtifactStream.ts @@ -1,8 +1,10 @@ import { Readable } from "node:stream"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; -import { artifactReadCancelledBy } from "./ArtifactFileOperation.js"; -import type { ArtifactResourceScope } from "./ArtifactResourceScope.js"; +import { + ArtifactReaderFailure, + artifactReadCancelledBy, + type ArtifactResourceScope, +} from "../resources/index.js"; /** Retain a member iterator, including pending reads, until its stream closes. */ export const ownAsyncArtifactStream = ( diff --git a/src/artifacts/PositionalArtifactReader.ts b/src/artifacts/PositionalArtifactReader.ts index 2ffc0161f6..c799763c9d 100644 --- a/src/artifacts/PositionalArtifactReader.ts +++ b/src/artifacts/PositionalArtifactReader.ts @@ -10,10 +10,10 @@ import { type ArtifactReader, type ArtifactReaderTraversal, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; + ArtifactResourceScope, + assertArtifactReadActive, +} from "../resources/index.js"; import { ownArtifactStream } from "./OwnedArtifactStream.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; import { readFileHandleChunks } from "../filesystem/readFileHandleChunks.js"; import type { StableRegularFileDescriptor } from "../filesystem/RegularFile.js"; diff --git a/src/artifacts/PyInstallerArtifactReader.ts b/src/artifacts/PyInstallerArtifactReader.ts index 2972646122..025c3a7aec 100644 --- a/src/artifacts/PyInstallerArtifactReader.ts +++ b/src/artifacts/PyInstallerArtifactReader.ts @@ -4,7 +4,7 @@ import { finished } from "node:stream/promises"; import { setImmediate } from "node:timers/promises"; import { jsonValueByteLength } from "../domain/jsonValueByteLength.js"; import type { JsonValue } from "../domain/jsonValue.js"; -import { normalizeArtifactPath } from "./ArtifactPaths.js"; +import { normalizeArtifactPath } from "../resources/index.js"; import type { FileHandle } from "node:fs/promises"; import type { PyInstallerMetadata } from "../domain/artifactFormatMetadata.js"; @@ -21,11 +21,11 @@ import { type ArtifactReader, type ArtifactReaderTraversal, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; + artifactReadCancelledBy, + ArtifactResourceScope, +} from "../resources/index.js"; import { abortIfNeeded } from "./ArtifactHash.js"; -import { artifactReadCancelledBy } from "./ArtifactFileOperation.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; import { parseMzHeaderEvidence } from "../domain/dosMz.js"; import { readFatContainerHeader, diff --git a/src/artifacts/RegularFileErrorProjection.ts b/src/artifacts/RegularFileErrorProjection.ts index faf9386ca0..66b3b08c69 100644 --- a/src/artifacts/RegularFileErrorProjection.ts +++ b/src/artifacts/RegularFileErrorProjection.ts @@ -1,6 +1,6 @@ import { BinaryTargetError } from "../domain/configurationErrors.js"; import { RejectedRegularFileSymlink } from "../filesystem/RegularFile.js"; -import { regularFileSymlinkRecovery } from "./StableArtifactFailure.js"; +import { regularFileSymlinkRecovery } from "../resources/index.js"; /** Project a selected-file admission failure without reinterpreting its path. */ export const selectedFileTargetError = ( diff --git a/src/artifacts/ReleaseExposureReader.test.ts b/src/artifacts/ReleaseExposureReader.test.ts index 42f45bafda..7ddd118b6d 100644 --- a/src/artifacts/ReleaseExposureReader.test.ts +++ b/src/artifacts/ReleaseExposureReader.test.ts @@ -25,7 +25,7 @@ import { pyzArchive, PYTHON_39_MAGIC, } from "./pyinstaller/CArchive.fixture.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { asarHeaderBytes } from "../../tests/fixtures/asarHeader.js"; import { binaryPlistObjectTable } from "../../tests/fixtures/binaryPlistObjectTable.js"; @@ -37,7 +37,7 @@ import { ArtifactReaderFailure, type ArtifactEntry, type ArtifactReader, -} from "./ArtifactReader.js"; +} from "../resources/ArtifactReader.js"; import { assembleReleaseExposureReport, MAX_RELEASE_EXPOSURE_INVENTORY_BYTES, @@ -64,17 +64,17 @@ const stableRead = vi.hoisted(() => ({ | undefined | (( ...args: Parameters< - typeof import("./readStableArtifact.js").readStableArtifact + typeof import("../resources/readStableArtifact.js").readStableArtifact > ) => ReturnType< - typeof import("./readStableArtifact.js").readStableArtifact + typeof import("../resources/readStableArtifact.js").readStableArtifact >), })); -vi.mock("./readStableArtifact.js", async () => { +vi.mock("../resources/readStableArtifact.js", async () => { const actual = await vi.importActual< - typeof import("./readStableArtifact.js") - >("./readStableArtifact.js"); + typeof import("../resources/readStableArtifact.js") + >("../resources/readStableArtifact.js"); stableRead.impl = actual.readStableArtifact; return { ...actual, diff --git a/src/artifacts/ReleaseExposureReader.ts b/src/artifacts/ReleaseExposureReader.ts index f583be9e67..03ee0ff587 100644 --- a/src/artifacts/ReleaseExposureReader.ts +++ b/src/artifacts/ReleaseExposureReader.ts @@ -11,8 +11,8 @@ import type { ReleaseExposurePort, ReleaseExposureScanVisitor, ReleaseExposureTextVisitor, -} from "../application/releaseExposure/ReleaseExposurePort.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +} from "../ports/releaseExposure/ReleaseExposurePort.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import { BoundedListCollector, boundedList, @@ -22,17 +22,17 @@ import { ArtifactReaderFailure, type ArtifactEntry, type ArtifactReader, -} from "./ArtifactReader.js"; -import { ArtifactResourceScope, type ArtifactCleanupAttempt, type ArtifactResourceOwner, -} from "./ArtifactResourceScope.js"; -import { artifactFileCancellationCause, artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, -} from "./ArtifactFileOperation.js"; + readStableArtifact, + projectArtifactCloseFailure, + projectStableArtifactFailure, + readerIntegrityFailure, +} from "../resources/index.js"; import { decodeBinaryPlistText } from "./apple/BinaryPlistMaterializer.js"; import { InternalInvariantError, @@ -57,12 +57,6 @@ import { releaseRootArtifact, } from "./inventory/hashStableRootArtifact.js"; import { createArtifactReader } from "./createArtifactReader.js"; -import { readStableArtifact } from "./readStableArtifact.js"; -import { - projectArtifactCloseFailure, - projectStableArtifactFailure, - readerIntegrityFailure, -} from "./StableArtifactFailure.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisAccessDeniedError, diff --git a/src/artifacts/UImageArtifactReader.ts b/src/artifacts/UImageArtifactReader.ts index 3c17137d4b..2dc4a1b305 100644 --- a/src/artifacts/UImageArtifactReader.ts +++ b/src/artifacts/UImageArtifactReader.ts @@ -9,16 +9,16 @@ import type { UImageMetadata, } from "../domain/artifactFormatMetadata.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; import { + assertArtifactReadActive, ArtifactReaderFailure, copyArtifactEntry, assertProducedEntry, type ArtifactEntry, type ArtifactReader, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; + ArtifactResourceScope, +} from "../resources/index.js"; import { ownArtifactStream } from "./OwnedArtifactStream.js"; import { readFileHandleChunks } from "../filesystem/readFileHandleChunks.js"; import type { StableRegularFileDescriptor } from "../filesystem/RegularFile.js"; diff --git a/src/artifacts/UnityFsArtifactReader.test.ts b/src/artifacts/UnityFsArtifactReader.test.ts index 55dfee3037..7727613148 100644 --- a/src/artifacts/UnityFsArtifactReader.test.ts +++ b/src/artifacts/UnityFsArtifactReader.test.ts @@ -10,7 +10,7 @@ import { type UnityFsMember, } from "../../tests/fixtures/unityfs.js"; -import type { ArtifactEntry } from "./ArtifactReader.js"; +import type { ArtifactEntry } from "../resources/ArtifactReader.js"; import { UnityFsArtifactReader } from "./UnityFsArtifactReader.js"; const writeBundle = async (bytes: Buffer): Promise => { diff --git a/src/artifacts/UnityFsArtifactReader.ts b/src/artifacts/UnityFsArtifactReader.ts index efeefb9288..225a87c2c9 100644 --- a/src/artifacts/UnityFsArtifactReader.ts +++ b/src/artifacts/UnityFsArtifactReader.ts @@ -12,10 +12,10 @@ import { type ArtifactEntry, type ArtifactReader, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; + ArtifactResourceScope, + assertArtifactReadActive, +} from "../resources/index.js"; import { ownAsyncArtifactStream } from "./OwnedAsyncArtifactStream.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; import { readArtifactFileBytes } from "./ArtifactFileRange.js"; import type { ArtifactFormatMetadata, diff --git a/src/artifacts/UnityFsStructures.ts b/src/artifacts/UnityFsStructures.ts index 54604ee277..5b36c6211f 100644 --- a/src/artifacts/UnityFsStructures.ts +++ b/src/artifacts/UnityFsStructures.ts @@ -1,13 +1,15 @@ import { Budget } from "../domain/budget.js"; import type { FileHandle } from "node:fs/promises"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { + ArtifactReaderFailure, + assertArtifactReadActive, +} from "../resources/index.js"; import { readArtifactFileBytes } from "./ArtifactFileRange.js"; import { decodeLz4Block } from "./Lz4Block.js"; import { BinaryFormatFailure, BinaryResourceFailure, } from "../domain/binaryContainer.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; import { setImmediate } from "node:timers/promises"; import { readUnityFsHeaderFacts, diff --git a/src/artifacts/WxapkgArtifactReader.test.ts b/src/artifacts/WxapkgArtifactReader.test.ts index 0f50222f08..65f1220ee7 100644 --- a/src/artifacts/WxapkgArtifactReader.test.ts +++ b/src/artifacts/WxapkgArtifactReader.test.ts @@ -15,7 +15,7 @@ import { ArtifactReaderFailure, type ArtifactEntry, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; +} from "../resources/ArtifactReader.js"; import { hasWxapkgHeader } from "../domain/wxapkgFormat.js"; import { WxapkgArtifactReader } from "./WxapkgArtifactReader.js"; diff --git a/src/artifacts/WxapkgArtifactReader.ts b/src/artifacts/WxapkgArtifactReader.ts index a78cd0705d..f3ac0490fb 100644 --- a/src/artifacts/WxapkgArtifactReader.ts +++ b/src/artifacts/WxapkgArtifactReader.ts @@ -11,10 +11,10 @@ import { type ArtifactEntry, type ArtifactReader, type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; -import { ArtifactResourceScope } from "./ArtifactResourceScope.js"; + ArtifactResourceScope, + assertArtifactReadActive, +} from "../resources/index.js"; import { ownAsyncArtifactStream } from "./OwnedAsyncArtifactStream.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; import { readArtifactFileBytes } from "./ArtifactFileRange.js"; import type { ArtifactFormatMetadata, diff --git a/src/artifacts/WxapkgStructures.ts b/src/artifacts/WxapkgStructures.ts index f65ae29fc3..ba8f9bf629 100644 --- a/src/artifacts/WxapkgStructures.ts +++ b/src/artifacts/WxapkgStructures.ts @@ -3,9 +3,9 @@ import type { FileHandle } from "node:fs/promises"; import { ArtifactReaderFailure, artifactFixedLimitFailure, -} from "./ArtifactReader.js"; + assertArtifactReadActive, +} from "../resources/index.js"; import { readArtifactFileBytes } from "./ArtifactFileRange.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; import { setImmediate } from "node:timers/promises"; import { hasWxapkgEncryptedMagic, diff --git a/src/artifacts/ZipArtifactReader.test.ts b/src/artifacts/ZipArtifactReader.test.ts index de860f0528..05aec55d5d 100644 --- a/src/artifacts/ZipArtifactReader.test.ts +++ b/src/artifacts/ZipArtifactReader.test.ts @@ -4,7 +4,10 @@ import { zstandardZipFixture, zstandardWindowFrameFixture, } from "../../tests/fixtures/zipZstandard.js"; -import { ArtifactReaderFailure, type ArtifactEntry } from "./ArtifactReader.js"; +import { + ArtifactReaderFailure, + type ArtifactEntry, +} from "../resources/ArtifactReader.js"; import { createDeferred } from "../../tests/fixtures/binarySession.js"; import { awaitAcknowledgement } from "../../tests/fixtures/lifecycleAcknowledgement.js"; import { once } from "node:events"; diff --git a/src/artifacts/ZipArtifactReader.ts b/src/artifacts/ZipArtifactReader.ts index 291a66e12d..9499966782 100644 --- a/src/artifacts/ZipArtifactReader.ts +++ b/src/artifacts/ZipArtifactReader.ts @@ -1,5 +1,14 @@ import { OwnerCancellation } from "../domain/analysisErrorCore.js"; -import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, + copyArtifactEntry, + sameArtifactEntry, + type ArtifactEntry, + type ArtifactReader, + type ArtifactReaderTraversal, + type ArtifactTraversalOptions, +} from "../resources/index.js"; import type { FileHandle } from "node:fs/promises"; import { Duplex, PassThrough, type Readable } from "node:stream"; import { once } from "node:events"; @@ -32,15 +41,6 @@ import { type ZipReaderConstructorOptions, } from "@zip.js/zip.js"; -import { - ArtifactReaderFailure, - copyArtifactEntry, - sameArtifactEntry, - type ArtifactEntry, - type ArtifactReader, - type ArtifactReaderTraversal, - type ArtifactTraversalOptions, -} from "./ArtifactReader.js"; import { accountZipMemberRegion, type ZipLocalRecord, diff --git a/src/artifacts/ZipMemberRegion.test.ts b/src/artifacts/ZipMemberRegion.test.ts index 42e03b8a8f..26c0411a9b 100644 --- a/src/artifacts/ZipMemberRegion.test.ts +++ b/src/artifacts/ZipMemberRegion.test.ts @@ -6,7 +6,7 @@ import { TextReader, Uint8ArrayWriter, ZipWriter } from "@zip.js/zip.js"; import { describe, expect, it } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import type { ArtifactReaderTraversal } from "./ArtifactReader.js"; +import type { ArtifactReaderTraversal } from "../resources/ArtifactReader.js"; import { scanReader } from "./inventory/scanReader.js"; import { ZipArtifactReader } from "./ZipArtifactReader.js"; import { accountZipMemberRegion } from "./ZipMemberRegion.js"; diff --git a/src/artifacts/apple/AppleAssetCatalogAnalysis.test.ts b/src/artifacts/apple/AppleAssetCatalogAnalysis.test.ts index d9f9b9c48c..c84a076d8b 100644 --- a/src/artifacts/apple/AppleAssetCatalogAnalysis.test.ts +++ b/src/artifacts/apple/AppleAssetCatalogAnalysis.test.ts @@ -8,7 +8,7 @@ import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirect import * as processOutput from "../../process/ExecFileOutput.js"; import { encodeNibArchiveFixture } from "./NibArchive.fixture.js"; import type { analyzeInterfaceBuilderBundle } from "./InterfaceBuilderAnalysis.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { diff --git a/src/artifacts/apple/AppleAssetCatalogAnalysis.ts b/src/artifacts/apple/AppleAssetCatalogAnalysis.ts index 98016f124e..a76b265971 100644 --- a/src/artifacts/apple/AppleAssetCatalogAnalysis.ts +++ b/src/artifacts/apple/AppleAssetCatalogAnalysis.ts @@ -13,9 +13,15 @@ import { import { fixedAllowanceOptions } from "../../domain/fixedAllowanceRemediation.js"; import { createHash } from "node:crypto"; import { lstat } from "node:fs/promises"; -import { streamChunkToBuffer } from "../StreamBytes.js"; +import { streamChunkToBuffer } from "../../resources/index.js"; import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; +import { + ArtifactResourceScope, + ArtifactReaderFailure, + sameArtifactSourceIdentity, + type ArtifactEntry, + type ArtifactReaderTraversal, +} from "../../resources/index.js"; import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; import { InternalInvariantError } from "../../domain/internalInvariant.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; @@ -25,12 +31,6 @@ import { ArtifactTraversalObservation, declaredArtifactEntries, } from "../ArtifactTraversalObservation.js"; -import { - ArtifactReaderFailure, - sameArtifactSourceIdentity, - type ArtifactEntry, - type ArtifactReaderTraversal, -} from "../ArtifactReader.js"; import { ArtifactOperationError } from "../../domain/artifactOperationError.js"; import { analyzeInterfaceBuilderBundle } from "./InterfaceBuilderAnalysis.js"; import { @@ -526,7 +526,7 @@ const assetUtilFailure = (cause: unknown, entry: ArtifactEntry): unknown => { const digestBounded = async ( reader: DirectoryArtifactReader, - entry: import("../ArtifactReader.js").ArtifactEntry, + entry: import("../../resources/index.js").ArtifactEntry, signal?: AbortSignal, ): Promise => { if (entry.declaredSize === null || entry.declaredSize > MAX_CATALOG_BYTES) diff --git a/src/artifacts/apple/DylibFileAccess.ts b/src/artifacts/apple/DylibFileAccess.ts index 00e650a860..fe56f7ef92 100644 --- a/src/artifacts/apple/DylibFileAccess.ts +++ b/src/artifacts/apple/DylibFileAccess.ts @@ -12,15 +12,13 @@ import { ArtifactReaderFailure, sameArtifactSourceIdentity, type ArtifactEntry, -} from "../ArtifactReader.js"; -import { assertArtifactReadActive, mapArtifactFileFailure, withArtifactRegularFile, -} from "../ArtifactFileOperation.js"; + type ArtifactResourceScope, +} from "../../resources/index.js"; import type { ArtifactIntegrityCheck } from "../../domain/artifactOperationError.js"; -import type { ArtifactResourceScope } from "../ArtifactResourceScope.js"; -import { readArtifactFileChunks } from "../readArtifactFileChunks.js"; +import { readArtifactFileChunks } from "../../resources/index.js"; import { hasMachoMagic } from "../../domain/apple/machoContainer.js"; import { readMachoImage } from "./MachoLoadCommandReader.js"; import { readFileHandleRange } from "../../filesystem/readFileHandleRange.js"; diff --git a/src/artifacts/apple/DylibResolutionReader.ts b/src/artifacts/apple/DylibResolutionReader.ts index 5732480ffe..7e96069be1 100644 --- a/src/artifacts/apple/DylibResolutionReader.ts +++ b/src/artifacts/apple/DylibResolutionReader.ts @@ -20,7 +20,9 @@ import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection. import { ArtifactReaderFailure, type ArtifactReaderTraversal, -} from "../ArtifactReader.js"; + ArtifactResourceScope, + assertArtifactReadActive, +} from "../../resources/index.js"; import { ArtifactTraversalObservation } from "../ArtifactTraversalObservation.js"; import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; import { targetDigestChangedFailure } from "../withArtifactTargetIdentity.js"; @@ -29,8 +31,6 @@ import { DylibFileAccess, classifyDylibReadFailure, } from "./DylibFileAccess.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; -import { assertArtifactReadActive } from "../ArtifactFileOperation.js"; const OPERATION = "trace_dylib_resolution"; // Resolution reads paths on this host's filesystem. diff --git a/src/artifacts/apple/InterfaceBuilderAnalysis.ts b/src/artifacts/apple/InterfaceBuilderAnalysis.ts index 4b69e71c52..636322863f 100644 --- a/src/artifacts/apple/InterfaceBuilderAnalysis.ts +++ b/src/artifacts/apple/InterfaceBuilderAnalysis.ts @@ -20,9 +20,14 @@ import { isSourceLessAppKitAnnotationConnector, isUIKitRuntimeConnectionClass, } from "../../domain/apple/interfaceBuilderKeyedArchive.js"; -import { streamChunkToBuffer } from "../StreamBytes.js"; +import { streamChunkToBuffer } from "../../resources/index.js"; import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; +import { + ArtifactResourceScope, + ArtifactReaderFailure, + type ArtifactEntry, + type ArtifactReaderTraversal, +} from "../../resources/index.js"; import { ArtifactTraversalObservation } from "../ArtifactTraversalObservation.js"; import { projectPlistValue, @@ -46,11 +51,6 @@ import { InterfaceBuilderDecodeBudget, interfaceBuilderDecodeBudgetExceeded, } from "./InterfaceBuilderDecodeBudget.js"; -import { - ArtifactReaderFailure, - type ArtifactEntry, - type ArtifactReaderTraversal, -} from "../ArtifactReader.js"; import { buildInterfaceBuilderAnalysis, interfaceBuilderLimitsSchema, diff --git a/src/artifacts/apple/InterfaceBuilderFinalization.test.ts b/src/artifacts/apple/InterfaceBuilderFinalization.test.ts index 06f9482a1e..3f0937ba22 100644 --- a/src/artifacts/apple/InterfaceBuilderFinalization.test.ts +++ b/src/artifacts/apple/InterfaceBuilderFinalization.test.ts @@ -5,8 +5,8 @@ import { expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { analyzeInterfaceBuilderBundle } from "./InterfaceBuilderAnalysis.js"; import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; const bundle = async () => { diff --git a/src/artifacts/apple/KeyedArchiveRawRefusal.test.ts b/src/artifacts/apple/KeyedArchiveRawRefusal.test.ts index 8ab88e3942..b430660aea 100644 --- a/src/artifacts/apple/KeyedArchiveRawRefusal.test.ts +++ b/src/artifacts/apple/KeyedArchiveRawRefusal.test.ts @@ -7,7 +7,7 @@ import { expect, it, vi } from "vitest"; import { AnalysisAccessDeniedError } from "../../domain/analysisErrorCore.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; import { inspectBundleKeyedArchive } from "./KeyedArchiveReader.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; diff --git a/src/artifacts/apple/KeyedArchiveReadFailure.test.ts b/src/artifacts/apple/KeyedArchiveReadFailure.test.ts index 46a1a1733d..35756d1bd8 100644 --- a/src/artifacts/apple/KeyedArchiveReadFailure.test.ts +++ b/src/artifacts/apple/KeyedArchiveReadFailure.test.ts @@ -7,7 +7,7 @@ import { describe, expect, it, vi } from "vitest"; import { ArtifactReaderFailure, type ArtifactEntry, -} from "../ArtifactReader.js"; +} from "../../resources/ArtifactReader.js"; import { DirectoryArtifactEntryAccessDenied, DirectoryArtifactReader, diff --git a/src/artifacts/apple/KeyedArchiveReader.ts b/src/artifacts/apple/KeyedArchiveReader.ts index 4835e3a693..4fd10cc4ea 100644 --- a/src/artifacts/apple/KeyedArchiveReader.ts +++ b/src/artifacts/apple/KeyedArchiveReader.ts @@ -9,8 +9,17 @@ import { import { basename, join } from "node:path"; import { realpath } from "node:fs/promises"; import { InternalInvariantError } from "../../domain/internalInvariant.js"; -import { readStableArtifact } from "../readStableArtifact.js"; -import { projectStableArtifactFailure } from "../StableArtifactFailure.js"; +import { + readStableArtifact, + projectStableArtifactFailure, + ArtifactReaderFailure, + type ArtifactEntry, + artifactSelectedPathErrno, + artifactFilePrimaryFacts, + assertArtifactReadActive, + bindArtifactFileCleanup, + ArtifactResourceScope, +} from "../../resources/index.js"; import { ARTIFACT_GRAPH_PROVIDER } from "../../domain/investigationProviders.js"; import { z } from "zod"; @@ -45,15 +54,6 @@ import { DirectoryArtifactReader, DirectoryArtifactEntryAccessDenied, } from "../DirectoryArtifactReader.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; -import type { ArtifactEntry } from "../ArtifactReader.js"; -import { - artifactSelectedPathErrno, - artifactFilePrimaryFacts, - assertArtifactReadActive, - bindArtifactFileCleanup, -} from "../ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; diff --git a/src/artifacts/artifactFormats.ts b/src/artifacts/artifactFormats.ts index e1aa894af9..7b78992182 100644 --- a/src/artifacts/artifactFormats.ts +++ b/src/artifacts/artifactFormats.ts @@ -13,7 +13,7 @@ import { import { ArtifactReaderFailure, type ArtifactReader, -} from "./ArtifactReader.js"; +} from "../resources/index.js"; import type { ArtifactReaderAdmission } from "./ArtifactReaderAdmission.js"; import { AsarArtifactReader } from "./AsarArtifactReader.js"; import type { BunStandaloneAdmission } from "./bun/BunStandaloneAdmission.js"; diff --git a/src/artifacts/bun/BunModuleGraphLayout.ts b/src/artifacts/bun/BunModuleGraphLayout.ts index 5999f9398f..d493ddbd15 100644 --- a/src/artifacts/bun/BunModuleGraphLayout.ts +++ b/src/artifacts/bun/BunModuleGraphLayout.ts @@ -16,7 +16,7 @@ import { } from "../../domain/artifactReaderLimits.js"; import { artifactReaderLimitFailure } from "../ArtifactReaderLimits.js"; import { abortIfNeeded } from "../ArtifactHash.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; /** Exact trailer written by Bun's standalone module graph serializer. */ const BUN_TRAILER = Buffer.from("\n---- Bun! ----\n"); diff --git a/src/artifacts/bun/BunModuleGraphMembers.ts b/src/artifacts/bun/BunModuleGraphMembers.ts index cb9dab9962..6a3565dab0 100644 --- a/src/artifacts/bun/BunModuleGraphMembers.ts +++ b/src/artifacts/bun/BunModuleGraphMembers.ts @@ -3,7 +3,7 @@ import { type BunReaderLimits, } from "../../domain/artifactReaderLimits.js"; import { setImmediate } from "node:timers/promises"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { BUN_RECORD_BYTES_1_3_3, BUN_RECORD_BYTES_1_3_9, diff --git a/src/artifacts/bun/BunStandaloneArtifactReader.test.ts b/src/artifacts/bun/BunStandaloneArtifactReader.test.ts index 003340d327..438fcea8e0 100644 --- a/src/artifacts/bun/BunStandaloneArtifactReader.test.ts +++ b/src/artifacts/bun/BunStandaloneArtifactReader.test.ts @@ -6,10 +6,10 @@ import { buffer } from "node:stream/consumers"; import { expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { phaseGate } from "../../../tests/support/lifecycleHarness.js"; -import * as artifactPaths from "../ArtifactPaths.js"; +import * as artifactPaths from "../../resources/ArtifactPaths.js"; import { BunStandaloneArtifactReader } from "../BunStandaloneArtifactReader.js"; import { inventoryArtifact } from "../inventory/ArtifactInventory.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { resolveArtifactReaderLimits } from "../../domain/artifactReaderLimits.js"; import { bunModuleGraphPayload, diff --git a/src/artifacts/createArtifactReader.ts b/src/artifacts/createArtifactReader.ts index 739e489e8c..5c1cd6d603 100644 --- a/src/artifacts/createArtifactReader.ts +++ b/src/artifacts/createArtifactReader.ts @@ -1,5 +1,5 @@ import type { ArtifactOccurrence } from "../domain/artifactGraph.js"; -import type { ArtifactReader } from "./ArtifactReader.js"; +import type { ArtifactReader } from "../resources/index.js"; import { ARTIFACT_FORMATS, type ArtifactReaderConstruction, diff --git a/src/artifacts/deno/DenoSectionLayout.ts b/src/artifacts/deno/DenoSectionLayout.ts index 3a2926761c..641d54c6f0 100644 --- a/src/artifacts/deno/DenoSectionLayout.ts +++ b/src/artifacts/deno/DenoSectionLayout.ts @@ -1,7 +1,7 @@ import { fixedAllowanceRemediation } from "../../domain/fixedAllowanceRemediation.js"; import { jsonValueSchema, type JsonValue } from "../../domain/jsonValue.js"; import { abortIfNeeded } from "../ArtifactHash.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { walkDenoVirtualFs, type DenoVfsWalk } from "./DenoVirtualFs.js"; import { strictUtf8Decoder } from "../../domain/strictUtf8.js"; diff --git a/src/artifacts/deno/DenoStandaloneArtifactReader.test.ts b/src/artifacts/deno/DenoStandaloneArtifactReader.test.ts index 19b93b4233..632f8eb7a2 100644 --- a/src/artifacts/deno/DenoStandaloneArtifactReader.test.ts +++ b/src/artifacts/deno/DenoStandaloneArtifactReader.test.ts @@ -17,7 +17,7 @@ import { peResourceFixture } from "../pe/PeResources.fixture.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { scanCanonicalArtifactInventory } from "../../../tests/fixtures/artifactInventory.js"; import { artifactFormatDescriptor } from "../artifactFormats.js"; -import { ArtifactPathRegistry } from "../ArtifactPaths.js"; +import { ArtifactPathRegistry } from "../../resources/ArtifactPaths.js"; import { DenoStandaloneArtifactReader } from "../DenoStandaloneArtifactReader.js"; import { cArchiveExecutable } from "../pyinstaller/CArchive.fixture.js"; import { locateDenoStandalone } from "./DenoStandaloneLocation.js"; diff --git a/src/artifacts/deno/DenoStandaloneLocation.ts b/src/artifacts/deno/DenoStandaloneLocation.ts index b3c2f50d27..4fd340c0e3 100644 --- a/src/artifacts/deno/DenoStandaloneLocation.ts +++ b/src/artifacts/deno/DenoStandaloneLocation.ts @@ -40,7 +40,7 @@ import { type ReadAt, } from "../apple/MachoLoadCommandReader.js"; import { abortIfNeeded } from "../ArtifactHash.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { locatePeResourcePayloads } from "../pe/PeResourceLayout.js"; import { DENO_SECTION_MAGIC } from "./DenoSectionLayout.js"; diff --git a/src/artifacts/deno/DenoVirtualFs.test.ts b/src/artifacts/deno/DenoVirtualFs.test.ts index a90354ac01..dfe4faf522 100644 --- a/src/artifacts/deno/DenoVirtualFs.test.ts +++ b/src/artifacts/deno/DenoVirtualFs.test.ts @@ -1,6 +1,6 @@ import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { MAX_DENO_LOGICAL_PATH_PARTS, walkDenoVirtualFs, diff --git a/src/artifacts/deno/DenoVirtualFs.ts b/src/artifacts/deno/DenoVirtualFs.ts index f678f30c7a..f9922245c3 100644 --- a/src/artifacts/deno/DenoVirtualFs.ts +++ b/src/artifacts/deno/DenoVirtualFs.ts @@ -1,7 +1,7 @@ import { fixedAllowanceRemediation } from "../../domain/fixedAllowanceRemediation.js"; import { abortIfNeeded } from "../ArtifactHash.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; -import { normalizeArtifactPath } from "../ArtifactPaths.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; +import { normalizeArtifactPath } from "../../resources/index.js"; /** Directory, file, and symlink records admitted from one virtual filesystem. */ const MAX_DENO_VFS_ENTRIES = 100_000; diff --git a/src/artifacts/dotnet/DotnetBundle.ts b/src/artifacts/dotnet/DotnetBundle.ts index 0d92096bb4..6e9f0856e9 100644 --- a/src/artifacts/dotnet/DotnetBundle.ts +++ b/src/artifacts/dotnet/DotnetBundle.ts @@ -5,16 +5,16 @@ import { } from "../../domain/artifactReaderLimits.js"; import { artifactReaderLimitFailure } from "../ArtifactReaderLimits.js"; -import { readArtifactFileChunks } from "../readArtifactFileChunks.js"; import { + readArtifactFileChunks, ArtifactPathRegistry, normalizeArtifactPath, -} from "../ArtifactPaths.js"; +} from "../../resources/index.js"; import { abortIfNeeded } from "../ArtifactHash.js"; import { ArtifactReaderFailure, artifactFixedLimitFailure, -} from "../ArtifactReader.js"; +} from "../../resources/index.js"; import { strictUtf8Decoder } from "../../domain/strictUtf8.js"; /** SHA-256 marker embedded by Microsoft's apphost; the preceding UInt64 is the header offset. */ diff --git a/src/artifacts/extraction/ArtifactExtraction.test.ts b/src/artifacts/extraction/ArtifactExtraction.test.ts index 23dec06a90..3ea88c6093 100644 --- a/src/artifacts/extraction/ArtifactExtraction.test.ts +++ b/src/artifacts/extraction/ArtifactExtraction.test.ts @@ -5,8 +5,8 @@ import { createHash } from "node:crypto"; import { TextReader, Uint8ArrayWriter, ZipWriter } from "@zip.js/zip.js"; import { expect, it, vi } from "vitest"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { openRegularFile } from "../../filesystem/RegularFile.js"; import { ZipArtifactReader } from "../ZipArtifactReader.js"; diff --git a/src/artifacts/extraction/ArtifactExtraction.ts b/src/artifacts/extraction/ArtifactExtraction.ts index 9afbd65a54..9116b59882 100644 --- a/src/artifacts/extraction/ArtifactExtraction.ts +++ b/src/artifacts/extraction/ArtifactExtraction.ts @@ -21,33 +21,31 @@ import { ArtifactEmbeddedFormatProbes, type ArtifactEmbeddedFormatProbeFacts, } from "../ArtifactEmbeddedFormatProbes.js"; -import { withArtifactRegularFile } from "../ArtifactFileOperation.js"; -import type { - ArtifactCleanupAttempt, - ArtifactResourceOwner, - ArtifactResourceScope, -} from "../ArtifactResourceScope.js"; -import { lstat, realpath } from "node:fs/promises"; -import { dirname } from "node:path"; -import { isPathWithinRoot } from "../../domain/localPath.js"; -import { SafeOutputTreeDestinationRefusal } from "../SafeOutputTreeAdmission.js"; - -import { compareUnicodeCodePoints } from "../../domain/unicodeCodePointOrder.js"; -import { digestCanonicalValue } from "../../domain/canonicalDigest.js"; -import { - ArtifactPathRegistry, - normalizeArtifactPath, -} from "../ArtifactPaths.js"; import { + withArtifactRegularFile, + type ArtifactCleanupAttempt, + type ArtifactResourceOwner, + type ArtifactResourceScope, ArtifactReaderFailure, type ArtifactEntry, type ArtifactReader, type ArtifactReaderTraversal, -} from "../ArtifactReader.js"; +} from "../../resources/index.js"; +import { lstat, realpath } from "node:fs/promises"; +import { dirname } from "node:path"; +import { isPathWithinRoot } from "../../domain/localPath.js"; +import { + SafeOutputTreeDestinationRefusal, + ArtifactPathRegistry, + normalizeArtifactPath, + SafeOutputTree, + SafeOutputTreeCreationFailure, +} from "../../resources/index.js"; + +import { compareUnicodeCodePoints } from "../../domain/unicodeCodePointOrder.js"; +import { digestCanonicalValue } from "../../domain/canonicalDigest.js"; import { ArtifactTraversalObservation } from "../ArtifactTraversalObservation.js"; import { abortIfNeeded } from "../ArtifactHash.js"; -import { SafeOutputTree } from "../SafeOutputTree.js"; -import { SafeOutputTreeCreationFailure } from "../SafeOutputTreeCreationFailure.js"; import { artifactExtractionResultSchema, type ArtifactExtractionResult, diff --git a/src/artifacts/extraction/EmbeddedArtifactExtraction.test.ts b/src/artifacts/extraction/EmbeddedArtifactExtraction.test.ts index 291b86f788..2de5214e59 100644 --- a/src/artifacts/extraction/EmbeddedArtifactExtraction.test.ts +++ b/src/artifacts/extraction/EmbeddedArtifactExtraction.test.ts @@ -13,7 +13,7 @@ import { expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { renameOpenParent } from "../../../tests/fixtures/renameOpenParent.js"; import { buildGodotPck } from "../../../tests/fixtures/godotPck.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { GodotPckArtifactReader } from "../GodotPckArtifactReader.js"; import { NodeSeaArtifactReader } from "../NodeSeaArtifactReader.js"; import { PyInstallerArtifactReader } from "../PyInstallerArtifactReader.js"; diff --git a/src/artifacts/fit/FitStructure.ts b/src/artifacts/fit/FitStructure.ts index 539502de45..309aa309e2 100644 --- a/src/artifacts/fit/FitStructure.ts +++ b/src/artifacts/fit/FitStructure.ts @@ -20,7 +20,7 @@ import { parseDevicetree, } from "../../domain/firmware/devicetreeParser.js"; import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { strictUtf8Decoder } from "../../domain/strictUtf8.js"; // Fixed resource bounds; configurable ceilings are tracked in #6176. diff --git a/src/artifacts/inventory/ArtifactGraphConstruction.test.ts b/src/artifacts/inventory/ArtifactGraphConstruction.test.ts index a70fe8f666..aa74d97267 100644 --- a/src/artifacts/inventory/ArtifactGraphConstruction.test.ts +++ b/src/artifacts/inventory/ArtifactGraphConstruction.test.ts @@ -15,7 +15,7 @@ import { } from "./ArtifactGraphConstruction.js"; import { createArtifactClassificationProbe } from "../ArtifactClassificationProbe.js"; import { createAsarHeaderSignatureProbe } from "../AsarHeader.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { artifactIdForContent } from "../../domain/artifactIdentity.js"; @@ -25,7 +25,7 @@ import { minimalElfImage, minimalMachoImage, } from "../../../tests/fixtures/nativeHeaders.js"; -import type { ArtifactEntry } from "../ArtifactReader.js"; +import type { ArtifactEntry } from "../../resources/ArtifactReader.js"; import { dfuseFile } from "../../domain/firmware/dfuse.fixture.js"; import { RP2040_FAMILY, diff --git a/src/artifacts/inventory/ArtifactGraphConstruction.ts b/src/artifacts/inventory/ArtifactGraphConstruction.ts index 02f33a2959..7424527c15 100644 --- a/src/artifacts/inventory/ArtifactGraphConstruction.ts +++ b/src/artifacts/inventory/ArtifactGraphConstruction.ts @@ -2,7 +2,7 @@ import { artifactFormatDescriptor } from "../artifactFormats.js"; import { recognizeArtifactFormat } from "../../domain/artifactFormatRecognition.js"; import type { ArtifactClassificationEvidence } from "../ArtifactClassificationProbe.js"; import { asarHeaderAdmissionFailure } from "../AsarHeader.js"; -import { hasDestinationPath } from "../ArtifactPaths.js"; +import { hasDestinationPath } from "../../resources/index.js"; import { compareUnicodeCodePoints } from "../../domain/unicodeCodePointOrder.js"; import { isJavaScriptSourcePath } from "../../domain/javascript/javascriptArtifactFiles.js"; import { digestCanonicalValue } from "../../domain/canonicalDigest.js"; @@ -20,7 +20,7 @@ import type { ArtifactEntry, ArtifactReader, ArtifactReaderTraversal, -} from "../ArtifactReader.js"; +} from "../../resources/index.js"; import type { ArtifactCommand, ArtifactEdge, diff --git a/src/artifacts/inventory/ArtifactInventoryFinalization.test.ts b/src/artifacts/inventory/ArtifactInventoryFinalization.test.ts index 4a33afa234..d4b5cc668e 100644 --- a/src/artifacts/inventory/ArtifactInventoryFinalization.test.ts +++ b/src/artifacts/inventory/ArtifactInventoryFinalization.test.ts @@ -5,8 +5,8 @@ import { TextReader, Uint8ArrayWriter, ZipWriter } from "@zip.js/zip.js"; import { afterEach, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { ArtifactProvider } from "../ArtifactProvider.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { ZipArtifactReader } from "../ZipArtifactReader.js"; import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; diff --git a/src/artifacts/inventory/classify.ts b/src/artifacts/inventory/classify.ts index 6f17981291..f82dc06788 100644 --- a/src/artifacts/inventory/classify.ts +++ b/src/artifacts/inventory/classify.ts @@ -1,4 +1,7 @@ -import { artifactOperationCause } from "../ArtifactFileOperation.js"; +import { + artifactOperationCause, + ArtifactReaderFailure, +} from "../../resources/index.js"; import { nesContainerFormat, parseInesLayout, @@ -48,7 +51,6 @@ import { zipRootPackageFormat, } from "../../domain/zipPackageFormat.js"; import { artifactFormatDescriptor } from "../artifactFormats.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; import type { HashResult } from "../ArtifactHash.js"; import { hashStableRootArtifactHandle, diff --git a/src/artifacts/inventory/hashStableRootArtifact.ts b/src/artifacts/inventory/hashStableRootArtifact.ts index 1d11fc1ae6..a34eca70ff 100644 --- a/src/artifacts/inventory/hashStableRootArtifact.ts +++ b/src/artifacts/inventory/hashStableRootArtifact.ts @@ -1,11 +1,14 @@ -import { artifactOperationCause } from "../ArtifactFileOperation.js"; +import { + artifactOperationCause, + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../../resources/index.js"; import { regularFileCancellation } from "../../filesystem/OwnedRegularFile.js"; import type { Stats } from "node:fs"; import type { FileHandle } from "node:fs/promises"; -import { readArtifactFileChunks } from "../readArtifactFileChunks.js"; +import { readArtifactFileChunks } from "../../resources/index.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; import { assertStableRegularFileIdentity, RegularFileChangedError, @@ -19,7 +22,6 @@ import { hashReadable, type HashResult, } from "../ArtifactHash.js"; -import type { ArtifactResourceScope } from "../ArtifactResourceScope.js"; import { fileSnapshotPartialObservationSchema } from "../../domain/fileSnapshotObservation.js"; /** Finalize the admitted root while preserving its completed identity and exact owner. */ diff --git a/src/artifacts/inventory/reader.ts b/src/artifacts/inventory/reader.ts index bc8ebad4ca..3de54c5f78 100644 --- a/src/artifacts/inventory/reader.ts +++ b/src/artifacts/inventory/reader.ts @@ -6,7 +6,7 @@ import type { ArtifactIntegrityPolicyName } from "../../domain/artifactIntegrity import type { ArtifactReader, ArtifactReaderTraversal, -} from "../ArtifactReader.js"; +} from "../../resources/index.js"; import { artifactFormatDescriptor } from "../artifactFormats.js"; import { createArtifactReader } from "../createArtifactReader.js"; import type { diff --git a/src/artifacts/inventory/scanCanonical.ts b/src/artifacts/inventory/scanCanonical.ts index 9ca466ace1..88c66fd5e0 100644 --- a/src/artifacts/inventory/scanCanonical.ts +++ b/src/artifacts/inventory/scanCanonical.ts @@ -19,8 +19,8 @@ import { ArtifactReaderFailure, type ArtifactReader, type ArtifactReaderTraversal, -} from "../ArtifactReader.js"; -import type { ArtifactResourceOwner } from "../ArtifactResourceScope.js"; + type ArtifactResourceOwner, +} from "../../resources/index.js"; import { artifactInventoryResultSchema, type ArtifactInventoryResult, diff --git a/src/artifacts/inventory/scanReader.test.ts b/src/artifacts/inventory/scanReader.test.ts index 49e55a6402..08d44e8b05 100644 --- a/src/artifacts/inventory/scanReader.test.ts +++ b/src/artifacts/inventory/scanReader.test.ts @@ -5,7 +5,7 @@ import { ArtifactReaderFailure, type ArtifactEntry, type ArtifactReader, -} from "../ArtifactReader.js"; +} from "../../resources/ArtifactReader.js"; import { scanReader } from "./scanReader.js"; it.each(["entries", "declared bytes", "unknown bytes", "understated bytes"])( diff --git a/src/artifacts/inventory/scanReader.ts b/src/artifacts/inventory/scanReader.ts index 270beaec7d..26c9ac75c7 100644 --- a/src/artifacts/inventory/scanReader.ts +++ b/src/artifacts/inventory/scanReader.ts @@ -13,14 +13,14 @@ import { annotateEnglishUnicodeCaseCollisions, ArtifactPathRegistry, normalizeArtifactPath, -} from "../ArtifactPaths.js"; +} from "../../resources/index.js"; import { ArtifactEntryContentUnavailable, ArtifactReaderFailure, type ArtifactEntry, type ArtifactReader, type ArtifactReaderTraversal, -} from "../ArtifactReader.js"; +} from "../../resources/index.js"; import { ArtifactTraversalObservation, declaredArtifactEntries, diff --git a/src/artifacts/inventory/types.ts b/src/artifacts/inventory/types.ts index d8fd4653c3..b5aa191b92 100644 --- a/src/artifacts/inventory/types.ts +++ b/src/artifacts/inventory/types.ts @@ -1,7 +1,7 @@ import type { EspFlashSelection } from "../../domain/firmware/espFlashLocation.js"; import type { ArtifactIntegrityPolicyName } from "../../domain/artifactIntegrityPolicy.js"; import type { AsarHeaderAdmission } from "../../config/asarHeaderAdmission.js"; -import type { ArtifactResourceScope } from "../ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import type { ArtifactReaderLimits } from "../../domain/artifactReaderLimits.js"; /** Options shared by artifact inventory scans. */ diff --git a/src/artifacts/javascript/JavaScriptArtifactFiles.ts b/src/artifacts/javascript/JavaScriptArtifactFiles.ts index 60fca15961..f7bac0b2ce 100644 --- a/src/artifacts/javascript/JavaScriptArtifactFiles.ts +++ b/src/artifacts/javascript/JavaScriptArtifactFiles.ts @@ -5,17 +5,17 @@ import type { Readable } from "node:stream"; import { compareUnicodeCodePoints } from "../../domain/unicodeCodePointOrder.js"; import { AsarArtifactReader } from "../AsarArtifactReader.js"; -import type { ArtifactResourceScope } from "../ArtifactResourceScope.js"; -import { - ArtifactPathRegistry, - normalizeArtifactPath, -} from "../ArtifactPaths.js"; import { + type ArtifactResourceScope, ArtifactReaderFailure, type ArtifactEntry, type ArtifactReader, -} from "../ArtifactReader.js"; -import { streamChunkToBuffer } from "../StreamBytes.js"; +} from "../../resources/index.js"; +import { + ArtifactPathRegistry, + normalizeArtifactPath, + streamChunkToBuffer, +} from "../../resources/index.js"; import { hashReadableToCompletion } from "../ArtifactHash.js"; import type { ArtifactOccurrence } from "../../domain/artifactGraph.js"; import type { ArtifactInventorySnapshot } from "../../domain/artifactInventorySnapshot.js"; diff --git a/src/artifacts/javascript/JavaScriptArtifactReader.ts b/src/artifacts/javascript/JavaScriptArtifactReader.ts index f5c91fad35..5805dd8294 100644 --- a/src/artifacts/javascript/JavaScriptArtifactReader.ts +++ b/src/artifacts/javascript/JavaScriptArtifactReader.ts @@ -1,6 +1,6 @@ import type { AsarHeaderAdmission } from "../../config/asarHeaderAdmission.js"; import { AsarArtifactReader } from "../AsarArtifactReader.js"; -import type { ArtifactReader } from "../ArtifactReader.js"; +import type { ArtifactReader } from "../../resources/index.js"; import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; /** Create the reader for an admitted JavaScript artifact format. */ diff --git a/src/artifacts/javascript/JavaScriptSourceAnalysis.ts b/src/artifacts/javascript/JavaScriptSourceAnalysis.ts index 60beb5c902..c6a8da1cf1 100644 --- a/src/artifacts/javascript/JavaScriptSourceAnalysis.ts +++ b/src/artifacts/javascript/JavaScriptSourceAnalysis.ts @@ -7,7 +7,7 @@ import type { import { JavaScriptAnalysisWorker } from "../../javascript/analysis/JavaScriptAnalysisWorker.js"; import type { spawnOwnedProviderProcess } from "../../process/ProviderProcess.js"; import { WorkerCleanupRegistry } from "../../process/OwnedWorkerRuntime.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/index.js"; interface RetainedJavaScriptSourceAnalysis { readonly worker: JavaScriptAnalysisWorker; diff --git a/src/artifacts/nodeSea/NodeSeaBlob.ts b/src/artifacts/nodeSea/NodeSeaBlob.ts index 2513564797..51b96e832e 100644 --- a/src/artifacts/nodeSea/NodeSeaBlob.ts +++ b/src/artifacts/nodeSea/NodeSeaBlob.ts @@ -1,7 +1,9 @@ import { setImmediate } from "node:timers/promises"; -import { assertArtifactReadActive } from "../ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, +} from "../../resources/index.js"; import { DEFAULT_NODE_SEA_READER_LIMITS, type NodeSeaReaderLimits, diff --git a/src/artifacts/nodeSea/NodeSeaLocation.ts b/src/artifacts/nodeSea/NodeSeaLocation.ts index 535d64fab3..4a561b138b 100644 --- a/src/artifacts/nodeSea/NodeSeaLocation.ts +++ b/src/artifacts/nodeSea/NodeSeaLocation.ts @@ -23,7 +23,7 @@ import type { FileHandle } from "node:fs/promises"; import type { StableRegularFileDescriptor } from "../../filesystem/RegularFile.js"; import { abortIfNeeded } from "../ArtifactHash.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { DEFAULT_NODE_SEA_READER_LIMITS, type NodeSeaReaderLimits, diff --git a/src/artifacts/pe/PeResourceLayout.ts b/src/artifacts/pe/PeResourceLayout.ts index abe83a485d..b64a17b4d4 100644 --- a/src/artifacts/pe/PeResourceLayout.ts +++ b/src/artifacts/pe/PeResourceLayout.ts @@ -10,7 +10,7 @@ import { parseMzHeaderEvidence } from "../../domain/dosMz.js"; import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { readPeCoffHeader } from "../../domain/peCoffHeader.js"; import { readPeSectionHeader } from "../../domain/peSectionHeader.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { readPeOptionalHeaderStructure, type PeOptionalHeaderFailure, diff --git a/src/artifacts/pe/PeResourceParser.test.ts b/src/artifacts/pe/PeResourceParser.test.ts index 7a25f746d2..bd57b7a73c 100644 --- a/src/artifacts/pe/PeResourceParser.test.ts +++ b/src/artifacts/pe/PeResourceParser.test.ts @@ -1,5 +1,5 @@ import { dosMz, nonPeWindowsMz } from "../../domain/binaryTarget.fixture.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { createHash } from "node:crypto"; import { describe, expect, it } from "vitest"; import { diff --git a/src/artifacts/pe/PeResourceParser.ts b/src/artifacts/pe/PeResourceParser.ts index 7f2aa002c3..243bbff7e5 100644 --- a/src/artifacts/pe/PeResourceParser.ts +++ b/src/artifacts/pe/PeResourceParser.ts @@ -9,8 +9,10 @@ import { } from "./PeResourceTreeFacts.js"; import { createHash } from "node:crypto"; import { setImmediate } from "node:timers/promises"; -import { assertArtifactReadActive } from "../ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, +} from "../../resources/index.js"; import type { ArtifactLimitBoundary } from "../../domain/artifactOperationError.js"; import { jsonParts } from "../../domain/jsonSerialization.js"; import type { diff --git a/src/artifacts/pyinstaller/CArchiveMembers.ts b/src/artifacts/pyinstaller/CArchiveMembers.ts index bc70a42961..9f0ba9340c 100644 --- a/src/artifacts/pyinstaller/CArchiveMembers.ts +++ b/src/artifacts/pyinstaller/CArchiveMembers.ts @@ -1,5 +1,8 @@ import type { FileHandle } from "node:fs/promises"; -import { copyArtifactEntry, type ArtifactEntry } from "../ArtifactReader.js"; +import { + copyArtifactEntry, + type ArtifactEntry, +} from "../../resources/index.js"; import { isCArchiveDeclaration, isCArchivePythonModule, diff --git a/src/artifacts/pyinstaller/PyInstallerAdmission.test.ts b/src/artifacts/pyinstaller/PyInstallerAdmission.test.ts index 75f2161c1d..1f91c767ab 100644 --- a/src/artifacts/pyinstaller/PyInstallerAdmission.test.ts +++ b/src/artifacts/pyinstaller/PyInstallerAdmission.test.ts @@ -5,7 +5,7 @@ import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirect import { withOwnedRegularFile } from "../../filesystem/OwnedRegularFile.js"; import type { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { ArtifactEmbeddedFormatProbes } from "../ArtifactEmbeddedFormatProbes.js"; -import { ArtifactResourceScope } from "../ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { inventoryArtifact } from "../inventory/ArtifactInventory.js"; import { classifyAndHashRootForInventory } from "../inventory/classify.js"; import { PyInstallerArtifactReader } from "../PyInstallerArtifactReader.js"; diff --git a/src/artifacts/pyinstaller/PyInstallerAdmissionBoundaries.test.ts b/src/artifacts/pyinstaller/PyInstallerAdmissionBoundaries.test.ts index 4c9ada45e7..e6ae71d6ec 100644 --- a/src/artifacts/pyinstaller/PyInstallerAdmissionBoundaries.test.ts +++ b/src/artifacts/pyinstaller/PyInstallerAdmissionBoundaries.test.ts @@ -6,7 +6,7 @@ import { phaseGate, } from "../../../tests/support/lifecycleHarness.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; -import type { ArtifactEntry } from "../ArtifactReader.js"; +import type { ArtifactEntry } from "../../resources/ArtifactReader.js"; import { PyInstallerPyzStore } from "./PyInstallerPyzStore.js"; import { cArchiveExecutable, diff --git a/src/artifacts/pyinstaller/PyInstallerArtifactReader.test.ts b/src/artifacts/pyinstaller/PyInstallerArtifactReader.test.ts index 01ea6979c5..8088123dd5 100644 --- a/src/artifacts/pyinstaller/PyInstallerArtifactReader.test.ts +++ b/src/artifacts/pyinstaller/PyInstallerArtifactReader.test.ts @@ -5,7 +5,7 @@ import { buffer } from "node:stream/consumers"; import { expect, it, vi } from "vitest"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { materializeArtifactInventory, diff --git a/src/artifacts/pyinstaller/PyInstallerBoundaries.test.ts b/src/artifacts/pyinstaller/PyInstallerBoundaries.test.ts index 7ff998e7b6..f791a4d533 100644 --- a/src/artifacts/pyinstaller/PyInstallerBoundaries.test.ts +++ b/src/artifacts/pyinstaller/PyInstallerBoundaries.test.ts @@ -14,12 +14,12 @@ import { hashReadable } from "../ArtifactHash.js"; import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { marshalCode } from "../../python/PythonPyc.fixture.js"; -import * as artifactPaths from "../ArtifactPaths.js"; +import * as artifactPaths from "../../resources/ArtifactPaths.js"; import { PyInstallerPyzStore } from "./PyInstallerPyzStore.js"; import { ArtifactReaderFailure, type ArtifactEntry, -} from "../ArtifactReader.js"; +} from "../../resources/ArtifactReader.js"; import { cArchiveExecutable, pyzArchive, diff --git a/src/artifacts/pyinstaller/PyInstallerBytes.ts b/src/artifacts/pyinstaller/PyInstallerBytes.ts index 4dc61eef1b..24f95ff14b 100644 --- a/src/artifacts/pyinstaller/PyInstallerBytes.ts +++ b/src/artifacts/pyinstaller/PyInstallerBytes.ts @@ -1,6 +1,6 @@ import type { FileHandle } from "node:fs/promises"; import { err, ok, type Result } from "../../domain/result.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { abortIfNeeded } from "../ArtifactHash.js"; import { pyInstallerFailure, diff --git a/src/artifacts/pyinstaller/PyInstallerFormatBoundaries.test.ts b/src/artifacts/pyinstaller/PyInstallerFormatBoundaries.test.ts index 1230d06dcf..eb87f89a08 100644 --- a/src/artifacts/pyinstaller/PyInstallerFormatBoundaries.test.ts +++ b/src/artifacts/pyinstaller/PyInstallerFormatBoundaries.test.ts @@ -23,7 +23,7 @@ import { parseArtifactInventoryEvidence } from "../../domain/artifactInventoryEv import { ArtifactReaderFailure, type ArtifactEntry, -} from "../ArtifactReader.js"; +} from "../../resources/ArtifactReader.js"; it.each([0, 1, 2])( "identifies malformed CArchive compression at table index %i", diff --git a/src/artifacts/pyinstaller/PyInstallerMemberStream.ts b/src/artifacts/pyinstaller/PyInstallerMemberStream.ts index d2f82f6290..e88043ec6c 100644 --- a/src/artifacts/pyinstaller/PyInstallerMemberStream.ts +++ b/src/artifacts/pyinstaller/PyInstallerMemberStream.ts @@ -1,7 +1,7 @@ import { Readable, Transform } from "node:stream"; import { pipeline } from "node:stream/promises"; import { createInflate } from "node:zlib"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { abortIfNeeded } from "../ArtifactHash.js"; interface MemberStreamOptions { diff --git a/src/artifacts/pyinstaller/PyInstallerPyzStore.ts b/src/artifacts/pyinstaller/PyInstallerPyzStore.ts index 3a12653d36..f9fe4e10e0 100644 --- a/src/artifacts/pyinstaller/PyInstallerPyzStore.ts +++ b/src/artifacts/pyinstaller/PyInstallerPyzStore.ts @@ -11,13 +11,13 @@ import { sameRegularFileState, type StableRegularFileDescriptor, } from "../../filesystem/RegularFile.js"; -import { ArtifactReaderFailure } from "../ArtifactReader.js"; import { + ArtifactReaderFailure, ArtifactResourceScope, type ArtifactResourceOwner, -} from "../ArtifactResourceScope.js"; +} from "../../resources/index.js"; import { abortIfNeeded } from "../ArtifactHash.js"; -import { readArtifactFileChunks } from "../readArtifactFileChunks.js"; +import { readArtifactFileChunks } from "../../resources/index.js"; import { pyInstallerMemberStream, readPyInstallerMemberPrefix, diff --git a/src/artifacts/pyinstaller/PyzArchive.ts b/src/artifacts/pyinstaller/PyzArchive.ts index eef7223577..634f19a7f6 100644 --- a/src/artifacts/pyinstaller/PyzArchive.ts +++ b/src/artifacts/pyinstaller/PyzArchive.ts @@ -1,6 +1,6 @@ import type { FileHandle } from "node:fs/promises"; import { hashReadable } from "../ArtifactHash.js"; -import { readArtifactFileChunks } from "../readArtifactFileChunks.js"; +import { readArtifactFileChunks } from "../../resources/index.js"; import { readPyInstallerBytes } from "./PyInstallerBytes.js"; import { err, ok, type Result } from "../../domain/result.js"; diff --git a/src/artifacts/withArtifactTargetIdentity.ts b/src/artifacts/withArtifactTargetIdentity.ts index ffebd5984b..7c3a589c92 100644 --- a/src/artifacts/withArtifactTargetIdentity.ts +++ b/src/artifacts/withArtifactTargetIdentity.ts @@ -1,6 +1,8 @@ import type { BinaryTarget } from "../domain/binaryTargetTypes.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; -import type { ArtifactResourceScope } from "./ArtifactResourceScope.js"; +import { + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../resources/index.js"; import { hashStableRootArtifact } from "./inventory/hashStableRootArtifact.js"; /** diff --git a/src/browser/BrowserScenarioSessionPort.ts b/src/browser/BrowserScenarioSessionPort.ts index 72d305e416..4c2c4320e2 100644 --- a/src/browser/BrowserScenarioSessionPort.ts +++ b/src/browser/BrowserScenarioSessionPort.ts @@ -1,4 +1,4 @@ -import type { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import type { AnalysisCleanupLease } from "../resources/index.js"; import type { BrowserScenario } from "../domain/browserScenario.js"; import type { BrowserScenarioAction } from "../domain/browserScenarioValues.js"; import type { diff --git a/src/browser/CdpBrowserProvider.ts b/src/browser/CdpBrowserProvider.ts index 17d3c6b203..dabe02cad4 100644 --- a/src/browser/CdpBrowserProvider.ts +++ b/src/browser/CdpBrowserProvider.ts @@ -3,11 +3,11 @@ import { DEFAULT_JAVASCRIPT_MEMBER_MUTATION_ALLOWANCE, type JavaScriptMemberMutationAllowance, } from "../domain/javascript/javascriptSemanticWorkAllowance.js"; -import type { BrowserObservationPort } from "../application/BrowserObservationPort.js"; +import type { BrowserObservationPort } from "../ports/BrowserObservationPort.js"; import type { ProviderIdentity, ExecutionOptions, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { sanitizeBrowserUrl, type InspectWebPageInput, diff --git a/src/browser/CdpElectronInspection.test.ts b/src/browser/CdpElectronInspection.test.ts index b694cf3323..fb3929d696 100644 --- a/src/browser/CdpElectronInspection.test.ts +++ b/src/browser/CdpElectronInspection.test.ts @@ -30,7 +30,7 @@ import { import { CDP_SCRIPT_SOURCE_BYTES_OMISSION_REASON } from "./CdpScriptSourceBudget.js"; import { captureElectronScripts } from "./CdpElectronScripts.js"; import { inspectElectronPageInputSchema } from "../domain/javascript/electronObservation.js"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; const temporary: string[] = []; diff --git a/src/browser/CdpElectronInspection.ts b/src/browser/CdpElectronInspection.ts index cd1854a578..ac3886be52 100644 --- a/src/browser/CdpElectronInspection.ts +++ b/src/browser/CdpElectronInspection.ts @@ -1,7 +1,7 @@ import type { CdpContextFrameClaim } from "./CdpScriptContextFacts.js"; import type { AsarHeaderAdmission } from "../config/asarHeaderAdmission.js"; import { digestCanonicalValue } from "../domain/canonicalDigest.js"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import type { ElectronPageInspection, InspectElectronPageInput, diff --git a/src/browser/CdpElectronProvider.ts b/src/browser/CdpElectronProvider.ts index fc3ce61520..45cb888451 100644 --- a/src/browser/CdpElectronProvider.ts +++ b/src/browser/CdpElectronProvider.ts @@ -6,8 +6,8 @@ import { import type { ExecutionOptions, ProviderIdentity, -} from "../application/AnalysisProvider.js"; -import type { ElectronObservationPort } from "../application/javascript/ElectronObservationPort.js"; +} from "../ports/AnalysisProvider.js"; +import type { ElectronObservationPort } from "../ports/javascript/ElectronObservationPort.js"; import { electronPageInspectionSchema, electronTargetListSchema, diff --git a/src/browser/CdpObservationSession.ts b/src/browser/CdpObservationSession.ts index ece73df955..d40f186c13 100644 --- a/src/browser/CdpObservationSession.ts +++ b/src/browser/CdpObservationSession.ts @@ -1,4 +1,4 @@ -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import type { ObserveWebSessionInput, WebObservationSession, diff --git a/src/browser/CdpPageCapture.ts b/src/browser/CdpPageCapture.ts index 95051bb427..444e477718 100644 --- a/src/browser/CdpPageCapture.ts +++ b/src/browser/CdpPageCapture.ts @@ -1,6 +1,6 @@ import type { InspectWebPageInput } from "../domain/browserObservation.js"; import type { WebPageInspection } from "../domain/browserObservationSchemas.js"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import { BrowserObservationError } from "../domain/browserObservationError.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { diff --git a/src/browser/CdpScreenshot.ts b/src/browser/CdpScreenshot.ts index 69bc87da38..84f81e98ca 100644 --- a/src/browser/CdpScreenshot.ts +++ b/src/browser/CdpScreenshot.ts @@ -1,4 +1,4 @@ -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import type { CaptureWebScreenshotInput, WebScreenshot, diff --git a/src/browser/CdpTargetSessionOwner.ts b/src/browser/CdpTargetSessionOwner.ts index 5443e5fdc2..87d6e3666e 100644 --- a/src/browser/CdpTargetSessionOwner.ts +++ b/src/browser/CdpTargetSessionOwner.ts @@ -2,7 +2,7 @@ import { MAX_NODE_TIMER_DELAY_MS } from "../domain/analysisResourceLimits.js"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/index.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { BrowserObservationError } from "../domain/browserObservationError.js"; @@ -16,7 +16,7 @@ import { } from "../domain/analysisErrorCore.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { CdpConnection } from "./CdpConnection.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; /** Typed ownership facts shared by transport errors and their adapter projections. */ class CdpTransportCleanupFailure extends ProviderCleanupError { diff --git a/src/browser/CdpWebMcpDiscovery.ts b/src/browser/CdpWebMcpDiscovery.ts index 1432461501..372aa45d65 100644 --- a/src/browser/CdpWebMcpDiscovery.ts +++ b/src/browser/CdpWebMcpDiscovery.ts @@ -2,7 +2,7 @@ import type { CdpFrameFacts } from "./CdpFrameIdentity.js"; import { cdpFrameEvent } from "./protocol/CdpEvents.js"; import { createHash } from "node:crypto"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import type { DiscoverWebMcpToolsInput, WebMcpDiscovery, diff --git a/src/browser/ElectronCaptureCleanup.boundary.test.ts b/src/browser/ElectronCaptureCleanup.boundary.test.ts index e9b0a57cb2..d5ea847c87 100644 --- a/src/browser/ElectronCaptureCleanup.boundary.test.ts +++ b/src/browser/ElectronCaptureCleanup.boundary.test.ts @@ -1,7 +1,7 @@ import { randomUUID } from "node:crypto"; import { once } from "node:events"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { spawnOwnedProviderProcess, diff --git a/src/browser/ElectronCaptureCleanup.test.ts b/src/browser/ElectronCaptureCleanup.test.ts index a95f90af59..23f303b40d 100644 --- a/src/browser/ElectronCaptureCleanup.test.ts +++ b/src/browser/ElectronCaptureCleanup.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, expect, it, vi } from "vitest"; import { createDeferred } from "../../tests/fixtures/binarySession.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; +import { bindArtifactFileCleanup } from "../resources/ArtifactFileOperation.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import * as ownershipObservation from "../process/ProcessOwnershipObservation.js"; import * as processCleanup from "./ElectronProcessCleanup.js"; diff --git a/src/browser/ElectronCaptureCleanup.ts b/src/browser/ElectronCaptureCleanup.ts index b8f8ee3ed3..62190c45a6 100644 --- a/src/browser/ElectronCaptureCleanup.ts +++ b/src/browser/ElectronCaptureCleanup.ts @@ -2,9 +2,9 @@ import type { _electron as electron } from "playwright-core"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../resources/index.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { observeOwnedProcessLineage } from "../process/ProcessOwnershipObservation.js"; import type { diff --git a/src/browser/ElectronFileScope.cleanup.test.ts b/src/browser/ElectronFileScope.cleanup.test.ts index ab7670d6b1..f5eca680c5 100644 --- a/src/browser/ElectronFileScope.cleanup.test.ts +++ b/src/browser/ElectronFileScope.cleanup.test.ts @@ -70,7 +70,7 @@ vi.mock("node:fs/promises", async (importOriginal) => { }; }); -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; import { CdpElectronProvider } from "./CdpElectronProvider.js"; import { V8InspectorProvider } from "../inspector/V8InspectorProvider.js"; diff --git a/src/browser/ElectronFileScope.ts b/src/browser/ElectronFileScope.ts index 0dad0b2ae8..dc56675f1d 100644 --- a/src/browser/ElectronFileScope.ts +++ b/src/browser/ElectronFileScope.ts @@ -13,10 +13,10 @@ import { assertArtifactReadActive, bindArtifactFileCleanup, withArtifactFileHandle, -} from "../artifacts/ArtifactFileOperation.js"; + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../resources/index.js"; import { asarNodeSchema } from "../artifacts/AsarNode.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { regularFileState, sameRegularFileState, diff --git a/src/browser/PlaywrightBrowserScenarioProvider.test.ts b/src/browser/PlaywrightBrowserScenarioProvider.test.ts index 7e5a363262..a6fcf15996 100644 --- a/src/browser/PlaywrightBrowserScenarioProvider.test.ts +++ b/src/browser/PlaywrightBrowserScenarioProvider.test.ts @@ -6,7 +6,7 @@ import { failBrowserScenarioOperation, PlaywrightScenarioBrowserCleanupOwner, } from "./PlaywrightScenarioBrowser.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; // Fake-backed composition coverage; real browser verification lives in // `npm run verify:browser`. import { describe, expect, it, vi } from "vitest"; diff --git a/src/browser/PlaywrightBrowserScenarioProvider.ts b/src/browser/PlaywrightBrowserScenarioProvider.ts index f52753ea2a..cf540a05f1 100644 --- a/src/browser/PlaywrightBrowserScenarioProvider.ts +++ b/src/browser/PlaywrightBrowserScenarioProvider.ts @@ -6,13 +6,13 @@ import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup. import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import type { BrowserScenarioCapturePort } from "../application/BrowserScenarioCapturePort.js"; +import type { BrowserScenarioCapturePort } from "../ports/BrowserScenarioCapturePort.js"; import type { ExecutionOptions, ProviderIdentity, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { BrowserScenario } from "../domain/browserScenario.js"; import { BROWSER_SCENARIO_START_STEP_ID, diff --git a/src/browser/PlaywrightElectronActiveActions.test.ts b/src/browser/PlaywrightElectronActiveActions.test.ts index 1c7e14d1ab..aa67c25253 100644 --- a/src/browser/PlaywrightElectronActiveActions.test.ts +++ b/src/browser/PlaywrightElectronActiveActions.test.ts @@ -3,7 +3,7 @@ import { runWithExecutionLimits } from "./PlaywrightElectronExecution.js"; // `npm run verify:electron`. import { afterEach, expect, it, vi } from "vitest"; import type { ElectronApplication } from "playwright-core"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { createDeferred } from "../../tests/fixtures/binarySession.js"; import { awaitAcknowledgement } from "../../tests/fixtures/lifecycleAcknowledgement.js"; diff --git a/src/browser/PlaywrightElectronActiveActions.ts b/src/browser/PlaywrightElectronActiveActions.ts index 8f87653e9b..828b6015c9 100644 --- a/src/browser/PlaywrightElectronActiveActions.ts +++ b/src/browser/PlaywrightElectronActiveActions.ts @@ -2,11 +2,11 @@ import type { ElectronApplication, JSHandle, Page } from "playwright-core"; import { z } from "zod"; import { runWithExecutionLimits } from "./PlaywrightElectronExecution.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { ArtifactResourceScope, ArtifactResourceOwner, -} from "../artifacts/ArtifactResourceScope.js"; +} from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { diff --git a/src/browser/PlaywrightElectronActiveFuses.ts b/src/browser/PlaywrightElectronActiveFuses.ts index 2e656856b6..adda1ce875 100644 --- a/src/browser/PlaywrightElectronActiveFuses.ts +++ b/src/browser/PlaywrightElectronActiveFuses.ts @@ -1,6 +1,8 @@ -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../resources/index.js"; import { electronFuseFailure } from "../electron/ElectronFuseFailures.js"; import { basename, dirname } from "node:path"; diff --git a/src/browser/PlaywrightElectronActiveProvider.ts b/src/browser/PlaywrightElectronActiveProvider.ts index d3c432dff9..6e6ab47e8a 100644 --- a/src/browser/PlaywrightElectronActiveProvider.ts +++ b/src/browser/PlaywrightElectronActiveProvider.ts @@ -3,13 +3,15 @@ import { processInspectionCancellationError, } from "../providers/OwnedCommandCleanup.js"; import { runWithExecutionLimits } from "./PlaywrightElectronExecution.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + bindArtifactFileCleanup, + ArtifactResourceScope, +} from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { ElectronCaptureCleanup } from "./ElectronCaptureCleanup.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { analysisErrorWithCancellation } from "../domain/analysisErrorCancellation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { electronFuseFailure } from "../electron/ElectronFuseFailures.js"; import { createHash, randomUUID } from "node:crypto"; import { fileURLToPath } from "node:url"; @@ -19,11 +21,11 @@ import type { _electron as electron } from "playwright-core"; import type { ExecutionOptions, ProviderIdentity, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { CanonicalElectronActiveObservationInput, ElectronActiveObservationPort, -} from "../application/javascript/ElectronActiveObservationPort.js"; +} from "../ports/javascript/ElectronActiveObservationPort.js"; import type { ElectronActiveObservationResult } from "../domain/javascript/electronActiveObservation.js"; import { AnalysisError, diff --git a/src/browser/PlaywrightScenarioBrowser.test.ts b/src/browser/PlaywrightScenarioBrowser.test.ts index 131c458c91..a583519bfb 100644 --- a/src/browser/PlaywrightScenarioBrowser.test.ts +++ b/src/browser/PlaywrightScenarioBrowser.test.ts @@ -1,5 +1,5 @@ import { AnalysisError } from "../domain/analysisErrorBase.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { afterEach, expect, it, vi } from "vitest"; diff --git a/src/browser/PlaywrightScenarioBrowser.ts b/src/browser/PlaywrightScenarioBrowser.ts index d63c2f79f2..6fee76dd30 100644 --- a/src/browser/PlaywrightScenarioBrowser.ts +++ b/src/browser/PlaywrightScenarioBrowser.ts @@ -8,7 +8,7 @@ import { ProviderAdapterError } from "../domain/providerAdapterError.js"; import { AnalysisCleanupLeaseGroup, AnalysisCleanupLease, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/index.js"; import { chmod, mkdtemp, rm } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; diff --git a/src/browser/PlaywrightScenarioSession.test.ts b/src/browser/PlaywrightScenarioSession.test.ts index 33b26e98e2..0db70bce6a 100644 --- a/src/browser/PlaywrightScenarioSession.test.ts +++ b/src/browser/PlaywrightScenarioSession.test.ts @@ -3,7 +3,7 @@ import { phaseGate } from "../../tests/support/lifecycleHarness.js"; import { AnalysisCleanupLeaseGroup, AnalysisCleanupLease, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/AnalysisCleanupLease.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { PlaywrightBrowserScenarioProvider } from "./PlaywrightBrowserScenarioProvider.js"; diff --git a/src/browser/PlaywrightScenarioSession.ts b/src/browser/PlaywrightScenarioSession.ts index e91a924572..4b5f0f6422 100644 --- a/src/browser/PlaywrightScenarioSession.ts +++ b/src/browser/PlaywrightScenarioSession.ts @@ -1,7 +1,7 @@ import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/index.js"; import type { BrowserContext } from "playwright-core"; import type { BrowserScenario } from "../domain/browserScenario.js"; diff --git a/src/browser/PlaywrightScenarioStorage.ts b/src/browser/PlaywrightScenarioStorage.ts index c18daa8339..601057d00d 100644 --- a/src/browser/PlaywrightScenarioStorage.ts +++ b/src/browser/PlaywrightScenarioStorage.ts @@ -1,4 +1,4 @@ -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; import { randomUUID } from "node:crypto"; import { z } from "zod"; diff --git a/src/browser/WebArtifactCleanup.test.ts b/src/browser/WebArtifactCleanup.test.ts index 6f724f9e4b..2be886b9e2 100644 --- a/src/browser/WebArtifactCleanup.test.ts +++ b/src/browser/WebArtifactCleanup.test.ts @@ -1,5 +1,5 @@ import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { LocalWebScriptArtifacts } from "./assets/LocalWebScriptArtifacts.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { WebArtifactCleanup } from "./WebArtifactCleanup.js"; diff --git a/src/browser/WebArtifactCleanup.ts b/src/browser/WebArtifactCleanup.ts index b8e72d3eca..d995fec944 100644 --- a/src/browser/WebArtifactCleanup.ts +++ b/src/browser/WebArtifactCleanup.ts @@ -1,10 +1,10 @@ import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import type { WebScriptArtifactPort } from "../application/WebScriptArtifactPort.js"; + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../resources/index.js"; +import type { WebScriptArtifactPort } from "../ports/WebScriptArtifactPort.js"; import { LocalWebScriptArtifacts } from "./assets/LocalWebScriptArtifacts.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; diff --git a/src/browser/WebBundleAnalysisWorker.ts b/src/browser/WebBundleAnalysisWorker.ts index d79f7bf2e9..530aed4bf6 100644 --- a/src/browser/WebBundleAnalysisWorker.ts +++ b/src/browser/WebBundleAnalysisWorker.ts @@ -22,25 +22,21 @@ import { join } from "node:path"; import { fileURLToPath } from "node:url"; import { StringDecoder } from "node:string_decoder"; import { getHeapStatistics } from "node:v8"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { + ArtifactReaderFailure, + ArtifactResourceScope, AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { artifactFileCompletion, ArtifactFileCleanupFailure, artifactFileCancellationCause, artifactFilePrimaryFacts, assertArtifactReadActive, withArtifactFileHandle, -} from "../artifacts/ArtifactFileOperation.js"; -import { completedStableArtifact, readStableArtifact, -} from "../artifacts/readStableArtifact.js"; -import type { StableArtifactSnapshot } from "../artifacts/readStableArtifact.js"; + type StableArtifactSnapshot, +} from "../resources/index.js"; import { AnalysisError, type AnalysisErrorOptions, @@ -73,7 +69,7 @@ import { import { RuntimeControlUnavailableError, runtimeControlCapabilityError, -} from "../process/RuntimeControlUnavailableError.js"; +} from "../domain/runtimeControlUnavailableError.js"; import { spawnOwnedProviderProcess } from "../process/ProviderProcess.js"; import { ProviderStartupDeadline } from "../process/ProviderDeadline.js"; import { prepareProcessOwnershipInspection } from "../process/ProcessOwnershipObservation.js"; diff --git a/src/browser/WebBundleAnalysisWorkerServer.ts b/src/browser/WebBundleAnalysisWorkerServer.ts index dc8a26b1d0..6b9e56d6e9 100644 --- a/src/browser/WebBundleAnalysisWorkerServer.ts +++ b/src/browser/WebBundleAnalysisWorkerServer.ts @@ -12,9 +12,12 @@ import { open } from "node:fs/promises"; import { join } from "node:path"; import { getHeapStatistics } from "node:v8"; import { readBoundedControlLines } from "../process/BoundedControlLines.js"; -import { withArtifactFileHandle } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + withArtifactFileHandle, + ArtifactReaderFailure, + ArtifactResourceScope, + readStableArtifact, +} from "../resources/index.js"; import { jsonParts } from "../domain/jsonSerialization.js"; import type { IncludedScript } from "../domain/webBundleAnalyzerState.js"; import { @@ -22,7 +25,6 @@ import { type WebBundleScriptAnalysis, } from "../domain/webBundleScriptAnalysis.js"; import { javaScriptRuntime } from "../domain/runtimeVersion.js"; -import { readStableArtifact } from "../artifacts/readStableArtifact.js"; import { WEB_BUNDLE_WORKER_LIMITS as LIMITS, includedWebScriptSchema, diff --git a/src/browser/assets/LocalWebScriptArtifacts.ts b/src/browser/assets/LocalWebScriptArtifacts.ts index b6d9ed8150..8182651ace 100644 --- a/src/browser/assets/LocalWebScriptArtifacts.ts +++ b/src/browser/assets/LocalWebScriptArtifacts.ts @@ -1,10 +1,12 @@ import { lstat, realpath } from "node:fs/promises"; import { dirname, join } from "node:path"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { normalizeArtifactPath } from "../../artifacts/ArtifactPaths.js"; -import type { WebScriptArtifactPort } from "../../application/WebScriptArtifactPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; +import { + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../../resources/index.js"; +import { normalizeArtifactPath } from "../../resources/index.js"; +import type { WebScriptArtifactPort } from "../../ports/WebScriptArtifactPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { AnalysisCapabilityUnavailableError, AnalysisInputError, diff --git a/src/browser/assets/PublishWebScripts.ts b/src/browser/assets/PublishWebScripts.ts index 77db6971e2..e4666a79f9 100644 --- a/src/browser/assets/PublishWebScripts.ts +++ b/src/browser/assets/PublishWebScripts.ts @@ -2,15 +2,17 @@ import { createHash } from "node:crypto"; import { join } from "node:path"; import { Readable } from "node:stream"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../../resources/index.js"; import { DestinationCaseCollisionFailure, DestinationPathUnrepresentableFailure, -} from "../../artifacts/ArtifactPaths.js"; -import { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; -import { outputDirectoryAdmissionRefusal } from "../../artifacts/SafeOutputTreeAdmission.js"; -import { SafeOutputTreeCreationFailure } from "../../artifacts/SafeOutputTreeCreationFailure.js"; + SafeOutputTree, + outputDirectoryAdmissionRefusal, + SafeOutputTreeCreationFailure, +} from "../../resources/index.js"; import { PLAYWRIGHT_RESPONSE_BODY_PROVENANCE_LIMITATION } from "../../domain/browserNetworkEvidence.js"; import { AnalysisCancelledError, diff --git a/src/browser/assets/WebArtifactReads.ts b/src/browser/assets/WebArtifactReads.ts index 0ffddf8473..32db5ab6b0 100644 --- a/src/browser/assets/WebArtifactReads.ts +++ b/src/browser/assets/WebArtifactReads.ts @@ -1,19 +1,17 @@ import { decodeStrictUtf8 } from "../../domain/strictUtf8.js"; import type { WebArtifactAcquisition as Acquisition } from "../../domain/webArtifactAcquisition.js"; import { z } from "zod"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { stableArtifactInputRecovery } from "../../artifacts/StableArtifactFailure.js"; import { + ArtifactReaderFailure, + stableArtifactInputRecovery, artifactFileCancellationCause, artifactFilePrimaryFacts, bindArtifactFileCleanup, type ArtifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { + type ArtifactResourceScope, completedStableArtifact, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; +} from "../../resources/index.js"; import { AnalysisError, primaryAnalysisError, diff --git a/src/browser/assets/WebSourceLocationArtifacts.ts b/src/browser/assets/WebSourceLocationArtifacts.ts index 7a09025d6e..0fe86aba4f 100644 --- a/src/browser/assets/WebSourceLocationArtifacts.ts +++ b/src/browser/assets/WebSourceLocationArtifacts.ts @@ -2,10 +2,10 @@ import { selectedSourceMapLimits, sourceMapLimitRecovery, } from "../../domain/sourceMapLimits.js"; -import type { WebSourceLocationArtifactPort } from "../../application/WebSourceLocationPorts.js"; -import type { WebScriptArtifactPort } from "../../application/WebScriptArtifactPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { WebSourceLocationArtifactPort } from "../../ports/WebSourceLocationPorts.js"; +import type { WebScriptArtifactPort } from "../../ports/WebScriptArtifactPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import { ArtifactResourceScope } from "../../resources/index.js"; import type { WebSourceLocationInput } from "../../domain/webSourceLocation.js"; import { err, ok } from "../../domain/result.js"; import { WebArtifactCleanup } from "../WebArtifactCleanup.js"; diff --git a/src/browser/execution/CdpRuntimeSession.ts b/src/browser/execution/CdpRuntimeSession.ts index 9e3823bfaf..ef8809a494 100644 --- a/src/browser/execution/CdpRuntimeSession.ts +++ b/src/browser/execution/CdpRuntimeSession.ts @@ -1,4 +1,4 @@ -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisTimeoutError, diff --git a/src/browser/execution/CdpWebRuntimeProvider.ts b/src/browser/execution/CdpWebRuntimeProvider.ts index 7d02bd7f51..77bf507ac0 100644 --- a/src/browser/execution/CdpWebRuntimeProvider.ts +++ b/src/browser/execution/CdpWebRuntimeProvider.ts @@ -1,6 +1,6 @@ import { z } from "zod"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; -import type { WebRuntimePort } from "../../application/WebRuntimePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { WebRuntimePort } from "../../ports/WebRuntimePort.js"; import { AnalysisError, type AnalysisPartialObservation, diff --git a/src/browser/history/CaptureFailures.test.ts b/src/browser/history/CaptureFailures.test.ts index 67ce738e54..5891fabd19 100644 --- a/src/browser/history/CaptureFailures.test.ts +++ b/src/browser/history/CaptureFailures.test.ts @@ -1,12 +1,12 @@ import { expect, it } from "vitest"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { captureDecoderHeapContinuingRecovery, DEFAULT_CAPTURE_DECODER_HEAP, } from "../../config/captureDecoderHeap.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; -import { analysisErrorProjectionSchema } from "../../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../domain/analysisErrorProjectionSchema.js"; import { inspectWebNetworkCaptureInputSchema } from "../../domain/webNetworkCapture.js"; import { historicalCaptureFailure, diff --git a/src/browser/history/CaptureFailures.ts b/src/browser/history/CaptureFailures.ts index 770c1d8bca..9214065d42 100644 --- a/src/browser/history/CaptureFailures.ts +++ b/src/browser/history/CaptureFailures.ts @@ -1,23 +1,19 @@ import { javaScriptWorkerMemoryLimitBytes } from "../../process/JavaScriptWorkerMemoryLimit.js"; import { captureBudgets } from "./CaptureBudgets.js"; import { analysisSettingLimit } from "../../domain/analysisSettingDefinitions.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { AnalysisCleanupLeaseGroup, type AnalysisCleanupLease, -} from "../../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, stableArtifactInputRecovery, readerIntegrityFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; -import { bindArtifactFileCleanup, artifactFileCancellationCause, artifactFilePrimaryFacts, artifactSelectedPathErrno, -} from "../../artifacts/ArtifactFileOperation.js"; +} from "../../resources/index.js"; +import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisAccessDeniedError, diff --git a/src/browser/history/HistoricalCaptureDecoder.ts b/src/browser/history/HistoricalCaptureDecoder.ts index 84fee74ccc..181cc93da8 100644 --- a/src/browser/history/HistoricalCaptureDecoder.ts +++ b/src/browser/history/HistoricalCaptureDecoder.ts @@ -28,18 +28,16 @@ import type { HistoricalCaptureFormatAdapter } from "./HistoricalCaptureFormatAd import { randomUUID } from "node:crypto"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; -import { readStableArtifact } from "../../artifacts/readStableArtifact.js"; -import { completedStableArtifactObservation } from "../../artifacts/StableArtifactObservation.js"; -import type { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { + readStableArtifact, + completedStableArtifactObservation, + type ArtifactReaderFailure, ArtifactResourceScope, type ArtifactCleanupAttempt, -} from "../../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../../artifacts/AnalysisCleanupLease.js"; +} from "../../resources/index.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisCapabilityUnavailableError, diff --git a/src/browser/history/HistoricalCaptureReply.test.ts b/src/browser/history/HistoricalCaptureReply.test.ts index 1fd6453246..635ccd63d7 100644 --- a/src/browser/history/HistoricalCaptureReply.test.ts +++ b/src/browser/history/HistoricalCaptureReply.test.ts @@ -1,7 +1,7 @@ import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, onTestFinished } from "vitest"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { historicalHar } from "../../../tests/fixtures/historicalHar.js"; import { decodeHarCapture } from "./HarCapture.js"; diff --git a/src/browser/history/HistoricalCaptureReply.ts b/src/browser/history/HistoricalCaptureReply.ts index 2f6696bbe7..918ca8f807 100644 --- a/src/browser/history/HistoricalCaptureReply.ts +++ b/src/browser/history/HistoricalCaptureReply.ts @@ -4,13 +4,13 @@ import type { JsonValue } from "../../domain/jsonValue.js"; import { CaptureRedaction, capturePointer } from "./CaptureRedaction.js"; import type { WebNetworkCaptureRecord } from "../../domain/webNetworkCapture.js"; import { safeParseUtf8Json } from "../../domain/safeJson.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { artifactFileCancellationCause } from "../../artifacts/ArtifactFileOperation.js"; import { + ArtifactReaderFailure, + type ArtifactResourceScope, + artifactFileCancellationCause, completedStableArtifact, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; +} from "../../resources/index.js"; import { AnalysisOutputError, cancelledBy, diff --git a/src/browser/history/NodeCaptureProcess.ts b/src/browser/history/NodeCaptureProcess.ts index b5f5b46eaa..c5c8f9710b 100644 --- a/src/browser/history/NodeCaptureProcess.ts +++ b/src/browser/history/NodeCaptureProcess.ts @@ -1,6 +1,6 @@ import { readFile, writeFile } from "node:fs/promises"; import { z } from "zod"; -import { readStableArtifact } from "../../artifacts/readStableArtifact.js"; +import { readStableArtifact } from "../../resources/index.js"; import { webNetworkCaptureBudgetsSchema } from "../../domain/webNetworkCapture.js"; import { captureBudgets, withCaptureBudgets } from "./CaptureBudgets.js"; import { CaptureFormatError } from "./CaptureFormatError.js"; diff --git a/src/browser/history/SazCapture.ts b/src/browser/history/SazCapture.ts index fa569c62bc..9fc8818beb 100644 --- a/src/browser/history/SazCapture.ts +++ b/src/browser/history/SazCapture.ts @@ -3,7 +3,7 @@ import { ZipArtifactReader } from "../../artifacts/ZipArtifactReader.js"; import { ArtifactReaderFailure, type ArtifactEntry, -} from "../../artifacts/ArtifactReader.js"; +} from "../../resources/index.js"; import type { WebNetworkCaptureRecord } from "../../domain/webNetworkCapture.js"; import { SAZ_CAPTURE_PROVIDER_IDENTITY } from "./CaptureProviderIdentities.js"; import { CaptureFormatError } from "./CaptureFormatError.js"; diff --git a/src/browser/history/playwrightTrace/PlaywrightTraceDecoder.test.ts b/src/browser/history/playwrightTrace/PlaywrightTraceDecoder.test.ts index 342ad4d4a4..0dde853cef 100644 --- a/src/browser/history/playwrightTrace/PlaywrightTraceDecoder.test.ts +++ b/src/browser/history/playwrightTrace/PlaywrightTraceDecoder.test.ts @@ -2,7 +2,7 @@ import { projectAnalysisError } from "../../../domain/analysisErrorProjection.js import { createHash } from "node:crypto"; import { readFile, writeFile, open } from "node:fs/promises"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../resources/ArtifactResourceScope.js"; import { PlaywrightTraceDecoder } from "./PlaywrightTraceDecoder.js"; import { playwrightTraceSchema } from "../../../domain/playwrightTrace/playwrightTrace.js"; import { diff --git a/src/browser/history/playwrightTrace/PlaywrightTraceDecoder.ts b/src/browser/history/playwrightTrace/PlaywrightTraceDecoder.ts index 10a8593234..781ad81470 100644 --- a/src/browser/history/playwrightTrace/PlaywrightTraceDecoder.ts +++ b/src/browser/history/playwrightTrace/PlaywrightTraceDecoder.ts @@ -1,14 +1,14 @@ import type { StableRegularFileDescriptor } from "../../../filesystem/RegularFile.js"; -import type { PlaywrightTracePort } from "../../../application/playwrightTrace/PlaywrightTracePort.js"; -import { ArtifactResourceScope } from "../../../artifacts/ArtifactResourceScope.js"; -import type { ArtifactEntry } from "../../../artifacts/ArtifactReader.js"; -import { ZipArtifactReader } from "../../../artifacts/ZipArtifactReader.js"; +import type { PlaywrightTracePort } from "../../../ports/playwrightTrace/PlaywrightTracePort.js"; import { + ArtifactResourceScope, + type ArtifactEntry, artifactFilePrimaryFacts, assertArtifactReadActive, withArtifactRegularFile, -} from "../../../artifacts/ArtifactFileOperation.js"; -import { projectStableArtifactFailure } from "../../../artifacts/StableArtifactFailure.js"; + projectStableArtifactFailure, +} from "../../../resources/index.js"; +import { ZipArtifactReader } from "../../../artifacts/ZipArtifactReader.js"; import { assertArtifactFileSelectedSource } from "../../../artifacts/ArtifactFileSource.js"; import { hashStableRootArtifactHandle } from "../../../artifacts/inventory/hashStableRootArtifact.js"; import { diff --git a/src/browser/history/playwrightTrace/PlaywrightTraceLifecycle.test.ts b/src/browser/history/playwrightTrace/PlaywrightTraceLifecycle.test.ts index 5e9bc74c2e..cfeb318d10 100644 --- a/src/browser/history/playwrightTrace/PlaywrightTraceLifecycle.test.ts +++ b/src/browser/history/playwrightTrace/PlaywrightTraceLifecycle.test.ts @@ -2,7 +2,7 @@ import { createDeferred } from "../../../../tests/fixtures/binarySession.js"; import { awaitAcknowledgement } from "../../../../tests/fixtures/lifecycleAcknowledgement.js"; import { readFile, rename, copyFile } from "node:fs/promises"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../resources/ArtifactResourceScope.js"; import { ZipArtifactReader } from "../../../artifacts/ZipArtifactReader.js"; import { PlaywrightTraceDecoder } from "./PlaywrightTraceDecoder.js"; import { PlaywrightTraceService } from "../../../application/playwrightTrace/PlaywrightTraceService.js"; diff --git a/src/browser/history/playwrightTrace/TraceFailure.ts b/src/browser/history/playwrightTrace/TraceFailure.ts index e0c9bf644d..ab175f4319 100644 --- a/src/browser/history/playwrightTrace/TraceFailure.ts +++ b/src/browser/history/playwrightTrace/TraceFailure.ts @@ -8,13 +8,13 @@ import { } from "../../../domain/analysisErrorCore.js"; import { ArtifactOperationError } from "../../../domain/artifactOperationError.js"; import { PLAYWRIGHT_TRACE_OPERATION as operation } from "../../../domain/playwrightTrace/playwrightTrace.js"; -import { ArtifactReaderFailure } from "../../../artifacts/ArtifactReader.js"; -import { artifactFileCancellationCause } from "../../../artifacts/ArtifactFileOperation.js"; -import { isSelectedRegularFileError } from "../../../filesystem/RegularFile.js"; import { + ArtifactReaderFailure, + artifactFileCancellationCause, stableArtifactInputFailure, readerIntegrityFailure, -} from "../../../artifacts/StableArtifactFailure.js"; +} from "../../../resources/index.js"; +import { isSelectedRegularFileError } from "../../../filesystem/RegularFile.js"; /** Classify the archive owner's facts without interpreting opaque cancellation reasons. */ export const traceFailure = (cause: unknown, path: string): AnalysisError => { diff --git a/src/browser/history/playwrightTrace/TraceInventory.ts b/src/browser/history/playwrightTrace/TraceInventory.ts index c581cea854..342246d25a 100644 --- a/src/browser/history/playwrightTrace/TraceInventory.ts +++ b/src/browser/history/playwrightTrace/TraceInventory.ts @@ -1,7 +1,7 @@ import { digestCanonicalValue } from "../../../domain/canonicalDigest.js"; import { Budget } from "../../../domain/budget.js"; import { AnalysisResourceConstraintError } from "../../../domain/analysisErrorCore.js"; -import type { ArtifactEntry } from "../../../artifacts/ArtifactReader.js"; +import type { ArtifactEntry } from "../../../resources/index.js"; import { PLAYWRIGHT_TRACE_LIMITS, PLAYWRIGHT_TRACE_OPERATION, diff --git a/src/browser/history/playwrightTrace/TraceLines.ts b/src/browser/history/playwrightTrace/TraceLines.ts index 614beba8d3..818172a965 100644 --- a/src/browser/history/playwrightTrace/TraceLines.ts +++ b/src/browser/history/playwrightTrace/TraceLines.ts @@ -1,6 +1,6 @@ import { setImmediate } from "node:timers/promises"; import type { Readable } from "node:stream"; -import { assertArtifactReadActive } from "../../../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../../../resources/index.js"; import { AnalysisResourceConstraintError } from "../../../domain/analysisErrorCore.js"; import { PLAYWRIGHT_TRACE_LIMITS, diff --git a/src/browser/history/playwrightTrace/TraceStream.ts b/src/browser/history/playwrightTrace/TraceStream.ts index 329fa9d286..719ec94c27 100644 --- a/src/browser/history/playwrightTrace/TraceStream.ts +++ b/src/browser/history/playwrightTrace/TraceStream.ts @@ -5,7 +5,7 @@ import { LosslessNumber, isSafeNumber } from "lossless-json"; import type { ArtifactEntry, ArtifactReader, -} from "../../../artifacts/ArtifactReader.js"; +} from "../../../resources/index.js"; import { AnalysisResourceConstraintError, AnalysisUnsupportedTargetError, diff --git a/src/browser/history/protobuf/ProtobufCapture.test.ts b/src/browser/history/protobuf/ProtobufCapture.test.ts index 4b48d29747..5417a8a416 100644 --- a/src/browser/history/protobuf/ProtobufCapture.test.ts +++ b/src/browser/history/protobuf/ProtobufCapture.test.ts @@ -4,7 +4,7 @@ import { createTestTempDirectory } from "../../../../tests/fixtures/temporaryDir import { protobufCaptureDescriptor } from "../../../../tests/fixtures/protobufCapture.js"; import { createHash } from "node:crypto"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../resources/ArtifactResourceScope.js"; import { inspectWebNetworkCaptureInputSchema, type WebNetworkCapture, diff --git a/src/browser/history/protobuf/ProtobufCapture.ts b/src/browser/history/protobuf/ProtobufCapture.ts index 06635957e5..8c94af4788 100644 --- a/src/browser/history/protobuf/ProtobufCapture.ts +++ b/src/browser/history/protobuf/ProtobufCapture.ts @@ -7,13 +7,15 @@ import { isCaptureCredentialHeaderBytes, } from "../CaptureRedaction.js"; import { createHash } from "node:crypto"; -import { readStableArtifact } from "../../../artifacts/readStableArtifact.js"; -import { completedStableArtifactObservation } from "../../../artifacts/StableArtifactObservation.js"; +import { + readStableArtifact, + completedStableArtifactObservation, + type ArtifactResourceScope, +} from "../../../resources/index.js"; import { historicalCaptureFailure, withCaptureReaderCleanup, } from "../CaptureFailures.js"; -import type { ArtifactResourceScope } from "../../../artifacts/ArtifactResourceScope.js"; import { AnalysisInputError, AnalysisCapabilityUnavailableError, diff --git a/src/browser/modules/NativeModuleResolver.ts b/src/browser/modules/NativeModuleResolver.ts index c1ae73b0d0..f507a1faf9 100644 --- a/src/browser/modules/NativeModuleResolver.ts +++ b/src/browser/modules/NativeModuleResolver.ts @@ -13,8 +13,8 @@ import type { ConsoleMessage, LaunchOptions, } from "playwright-core"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; -import type { WebModuleResolutionPort } from "../../application/WebModulePorts.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { WebModuleResolutionPort } from "../../ports/WebModulePorts.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; import { analysisErrorWithCancellation } from "../../domain/analysisErrorCancellation.js"; @@ -32,7 +32,7 @@ import { err, ok, type Result } from "../../domain/result.js"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../../artifacts/AnalysisCleanupLease.js"; +} from "../../resources/index.js"; import type { WebModuleResolutionBatch, WebModuleResolutionObservation, diff --git a/src/browser/modules/WebModuleArtifacts.ts b/src/browser/modules/WebModuleArtifacts.ts index 751abd61b0..65242c5696 100644 --- a/src/browser/modules/WebModuleArtifacts.ts +++ b/src/browser/modules/WebModuleArtifacts.ts @@ -1,10 +1,10 @@ import type { WebModuleArtifactPort, WebModuleArtifacts, -} from "../../application/WebModulePorts.js"; -import type { WebScriptArtifactPort } from "../../application/WebScriptArtifactPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +} from "../../ports/WebModulePorts.js"; +import type { WebScriptArtifactPort } from "../../ports/WebScriptArtifactPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import { ArtifactResourceScope } from "../../resources/index.js"; import { jsonObjectSchema } from "../../domain/jsonValue.js"; import { err, ok } from "../../domain/result.js"; import { WebArtifactCleanup } from "../WebArtifactCleanup.js"; diff --git a/src/browser/providerIdentities.ts b/src/browser/providerIdentities.ts index 4dbbaf0094..625db8eaeb 100644 --- a/src/browser/providerIdentities.ts +++ b/src/browser/providerIdentities.ts @@ -1,4 +1,4 @@ -import type { ProviderIdentity } from "../application/AnalysisProvider.js"; +import type { ProviderIdentity } from "../ports/AnalysisProvider.js"; /** Identity available without loading the CdpBrowserProvider implementation. */ export const CDP_BROWSER_PROVIDER_IDENTITY: ProviderIdentity = Object.freeze({ diff --git a/src/captures/TsharkCaptureProvider.ts b/src/captures/TsharkCaptureProvider.ts index fcb6ad2738..48550613b1 100644 --- a/src/captures/TsharkCaptureProvider.ts +++ b/src/captures/TsharkCaptureProvider.ts @@ -1,5 +1,9 @@ import { capturedProviderOutput } from "../process/capturedProviderOutput.js"; -import { readerIntegrityFailure } from "../artifacts/StableArtifactFailure.js"; +import { + ArtifactReaderFailure, + readerIntegrityFailure, + readStableArtifact, +} from "../resources/index.js"; import { classifyProviderFailure, type ProviderFailureDialect, @@ -37,9 +41,8 @@ import { createAnalysisExecution, type AnalysisExecution, type ExecutionOptions, -} from "../application/AnalysisProvider.js"; -import type { PacketCapturePort } from "../application/captures/PacketCaptureService.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +} from "../ports/AnalysisProvider.js"; +import type { PacketCapturePort } from "../ports/captures/PacketCapturePort.js"; import { ARTIFACT_PRODUCER_LIMITATION, ArtifactAnalysisResources, @@ -49,7 +52,6 @@ import { artifactResourceDialect, createArtifactAnalysisResources, } from "../providers/artifactResourceFailure.js"; -import { readStableArtifact } from "../artifacts/readStableArtifact.js"; import { assertArtifactCommandPath, selectArtifactCommandPath, diff --git a/src/cli.ts b/src/cli.ts index 394f0ccc3a..c7f2c83cec 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -1,4 +1,4 @@ -import type { FridaInstrumentationPort } from "./application/frida/FridaInstrumentationPort.js"; +import type { FridaInstrumentationPort } from "./ports/frida/FridaInstrumentationPort.js"; import { CURRENT_ENTRYPOINT_PATH, isDirectEntrypoint, diff --git a/src/cli/analysisViewCommands.ts b/src/cli/analysisViewCommands.ts index 3385daf4d9..f8323e39cd 100644 --- a/src/cli/analysisViewCommands.ts +++ b/src/cli/analysisViewCommands.ts @@ -1,7 +1,7 @@ import { z } from "incur"; import { inspectAnalysisView } from "../application/analysisView/AnalysisViewService.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { ANALYSIS_VIEW_PROVIDER } from "../domain/investigationProviders.js"; import { inspectEvidenceBundleCommand } from "../application/EvidenceBundleCommands.js"; import { ANALYSIS_VIEW_TOOL_CONTRACTS } from "../contracts/analysisViewToolContracts.js"; diff --git a/src/cli/apiContractCommand.ts b/src/cli/apiContractCommand.ts index 6e0b8cca17..a83b335ed1 100644 --- a/src/cli/apiContractCommand.ts +++ b/src/cli/apiContractCommand.ts @@ -1,7 +1,9 @@ import type { Logger } from "pino"; import type { CliInstance } from "./types.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { projectArtifactCloseFailure } from "../artifacts/StableArtifactFailure.js"; +import { + ArtifactResourceScope, + projectArtifactCloseFailure, +} from "../resources/index.js"; import { API_CONTRACT_TOOL_CONTRACTS } from "../contracts/apiContractToolContracts.js"; import { API_CONTRACT_OPERATION as operation, diff --git a/src/cli/artifactComparisonCommand.ts b/src/cli/artifactComparisonCommand.ts index 2bc4064c2f..8b7a7f9433 100644 --- a/src/cli/artifactComparisonCommand.ts +++ b/src/cli/artifactComparisonCommand.ts @@ -4,7 +4,7 @@ import { compareArtifactEvidence, resolveArtifactComparisonSources, } from "../application/artifacts/ArtifactComparisonEvidence.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { SESSION_TOOL_CONTRACTS } from "../contracts/sessionToolContracts.js"; import { ARTIFACT_COMPARISON_PROVIDER } from "../domain/comparisonEvidenceIdentity.js"; import { contractNamed } from "./contractCliDescription.js"; diff --git a/src/cli/browserContractCommands.ts b/src/cli/browserContractCommands.ts index 7d6d32170f..5a2552a7b8 100644 --- a/src/cli/browserContractCommands.ts +++ b/src/cli/browserContractCommands.ts @@ -1,6 +1,6 @@ import type { z } from "incur"; -import type { BrowserObservationPort } from "../application/BrowserObservationPort.js"; +import type { BrowserObservationPort } from "../ports/BrowserObservationPort.js"; import { createBrowserObservationProvider } from "../composition/browserObservation.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import type { Evidence } from "../domain/evidence.js"; diff --git a/src/cli/cliCommandRegistration.ts b/src/cli/cliCommandRegistration.ts index fc5c25796f..7bfc00d4cf 100644 --- a/src/cli/cliCommandRegistration.ts +++ b/src/cli/cliCommandRegistration.ts @@ -1,6 +1,6 @@ import type { Logger } from "pino"; -import type { FridaInstrumentationPort } from "../application/frida/FridaInstrumentationPort.js"; +import type { FridaInstrumentationPort } from "../ports/frida/FridaInstrumentationPort.js"; import type { DirectAnalysis } from "../composition/directAnalysis.js"; import type { CliInstance } from "./types.js"; diff --git a/src/cli/cliJsonInput.ts b/src/cli/cliJsonInput.ts index 23175bde9c..6fdc4c3211 100644 --- a/src/cli/cliJsonInput.ts +++ b/src/cli/cliJsonInput.ts @@ -21,7 +21,7 @@ import { ownCliProcessResource } from "./cliResources.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { AnalysisAccessDeniedError, AnalysisInputError, diff --git a/src/cli/cliProgress.ts b/src/cli/cliProgress.ts index b731312e00..a154fbf434 100644 --- a/src/cli/cliProgress.ts +++ b/src/cli/cliProgress.ts @@ -1,4 +1,4 @@ -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; /** Write one progress update as a stderr line, keeping stdout results parseable. */ export const writeCliProgressLine = (update: unknown): void => { diff --git a/src/cli/cliResultOutput.ts b/src/cli/cliResultOutput.ts index d8712b1eff..422b398203 100644 --- a/src/cli/cliResultOutput.ts +++ b/src/cli/cliResultOutput.ts @@ -4,7 +4,7 @@ import type { Writable } from "node:stream"; import { Filter } from "incur"; import { estimateTokenCount } from "tokenx"; -import { analysisErrorProjectionSchema } from "../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../domain/analysisErrorProjectionSchema.js"; import type { ParsedCliOutputArguments } from "../cliOutput.js"; import { normalizeCliArguments, diff --git a/src/cli/cliShell.ts b/src/cli/cliShell.ts index ce69932105..c578435800 100644 --- a/src/cli/cliShell.ts +++ b/src/cli/cliShell.ts @@ -1,7 +1,7 @@ import { Cli, z } from "incur"; import { HOST_PLATFORM } from "../platform/HostPlatform.js"; -import type { FridaInstrumentationPort } from "../application/frida/FridaInstrumentationPort.js"; +import type { FridaInstrumentationPort } from "../ports/frida/FridaInstrumentationPort.js"; import { currentClientRegistrationCommand } from "../application/ClientRegistrationIdentity.js"; import { adaptCliOutputArgumentsForIncur, diff --git a/src/cli/desktopCaptureCommands.ts b/src/cli/desktopCaptureCommands.ts index 9d8f0564e2..bb7b442473 100644 --- a/src/cli/desktopCaptureCommands.ts +++ b/src/cli/desktopCaptureCommands.ts @@ -11,8 +11,10 @@ import type { DesktopStateReaders } from "../application/desktop/DesktopApplicat import { AnalysisError } from "../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + bindArtifactFileCleanup, +} from "../resources/index.js"; import type { Evidence } from "../domain/evidence.js"; import { localPathStringSchema } from "../domain/localPath.js"; import { err, ok } from "../domain/result.js"; diff --git a/src/cli/electronCommands.ts b/src/cli/electronCommands.ts index ee11c9b65a..ee62268e1d 100644 --- a/src/cli/electronCommands.ts +++ b/src/cli/electronCommands.ts @@ -27,7 +27,7 @@ import { runJavaScriptApplicationCommand, } from "./javascriptApplicationAnalysis.js"; import { finishAnalysisCommand } from "./finishAnalysisCommand.js"; -import type { ElectronActiveObservationPort } from "../application/javascript/ElectronActiveObservationPort.js"; +import type { ElectronActiveObservationPort } from "../ports/javascript/ElectronActiveObservationPort.js"; import { evidenceBundleOption, runEvidenceInputCommand, diff --git a/src/cli/evidenceInputCommand.ts b/src/cli/evidenceInputCommand.ts index 96107d7218..9441d6991a 100644 --- a/src/cli/evidenceInputCommand.ts +++ b/src/cli/evidenceInputCommand.ts @@ -3,7 +3,7 @@ import type { Evidence } from "../domain/evidence.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { err, type Result } from "../domain/result.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { absoluteCallerPath } from "../filesystem/callerPath.js"; import type { EvidenceLookup } from "../application/EvidenceInputResolver.js"; import { parseAnalysisInput } from "../application/AnalysisInput.js"; diff --git a/src/cli/fridaCommands.ts b/src/cli/fridaCommands.ts index 4e6e6f3e72..cb71a3475d 100644 --- a/src/cli/fridaCommands.ts +++ b/src/cli/fridaCommands.ts @@ -2,7 +2,7 @@ import { projectCliAnalysisResult } from "./projectCliAnalysisResult.js"; import { z } from "incur"; import { FridaInstrumentationService } from "../application/frida/FridaInstrumentationService.js"; -import type { FridaInstrumentationPort } from "../application/frida/FridaInstrumentationPort.js"; +import type { FridaInstrumentationPort } from "../ports/frida/FridaInstrumentationPort.js"; import { createFridaInstrumentationProvider } from "../composition/frida.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { AnalysisInputError } from "../domain/analysisErrorCore.js"; diff --git a/src/cli/guidanceCommands.ts b/src/cli/guidanceCommands.ts index 7f0c0c5f12..188a4158ca 100644 --- a/src/cli/guidanceCommands.ts +++ b/src/cli/guidanceCommands.ts @@ -1,5 +1,5 @@ import { z } from "incur"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { readGuidanceSection, searchGuidance, diff --git a/src/cli/javascriptApplicationAnalysis.ts b/src/cli/javascriptApplicationAnalysis.ts index 525d0f064c..c7677c443a 100644 --- a/src/cli/javascriptApplicationAnalysis.ts +++ b/src/cli/javascriptApplicationAnalysis.ts @@ -3,9 +3,11 @@ import type { ContractCommandContext } from "./contractCommand.js"; import type { AnalysisViewRequest } from "../domain/analysisView/analysisViewRequest.js"; import { publishCliAnalysisEvidence } from "./analysisEvidenceDelivery.js"; import { JAVASCRIPT_APPLICATION_PROVIDER } from "../domain/investigationProviders.js"; -import { createProgressReporter } from "../application/ProgressReporter.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { createProgressReporter } from "../ports/ProgressReporter.js"; +import { + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../resources/index.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { completeProviderEvidence } from "../application/ProviderOperationExecution.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; diff --git a/src/cli/javascriptRuntimeCommands.ts b/src/cli/javascriptRuntimeCommands.ts index 4b9363c332..830bdf5b71 100644 --- a/src/cli/javascriptRuntimeCommands.ts +++ b/src/cli/javascriptRuntimeCommands.ts @@ -1,7 +1,7 @@ import { projectCliAnalysisResult } from "./projectCliAnalysisResult.js"; import type { z } from "incur"; -import type { JavaScriptRuntimeObservationPort } from "../application/javascript/JavaScriptRuntimeObservationPort.js"; +import type { JavaScriptRuntimeObservationPort } from "../ports/javascript/JavaScriptRuntimeObservationPort.js"; import { listJavaScriptRuntimeTargets, observeJavaScriptRuntime, diff --git a/src/cli/jebCommands.ts b/src/cli/jebCommands.ts index 182435f89d..604f5c8208 100644 --- a/src/cli/jebCommands.ts +++ b/src/cli/jebCommands.ts @@ -1,5 +1,5 @@ import { JebAnalysisService } from "../application/jeb/JebAnalysisService.js"; -import type { JebAnalysisPort } from "../application/jeb/JebAnalysisPort.js"; +import type { JebAnalysisPort } from "../ports/jeb/JebAnalysisPort.js"; import { createJebAnalysisProvider } from "../composition/jeb.js"; import { JEB_TOOL_CONTRACTS } from "../contracts/jeb/jebToolContracts.js"; import type { JebOperation } from "../domain/jeb/jebAnalysis.js"; diff --git a/src/cli/mcpRegistration.ts b/src/cli/mcpRegistration.ts index 5519245136..08c0305bc3 100644 --- a/src/cli/mcpRegistration.ts +++ b/src/cli/mcpRegistration.ts @@ -12,8 +12,10 @@ import { type McpRegistrationClient, } from "../application/McpRegistrationCatalog.js"; import { runningClientRewriteNotice } from "../application/SupportedClients.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../resources/index.js"; import { classifyMcpAddDiscovery, declaredSensitiveValues, diff --git a/src/cli/nativeFunctionMatchingCommands.ts b/src/cli/nativeFunctionMatchingCommands.ts index 6de65eb176..a6caa65a65 100644 --- a/src/cli/nativeFunctionMatchingCommands.ts +++ b/src/cli/nativeFunctionMatchingCommands.ts @@ -1,7 +1,7 @@ import { z } from "incur"; import type { Logger } from "pino"; import { matchNativeFunctionsFromBundles } from "../application/native/NativeFunctionMatchingService.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { SESSION_TOOL_CONTRACTS } from "../contracts/sessionToolContracts.js"; import { FUNCTION_COMPARISON_PROVIDER } from "../domain/comparisonEvidenceIdentity.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; diff --git a/src/cli/ntfsJournalCommand.ts b/src/cli/ntfsJournalCommand.ts index 1b66c26857..a7d4be9bfd 100644 --- a/src/cli/ntfsJournalCommand.ts +++ b/src/cli/ntfsJournalCommand.ts @@ -1,7 +1,9 @@ import type { Logger } from "pino"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { projectArtifactCloseFailure } from "../artifacts/StableArtifactFailure.js"; +import { + ArtifactResourceScope, + projectArtifactCloseFailure, +} from "../resources/index.js"; import { NTFS_JOURNAL_TOOL_CONTRACTS } from "../contracts/ntfsJournalToolContracts.js"; import { NTFS_JOURNAL_OPERATION as operation, diff --git a/src/cli/playwrightTraceCommand.ts b/src/cli/playwrightTraceCommand.ts index 3422cc05af..e059631505 100644 --- a/src/cli/playwrightTraceCommand.ts +++ b/src/cli/playwrightTraceCommand.ts @@ -1,7 +1,9 @@ import type { Logger } from "pino"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { projectArtifactCloseFailure } from "../artifacts/StableArtifactFailure.js"; +import { + ArtifactResourceScope, + projectArtifactCloseFailure, +} from "../resources/index.js"; import { PLAYWRIGHT_TRACE_TOOL_CONTRACTS } from "../contracts/playwrightTraceToolContracts.js"; import { PLAYWRIGHT_TRACE_OPERATION as operation, diff --git a/src/cli/utilityCommands.ts b/src/cli/utilityCommands.ts index d3ea41f890..0c7270690e 100644 --- a/src/cli/utilityCommands.ts +++ b/src/cli/utilityCommands.ts @@ -5,7 +5,7 @@ import { cliDecimalField } from "./options.js"; import type { DirectAnalysis } from "../composition/directAnalysis.js"; import { createHistoricalSourceSummary } from "../domain/referenceSourceSummary.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { importReferenceSource } from "../application/ReferenceSourceImport.js"; import { referenceSourceImportAnalysisError, diff --git a/src/cli/webRuntimeCommands.ts b/src/cli/webRuntimeCommands.ts index ab0f078196..3d748e1235 100644 --- a/src/cli/webRuntimeCommands.ts +++ b/src/cli/webRuntimeCommands.ts @@ -2,7 +2,7 @@ import type { Cli } from "incur"; import type { Logger } from "pino"; import type { WebRuntimeService } from "../application/WebRuntimeService.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import { createWebRuntimeService } from "../composition/webRuntime.js"; import { WEB_RUNTIME_TOOL_CONTRACTS } from "../contracts/webRuntimeToolContracts.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; diff --git a/src/cli/webScriptCommands.ts b/src/cli/webScriptCommands.ts index deb9d38c6b..91b28b4289 100644 --- a/src/cli/webScriptCommands.ts +++ b/src/cli/webScriptCommands.ts @@ -1,7 +1,7 @@ import type { Logger } from "pino"; import { exportWebScripts } from "../application/WebScriptExportService.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { WEB_SCRIPT_TOOL_CONTRACTS } from "../contracts/webScriptToolContracts.js"; import { WEB_SCRIPT_EXPORT_PROVIDER } from "../domain/investigationProviders.js"; import { contractNamed } from "./contractCliDescription.js"; diff --git a/src/cliBrowserScenarioCommands.ts b/src/cliBrowserScenarioCommands.ts index add498fb1e..cc4bcb446d 100644 --- a/src/cliBrowserScenarioCommands.ts +++ b/src/cliBrowserScenarioCommands.ts @@ -1,7 +1,7 @@ import type { Logger } from "pino"; import { captureBrowserScenario } from "./application/BrowserScenarioCaptureService.js"; -import type { BrowserScenarioCapturePort } from "./application/BrowserScenarioCapturePort.js"; +import type { BrowserScenarioCapturePort } from "./ports/BrowserScenarioCapturePort.js"; import { publishCliAnalysisEvidence } from "./cli/analysisEvidenceDelivery.js"; import { contractNamed } from "./cli/contractCliDescription.js"; import { registerContractDocumentCommand } from "./cli/contractCommand.js"; diff --git a/src/cliLogging.ts b/src/cliLogging.ts index 88002ef867..e9ac96d3b7 100644 --- a/src/cliLogging.ts +++ b/src/cliLogging.ts @@ -1,7 +1,5 @@ -import { - analysisCliErrorEnvelopeSchema, - analysisErrorProjectionSchema, -} from "./contracts/errorSchemas.js"; +import { analysisCliErrorEnvelopeSchema } from "./contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "./domain/analysisErrorProjectionSchema.js"; import { AnalysisError } from "./domain/analysisErrorBase.js"; import { projectAnalysisError, diff --git a/src/cliMcpRegistration.test.ts b/src/cliMcpRegistration.test.ts index 3868727f1b..6d3cbeb68d 100644 --- a/src/cliMcpRegistration.test.ts +++ b/src/cliMcpRegistration.test.ts @@ -36,7 +36,7 @@ const CHILD_PROGRAM = ` } const { createCli, closeCliResources } = await import(${JSON.stringify(new URL("./cli.ts", import.meta.url).href)}); const { resolveMcpRegistrationClients } = await import(${JSON.stringify(new URL("./application/McpRegistrationCatalog.ts", import.meta.url).href)}); - const { ArtifactResourceScope } = await import(${JSON.stringify(new URL("./artifacts/ArtifactResourceScope.ts", import.meta.url).href)}); + const { ArtifactResourceScope } = await import(${JSON.stringify(new URL("./resources/ArtifactResourceScope.ts", import.meta.url).href)}); const preflightResources = new ArtifactResourceScope(); const { parse: parseToml } = await import(${JSON.stringify(pathToFileURL(require.resolve("smol-toml")).href)}); const { parse: parseYaml } = await import(${JSON.stringify(pathToFileURL(require.resolve("yaml")).href)}); diff --git a/src/composition/android.ts b/src/composition/android.ts index 09e7cd3f4b..b1d921135e 100644 --- a/src/composition/android.ts +++ b/src/composition/android.ts @@ -1,5 +1,5 @@ import type { AnalysisSettingsReader } from "../domain/analysisSettings.js"; -import type { AndroidAnalysisPort } from "../application/android/AndroidAnalysisPort.js"; +import type { AndroidAnalysisPort } from "../ports/android/AndroidAnalysisPort.js"; import type { JadxLauncher } from "../android/JadxMcpTransport.js"; import { JadxProvider } from "../android/JadxProvider.js"; diff --git a/src/composition/binary.ts b/src/composition/binary.ts index c96d161f42..335078531d 100644 --- a/src/composition/binary.ts +++ b/src/composition/binary.ts @@ -13,6 +13,7 @@ import type { Logger } from "pino"; import { auxiliaryAnalysisProviderDeclarations } from "./auxiliaryAnalysisProviders.js"; import { AnalysisProviderRegistry } from "../application/binary/AnalysisProviderRegistry.js"; import { composeBinarySession } from "../application/binary/BinarySessionComposition.js"; +import { LINUX_HOPPER_LAUNCHER_VERIFICATION } from "../application/LinuxHopper.js"; import { LazyAnalysisProvider } from "../application/binary/LazyAnalysisProvider.js"; import { ManagedStaticProvider } from "../dotnet/ManagedStaticProvider.js"; import { HOST_PLATFORM } from "../platform/HostPlatform.js"; @@ -63,7 +64,13 @@ const composeDeepBinarySession = ( ): BinarySession => { const platform = HOST_PLATFORM.platform; const environment = snapshotEnvironment(selectedEnvironment, platform); - const hopper = new HopperProvider(config, logger, environment); + const hopper = new HopperProvider( + config, + logger, + environment, + platform, + LINUX_HOPPER_LAUNCHER_VERIFICATION, + ); const ghidra = new GhidraProvider(config, logger, environment); const ida = new IdaProvider(config, environment, (registration, selected) => createIdaMcpConnection(registration, selected, { @@ -106,7 +113,7 @@ const createBundleResourceFactory = ( ) => { return { createClient: async ( - root: import("../application/AppBundleExecutable.js").ResolvedAppBundleResourceRoot, + root: import("../domain/apple/bundleResourceRoot.js").ResolvedAppBundleResourceRoot, ) => { const [{ ArtifactProvider }, { NativeMacOSProvider }] = await Promise.all( [ diff --git a/src/composition/binaryDiagnostics.ts b/src/composition/binaryDiagnostics.ts index 8ee7221c46..43db3c08fa 100644 --- a/src/composition/binaryDiagnostics.ts +++ b/src/composition/binaryDiagnostics.ts @@ -27,7 +27,7 @@ import { KernelModuleService } from "../application/binaryDiagnostics/KernelModu import { KernelModuleProvider } from "../native/elf/KernelModuleProvider.js"; import { KernelBuildConfigService } from "../application/binaryDiagnostics/KernelBuildConfigService.js"; import { KernelBuildConfigProvider } from "../native/elf/KernelBuildConfigProvider.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { NativeExportsService } from "../application/binaryDiagnostics/NativeExportsService.js"; import { NativeExportsProvider } from "../native/exports/NativeExportsProvider.js"; diff --git a/src/composition/browserObservation.ts b/src/composition/browserObservation.ts index 41de05395a..4e4f4c1b4c 100644 --- a/src/composition/browserObservation.ts +++ b/src/composition/browserObservation.ts @@ -1,4 +1,4 @@ -import type { BrowserObservationPort } from "../application/BrowserObservationPort.js"; +import type { BrowserObservationPort } from "../ports/BrowserObservationPort.js"; import { CdpBrowserProvider } from "../browser/CdpBrowserProvider.js"; import type { WebBundleAnalysisAdmission } from "../browser/IsolatedWebBundleAnalyzer.js"; import { resolveJavaScriptMemberMutationAllowance } from "../config/javascriptMemberMutationAllowance.js"; diff --git a/src/composition/browserScenario.ts b/src/composition/browserScenario.ts index 8a4aa5bc97..b176b60495 100644 --- a/src/composition/browserScenario.ts +++ b/src/composition/browserScenario.ts @@ -1,4 +1,4 @@ -import type { BrowserScenarioCapturePort } from "../application/BrowserScenarioCapturePort.js"; +import type { BrowserScenarioCapturePort } from "../ports/BrowserScenarioCapturePort.js"; import { PlaywrightBrowserScenarioProvider } from "../browser/PlaywrightBrowserScenarioProvider.js"; import { PlaywrightScenarioSession } from "../browser/PlaywrightScenarioSession.js"; diff --git a/src/composition/capabilityDeclarations.ts b/src/composition/capabilityDeclarations.ts index 71d294ed1a..8f9a4cf709 100644 --- a/src/composition/capabilityDeclarations.ts +++ b/src/composition/capabilityDeclarations.ts @@ -1,5 +1,5 @@ // oxlint-disable max-lines -- Keep the exhaustive static provenance bindings together; this table has no execution or host-availability logic. -import type { ProviderIdentity } from "../application/AnalysisProvider.js"; +import type { ProviderIdentity } from "../ports/AnalysisProvider.js"; import type { TOOL_CONTRACTS, ToolContractGroupId, diff --git a/src/composition/capabilityServices.ts b/src/composition/capabilityServices.ts index 3b28a8f087..50f901cf45 100644 --- a/src/composition/capabilityServices.ts +++ b/src/composition/capabilityServices.ts @@ -1,4 +1,4 @@ -import type { OptionalProviderLoadFailures } from "../application/OptionalObservationProviders.js"; +import type { OptionalProviderLoadFailures } from "../ports/OptionalObservationProviders.js"; import { locateWiresharkTool, selectWiresharkTool, @@ -41,7 +41,7 @@ import { createWebModuleTraceService } from "./webModules.js"; import { createWebRuntimeService } from "./webRuntime.js"; import { createJavaScriptRecoveryProvider } from "./javascriptRecovery.js"; import { wakaruHostSupported } from "../javascript/recovery/WakaruCommand.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/index.js"; import { createReverseEngineeringService } from "./reverseEngineering.js"; import type { ReverseEngineeringService, @@ -99,23 +99,23 @@ import type { BeamService } from "../application/erlang/BeamService.js"; import type { V8CodeCacheService } from "../application/v8CodeCache/V8CodeCacheService.js"; import type { RecordedCrashService } from "../application/binaryDiagnostics/RecordedCrashService.js"; import type { BinaryLayoutService } from "../application/binaryDiagnostics/BinaryLayoutService.js"; -import type { BrowserObservationPort } from "../application/BrowserObservationPort.js"; -import type { BrowserScenarioCapturePort } from "../application/BrowserScenarioCapturePort.js"; -import type { ElectronActiveObservationPort } from "../application/javascript/ElectronActiveObservationPort.js"; -import type { ElectronObservationPort } from "../application/javascript/ElectronObservationPort.js"; -import type { JavaScriptRuntimeObservationPort } from "../application/javascript/JavaScriptRuntimeObservationPort.js"; -import type { FridaInstrumentationPort } from "../application/frida/FridaInstrumentationPort.js"; +import type { BrowserObservationPort } from "../ports/BrowserObservationPort.js"; +import type { BrowserScenarioCapturePort } from "../ports/BrowserScenarioCapturePort.js"; +import type { ElectronActiveObservationPort } from "../ports/javascript/ElectronActiveObservationPort.js"; +import type { ElectronObservationPort } from "../ports/javascript/ElectronObservationPort.js"; +import type { JavaScriptRuntimeObservationPort } from "../ports/javascript/JavaScriptRuntimeObservationPort.js"; +import type { FridaInstrumentationPort } from "../ports/frida/FridaInstrumentationPort.js"; import type { WebModuleTraceService } from "../application/WebModuleTraceService.js"; import type { WebSourceLocationService } from "../application/WebSourceLocationService.js"; import type { WebRuntimeService } from "../application/WebRuntimeService.js"; import type { WebNetworkCaptureService } from "../application/WebNetworkCaptureService.js"; -import type { JavaScriptRecoveryPort } from "../application/javascript/JavaScriptRecoveryPort.js"; -import type { FirmwareAnalysisPort } from "../application/firmware/FirmwareAnalysisPort.js"; -import type { AndroidAnalysisPort } from "../application/android/AndroidAnalysisPort.js"; +import type { JavaScriptRecoveryPort } from "../ports/javascript/JavaScriptRecoveryPort.js"; +import type { FirmwareAnalysisPort } from "../ports/firmware/FirmwareAnalysisPort.js"; +import type { AndroidAnalysisPort } from "../ports/android/AndroidAnalysisPort.js"; import type { ApktoolResourceAnalysisPort } from "../application/apktool/ApktoolResourceAnalysisPort.js"; import type { PcapAnalysisPort } from "../application/pcap/PcapAnalysisPort.js"; import type { FlutterBuildAnalysisPort } from "../application/flutter/FlutterBuildAnalysisPort.js"; -import type { JebAnalysisPort } from "../application/jeb/JebAnalysisPort.js"; +import type { JebAnalysisPort } from "../ports/jeb/JebAnalysisPort.js"; import type { AdbDeviceAnalysisPort } from "../application/adb/AdbDeviceAnalysisPort.js"; import type { BuildSettle } from "../application/desktop/DesktopBuildSettle.js"; import type { BuildComputerDefaults } from "../desktop/BuildComputerEnvironment.js"; diff --git a/src/composition/electronObservation.ts b/src/composition/electronObservation.ts index 242ab7cd16..0a2ff0ec13 100644 --- a/src/composition/electronObservation.ts +++ b/src/composition/electronObservation.ts @@ -1,6 +1,6 @@ import type { AnalysisSettingsReader } from "../domain/analysisSettings.js"; import { runtimeAsarHeaderAdmission } from "../config/runtimeAnalysisSettings.js"; -import type { ElectronObservationPort } from "../application/javascript/ElectronObservationPort.js"; +import type { ElectronObservationPort } from "../ports/javascript/ElectronObservationPort.js"; import { CdpElectronProvider } from "../browser/CdpElectronProvider.js"; /** Construct a fresh provider without opening a target or acquiring an engine. */ diff --git a/src/composition/electronScenario.ts b/src/composition/electronScenario.ts index 38a9364faf..ff56a4d6f0 100644 --- a/src/composition/electronScenario.ts +++ b/src/composition/electronScenario.ts @@ -1,4 +1,4 @@ -import type { ElectronActiveObservationPort } from "../application/javascript/ElectronActiveObservationPort.js"; +import type { ElectronActiveObservationPort } from "../ports/javascript/ElectronActiveObservationPort.js"; import { PlaywrightElectronActiveProvider } from "../browser/PlaywrightElectronActiveProvider.js"; /** Construct a fresh provider without opening a target or acquiring an engine. */ diff --git a/src/composition/firmware.ts b/src/composition/firmware.ts index f3bed02938..84952b9123 100644 --- a/src/composition/firmware.ts +++ b/src/composition/firmware.ts @@ -1,4 +1,4 @@ -import type { FirmwareAnalysisPort } from "../application/firmware/FirmwareAnalysisPort.js"; +import type { FirmwareAnalysisPort } from "../ports/firmware/FirmwareAnalysisPort.js"; import type { FirmwareLauncher } from "../firmware/FirmwareCommand.js"; import { FirmwareProvider } from "../firmware/FirmwareProvider.js"; diff --git a/src/composition/frida.ts b/src/composition/frida.ts index 1de5ca82fa..a8cd37a330 100644 --- a/src/composition/frida.ts +++ b/src/composition/frida.ts @@ -1,4 +1,4 @@ -import type { FridaInstrumentationPort } from "../application/frida/FridaInstrumentationPort.js"; +import type { FridaInstrumentationPort } from "../ports/frida/FridaInstrumentationPort.js"; import { FridaInstrumentationManager, type FridaInstrumentationManagerOptions, diff --git a/src/composition/javascriptRecovery.ts b/src/composition/javascriptRecovery.ts index f3f2ae49d4..cac9a9d85f 100644 --- a/src/composition/javascriptRecovery.ts +++ b/src/composition/javascriptRecovery.ts @@ -1,4 +1,4 @@ -import type { JavaScriptRecoveryPort } from "../application/javascript/JavaScriptRecoveryPort.js"; +import type { JavaScriptRecoveryPort } from "../ports/javascript/JavaScriptRecoveryPort.js"; import { WakaruProvider } from "../javascript/recovery/WakaruProvider.js"; import type { WakaruLauncher } from "../javascript/recovery/WakaruCommand.js"; diff --git a/src/composition/javascriptRuntimeObservation.ts b/src/composition/javascriptRuntimeObservation.ts index 3255b56108..f4bc994184 100644 --- a/src/composition/javascriptRuntimeObservation.ts +++ b/src/composition/javascriptRuntimeObservation.ts @@ -1,6 +1,6 @@ import type { AnalysisSettingsReader } from "../domain/analysisSettings.js"; import { runtimeAsarHeaderAdmission } from "../config/runtimeAnalysisSettings.js"; -import type { JavaScriptRuntimeObservationPort } from "../application/javascript/JavaScriptRuntimeObservationPort.js"; +import type { JavaScriptRuntimeObservationPort } from "../ports/javascript/JavaScriptRuntimeObservationPort.js"; import { V8InspectorAdmission, V8InspectorProvider, diff --git a/src/composition/jeb.ts b/src/composition/jeb.ts index ff51fa781f..96cd7e075c 100644 --- a/src/composition/jeb.ts +++ b/src/composition/jeb.ts @@ -1,4 +1,4 @@ -import type { JebAnalysisPort } from "../application/jeb/JebAnalysisPort.js"; +import type { JebAnalysisPort } from "../ports/jeb/JebAnalysisPort.js"; import { parseJebMcpTimeoutMs } from "../config/environment.js"; import { ConfigurationError } from "../domain/configurationErrors.js"; import { AnalysisInputError } from "../domain/analysisErrorCore.js"; diff --git a/src/composition/optionalObservationProviders.ts b/src/composition/optionalObservationProviders.ts index 12ecdd1163..599af1eb14 100644 --- a/src/composition/optionalObservationProviders.ts +++ b/src/composition/optionalObservationProviders.ts @@ -5,7 +5,7 @@ import type { OptionalObservationProviders, OptionalProviderLoadFailure, OptionalProviderLoadResult, -} from "../application/OptionalObservationProviders.js"; +} from "../ports/OptionalObservationProviders.js"; import { CDP_BROWSER_PROVIDER_IDENTITY, PLAYWRIGHT_BROWSER_SCENARIO_PROVIDER_IDENTITY, diff --git a/src/config.test.ts b/src/config.test.ts index 0bd7c1c5e6..6b2dd9b051 100644 --- a/src/config.test.ts +++ b/src/config.test.ts @@ -5,7 +5,6 @@ import { runtimeAnalysisConfig } from "./config/runtimeAnalysisSettings.js"; import { runWithAnalysisOperationSnapshot } from "./domain/analysisOperationSnapshot.js"; import { ConfigurationError } from "./domain/configurationErrors.js"; import { - defaultHopperLauncherPath, inspectNativeAnalysisConfiguration, parseConfig, } from "./config/parseConfig.js"; @@ -594,63 +593,7 @@ describe("JEB MCP timeout configuration", () => { ); }); -describe("default Linux Hopper launcher", () => { - const home = "/fixture/home"; - const withExecutables = - (paths: readonly string[]) => - (path: string): boolean => - paths.includes(path); - - it.each([["/opt/hopper-v4/bin/hopper"], ["/usr/bin/hopper"]])( - "selects an existing system launcher %s", - (path) => { - expect( - defaultHopperLauncherPath("linux", home, withExecutables([path])), - ).toBe(path); - }, - ); - - it("prefers REA-managed and user-local launchers over system paths", () => { - expect( - defaultHopperLauncherPath( - "linux", - home, - withExecutables([ - "/opt/hopper/bin/Hopper", - "/opt/hopper-v4/bin/hopper", - "/usr/bin/hopper", - ]), - ), - ).toBe("/opt/hopper/bin/Hopper"); - expect( - defaultHopperLauncherPath( - "linux", - home, - withExecutables([ - `${home}/.local/share/rea/hopper/bin/Hopper`, - "/usr/bin/hopper", - ]), - ), - ).toBe(`${home}/.local/share/rea/hopper/bin/Hopper`); - }); -}); - -describe("default macOS Hopper launcher", () => { - it("selects the system path before the installer user path", () => { - const home = "/fixture/home"; - const system = - "/Applications/Hopper Disassembler.app/Contents/MacOS/hopper"; - const user = - "/fixture/home/Applications/Hopper Disassembler.app/Contents/MacOS/hopper"; - const executable = (path: string): boolean => - path === system || path === user; - - expect(defaultHopperLauncherPath("darwin", home, executable)).toBe(system); - expect( - defaultHopperLauncherPath("darwin", home, (path) => path === user), - ).toBe(user); - }); - +describe("Hopper launcher configuration", () => { it("keeps an explicit launcher path unchanged", () => { const configured = "/custom/../Hopper launcher"; const parsed = parseConfig({ HOPPER_LAUNCHER_PATH: configured }); @@ -659,6 +602,12 @@ describe("default macOS Hopper launcher", () => { value: { hopperLauncherPath: configured }, }); }); + + it("leaves an unset launcher to the Hopper provider's discovery", () => { + const parsed = parseConfig({}); + if (!parsed.ok) throw parsed.error; + expect(parsed.value.hopperLauncherPath).toBeUndefined(); + }); }); describe("Ghidra decompile limit configuration", () => { diff --git a/src/config/analysisSettings.ts b/src/config/analysisSettings.ts index b2e2e529ab..49a65f1d94 100644 --- a/src/config/analysisSettings.ts +++ b/src/config/analysisSettings.ts @@ -33,7 +33,7 @@ import { windowsChangeTimeSettleMaxPollsSchema, windowsChangeTimeSettlePollMsSchema, } from "./windowsChangeTimeSettle.js"; -import { pwntoolsInputBytesSchema } from "../native/pwntools/PwntoolsInputLimit.js"; +import { pwntoolsInputBytesSchema } from "./pwntoolsInputLimit.js"; const environmentSchemas: Readonly>> = { REA_ASAR_MAX_HEADER_BYTES: asarMaxHeaderBytesSchema, diff --git a/src/config/parseConfig.ts b/src/config/parseConfig.ts index 3b2df5a693..b442b07178 100644 --- a/src/config/parseConfig.ts +++ b/src/config/parseConfig.ts @@ -1,5 +1,3 @@ -import { accessSync, constants, statSync } from "node:fs"; - import { ConfigurationError, type ConfigurationSettingIssue, @@ -12,7 +10,6 @@ import { import type { AnalysisSettingId } from "../domain/analysisSettings.js"; import { parseEnvironment } from "./environment.js"; import { providerStartupTimeoutSchema } from "./providerStartupTimeout.js"; -import { homeDirectoryFromEnvironment } from "./homeDirectory.js"; import { DEFAULT_GHIDRA_STARTUP_TIMEOUT_MS, DEFAULT_HOPPER_CALLER_SCAN_BUDGET_MS, @@ -24,33 +21,6 @@ import { hopperCallerScanBudgetFromEnvironment } from "./hopperCallerScanBudget. import { DEFAULT_REGEX_MATCHING_DEADLINE } from "./regexMatchingDeadline.js"; import { DEFAULT_REGEX_WORKER_HEAP_REQUEST } from "./regexWorkerHeapRequest.js"; import type { AppConfig } from "./types.js"; -import { hopperLauncherDiscovery } from "../application/HopperLauncherDiscovery.js"; -import { localMacHopperRenamedLauncherCandidates } from "../application/MacHopperPaths.js"; -const executableAvailable = (path: string): boolean => { - try { - accessSync(path, constants.X_OK); - return statSync(path).isFile(); - } catch { - return false; - } -}; - -export const defaultHopperLauncherPath = ( - platform: NodeJS.Platform, - homeDirectory: string, - executable: (path: string) => boolean = executableAvailable, -): string => { - const discovery = hopperLauncherDiscovery(platform, homeDirectory); - for (const candidate of discovery.candidates) - if (executable(candidate)) return candidate; - if (discovery.probesMacApplicationBundles) - for (const candidate of localMacHopperRenamedLauncherCandidates( - homeDirectory, - )) - if (executable(candidate)) return candidate; - return discovery.fallback; -}; - /** * Environment native analysis admits. JEB validates its own settings during * optional provider composition; that setting must not block unrelated @@ -213,12 +183,7 @@ export const parseConfig = ( ? {} : { ghidraNativeAotJar: env.REA_GHIDRA_NATIVEAOT_JAR }), ilspyCmdPath: env.REA_ILSPY_CMD_PATH, - hopperLauncherPath: - env.HOPPER_LAUNCHER_PATH ?? - defaultHopperLauncherPath( - process.platform, - homeDirectoryFromEnvironment(environment, process.platform), - ), + hopperLauncherPath: env.HOPPER_LAUNCHER_PATH, hopperStartupTimeoutMs: hopperStartup ?? DEFAULT_HOPPER_STARTUP_TIMEOUT_MS, hopperStartupTimeoutSource: environment.REA_HOPPER_STARTUP_TIMEOUT_MS === undefined || diff --git a/src/native/pwntools/PwntoolsInputLimit.test.ts b/src/config/pwntoolsInputLimit.test.ts similarity index 88% rename from src/native/pwntools/PwntoolsInputLimit.test.ts rename to src/config/pwntoolsInputLimit.test.ts index b176af8c01..9efe240fae 100644 --- a/src/native/pwntools/PwntoolsInputLimit.test.ts +++ b/src/config/pwntoolsInputLimit.test.ts @@ -1,9 +1,9 @@ import { describe, expect, it } from "vitest"; -import { pwntoolsInputBytes } from "./PwntoolsInputLimit.js"; -import { pwntoolsUnavailable } from "./PwntoolsFailures.js"; -import { PWNTOOLS_LIMITS } from "../../domain/native/pwntoolsResourceLimits.js"; -import { PWNTOOLS_PROVIDER_IDENTITY } from "./PwntoolsProviderIdentity.js"; +import { pwntoolsInputBytes } from "./pwntoolsInputLimit.js"; +import { pwntoolsUnavailable } from "../native/pwntools/PwntoolsFailures.js"; +import { PWNTOOLS_LIMITS } from "../domain/native/pwntoolsResourceLimits.js"; +import { PWNTOOLS_PROVIDER_IDENTITY } from "../native/pwntools/PwntoolsProviderIdentity.js"; const CONSTRAINT = "REA_PWNTOOLS_MAX_INPUT_BYTES must be a decimal integer from 1 to " + diff --git a/src/native/pwntools/PwntoolsInputLimit.ts b/src/config/pwntoolsInputLimit.ts similarity index 91% rename from src/native/pwntools/PwntoolsInputLimit.ts rename to src/config/pwntoolsInputLimit.ts index cdde30f9b2..b8efb2cb82 100644 --- a/src/native/pwntools/PwntoolsInputLimit.ts +++ b/src/config/pwntoolsInputLimit.ts @@ -1,7 +1,7 @@ import { z } from "zod"; -import { currentAnalysisOperationSnapshot } from "../../domain/analysisOperationSnapshot.js"; -import { PWNTOOLS_LIMITS } from "../../domain/native/pwntoolsResourceLimits.js"; +import { currentAnalysisOperationSnapshot } from "../domain/analysisOperationSnapshot.js"; +import { PWNTOOLS_LIMITS } from "../domain/native/pwntoolsResourceLimits.js"; // The artifact is read into one in-memory buffer and staged again as a private // snapshot before the owned bridge parses it under a 3 GiB address-space diff --git a/src/config/types.ts b/src/config/types.ts index 979e01010a..1d2c8eb3cf 100644 --- a/src/config/types.ts +++ b/src/config/types.ts @@ -40,7 +40,12 @@ export interface AppConfig { readonly ghidraCheckpointDirectory?: string; readonly ghidraNativeAotJar?: string; readonly ilspyCmdPath: string | undefined; - readonly hopperLauncherPath: string; + /** + * The caller's `HOPPER_LAUNCHER_PATH`, unchanged. Undefined selects + * automatic discovery, which the Hopper provider performs + * (src/hopperPaths/HopperLauncherDiscovery.ts). + */ + readonly hopperLauncherPath: string | undefined; readonly hopperStartupTimeoutMs: number; /** Whether `hopperStartupTimeoutMs` came from the launch environment. */ readonly hopperStartupTimeoutSource: "default" | "setting" | "runtime"; diff --git a/src/contracts/analysisSettingsContracts.ts b/src/contracts/analysisSettingsContracts.ts index 003821aff0..9e67940040 100644 --- a/src/contracts/analysisSettingsContracts.ts +++ b/src/contracts/analysisSettingsContracts.ts @@ -1,4 +1,4 @@ -import { analysisErrorProjectionSchema } from "./errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../domain/analysisErrorProjectionSchema.js"; import { z } from "zod"; import { analysisSettingIds, diff --git a/src/contracts/errorSchemas.ts b/src/contracts/errorSchemas.ts index 9052d1d765..6033fead4f 100644 --- a/src/contracts/errorSchemas.ts +++ b/src/contracts/errorSchemas.ts @@ -1,112 +1,6 @@ import { z } from "zod"; -import { analysisErrorRecoverySchema } from "../domain/analysisErrorRecovery.js"; -import { jsonValueSchema } from "../domain/jsonValue.js"; -import type { AnalysisErrorProjection } from "../domain/analysisErrorProjection.js"; - -const categorySchema = z.enum([ - "invalid_input", - "unsupported_provider", - "unsupported_target", - "integrity_mismatch", - "truncated", - "cancelled", - "timeout", - "resource_constraint", - "unavailable", - "execution_failure", -]); -const remediationSchema = z - .object({ - action: z.string().min(1), - }) - .strict(); -const common = { - category: categorySchema, - message: z.string().min(1), - retryable: z.boolean(), - remediation: remediationSchema, - recovery: analysisErrorRecoverySchema.optional(), -}; -const genericDetails = z.record(z.string(), jsonValueSchema).optional(); -const generic = (code: Code) => - z - .object({ code: z.literal(code), ...common, details: genericDetails }) - .strict(); - -/** The canonical invalid-input projection, also used for facet-local refusals. */ -export const analysisInputErrorProjectionSchema = generic("invalid_request"); -/** The canonical resource refusal, including its reported limits and recovery. */ -export const analysisResourceErrorProjectionSchema = generic( - "resource_constraint", -); -/** Authentication or integrity refusal for a supplied Evidence record. */ -export const evidenceIntegrityErrorProjectionSchema = generic( - "evidence_integrity_mismatch", -); - -/** Stable discriminated schema shared by every CLI and MCP error surface. */ -export const analysisErrorProjectionSchema = z.discriminatedUnion("code", [ - analysisInputErrorProjectionSchema, - generic("access_denied"), - generic("artifact_changed"), - generic("unreadable_output"), - generic("capability_unavailable"), - generic("unsupported_target"), - generic("provider_unavailable"), - generic("provider_timeout"), - analysisResourceErrorProjectionSchema, - generic("cancelled"), - z - .object({ - code: z.literal("artifact_integrity_mismatch"), - ...common, - details: z.union([ - z - .object({ - logical_path: z.string(), - declared_sha256: z.string().nullable(), - calculated_sha256: z.string().nullable(), - unpacked: z.boolean(), - }) - .catchall(jsonValueSchema), - z - .object({ - logical_path: z.string(), - algorithm: z.literal("md5"), - declared_md5: z.string().regex(/^[a-f0-9]{32}$/u), - calculated_md5: z - .string() - .regex(/^[a-f0-9]{32}$/u) - .nullable(), - unpacked: z.boolean(), - }) - .catchall(jsonValueSchema), - z - .object({ - logical_path: z.string(), - algorithm: z.literal("dfu-crc32"), - declared_crc32: z.string().regex(/^[a-f0-9]{8}$/u), - calculated_crc32: z - .string() - .regex(/^[a-f0-9]{8}$/u) - .nullable(), - unpacked: z.boolean(), - }) - .catchall(jsonValueSchema), - ]), - }) - .strict(), - generic("artifact_operation_failed"), - evidenceIntegrityErrorProjectionSchema, - generic("truncated"), - generic("process_capture_failed"), - generic("cleanup_incomplete"), - generic("revision_conflict"), - generic("configuration_invalid"), - generic("target_unavailable"), - generic("execution_failure"), -]) as unknown as z.ZodType; +import { analysisErrorProjectionSchema } from "../domain/analysisErrorProjectionSchema.js"; /** CLI label and input diagnostics surrounding the strict canonical error projection. */ export const analysisCliErrorEnvelopeSchema = z diff --git a/src/contracts/toolOutputSchemaGroups.ts b/src/contracts/toolOutputSchemaGroups.ts index 19089b5838..bee9909ad3 100644 --- a/src/contracts/toolOutputSchemaGroups.ts +++ b/src/contracts/toolOutputSchemaGroups.ts @@ -101,7 +101,7 @@ import { analysisInputErrorProjectionSchema, analysisResourceErrorProjectionSchema, evidenceIntegrityErrorProjectionSchema, -} from "./errorSchemas.js"; +} from "../domain/analysisErrorProjectionSchema.js"; import { relationshipCoverageSchema } from "../domain/relationshipCoverage.js"; import { nativeDispatchMetadataResultSchema } from "../domain/native/objcSwiftMetadata.js"; import { nativeInvestigationTraceSchema } from "../domain/native/nativeInvestigationGraph.js"; diff --git a/src/cutter/CutterBridgeClient.ts b/src/cutter/CutterBridgeClient.ts index 7a7e852f8e..cefc988f3d 100644 --- a/src/cutter/CutterBridgeClient.ts +++ b/src/cutter/CutterBridgeClient.ts @@ -1,15 +1,15 @@ import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactResourceScope, + ArtifactReaderFailure, withArtifactRegularFile, ArtifactFileCleanupFailure, artifactFileCompletion, bindArtifactFileCleanup, artifactFileCancellationCause, assertArtifactReadActive, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { isUtf8 } from "node:buffer"; import { diff --git a/src/desktop/AgentEnvComputerHelper.cleanup.test.ts b/src/desktop/AgentEnvComputerHelper.cleanup.test.ts index 9faf7e559e..33cb6f4672 100644 --- a/src/desktop/AgentEnvComputerHelper.cleanup.test.ts +++ b/src/desktop/AgentEnvComputerHelper.cleanup.test.ts @@ -2,8 +2,8 @@ import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactFileCleanupFailure } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { agentEnvInterpreter } from "./AgentEnvComputerHelper.js"; diff --git a/src/desktop/AgentEnvComputerHelper.ts b/src/desktop/AgentEnvComputerHelper.ts index 8e3330c8c2..6a96ea3661 100644 --- a/src/desktop/AgentEnvComputerHelper.ts +++ b/src/desktop/AgentEnvComputerHelper.ts @@ -20,8 +20,8 @@ import { import { ArtifactFileCleanupFailure, withArtifactFileHandle, -} from "../artifacts/ArtifactFileOperation.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; + type ArtifactResourceScope, +} from "../resources/index.js"; const execFileAsync = promisify(execFile); diff --git a/src/desktop/BuildComputerEnvironment.ts b/src/desktop/BuildComputerEnvironment.ts index 376884e349..b774ab25fd 100644 --- a/src/desktop/BuildComputerEnvironment.ts +++ b/src/desktop/BuildComputerEnvironment.ts @@ -2,7 +2,7 @@ import { stat } from "node:fs/promises"; import { isAbsolute } from "node:path"; import { homeDirectoryFromEnvironment } from "../config/homeDirectory.js"; -import { reaCacheDirectory } from "../config/kunaCacheDirectory.js"; +import { reaCacheDirectory } from "../filesystem/cacheDirectory.js"; import { appendCallerPath } from "../filesystem/callerPath.js"; import { PRODUCT_IDENTITY } from "../identity.js"; import { HOST_PLATFORM } from "../platform/HostPlatform.js"; diff --git a/src/desktop/BuildSecretFiles.ts b/src/desktop/BuildSecretFiles.ts index 8beca6f60e..27c58ea8fc 100644 --- a/src/desktop/BuildSecretFiles.ts +++ b/src/desktop/BuildSecretFiles.ts @@ -16,11 +16,9 @@ import { ArtifactFileCleanupFailure, bindArtifactFileCleanup, withArtifactFileHandle, -} from "../artifacts/ArtifactFileOperation.js"; -import type { - ArtifactResourceScope, - ArtifactResourceOwner, -} from "../artifacts/ArtifactResourceScope.js"; + type ArtifactResourceScope, + type ArtifactResourceOwner, +} from "../resources/index.js"; import { homeDirectoryFromEnvironment } from "../config/homeDirectory.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; diff --git a/src/desktop/DconfDatabaseReader.test.ts b/src/desktop/DconfDatabaseReader.test.ts index 8a20d40074..d7fbc9a34a 100644 --- a/src/desktop/DconfDatabaseReader.test.ts +++ b/src/desktop/DconfDatabaseReader.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { dumpDconfDatabase } from "./DconfDatabaseReader.js"; describe.skipIf(process.platform === "win32")("dumpDconfDatabase", () => { diff --git a/src/desktop/DconfDatabaseReader.ts b/src/desktop/DconfDatabaseReader.ts index 89c970cb7a..f5dfbc9be7 100644 --- a/src/desktop/DconfDatabaseReader.ts +++ b/src/desktop/DconfDatabaseReader.ts @@ -7,8 +7,10 @@ import { ExecFileOutputCancelledError, } from "../process/ExecFileOutput.js"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, +} from "../resources/index.js"; const DCONF_TIMEOUT_MS = 30_000; const DCONF_MAX_BUFFER = 16 * 1024 * 1024; diff --git a/src/desktop/DebianPackageFile.ts b/src/desktop/DebianPackageFile.ts index 4057dd6447..c7c6c5b7f7 100644 --- a/src/desktop/DebianPackageFile.ts +++ b/src/desktop/DebianPackageFile.ts @@ -1,8 +1,10 @@ import { stat } from "node:fs/promises"; import { basename } from "node:path"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactFileCleanupFailure } from "../artifacts/ArtifactFileOperation.js"; +import { + AnalysisCleanupLease, + ArtifactFileCleanupFailure, +} from "../resources/index.js"; import { PACKAGE_FILE_FIELDS, packageFileMismatch, diff --git a/src/desktop/DebianPackageFileCleanup.test.ts b/src/desktop/DebianPackageFileCleanup.test.ts index 6adc8a17e5..cfd2933389 100644 --- a/src/desktop/DebianPackageFileCleanup.test.ts +++ b/src/desktop/DebianPackageFileCleanup.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactFileCleanupFailure } from "../artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js"; import { DPKG_DEB_OUTPUT } from "../domain/desktop/debianPackageFile.fixture.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; import { observeStableFile } from "../filesystem/StableFileHash.js"; diff --git a/src/desktop/DebianPackageInventory.test.ts b/src/desktop/DebianPackageInventory.test.ts index b520d3deb3..3a3ca5fb30 100644 --- a/src/desktop/DebianPackageInventory.test.ts +++ b/src/desktop/DebianPackageInventory.test.ts @@ -15,7 +15,7 @@ import { join } from "node:path"; import { afterEach, describe, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { A_ARMORED, B_ARMORED, diff --git a/src/desktop/DebianPackageInventory.ts b/src/desktop/DebianPackageInventory.ts index e89f106550..b54b988658 100644 --- a/src/desktop/DebianPackageInventory.ts +++ b/src/desktop/DebianPackageInventory.ts @@ -5,7 +5,7 @@ import { readdir } from "node:fs/promises"; import { ArtifactReaderFailure, artifactPrimaryCleanupLeases, -} from "../artifacts/ArtifactReader.js"; +} from "../resources/index.js"; import { fromUbuntuNobleArchive, repositoryRefusal, diff --git a/src/desktop/DesktopApplicationSession.test.ts b/src/desktop/DesktopApplicationSession.test.ts index 3f0105b4e4..f19167d56a 100644 --- a/src/desktop/DesktopApplicationSession.test.ts +++ b/src/desktop/DesktopApplicationSession.test.ts @@ -14,7 +14,7 @@ import * as sessionObservations from "./DesktopSessionObservations.js"; import type { ProcessCleanupResult } from "../process/ProcessOwnership.js"; import * as runTokenObservations from "../process/ProcessRunTokenObservations.js"; import { isProcessOwnershipInspectionCancellation } from "../process/ProcessInspectionCancellation.js"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/ArtifactFileOperation.js"; import { runDesktopSession, type DesktopSessionPlan, diff --git a/src/desktop/DesktopApplicationSession.ts b/src/desktop/DesktopApplicationSession.ts index f83fa0766b..93653e3928 100644 --- a/src/desktop/DesktopApplicationSession.ts +++ b/src/desktop/DesktopApplicationSession.ts @@ -2,7 +2,10 @@ import { SamplingReadBatchFailure, samplingInspectionFailures, } from "../process/capture/ProcessSamplingObservation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + ArtifactReaderFailure, + AnalysisCleanupLease, +} from "../resources/index.js"; import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; import { assertProcessOwnershipInspectionActive, @@ -11,7 +14,6 @@ import { } from "../process/ProcessInspectionCancellation.js"; import { randomUUID } from "node:crypto"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; import { checkpointNameRefusal, type DesktopCaptureEvent, diff --git a/src/desktop/DesktopBuildDoctorFacts.test.ts b/src/desktop/DesktopBuildDoctorFacts.test.ts index f716538266..ffb73a2fe7 100644 --- a/src/desktop/DesktopBuildDoctorFacts.test.ts +++ b/src/desktop/DesktopBuildDoctorFacts.test.ts @@ -17,8 +17,8 @@ import { expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { runDoctor, systemDoctorHost } from "../application/Doctor.js"; import { readDesktopBuildFacts } from "./DesktopBuildDoctorFacts.js"; -import { ArtifactFileCleanupFailure } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import type { ClientRegistrationStatus } from "../application/ClientRegistrationStatus.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; diff --git a/src/desktop/DesktopBuildDoctorFacts.ts b/src/desktop/DesktopBuildDoctorFacts.ts index b671e946c4..637dba7db2 100644 --- a/src/desktop/DesktopBuildDoctorFacts.ts +++ b/src/desktop/DesktopBuildDoctorFacts.ts @@ -8,7 +8,7 @@ import type { DesktopBuildCommand, DesktopBuildFacts, DesktopBuildFactsInput, -} from "../application/DesktopBuildDoctor.js"; +} from "../ports/DesktopBuildHost.js"; import { AnalysisCancelledError, cancelledBy, @@ -18,17 +18,17 @@ import { safeParseJson } from "../domain/safeJson.js"; import { readRegularFileText, RetainedRegularFileCleanupFailure, -} from "../application/RegularFileRead.js"; +} from "../process/RegularFileRead.js"; import { DESKTOP_EXPORT_FRAMEWORK_VERSION } from "../domain/desktop/appExport.js"; import { PRODUCT_IDENTITY } from "../identity.js"; import { execFileOutputFailure } from "../process/ExecFileOutput.js"; import { describeSystemPs, resolveSystemPs } from "../process/systemPs.js"; import { agentEnvInterpreter } from "./AgentEnvComputerHelper.js"; -import { ArtifactFileCleanupFailure } from "../artifacts/ArtifactFileOperation.js"; import { + ArtifactFileCleanupFailure, AnalysisCleanupLeaseGroup, type AnalysisCleanupLease, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { agentEnvReportedVersion, diff --git a/src/desktop/DesktopBuildOwnedCommand.test.ts b/src/desktop/DesktopBuildOwnedCommand.test.ts index 995c9bab72..5cd78b713a 100644 --- a/src/desktop/DesktopBuildOwnedCommand.test.ts +++ b/src/desktop/DesktopBuildOwnedCommand.test.ts @@ -2,7 +2,7 @@ import { chmod, mkdir, readFile, stat, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import * as owned from "../process/OwnedCommand.js"; import { runDesktopBuildOwnedCommand } from "./DesktopBuildOwnedCommand.js"; import { systemDesktopBuildSetupHost } from "./DesktopBuildSetupHost.js"; diff --git a/src/desktop/DesktopBuildOwnedCommand.ts b/src/desktop/DesktopBuildOwnedCommand.ts index aa6a3d1b39..9117b6ec6e 100644 --- a/src/desktop/DesktopBuildOwnedCommand.ts +++ b/src/desktop/DesktopBuildOwnedCommand.ts @@ -2,8 +2,10 @@ import { capturedProviderOutput } from "../process/capturedProviderOutput.js"; import { randomUUID } from "node:crypto"; import { rm } from "node:fs/promises"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { + type ArtifactResourceScope, + AnalysisCleanupLease, +} from "../resources/index.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { analysisErrorWithCancellation } from "../domain/analysisErrorCancellation.js"; import { diff --git a/src/desktop/DesktopBuildSetupHost.test.ts b/src/desktop/DesktopBuildSetupHost.test.ts index 7a09af62d6..c4efe3a0a9 100644 --- a/src/desktop/DesktopBuildSetupHost.test.ts +++ b/src/desktop/DesktopBuildSetupHost.test.ts @@ -11,7 +11,7 @@ import * as owned from "../process/OwnedCommand.js"; import { systemDoctorHost } from "../application/Doctor.js"; import { PRODUCT_IDENTITY } from "../identity.js"; import { systemDesktopBuildSetupHost } from "./DesktopBuildSetupHost.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { DESKTOP_EXPORT_FRAMEWORK_VERSION } from "../domain/desktop/appExport.js"; import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; diff --git a/src/desktop/DesktopBuildSetupHost.ts b/src/desktop/DesktopBuildSetupHost.ts index 7e69512eff..38fdeafd4a 100644 --- a/src/desktop/DesktopBuildSetupHost.ts +++ b/src/desktop/DesktopBuildSetupHost.ts @@ -4,18 +4,20 @@ import { tmpdir } from "node:os"; import { basename, dirname, isAbsolute, join, resolve } from "node:path"; import { fileURLToPath } from "node:url"; -import type { DoctorHost } from "../application/Doctor.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { + type ArtifactResourceScope, + AnalysisCleanupLease, +} from "../resources/index.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import { assertSetupActive } from "../application/SetupCancellation.js"; +import { assertSetupActive } from "../domain/setupCancellation.js"; import { absoluteCallerPath } from "../filesystem/callerPath.js"; import type { + DesktopBuildRegistrationReader, DesktopBuildSetupFacts, DesktopBuildSetupHost, -} from "../application/SetupDesktopBuild.js"; +} from "../ports/DesktopBuildHost.js"; import { DESKTOP_EXPORT_FRAMEWORK_VERSION } from "../domain/desktop/appExport.js"; import { execFileOutput, @@ -48,7 +50,7 @@ const ARCHIVE = "REA_BUILD_COMPUTER_REA_ARCHIVE"; interface SetupContext { readonly environment: Readonly; readonly platform: NodeJS.Platform; - readonly registrations: DoctorHost["clientRegistrations"]; + readonly registrations: DesktopBuildRegistrationReader | undefined; probe( command: string, arguments_: readonly string[], @@ -71,7 +73,7 @@ const failureReason = (cause: unknown): string => { export const systemDesktopBuildSetupHost = ( environment: Readonly, platform: NodeJS.Platform, - registrations: DoctorHost["clientRegistrations"], + registrations: DesktopBuildRegistrationReader | undefined, resources: ArtifactResourceScope, ): DesktopBuildSetupHost => { const run = ( diff --git a/src/desktop/DesktopContentStore.test.ts b/src/desktop/DesktopContentStore.test.ts index dd947945f3..f731a718c6 100644 --- a/src/desktop/DesktopContentStore.test.ts +++ b/src/desktop/DesktopContentStore.test.ts @@ -9,7 +9,7 @@ import type { DesktopPathState } from "../domain/desktop/desktopStateDiff.js"; import { DesktopContentStore } from "./DesktopContentStore.js"; import { walkHomeState } from "./HomeStateWalker.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; const sha256 = (text: string) => diff --git a/src/desktop/DesktopContentStore.ts b/src/desktop/DesktopContentStore.ts index 0ca947fcc5..d8273e1b50 100644 --- a/src/desktop/DesktopContentStore.ts +++ b/src/desktop/DesktopContentStore.ts @@ -1,9 +1,11 @@ -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../resources/index.js"; import { createHash } from "node:crypto"; import { mkdir, open, rename, rm, rmdir } from "node:fs/promises"; import { join } from "node:path"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { Budget } from "../domain/budget.js"; import type { DesktopApplicationCapture } from "../domain/desktop/desktopCapture.js"; import type { DesktopPathState } from "../domain/desktop/desktopStateDiff.js"; diff --git a/src/desktop/DesktopInspectionTermination.test.ts b/src/desktop/DesktopInspectionTermination.test.ts index 237a47bfe9..98c70aabdc 100644 --- a/src/desktop/DesktopInspectionTermination.test.ts +++ b/src/desktop/DesktopInspectionTermination.test.ts @@ -1,4 +1,4 @@ -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { AnalysisOutputError } from "../domain/analysisErrorCore.js"; import { primaryAnalysisError } from "../domain/analysisErrorBase.js"; import { retainProcessInspectionCleanup } from "../providers/OwnedCommandCleanup.js"; diff --git a/src/desktop/GpgvKeyCheck.test.ts b/src/desktop/GpgvKeyCheck.test.ts index 9a2b6d1002..615927736a 100644 --- a/src/desktop/GpgvKeyCheck.test.ts +++ b/src/desktop/GpgvKeyCheck.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { afterEach, describe, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { A_ARMORED, SIGNED_BY_BOTH, diff --git a/src/desktop/GpgvKeyCheck.ts b/src/desktop/GpgvKeyCheck.ts index e6621c70f7..b905b38ceb 100644 --- a/src/desktop/GpgvKeyCheck.ts +++ b/src/desktop/GpgvKeyCheck.ts @@ -2,8 +2,10 @@ import { createHash } from "node:crypto"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { + ArtifactResourceScope, + assertArtifactReadActive, +} from "../resources/index.js"; import { dearmorPublicKeys, isArmoredKey, diff --git a/src/desktop/HomeStateWalker.test.ts b/src/desktop/HomeStateWalker.test.ts index 7ed342e51a..3a57d21170 100644 --- a/src/desktop/HomeStateWalker.test.ts +++ b/src/desktop/HomeStateWalker.test.ts @@ -11,7 +11,7 @@ import { dirname, join } from "node:path"; import { describe, expect, it } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { walkHomeState } from "./HomeStateWalker.js"; describe("walkHomeState", () => { diff --git a/src/desktop/HomeStateWalker.ts b/src/desktop/HomeStateWalker.ts index 5ff92f75eb..f8e90527e1 100644 --- a/src/desktop/HomeStateWalker.ts +++ b/src/desktop/HomeStateWalker.ts @@ -1,4 +1,4 @@ -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import type { BigIntStats } from "node:fs"; import { lstat, readdir } from "node:fs/promises"; import { join } from "node:path"; diff --git a/src/desktop/HostFileRead.ts b/src/desktop/HostFileRead.ts index 75c8f333e7..77642170aa 100644 --- a/src/desktop/HostFileRead.ts +++ b/src/desktop/HostFileRead.ts @@ -2,12 +2,12 @@ import { stat } from "node:fs/promises"; import type { LibraryFileProbe } from "../domain/desktop/libraryPackages.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; import { + AnalysisCleanupLease, ArtifactFileCancelled, ArtifactFileCleanupFailure, artifactOperationCause, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { RegularFileCleanupFailure, RegularFileCancelled, diff --git a/src/desktop/HostQuery.test.ts b/src/desktop/HostQuery.test.ts index 5ecd669b21..8d24fbb925 100644 --- a/src/desktop/HostQuery.test.ts +++ b/src/desktop/HostQuery.test.ts @@ -1,6 +1,6 @@ import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { runHostQuery } from "./HostQuery.js"; it("returns an inert Node query's actual output and status", async () => { diff --git a/src/desktop/HostQuery.ts b/src/desktop/HostQuery.ts index 5a9ad79218..cff6b6007e 100644 --- a/src/desktop/HostQuery.ts +++ b/src/desktop/HostQuery.ts @@ -1,4 +1,4 @@ -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { execFileOutput, execFileOutputFailure, diff --git a/src/desktop/LinuxApplicationInventory.test.ts b/src/desktop/LinuxApplicationInventory.test.ts index 9cb927edac..6c73138095 100644 --- a/src/desktop/LinuxApplicationInventory.test.ts +++ b/src/desktop/LinuxApplicationInventory.test.ts @@ -13,7 +13,7 @@ import { describe, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { inspectLinuxApplication } from "./LinuxApplicationInventory.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; -import { ArtifactFileCleanupFailure } from "../artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js"; import { desktopOperationFailure } from "../application/desktop/DesktopCaptureRefusals.js"; const fixture = async () => { diff --git a/src/desktop/LinuxApplicationInventory.ts b/src/desktop/LinuxApplicationInventory.ts index 54aa604ebd..85bdd8cd39 100644 --- a/src/desktop/LinuxApplicationInventory.ts +++ b/src/desktop/LinuxApplicationInventory.ts @@ -19,8 +19,10 @@ import { } from "../domain/desktop/linuxPackages.js"; import { err, ok, type Result } from "../domain/result.js"; import { readElectronFuseImage } from "../electron/ElectronFuseReader.js"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, +} from "../resources/index.js"; import { withOwnedRegularFile } from "../filesystem/OwnedRegularFile.js"; import { absoluteCallerPath } from "../filesystem/callerPath.js"; import { diff --git a/src/desktop/ScreenJudgeProcess.ts b/src/desktop/ScreenJudgeProcess.ts index 3df8d272e3..6f9f7c84ac 100644 --- a/src/desktop/ScreenJudgeProcess.ts +++ b/src/desktop/ScreenJudgeProcess.ts @@ -1,4 +1,4 @@ -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; import { randomUUID } from "node:crypto"; import { mkdtemp, rm, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; diff --git a/src/desktop/X11WindowObserver.test.ts b/src/desktop/X11WindowObserver.test.ts index 1b0ce1536b..51a39819ed 100644 --- a/src/desktop/X11WindowObserver.test.ts +++ b/src/desktop/X11WindowObserver.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect, it } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { X11WindowObserver } from "./X11WindowObserver.js"; it.skipIf(process.platform === "win32").each([false, true])( diff --git a/src/desktop/X11WindowObserver.ts b/src/desktop/X11WindowObserver.ts index 458b59df6e..d585cb01b4 100644 --- a/src/desktop/X11WindowObserver.ts +++ b/src/desktop/X11WindowObserver.ts @@ -1,4 +1,4 @@ -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { X11_WINDOW_PROPERTY_NAMES, parseX11ClientList, diff --git a/src/doctorRuntime.test.ts b/src/doctorRuntime.test.ts index f5fa317959..b9e3ca9f33 100644 --- a/src/doctorRuntime.test.ts +++ b/src/doctorRuntime.test.ts @@ -22,7 +22,7 @@ import { AnalysisCancelledError } from "./domain/analysisErrorCore.js"; import { createDoctorHostFixture } from "./application/Doctor.fixture.js"; import { runDoctor, runDoctorOwned } from "./application/Doctor.js"; import { waitForAbortable } from "./process/AbortablePromise.js"; -import { AnalysisCleanupLease } from "./artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "./resources/AnalysisCleanupLease.js"; import { CURRENT_ENTRYPOINT_PATH } from "./process/CurrentEntrypointPath.js"; import * as configurationFiles from "./application/ClientConfigurationFiles.js"; import { RegularFileCleanupFailure } from "./filesystem/OwnedRegularFile.js"; diff --git a/src/doctorRuntime.ts b/src/doctorRuntime.ts index 5770ffd003..ea93e38d35 100644 --- a/src/doctorRuntime.ts +++ b/src/doctorRuntime.ts @@ -1,10 +1,9 @@ import { HOST_PLATFORM, type HostPlatform } from "./platform/HostPlatform.js"; -import { - systemDoctorHost, - type DoctorCheck, - type DoctorHost, - type DoctorProviderInspection, -} from "./application/Doctor.js"; +import { systemDoctorHost, type DoctorHost } from "./application/Doctor.js"; +import type { + DoctorCheck, + DoctorProviderInspection, +} from "./ports/DoctorProviderInspection.js"; import { fileURLToPath } from "node:url"; import { readDesktopBuildFacts } from "./desktop/DesktopBuildDoctorFacts.js"; import { @@ -28,8 +27,8 @@ import { selectLinuxPrivateDisplayStrategy } from "./hopper/LinuxPrivateDisplayP import { ok } from "./domain/result.js"; import { cancelledBy, carriedReason } from "./domain/analysisErrorCore.js"; import { ProviderCleanupError } from "./domain/providerCleanupError.js"; -import { AnalysisCleanupLeaseGroup } from "./artifacts/AnalysisCleanupLease.js"; -import type { RetainedResourceScope } from "./application/AnalysisProvider.js"; +import { AnalysisCleanupLeaseGroup } from "./resources/index.js"; +import type { RetainedResourceScope } from "./ports/AnalysisProvider.js"; import { RegularFileCleanupFailure } from "./filesystem/OwnedRegularFile.js"; import { readEffectiveClientRegistrationConfiguration } from "./application/ClientConfigurationFiles.js"; import { clientRegistrationEnvironmentDetails } from "./application/ClientRegistrationEnvironment.js"; diff --git a/src/domain/analysisAccessDenied.test.ts b/src/domain/analysisAccessDenied.test.ts index 2f5ce5c43e..e54eea414a 100644 --- a/src/domain/analysisAccessDenied.test.ts +++ b/src/domain/analysisAccessDenied.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; import { AnalysisAccessDeniedError } from "./analysisErrorCore.js"; import { projectAnalysisError } from "./analysisErrorProjection.js"; -import { analysisErrorProjectionSchema } from "../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "./analysisErrorProjectionSchema.js"; it.each(["EACCES", "EPERM"] as const)( "projects %s as host access denial with correction guidance and a valid public schema", diff --git a/src/domain/analysisErrorProjection.test.ts b/src/domain/analysisErrorProjection.test.ts index cd7cfc74a1..dd28c090c9 100644 --- a/src/domain/analysisErrorProjection.test.ts +++ b/src/domain/analysisErrorProjection.test.ts @@ -43,7 +43,7 @@ import { analysisErrorUserMessage, } from "./analysisErrorPresentation.js"; import { ProviderSelectionError } from "./providerSelectionError.js"; -import { analysisErrorProjectionSchema } from "../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "./analysisErrorProjectionSchema.js"; import { nativeCallPartialObservationSchema } from "./native/nativeCallPartialObservation.js"; import { analysisSettingLimit } from "./analysisSettingDefinitions.js"; import { redactExplicitFailure } from "./explicitSensitiveFailure.js"; diff --git a/src/domain/analysisErrorProjectionSchema.ts b/src/domain/analysisErrorProjectionSchema.ts new file mode 100644 index 0000000000..8f07a097ee --- /dev/null +++ b/src/domain/analysisErrorProjectionSchema.ts @@ -0,0 +1,109 @@ +import { z } from "zod"; + +import { analysisErrorRecoverySchema } from "./analysisErrorRecovery.js"; +import { jsonValueSchema } from "./jsonValue.js"; +import type { AnalysisErrorProjection } from "./analysisErrorProjection.js"; + +const categorySchema = z.enum([ + "invalid_input", + "unsupported_provider", + "unsupported_target", + "integrity_mismatch", + "truncated", + "cancelled", + "timeout", + "resource_constraint", + "unavailable", + "execution_failure", +]); +const remediationSchema = z + .object({ + action: z.string().min(1), + }) + .strict(); +const common = { + category: categorySchema, + message: z.string().min(1), + retryable: z.boolean(), + remediation: remediationSchema, + recovery: analysisErrorRecoverySchema.optional(), +}; +const genericDetails = z.record(z.string(), jsonValueSchema).optional(); +const generic = (code: Code) => + z + .object({ code: z.literal(code), ...common, details: genericDetails }) + .strict(); + +/** The canonical invalid-input projection, also used for facet-local refusals. */ +export const analysisInputErrorProjectionSchema = generic("invalid_request"); +/** The canonical resource refusal, including its reported limits and recovery. */ +export const analysisResourceErrorProjectionSchema = generic( + "resource_constraint", +); +/** Authentication or integrity refusal for a supplied Evidence record. */ +export const evidenceIntegrityErrorProjectionSchema = generic( + "evidence_integrity_mismatch", +); + +/** Stable discriminated schema shared by every CLI and MCP error surface. */ +export const analysisErrorProjectionSchema = z.discriminatedUnion("code", [ + analysisInputErrorProjectionSchema, + generic("access_denied"), + generic("artifact_changed"), + generic("unreadable_output"), + generic("capability_unavailable"), + generic("unsupported_target"), + generic("provider_unavailable"), + generic("provider_timeout"), + analysisResourceErrorProjectionSchema, + generic("cancelled"), + z + .object({ + code: z.literal("artifact_integrity_mismatch"), + ...common, + details: z.union([ + z + .object({ + logical_path: z.string(), + declared_sha256: z.string().nullable(), + calculated_sha256: z.string().nullable(), + unpacked: z.boolean(), + }) + .catchall(jsonValueSchema), + z + .object({ + logical_path: z.string(), + algorithm: z.literal("md5"), + declared_md5: z.string().regex(/^[a-f0-9]{32}$/u), + calculated_md5: z + .string() + .regex(/^[a-f0-9]{32}$/u) + .nullable(), + unpacked: z.boolean(), + }) + .catchall(jsonValueSchema), + z + .object({ + logical_path: z.string(), + algorithm: z.literal("dfu-crc32"), + declared_crc32: z.string().regex(/^[a-f0-9]{8}$/u), + calculated_crc32: z + .string() + .regex(/^[a-f0-9]{8}$/u) + .nullable(), + unpacked: z.boolean(), + }) + .catchall(jsonValueSchema), + ]), + }) + .strict(), + generic("artifact_operation_failed"), + evidenceIntegrityErrorProjectionSchema, + generic("truncated"), + generic("process_capture_failed"), + generic("cleanup_incomplete"), + generic("revision_conflict"), + generic("configuration_invalid"), + generic("target_unavailable"), + generic("execution_failure"), +]) as unknown as z.ZodType; diff --git a/src/domain/analysisRefusal.test.ts b/src/domain/analysisRefusal.test.ts index 610429944d..0f2853090f 100644 --- a/src/domain/analysisRefusal.test.ts +++ b/src/domain/analysisRefusal.test.ts @@ -11,7 +11,7 @@ import { analysisRefusalRemediation, type AnalysisRefusal, } from "./analysisRefusal.js"; -import { analysisErrorProjectionSchema } from "../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "./analysisErrorProjectionSchema.js"; const budgetError = ( setting: Parameters[0], diff --git a/src/domain/analysisView/batchDecompileView.ts b/src/domain/analysisView/batchDecompileView.ts index 90f744e0da..57540331ed 100644 --- a/src/domain/analysisView/batchDecompileView.ts +++ b/src/domain/analysisView/batchDecompileView.ts @@ -13,7 +13,7 @@ import { type BatchDecompileItem, type BatchDecompileResult, } from "../native/batchDecompile.js"; -import { analysisErrorProjectionSchema } from "../../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../analysisErrorProjectionSchema.js"; import { err, ok } from "../result.js"; import { boundedViewMessages, diff --git a/src/domain/analysisView/nativeObservationSchemas.ts b/src/domain/analysisView/nativeObservationSchemas.ts index bd526d2379..7a95241b36 100644 --- a/src/domain/analysisView/nativeObservationSchemas.ts +++ b/src/domain/analysisView/nativeObservationSchemas.ts @@ -10,7 +10,7 @@ import { partialRelationshipCoverageSchema, unknownRelationshipCoverageSchema, } from "../relationshipCoverage.js"; -import { analysisErrorProjectionSchema } from "../../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../analysisErrorProjectionSchema.js"; export const nativeObservationOperationSchema = z.enum( NATIVE_OBSERVATION_OPERATIONS, diff --git a/src/domain/apple/bundleResourceRoot.ts b/src/domain/apple/bundleResourceRoot.ts index 8d085c6ef7..d8273517cc 100644 --- a/src/domain/apple/bundleResourceRoot.ts +++ b/src/domain/apple/bundleResourceRoot.ts @@ -19,6 +19,18 @@ export const bundleResourceRootSchema = z.strictObject({ export type BundleResourceRoot = z.infer; +/** Resource-only identity for an app directory; it is not a BinaryTarget. */ +export interface ResolvedAppBundleResourceRoot { + /** Path selected by the caller, retained even when it is a symlink alias. */ + readonly callerPath: string; + /** Canonical directory whose resources are inspected. */ + readonly canonicalPath: string; + readonly infoPlistPath: string; + readonly layout: BundleResourceRoot["layout"]; + /** No executable was opened or hashed by resource-root discovery. */ + readonly executableSha256: string | null; +} + /** Output identity: executable-bound, or explicitly rooted resource-only. */ export const bundleResourceBoundResultSchema = ( executableSha256: z.ZodType, diff --git a/src/domain/javascript/javascriptStaticAnalysis.ts b/src/domain/javascript/javascriptStaticAnalysis.ts index aba14a9e2d..c6dfce971d 100644 --- a/src/domain/javascript/javascriptStaticAnalysis.ts +++ b/src/domain/javascript/javascriptStaticAnalysis.ts @@ -1,5 +1,10 @@ import type { AnalysisResourceConstraintError } from "../analysisErrorCore.js"; -import { failedJavaScriptStaticAnalysis } from "./javascriptStaticAnalysisHelpers.js"; +import { + failedJavaScriptStaticAnalysis, + detectVendors, + registrationKey, + stringValue, +} from "./javascriptStaticAnalysisHelpers.js"; import type { JavaScriptMemberMutationAllowance } from "./javascriptSemanticWorkAllowance.js"; import { JAVASCRIPT_SEMANTIC_PRECISION_DEFAULTS, @@ -35,11 +40,6 @@ import { semanticResourceLimitReason } from "./javascriptSemanticResourceLimits. import { createStaticPathIntrinsicQuery } from "./javascriptStaticPathIntrinsics.js"; import { createSemanticExpressionShapeResolver } from "./javascriptSemanticExpressionShapes.js"; import { finishElectronBrowserWindowsSteps } from "./electronStaticAnalysisBrowser.js"; -import { - detectVendors, - registrationKey, - stringValue, -} from "./javascriptStaticAnalysisHelpers.js"; import { addReference, addEndpoint, diff --git a/src/domain/localPath.ts b/src/domain/localPath.ts index 2761e98719..af73a0a1b9 100644 --- a/src/domain/localPath.ts +++ b/src/domain/localPath.ts @@ -1,6 +1,10 @@ import { isAbsolute, relative, sep } from "node:path"; import { z } from "zod"; +// Declared layer exception (scripts/lib/module-layers.mjs LAYER_EXCEPTIONS): +// which paths are absolute is a fact about the running host's path rules. +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; + import { rejectUnpairedSurrogates } from "./stringPatterns.js"; /** @@ -38,7 +42,7 @@ export const windowsAbsolutePathPattern = /** A caller-selected path that is absolute on the host running REA. */ export const absoluteLocalPathStringSchema = localPathStringSchema.regex( - process.platform === "win32" ? windowsAbsolutePathPattern : /^\//u, + HOST_PLATFORM.platform === "win32" ? windowsAbsolutePathPattern : /^\//u, "must be an absolute local filesystem path", ); diff --git a/src/domain/native/batchDecompile.ts b/src/domain/native/batchDecompile.ts index fa85c9ba70..59fe56a357 100644 --- a/src/domain/native/batchDecompile.ts +++ b/src/domain/native/batchDecompile.ts @@ -1,5 +1,5 @@ import { z } from "zod"; -import { analysisErrorProjectionSchema } from "../../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../analysisErrorProjectionSchema.js"; import { pseudocodeAbsenceSchema } from "./pseudocodeAbsence.js"; /** Identity facts attached to one requested batch selector. */ diff --git a/src/domain/native/nativeCallGraph.ts b/src/domain/native/nativeCallGraph.ts index f2d1c82b28..6e6b6f0b85 100644 --- a/src/domain/native/nativeCallGraph.ts +++ b/src/domain/native/nativeCallGraph.ts @@ -1,5 +1,5 @@ import { z } from "zod"; -import { analysisErrorProjectionSchema } from "../../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../analysisErrorProjectionSchema.js"; import { relationshipCoverageSchema } from "../relationshipCoverage.js"; /** One recorded traversal outcome; source levels and array positions retain identity. */ diff --git a/src/process/PrivateRuntimeRootUnavailableError.ts b/src/domain/privateRuntimeRootUnavailableError.ts similarity index 87% rename from src/process/PrivateRuntimeRootUnavailableError.ts rename to src/domain/privateRuntimeRootUnavailableError.ts index 856c79d676..b322c700cb 100644 --- a/src/process/PrivateRuntimeRootUnavailableError.ts +++ b/src/domain/privateRuntimeRootUnavailableError.ts @@ -1,4 +1,4 @@ -import { RuntimeControlUnavailableError } from "./RuntimeControlUnavailableError.js"; +import { RuntimeControlUnavailableError } from "./runtimeControlUnavailableError.js"; /** Expected failure when a runtime root's privacy boundary is unavailable. */ export class PrivateRuntimeRootUnavailableError extends RuntimeControlUnavailableError { diff --git a/src/domain/providerCleanupError.test.ts b/src/domain/providerCleanupError.test.ts index daae141bc5..93e4b8f04c 100644 --- a/src/domain/providerCleanupError.test.ts +++ b/src/domain/providerCleanupError.test.ts @@ -5,7 +5,7 @@ import { analysisErrorWithCleanupFailure } from "./analysisErrorCleanup.js"; import { AnalysisCancelledError } from "./analysisErrorCore.js"; import { cleanupRetryRemediation } from "./analysisErrorRecovery.js"; import { analysisErrorRemediationAction } from "./analysisErrorPresentation.js"; -import { analysisErrorProjectionSchema } from "../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "./analysisErrorProjectionSchema.js"; import { releaseOwnedCleanup } from "../../tests/support/cleanupRelease.js"; const CLOSE_RETRY = { operation: "close_binary" } as const; diff --git a/src/process/RuntimeControlUnavailableError.ts b/src/domain/runtimeControlUnavailableError.ts similarity index 94% rename from src/process/RuntimeControlUnavailableError.ts rename to src/domain/runtimeControlUnavailableError.ts index 1747730877..70c644eba4 100644 --- a/src/process/RuntimeControlUnavailableError.ts +++ b/src/domain/runtimeControlUnavailableError.ts @@ -1,4 +1,4 @@ -import { AnalysisCapabilityUnavailableError } from "../domain/analysisErrorCore.js"; +import { AnalysisCapabilityUnavailableError } from "./analysisErrorCore.js"; /** * Expected refusal when a host control required before launch is unavailable. diff --git a/src/application/SetupCancellation.ts b/src/domain/setupCancellation.ts similarity index 84% rename from src/application/SetupCancellation.ts rename to src/domain/setupCancellation.ts index acf037592f..84e4ba7192 100644 --- a/src/application/SetupCancellation.ts +++ b/src/domain/setupCancellation.ts @@ -1,4 +1,4 @@ -import { cancelledBy } from "../domain/analysisErrorCore.js"; +import { cancelledBy } from "./analysisErrorCore.js"; /** Preserve the caller's exact reason while setup unwinds its resource owners. */ export const assertSetupActive = ( diff --git a/src/dotnet/ManagedSnapshot.ts b/src/dotnet/ManagedSnapshot.ts index 844129ad44..8ec924d70a 100644 --- a/src/dotnet/ManagedSnapshot.ts +++ b/src/dotnet/ManagedSnapshot.ts @@ -13,8 +13,8 @@ import { bindRegularFileCleanup, withRegularFileCompletion, type RegularFileReadOptions, -} from "../application/RegularFileRead.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +} from "../process/RegularFileRead.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { diff --git a/src/dotnet/ManagedStaticProvider.ts b/src/dotnet/ManagedStaticProvider.ts index e37b669cfa..70d19f3f2e 100644 --- a/src/dotnet/ManagedStaticProvider.ts +++ b/src/dotnet/ManagedStaticProvider.ts @@ -6,10 +6,12 @@ import { type CapabilityDescriptor, type ExecutionOptions, type ProviderIdentity, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { invariantViolation } from "../domain/internalInvariant.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../resources/index.js"; import { managedStaticCapabilities } from "./ManagedStaticProviderMetadata.js"; import { MANAGED_STATIC_PROVIDER } from "../domain/investigationProviders.js"; import { diff --git a/src/dotnet/ManagedStaticProviderMetadata.ts b/src/dotnet/ManagedStaticProviderMetadata.ts index 0a7c53b93b..72d0c5aaa0 100644 --- a/src/dotnet/ManagedStaticProviderMetadata.ts +++ b/src/dotnet/ManagedStaticProviderMetadata.ts @@ -1,4 +1,4 @@ -import type { CapabilityDescriptor } from "../application/AnalysisProvider.js"; +import type { CapabilityDescriptor } from "../ports/AnalysisProvider.js"; import { MANAGED_STATIC_PROVIDER } from "../domain/investigationProviders.js"; import { MANAGED_TOOL_CONTRACTS, diff --git a/src/electron/ElectronFuseCleanup.test.ts b/src/electron/ElectronFuseCleanup.test.ts index 69c206d5b2..af9bb00ef1 100644 --- a/src/electron/ElectronFuseCleanup.test.ts +++ b/src/electron/ElectronFuseCleanup.test.ts @@ -17,7 +17,7 @@ import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { ElectronFuseProvider } from "./ElectronFuseProvider.js"; import { PlaywrightElectronActiveProvider } from "../browser/PlaywrightElectronActiveProvider.js"; import { electronActiveObservationInputSchema } from "../domain/javascript/electronActiveObservation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { assertNodeCliInspectArgumentsSupported } from "../browser/PlaywrightElectronActiveFuses.js"; afterEach(() => { diff --git a/src/electron/ElectronFuseFailures.ts b/src/electron/ElectronFuseFailures.ts index 4119e964ab..1c5356306e 100644 --- a/src/electron/ElectronFuseFailures.ts +++ b/src/electron/ElectronFuseFailures.ts @@ -1,12 +1,12 @@ import { parseFailureAnalysisError } from "../domain/parseFailureAnalysisError.js"; import { ELECTRON_FUSE_PROVIDER_IDENTITY } from "./ElectronFuseProviderIdentity.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactReaderFailure, ArtifactFileCleanupFailure, artifactFileCompletion, artifactFileCancellationCause, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { regularFileCancellation } from "../filesystem/OwnedRegularFile.js"; diff --git a/src/electron/ElectronFusePath.ts b/src/electron/ElectronFusePath.ts index ec9c18458d..c863ecfd26 100644 --- a/src/electron/ElectronFusePath.ts +++ b/src/electron/ElectronFusePath.ts @@ -1,5 +1,5 @@ import { decodeStrictUtf8 } from "../domain/strictUtf8.js"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import type { BigIntStats } from "node:fs"; import { lstat, readlink } from "node:fs/promises"; import { basename, dirname, isAbsolute, sep } from "node:path"; diff --git a/src/electron/ElectronFuseProvider.ts b/src/electron/ElectronFuseProvider.ts index ffae6fbc74..b65a548f39 100644 --- a/src/electron/ElectronFuseProvider.ts +++ b/src/electron/ElectronFuseProvider.ts @@ -1,11 +1,11 @@ -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; -import type { ElectronFusePort } from "../application/electron/ElectronFusePort.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; +import type { ElectronFusePort } from "../ports/electron/ElectronFusePort.js"; import { createElectronFuseEvidence } from "../domain/electron/electronFuseEvidence.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { + ArtifactResourceScope, assertArtifactReadActive, artifactFileCompletion, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../domain/analysisErrorCore.js"; import { diff --git a/src/electron/ElectronFuseReader.ts b/src/electron/ElectronFuseReader.ts index 25418a0c93..45ba6655e0 100644 --- a/src/electron/ElectronFuseReader.ts +++ b/src/electron/ElectronFuseReader.ts @@ -26,11 +26,11 @@ import { RegularFileChangedError, sameRegularFileState, } from "../filesystem/RegularFile.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { + ArtifactResourceScope, assertArtifactReadActive, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; /** Admission and search bounds for one Electron executable. */ export const ELECTRON_FUSE_LIMITS = { diff --git a/src/electron/ElectronFuseReaderCleanup.test.ts b/src/electron/ElectronFuseReaderCleanup.test.ts index 9c6e1fdf16..1c81fca5d1 100644 --- a/src/electron/ElectronFuseReaderCleanup.test.ts +++ b/src/electron/ElectronFuseReaderCleanup.test.ts @@ -1,4 +1,4 @@ -import { ArtifactFileCleanupFailure } from "../artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js"; import { parseEvidence } from "../domain/evidence.js"; import { fstatSync } from "node:fs"; import type { FileHandle } from "node:fs/promises"; diff --git a/src/erlang/BeamParser.test.ts b/src/erlang/BeamParser.test.ts index ec8f06c4da..a91a48dd79 100644 --- a/src/erlang/BeamParser.test.ts +++ b/src/erlang/BeamParser.test.ts @@ -5,7 +5,7 @@ import { MAX_INSPECT_ERLANG_BEAM_TABLE_ROWS, inspectErlangBeamInputSchema, } from "../domain/erlang/beam.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { erlangBeamChunksFixture, erlangBeamRowsFixture, @@ -16,7 +16,7 @@ import { } from "./Beam.fixture.js"; import { BeamCapacityFailure, parseErlangBeam } from "./BeamParser.js"; import { BeamProvider } from "./BeamProvider.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; const defaults = inspectErlangBeamInputSchema.parse({ path: "/artifacts/app.beam", diff --git a/src/erlang/BeamParser.ts b/src/erlang/BeamParser.ts index 86d5e946d7..85e3f907ee 100644 --- a/src/erlang/BeamParser.ts +++ b/src/erlang/BeamParser.ts @@ -1,6 +1,6 @@ import { isUtf8 } from "node:buffer"; import { createHash } from "node:crypto"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { MAX_INSPECT_ERLANG_BEAM_TABLE_ROWS, type ErlangBeam, diff --git a/src/erlang/BeamProvider.ts b/src/erlang/BeamProvider.ts index 3e4d6867a0..f4c2f6a1d5 100644 --- a/src/erlang/BeamProvider.ts +++ b/src/erlang/BeamProvider.ts @@ -4,20 +4,16 @@ import { projectStableArtifactFailure, stableArtifactInputFailure, projectArtifactCloseFailure, -} from "../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, type StableArtifactSnapshot, readStableArtifact, -} from "../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, artifactSelectedPathErrno, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import type { BeamPort } from "../application/erlang/BeamPort.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../resources/index.js"; +import type { BeamPort } from "../ports/erlang/BeamPort.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import { ArtifactOperationError } from "../domain/artifactOperationError.js"; import { AnalysisAccessDeniedError, diff --git a/src/evm/EvmoleFailures.test.ts b/src/evm/EvmoleFailures.test.ts index fc484f61c8..892195b8e3 100644 --- a/src/evm/EvmoleFailures.test.ts +++ b/src/evm/EvmoleFailures.test.ts @@ -8,7 +8,7 @@ import { classifyProviderFailure } from "../providers/classifyProviderFailure.js import { OwnedCommandFailure } from "../process/OwnedCommand.js"; import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { DEFAULT_EVM_TIMEOUT_MS, diff --git a/src/evm/EvmoleInterfaceProvider.test.ts b/src/evm/EvmoleInterfaceProvider.test.ts index 16395e2f0c..864cc081e2 100644 --- a/src/evm/EvmoleInterfaceProvider.test.ts +++ b/src/evm/EvmoleInterfaceProvider.test.ts @@ -2,7 +2,7 @@ import { access } from "node:fs/promises"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; diff --git a/src/evm/EvmoleInterfaceProvider.ts b/src/evm/EvmoleInterfaceProvider.ts index 5829603ec3..2858acf858 100644 --- a/src/evm/EvmoleInterfaceProvider.ts +++ b/src/evm/EvmoleInterfaceProvider.ts @@ -19,26 +19,22 @@ import { createAnalysisExecution, type ExecutionOptions, type ProviderAvailability, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { EvmInterfaceExecution, EvmInterfacePort, -} from "../application/evm/EvmInterfacePort.js"; +} from "../ports/evm/EvmInterfacePort.js"; import { completedStableArtifact, readStableArtifact, -} from "../artifacts/readStableArtifact.js"; -import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { + ArtifactResourceScope, + ArtifactReaderFailure, artifactFileCancellationCause, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; -import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/index.js"; +import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { OwnedCommandFailure, ownedCommandResources, diff --git a/src/evm/EvmoleInterfaceWorker.ts b/src/evm/EvmoleInterfaceWorker.ts index 05ae09bd17..be5657b250 100644 --- a/src/evm/EvmoleInterfaceWorker.ts +++ b/src/evm/EvmoleInterfaceWorker.ts @@ -13,7 +13,7 @@ import { evmProducerLimitsSchema, selectedEvmProducerLimits, } from "../domain/evm/evmInterface.js"; -import { readStableArtifact } from "../artifacts/readStableArtifact.js"; +import { readStableArtifact } from "../resources/index.js"; const requestSchema = z.strictObject({ snapshot_path: z.string(), diff --git a/src/config/kunaCacheDirectory.ts b/src/filesystem/cacheDirectory.ts similarity index 96% rename from src/config/kunaCacheDirectory.ts rename to src/filesystem/cacheDirectory.ts index 4a6bd4551f..1e15b6d3a7 100644 --- a/src/config/kunaCacheDirectory.ts +++ b/src/filesystem/cacheDirectory.ts @@ -1,8 +1,5 @@ import { isAbsolute, posix, win32 } from "node:path"; -import { - absoluteCallerPath, - appendCallerPath, -} from "../filesystem/callerPath.js"; +import { absoluteCallerPath, appendCallerPath } from "./callerPath.js"; /** Per-user cache directory that REA owns for Kuna on this host. */ export const defaultKunaCacheDirectory = ( diff --git a/src/firmware/FirmwareCommand.ts b/src/firmware/FirmwareCommand.ts index 1787b5288e..02fe6f2be3 100644 --- a/src/firmware/FirmwareCommand.ts +++ b/src/firmware/FirmwareCommand.ts @@ -3,12 +3,14 @@ import { processInspectionCancellationError, retainProcessInspectionCleanup, } from "../providers/OwnedCommandCleanup.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + type ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import { selectArtifactCommandPath, type ArtifactCommandPath, } from "../process/ArtifactCommandPath.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { FIRMWARE_TOOL_REQUIREMENTS, type FirmwareEngineName, diff --git a/src/firmware/FirmwareDeadline.test.ts b/src/firmware/FirmwareDeadline.test.ts index 8b234a1976..2b16faeed4 100644 --- a/src/firmware/FirmwareDeadline.test.ts +++ b/src/firmware/FirmwareDeadline.test.ts @@ -5,7 +5,7 @@ import { } from "../domain/analysisErrorCore.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { firmwareRequestSchema } from "../domain/firmware/firmwareAnalysis.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { classifyProviderFailure } from "../providers/classifyProviderFailure.js"; import { firmwareFailureDialect, diff --git a/src/firmware/FirmwareFailures.ts b/src/firmware/FirmwareFailures.ts index 5c5b0f9aaf..e844f70943 100644 --- a/src/firmware/FirmwareFailures.ts +++ b/src/firmware/FirmwareFailures.ts @@ -1,9 +1,9 @@ import { MAX_NODE_TIMER_DELAY_MS } from "../domain/analysisResourceLimits.js"; -import type { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; import { + type AnalysisCleanupLease, ArtifactFileCleanupFailure, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import type { AnalysisCapturedOutput, AnalysisError, diff --git a/src/firmware/FirmwareFiles.ts b/src/firmware/FirmwareFiles.ts index 8c0d40309e..b498c04eda 100644 --- a/src/firmware/FirmwareFiles.ts +++ b/src/firmware/FirmwareFiles.ts @@ -27,15 +27,17 @@ import { } from "./FirmwareFailures.js"; import type { FirmwareDeadline } from "./FirmwareDeadline.js"; import { compareUnicodeCodePoints } from "../domain/unicodeCodePointOrder.js"; -import type { SafeOutputTree } from "../artifacts/SafeOutputTree.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { + type SafeOutputTree, + readArtifactFileChunks, +} from "../resources/index.js"; +import { + ArtifactResourceScope, withArtifactRegularFile, assertArtifactReadActive, mapArtifactFileFailure, artifactSelectedPathErrno, -} from "../artifacts/ArtifactFileOperation.js"; -import { readArtifactFileChunks } from "../artifacts/readArtifactFileChunks.js"; +} from "../resources/index.js"; import { decodeDirectoryEntryName } from "../filesystem/decodeDirectoryEntryName.js"; import { NonRegularFileReadError } from "../filesystem/RegularFile.js"; import { observedSymlinkTarget } from "../domain/symlinkTarget.js"; diff --git a/src/firmware/FirmwareNestedCoverage.test.ts b/src/firmware/FirmwareNestedCoverage.test.ts index e10478af94..ddc717c5a5 100644 --- a/src/firmware/FirmwareNestedCoverage.test.ts +++ b/src/firmware/FirmwareNestedCoverage.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { gzipSync } from "node:zlib"; import { expect, it } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { createAnalysisExecution } from "../application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import { FirmwareAnalysisService } from "../application/firmware/FirmwareAnalysisService.js"; import { ok } from "../domain/result.js"; import { startFirmwareDeadline } from "./FirmwareDeadline.js"; diff --git a/src/firmware/FirmwareProvider.ts b/src/firmware/FirmwareProvider.ts index 7f5319e0b0..828bf6b44a 100644 --- a/src/firmware/FirmwareProvider.ts +++ b/src/firmware/FirmwareProvider.ts @@ -3,12 +3,12 @@ import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { assertArtifactCommandPath } from "../process/ArtifactCommandPath.js"; import { join } from "node:path"; -import type { FirmwareAnalysisPort } from "../application/firmware/FirmwareAnalysisPort.js"; +import type { FirmwareAnalysisPort } from "../ports/firmware/FirmwareAnalysisPort.js"; import { createAnalysisExecution, type AnalysisExecution, type ExecutionOptions, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { firmwareResultSchemas, DEFAULT_FIRMWARE_ANALYSIS_TIMEOUT_MS, @@ -31,8 +31,10 @@ import { jsonValueSchema } from "../domain/jsonValue.js"; import { err, ok, type Result } from "../domain/result.js"; import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; import type { ProviderProcessSupervisor } from "../process/ProviderProcess.js"; -import { SafeOutputTree } from "../artifacts/SafeOutputTree.js"; -import { outputDirectoryAdmissionRefusal } from "../artifacts/SafeOutputTreeAdmission.js"; +import { + SafeOutputTree, + outputDirectoryAdmissionRefusal, +} from "../resources/index.js"; import { publishFirmwareExtraction } from "./FirmwarePublication.js"; import { BINWALK_PROVIDER_IDENTITY, @@ -65,7 +67,7 @@ import { firmwarePhaseInterruption, firmwareSignalInterruption, } from "./FirmwareFailures.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; type Outcome = Awaited>; interface PendingFirmwareCleanup { diff --git a/src/firmware/FirmwarePublication.ts b/src/firmware/FirmwarePublication.ts index d3d87ff2b9..0cf051e921 100644 --- a/src/firmware/FirmwarePublication.ts +++ b/src/firmware/FirmwarePublication.ts @@ -1,4 +1,4 @@ -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupDependencies } from "../domain/analysisErrorCleanup.js"; import { @@ -8,10 +8,12 @@ import { import { createHash } from "node:crypto"; import { join } from "node:path"; import type { z } from "zod"; -import { SafeOutputTree } from "../artifacts/SafeOutputTree.js"; -import { outputDirectoryAdmissionRefusal } from "../artifacts/SafeOutputTreeAdmission.js"; +import { + SafeOutputTree, + outputDirectoryAdmissionRefusal, + SafeOutputTreeCreationFailure, +} from "../resources/index.js"; import { classifyProviderFailure } from "../providers/classifyProviderFailure.js"; -import { SafeOutputTreeCreationFailure } from "../artifacts/SafeOutputTreeCreationFailure.js"; import { AnalysisOutputError } from "../domain/analysisErrorCore.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { jsonValueSchema } from "../domain/jsonValue.js"; diff --git a/src/firmware/devicetree/DevicetreeProvider.ts b/src/firmware/devicetree/DevicetreeProvider.ts index 4e25d12d8e..96342b8179 100644 --- a/src/firmware/devicetree/DevicetreeProvider.ts +++ b/src/firmware/devicetree/DevicetreeProvider.ts @@ -5,19 +5,15 @@ import { projectStableArtifactFailure, stableArtifactInputFailure, projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, type StableArtifactSnapshot, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { DevicetreePort } from "../../application/binaryDiagnostics/DevicetreePort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { DevicetreePort } from "../../ports/binaryDiagnostics/DevicetreePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { ArtifactOperationError } from "../../domain/artifactOperationError.js"; import { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js"; import { diff --git a/src/flutter/DartElf.ts b/src/flutter/DartElf.ts index 524a214785..6d629fa805 100644 --- a/src/flutter/DartElf.ts +++ b/src/flutter/DartElf.ts @@ -1,4 +1,4 @@ -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import { observeElfStringTableEntry, elfStringTableText, diff --git a/src/flutter/ElfBuildId.ts b/src/flutter/ElfBuildId.ts index b2e3cb0a14..7bb37d68c2 100644 --- a/src/flutter/ElfBuildId.ts +++ b/src/flutter/ElfBuildId.ts @@ -1,4 +1,4 @@ -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import { readElfSectionHeader } from "../domain/elfSectionHeader.js"; import { readElfProgramHeader } from "../domain/elfProgramHeader.js"; import { MAX_FLUTTER_BUILD_ID_BYTES } from "../domain/flutter/flutterBuildAnalysis.js"; diff --git a/src/flutter/ElfLoadMap.ts b/src/flutter/ElfLoadMap.ts index f0d31d11b7..f0623f1ddb 100644 --- a/src/flutter/ElfLoadMap.ts +++ b/src/flutter/ElfLoadMap.ts @@ -1,4 +1,4 @@ -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import { setImmediate as yieldToEventLoop } from "node:timers/promises"; import { err, ok, type Result } from "../domain/result.js"; diff --git a/src/flutter/FlutterBuildProvider.ts b/src/flutter/FlutterBuildProvider.ts index 37826c3bf2..2dd3a4be9c 100644 --- a/src/flutter/FlutterBuildProvider.ts +++ b/src/flutter/FlutterBuildProvider.ts @@ -2,12 +2,12 @@ import { FLUTTER_PROVIDER_IDENTITY } from "./FlutterProviderIdentity.js"; import { artifactFileCancellationCause, assertArtifactReadActive, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { + ArtifactResourceScope, AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; + ArtifactReaderFailure, + type ArtifactEntry, +} from "../resources/index.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { analysisErrorWithCancellation } from "../domain/analysisErrorCancellation.js"; import { regularFileCancellation } from "../filesystem/OwnedRegularFile.js"; @@ -23,7 +23,7 @@ import { type ProviderAvailability, createAnalysisExecution, type AnalysisExecution, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../domain/analysisObservation.js"; import { MAX_FLUTTER_LIBRARY_PATH_BYTES, @@ -50,10 +50,6 @@ import { } from "../domain/analysisErrorBase.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { err, ok, type Result } from "../domain/result.js"; -import { - ArtifactReaderFailure, - type ArtifactEntry, -} from "../artifacts/ArtifactReader.js"; import { ZipArtifactReader } from "../artifacts/ZipArtifactReader.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { diff --git a/src/frida/FridaInstrumentationManager.test.ts b/src/frida/FridaInstrumentationManager.test.ts index 34a16cb850..832bdd0fae 100644 --- a/src/frida/FridaInstrumentationManager.test.ts +++ b/src/frida/FridaInstrumentationManager.test.ts @@ -12,7 +12,7 @@ import type { Signal, } from "frida"; import { jsonObjectSchema } from "../domain/jsonValue.js"; -import { FridaScriptLoadCancelledError } from "../application/frida/FridaInstrumentationPort.js"; +import { FridaScriptLoadCancelledError } from "../ports/frida/FridaInstrumentationPort.js"; import { AnalysisCapabilityUnavailableError, AnalysisInputError, diff --git a/src/frida/FridaInstrumentationManager.ts b/src/frida/FridaInstrumentationManager.ts index fa594e9c59..e2f7cf1b69 100644 --- a/src/frida/FridaInstrumentationManager.ts +++ b/src/frida/FridaInstrumentationManager.ts @@ -22,9 +22,9 @@ import type { FridaSessionObservation, FridaSessionStatus, StartFridaSessionInput, -} from "../application/frida/FridaInstrumentationPort.js"; -import { FridaScriptLoadCancelledError } from "../application/frida/FridaInstrumentationPort.js"; -import type { OptionalProviderLoadFailure } from "../application/OptionalObservationProviders.js"; +} from "../ports/frida/FridaInstrumentationPort.js"; +import { FridaScriptLoadCancelledError } from "../ports/frida/FridaInstrumentationPort.js"; +import type { OptionalProviderLoadFailure } from "../ports/OptionalObservationProviders.js"; import { AnalysisAccessDeniedError, AnalysisCancelledError, @@ -39,14 +39,11 @@ import { isValidFridaRemoteAddress } from "../domain/fridaRemoteAddress.js"; import { redactExplicitFailure } from "../domain/explicitSensitiveFailure.js"; import { explicitValueSpans } from "../domain/explicitSensitiveValues.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { jsonStringByteLength } from "../domain/jsonStringByteLength.js"; import { err, ok, type Result } from "../domain/result.js"; -import { - unknownFridaScript, - unknownFridaSession, -} from "../application/frida/fridaInputErrors.js"; +import { unknownFridaScript, unknownFridaSession } from "./fridaInputErrors.js"; import { MAX_MESSAGE_METADATA_BYTES, type FridaOwnedCaptureLimit, diff --git a/src/application/frida/fridaInputErrors.ts b/src/frida/fridaInputErrors.ts similarity index 91% rename from src/application/frida/fridaInputErrors.ts rename to src/frida/fridaInputErrors.ts index 9dc65d5103..2a2de11427 100644 --- a/src/application/frida/fridaInputErrors.ts +++ b/src/frida/fridaInputErrors.ts @@ -1,4 +1,4 @@ -import { AnalysisInputError } from "../../domain/analysisErrorCore.js"; +import { AnalysisInputError } from "../domain/analysisErrorCore.js"; /** A session ID that names no open Frida session owned by this process. */ export const unknownFridaSession = ( diff --git a/src/ghidra/GhidraAnalysisProfile.ts b/src/ghidra/GhidraAnalysisProfile.ts index 2122d2bf90..a5a39181da 100644 --- a/src/ghidra/GhidraAnalysisProfile.ts +++ b/src/ghidra/GhidraAnalysisProfile.ts @@ -1,8 +1,8 @@ -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import type { AnalysisProfileResolution, ProviderIdentity, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { createFunctionCoordinateContext } from "../domain/native/functionCoordinateContext.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { createAnalysisProfile } from "../domain/analysisProfile.js"; diff --git a/src/ghidra/GhidraAnalysisSeeds.test.ts b/src/ghidra/GhidraAnalysisSeeds.test.ts index 8a927b4e41..9590dcd830 100644 --- a/src/ghidra/GhidraAnalysisSeeds.test.ts +++ b/src/ghidra/GhidraAnalysisSeeds.test.ts @@ -1,4 +1,4 @@ -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { createHash } from "node:crypto"; import { mkdtemp, diff --git a/src/ghidra/GhidraAnalysisSeeds.ts b/src/ghidra/GhidraAnalysisSeeds.ts index c9d6dcfb3e..876544ea1f 100644 --- a/src/ghidra/GhidraAnalysisSeeds.ts +++ b/src/ghidra/GhidraAnalysisSeeds.ts @@ -4,11 +4,11 @@ import { mkdir, realpath, stat } from "node:fs/promises"; import { isAbsolute, join } from "node:path"; import { z } from "zod"; -import type { AnalysisOperation } from "../application/AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; import { ConfigurationError } from "../domain/configurationErrors.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { readGhidraProfileArtifact, writeGhidraProfileArtifact, diff --git a/src/ghidra/GhidraCheckpoint.test.ts b/src/ghidra/GhidraCheckpoint.test.ts index 97f29425be..e4ba3c28e9 100644 --- a/src/ghidra/GhidraCheckpoint.test.ts +++ b/src/ghidra/GhidraCheckpoint.test.ts @@ -13,7 +13,7 @@ import { } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { createAnalysisProfile } from "../domain/analysisProfile.js"; import { acquireOwnedLease } from "../process/OwnedLease.js"; import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; diff --git a/src/ghidra/GhidraCheckpoint.ts b/src/ghidra/GhidraCheckpoint.ts index 161a3272e6..ebf94c9e9c 100644 --- a/src/ghidra/GhidraCheckpoint.ts +++ b/src/ghidra/GhidraCheckpoint.ts @@ -17,14 +17,14 @@ import { ConfigurationError } from "../domain/configurationErrors.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { AnalysisCleanupRelease } from "../domain/analysisCleanupRelease.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { + type ArtifactResourceScope, withArtifactFileHandle, withArtifactRegularFile, assertArtifactReadActive, artifactFilePrimaryFacts, mapArtifactFileFailure, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { sameRegularFileState, RegularFileChangedError, diff --git a/src/ghidra/GhidraClient.ts b/src/ghidra/GhidraClient.ts index a387bda310..60371ef412 100644 --- a/src/ghidra/GhidraClient.ts +++ b/src/ghidra/GhidraClient.ts @@ -11,7 +11,7 @@ import { z } from "zod"; import type { Stats } from "node:fs"; import type { FileHandle } from "node:fs/promises"; import type { Socket } from "node:net"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import { AnalysisCancelledError, @@ -89,15 +89,15 @@ import { type NativeLoadImageObservation, type NativeLoadImagePartialObservation, } from "../domain/native/nativeLoadImage.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactResourceScope, + ArtifactReaderFailure, artifactFileCancellationCause, artifactFilePrimaryFacts, bindArtifactFileCleanup, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; -import { readArtifactFileChunks } from "../artifacts/readArtifactFileChunks.js"; + readArtifactFileChunks, +} from "../resources/index.js"; import { readBoundedFileBytes } from "../process/BoundedFileBytes.js"; import { assertRegularFileActive, diff --git a/src/ghidra/GhidraDisabledAnalyzers.ts b/src/ghidra/GhidraDisabledAnalyzers.ts index d280fffec6..833b02cec1 100644 --- a/src/ghidra/GhidraDisabledAnalyzers.ts +++ b/src/ghidra/GhidraDisabledAnalyzers.ts @@ -1,6 +1,6 @@ import { z } from "zod"; -import type { AnalysisOperation } from "../application/AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; import { MAX_GHIDRA_DISABLED_ANALYZER_NAME_LENGTH, MAX_GHIDRA_DISABLED_ANALYZER_NAMES, diff --git a/src/ghidra/GhidraDoctor.ts b/src/ghidra/GhidraDoctor.ts index 5368ece3fa..5789a79c3a 100644 --- a/src/ghidra/GhidraDoctor.ts +++ b/src/ghidra/GhidraDoctor.ts @@ -1,10 +1,10 @@ import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { analysisClientFailureForOperation } from "../providers/AnalysisClientFailure.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import type { DoctorProviderCheck, DoctorProviderInspection, -} from "../application/Doctor.js"; +} from "../ports/DoctorProviderInspection.js"; import { admitGhidraInstallation } from "./GhidraAdmission.js"; import { EXISTING_PROJECT_WINDOWS_REMEDIATION, diff --git a/src/ghidra/GhidraDosSnapshot.ts b/src/ghidra/GhidraDosSnapshot.ts index 3188de5864..3a0bdadb9c 100644 --- a/src/ghidra/GhidraDosSnapshot.ts +++ b/src/ghidra/GhidraDosSnapshot.ts @@ -1,7 +1,7 @@ import { createHash } from "node:crypto"; import type { FileHandle } from "node:fs/promises"; -import { readArtifactFileChunks } from "../artifacts/readArtifactFileChunks.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { readArtifactFileChunks } from "../resources/index.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import { dosMzDeclaredImageByteLength, readDosMzDeclarations, diff --git a/src/ghidra/GhidraExecutableHeader.ts b/src/ghidra/GhidraExecutableHeader.ts index c042be6f0c..567298e3aa 100644 --- a/src/ghidra/GhidraExecutableHeader.ts +++ b/src/ghidra/GhidraExecutableHeader.ts @@ -5,7 +5,7 @@ import type { GhidraInstallationFileOptions } from "./GhidraInstallationProperti import { err, ok, type Result } from "../domain/result.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisResourceConstraintError } from "../domain/analysisErrorCore.js"; -import { withArtifactRegularFile } from "../artifacts/ArtifactFileOperation.js"; +import { withArtifactRegularFile } from "../resources/index.js"; import { readStableFilePrefix } from "../filesystem/readStableFileBytes.js"; import { ghidraFileFailure } from "./GhidraFileArtifacts.js"; diff --git a/src/ghidra/GhidraFileArtifacts.ts b/src/ghidra/GhidraFileArtifacts.ts index 3e24535837..e74fa930b3 100644 --- a/src/ghidra/GhidraFileArtifacts.ts +++ b/src/ghidra/GhidraFileArtifacts.ts @@ -1,8 +1,8 @@ import { GhidraAdmissionError } from "./GhidraAdmissionError.js"; import { open } from "node:fs/promises"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + type ArtifactResourceScope, + ArtifactReaderFailure, assertArtifactReadActive, artifactFileCancellationCause, artifactFilePrimaryFacts, @@ -10,7 +10,7 @@ import { bindArtifactFileCleanup, withArtifactFileHandle, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { readStableFileBytes, RegularFileCapacityError, diff --git a/src/ghidra/GhidraInstallation.ts b/src/ghidra/GhidraInstallation.ts index 411e4b4bd1..d1b719d21c 100644 --- a/src/ghidra/GhidraInstallation.ts +++ b/src/ghidra/GhidraInstallation.ts @@ -4,7 +4,7 @@ import { AnalysisCancelledError, cancelledBy, } from "../domain/analysisErrorCore.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { probeGhidraJava, type GhidraJavaObservation, diff --git a/src/ghidra/GhidraInstallationProperties.ts b/src/ghidra/GhidraInstallationProperties.ts index 3f1220a183..d78ef919e7 100644 --- a/src/ghidra/GhidraInstallationProperties.ts +++ b/src/ghidra/GhidraInstallationProperties.ts @@ -1,12 +1,12 @@ import { createHash } from "node:crypto"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { artifactFileCompletion, mapArtifactFileFailure, ArtifactFileCleanupFailure, artifactFilePrimaryFacts, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { jsonValueSchema } from "../domain/jsonValue.js"; import { RegularFileCapacityError, diff --git a/src/ghidra/GhidraJavaLaunch.ts b/src/ghidra/GhidraJavaLaunch.ts index 0a3bbc9e73..4362ac93b8 100644 --- a/src/ghidra/GhidraJavaLaunch.ts +++ b/src/ghidra/GhidraJavaLaunch.ts @@ -2,8 +2,10 @@ import { GhidraAdmissionError } from "./GhidraAdmissionError.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { appendCallerPath } from "../filesystem/callerPath.js"; import { dirname } from "node:path"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + type ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import { jvmEnvironmentArguments, prepareJdkJavaOptions, diff --git a/src/ghidra/GhidraJavaOptions.ts b/src/ghidra/GhidraJavaOptions.ts index 1e407f8c09..8048f25741 100644 --- a/src/ghidra/GhidraJavaOptions.ts +++ b/src/ghidra/GhidraJavaOptions.ts @@ -2,9 +2,11 @@ import { decodeStrictUtf8 } from "../domain/strictUtf8.js"; import { GhidraAdmissionError } from "./GhidraAdmissionError.js"; import { randomUUID } from "node:crypto"; import { join } from "node:path"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { withArtifactRegularFile } from "../artifacts/ArtifactFileOperation.js"; +import { + type ArtifactResourceScope, + ArtifactReaderFailure, + withArtifactRegularFile, +} from "../resources/index.js"; import { RegularFileOperationCancelled } from "../filesystem/RegularFile.js"; import { readBoundedFileBytes } from "../process/BoundedFileBytes.js"; import { writeGhidraRuntimeFile } from "./GhidraRuntimeFile.js"; diff --git a/src/ghidra/GhidraJavaProbe.preparation.test.ts b/src/ghidra/GhidraJavaProbe.preparation.test.ts index ccbccacec1..da8b1b5214 100644 --- a/src/ghidra/GhidraJavaProbe.preparation.test.ts +++ b/src/ghidra/GhidraJavaProbe.preparation.test.ts @@ -4,7 +4,7 @@ import { AnalysisError, primaryAnalysisError, } from "../domain/analysisErrorBase.js"; -import { ArtifactResourceRetryFailure } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceRetryFailure } from "../resources/ArtifactResourceScope.js"; import { ProcessOwnershipIdentityBatchFailure, ProcessOwnershipInspectionCancelled, diff --git a/src/ghidra/GhidraJavaProbe.test.ts b/src/ghidra/GhidraJavaProbe.test.ts index b3c101d6aa..7f4994fec5 100644 --- a/src/ghidra/GhidraJavaProbe.test.ts +++ b/src/ghidra/GhidraJavaProbe.test.ts @@ -1,6 +1,6 @@ import { EventEmitter } from "node:events"; import { PassThrough } from "node:stream"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { mkdir, writeFile } from "node:fs/promises"; diff --git a/src/ghidra/GhidraJavaProbe.ts b/src/ghidra/GhidraJavaProbe.ts index fa14e09259..b228fbb1bb 100644 --- a/src/ghidra/GhidraJavaProbe.ts +++ b/src/ghidra/GhidraJavaProbe.ts @@ -15,7 +15,7 @@ import { cancelledBy, carriedReason } from "../domain/analysisErrorCore.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { jsonValueSchema } from "../domain/jsonValue.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { DarwinProcessOwnershipInspectionError } from "../process/DarwinProcessRunTokenReader.js"; import { OwnedCommandFailure, diff --git a/src/ghidra/GhidraLanguageCatalog.ts b/src/ghidra/GhidraLanguageCatalog.ts index fa0d17ea12..c2f439cde5 100644 --- a/src/ghidra/GhidraLanguageCatalog.ts +++ b/src/ghidra/GhidraLanguageCatalog.ts @@ -3,8 +3,10 @@ import { join } from "node:path"; import { parseXmlDocument } from "../domain/xmlDocument.js"; import { decodeXmlPlistText } from "../domain/propertyListXmlText.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { withArtifactRegularFile } from "../artifacts/ArtifactFileOperation.js"; +import { + type ArtifactResourceScope, + withArtifactRegularFile, +} from "../resources/index.js"; import type { GhidraLanguageOverride } from "../config/ghidraLanguageOverride.js"; import { ConfigurationError } from "../domain/configurationErrors.js"; import { RegularFileOperationCancelled } from "../filesystem/RegularFile.js"; diff --git a/src/ghidra/GhidraLanguageOverride.test.ts b/src/ghidra/GhidraLanguageOverride.test.ts index c9df41a86e..2f3279c137 100644 --- a/src/ghidra/GhidraLanguageOverride.test.ts +++ b/src/ghidra/GhidraLanguageOverride.test.ts @@ -20,7 +20,7 @@ import { readGhidraLanguageCatalog, } from "./GhidraLanguageCatalog.js"; import { GhidraProvider } from "./GhidraProvider.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; // Abbreviated from Ghidra 12.1.4 Processors/x86/data/languages/x86.ldefs. const X86_LDEFS = ` diff --git a/src/ghidra/GhidraLauncher.ts b/src/ghidra/GhidraLauncher.ts index a8c4d726d8..a52c206a73 100644 --- a/src/ghidra/GhidraLauncher.ts +++ b/src/ghidra/GhidraLauncher.ts @@ -8,7 +8,7 @@ import { GhidraAdmissionError } from "./GhidraAdmissionError.js"; import { copyExistingGhidraProject } from "./GhidraProjectSnapshot.js"; import { hashGhidraPackedProgram } from "./GhidraCheckpoint.js"; import { constants as fsConstants } from "node:fs"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { GHIDRA_BRIDGE_SOURCES } from "./GhidraBridgeSources.js"; import { snapshotGhidraAnalysisSeeds, diff --git a/src/ghidra/GhidraLoadImageAttest.ts b/src/ghidra/GhidraLoadImageAttest.ts index 244169d8a3..11ad6c0b91 100644 --- a/src/ghidra/GhidraLoadImageAttest.ts +++ b/src/ghidra/GhidraLoadImageAttest.ts @@ -1,5 +1,5 @@ import { jsonValueSchema } from "../domain/jsonValue.js"; -import type { AnalysisOperation } from "../application/AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; import { cancelledBy } from "../domain/analysisErrorCore.js"; import type { BinaryTarget } from "../domain/binaryTargetTypes.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; diff --git a/src/ghidra/GhidraNativeAotSnapshotOwner.ts b/src/ghidra/GhidraNativeAotSnapshotOwner.ts index 8556af764c..8d696af862 100644 --- a/src/ghidra/GhidraNativeAotSnapshotOwner.ts +++ b/src/ghidra/GhidraNativeAotSnapshotOwner.ts @@ -1,4 +1,4 @@ -import type { AnalysisOperation } from "../application/AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; import type { AnalysisError, AnalysisPartialObservation, diff --git a/src/ghidra/GhidraProjectSnapshot.ts b/src/ghidra/GhidraProjectSnapshot.ts index 339e11e867..e879573942 100644 --- a/src/ghidra/GhidraProjectSnapshot.ts +++ b/src/ghidra/GhidraProjectSnapshot.ts @@ -14,11 +14,11 @@ import { sep, } from "node:path"; import { z } from "zod"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { + type ArtifactResourceScope, assertArtifactReadActive, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { sameRegularFileState, RegularFileChangedError, diff --git a/src/ghidra/GhidraProvider.behavior.test.ts b/src/ghidra/GhidraProvider.behavior.test.ts index 2bae9581f3..907d0fee5c 100644 --- a/src/ghidra/GhidraProvider.behavior.test.ts +++ b/src/ghidra/GhidraProvider.behavior.test.ts @@ -29,7 +29,7 @@ import { } from "../process/ProcessOutputTokenScanner.js"; import { runtimeExhaustion } from "../process/RuntimeExhaustion.js"; import { GhidraNativeAotSnapshotOwner } from "./GhidraNativeAotSnapshotOwner.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { AnalysisError, primaryAnalysisError, @@ -38,7 +38,7 @@ import { } from "../domain/analysisErrorBase.js"; import { createDeferred } from "../../tests/fixtures/binarySession.js"; import { awaitAcknowledgement } from "../../tests/fixtures/lifecycleAcknowledgement.js"; -import { ProviderInspectionScope } from "../application/ProviderInspectionScope.js"; +import { ProviderInspectionScope } from "../ports/ProviderInspectionScope.js"; import { ok as javaProbeOk, err, ok } from "../domain/result.js"; import type { GhidraJavaObservation } from "./GhidraJavaProbe.js"; import type { GhidraSeedReport } from "./GhidraAnalysisSeeds.js"; @@ -120,7 +120,7 @@ import { existingGhidraAnalysisProfile } from "./GhidraAnalysisProfile.js"; import { createAnalysisExecution, type AnalysisOperation, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { AnalysisSnapshotCache } from "../application/binary/AnalysisSnapshotCache.js"; import { createEvidence } from "../domain/evidence.js"; import { createEvidenceBundle } from "../domain/evidenceBundle.js"; diff --git a/src/ghidra/GhidraProvider.ts b/src/ghidra/GhidraProvider.ts index dbb7611403..6bd7959cc1 100644 --- a/src/ghidra/GhidraProvider.ts +++ b/src/ghidra/GhidraProvider.ts @@ -17,14 +17,16 @@ import { import { ConfigurationError } from "../domain/configurationErrors.js"; import { resolveGhidraProject } from "./GhidraProjectSnapshot.js"; import { DeferredAnalysisClient } from "../providers/DeferredAnalysisClient.js"; -import type { ProviderInspectionScope } from "../application/ProviderInspectionScope.js"; +import type { ProviderInspectionScope } from "../ports/ProviderInspectionScope.js"; import { analysisClientFailureForOperation } from "../providers/AnalysisClientFailure.js"; import { finalizedResult, runOwned } from "../providers/runOwned.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { + AnalysisCleanupLease, + ArtifactResourceScope, + ArtifactReaderFailure, + bindArtifactFileCleanup, +} from "../resources/index.js"; import { SharedStartupAttempt } from "../process/SharedStartupAttempt.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import type { AnalysisClient, @@ -39,7 +41,7 @@ import type { ProviderAvailability, ProviderIdentity, ProviderTargetSupport, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { AppConfig } from "../config/types.js"; import { createAnalysisProfile, diff --git a/src/ghidra/GhidraProviderCapabilities.ts b/src/ghidra/GhidraProviderCapabilities.ts index 2e4e3d9682..175d3757f7 100644 --- a/src/ghidra/GhidraProviderCapabilities.ts +++ b/src/ghidra/GhidraProviderCapabilities.ts @@ -1,5 +1,5 @@ import { GHIDRA_PROVIDER_IDENTITY } from "./GhidraProviderMetadata.js"; -import type { CapabilityDescriptor } from "../application/AnalysisProvider.js"; +import type { CapabilityDescriptor } from "../ports/AnalysisProvider.js"; import { inspectWindowsNativeReadiness, type WindowsNativeReadiness, diff --git a/src/ghidra/GhidraProviderClient.ts b/src/ghidra/GhidraProviderClient.ts index e348c0b387..6e4150c7fb 100644 --- a/src/ghidra/GhidraProviderClient.ts +++ b/src/ghidra/GhidraProviderClient.ts @@ -21,7 +21,7 @@ import { import { z } from "zod"; import { analysisClientFailureForOperation } from "../providers/AnalysisClientFailure.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; -import { artifactFilePrimaryFacts } from "../artifacts/ArtifactFileOperation.js"; +import { artifactFilePrimaryFacts } from "../resources/index.js"; import { fileURLToPath } from "node:url"; import { GHIDRA_BRIDGE_SOURCES } from "./GhidraBridgeSources.js"; import { GhidraAdmissionError } from "./GhidraAdmissionError.js"; @@ -37,7 +37,7 @@ import { type AnalysisClientContext, type AnalysisOperation, type ExecutionOptions, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { AppConfig } from "../config/types.js"; import { ghidraSeedCommitmentSchema, diff --git a/src/ghidra/GhidraProviderMetadata.ts b/src/ghidra/GhidraProviderMetadata.ts index f8bc9b8b73..13843968c6 100644 --- a/src/ghidra/GhidraProviderMetadata.ts +++ b/src/ghidra/GhidraProviderMetadata.ts @@ -1,4 +1,4 @@ -import type { ProviderIdentity } from "../application/AnalysisProvider.js"; +import type { ProviderIdentity } from "../ports/AnalysisProvider.js"; import { GHIDRA_FUNCTION_OPERATIONS } from "./GhidraFunctionOperations.js"; import { GHIDRA_INVENTORY_OPERATIONS } from "./GhidraInventoryOperations.js"; diff --git a/src/ghidra/GhidraPspExtension.ts b/src/ghidra/GhidraPspExtension.ts index 47cde6fe0a..640d4ed900 100644 --- a/src/ghidra/GhidraPspExtension.ts +++ b/src/ghidra/GhidraPspExtension.ts @@ -14,15 +14,15 @@ import { err, ok, type Result } from "../domain/result.js"; import type { GhidraInstallationInspection } from "./GhidraInstallation.js"; import { parseGhidraJavaProperties } from "./GhidraJavaProperties.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import { OwnedDirectoryHandle } from "../filesystem/OwnedDirectoryHandle.js"; import { + type ArtifactResourceScope, + ArtifactReaderFailure, + AnalysisCleanupLease, assertArtifactReadActive, artifactFilePrimaryFacts, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; +import { OwnedDirectoryHandle } from "../filesystem/OwnedDirectoryHandle.js"; /** Installed processor code and data, distinct from REA's analysis-extension ABI. */ export const ghidraPspExtensionSchema = z.strictObject({ diff --git a/src/ghidra/GhidraSnapshotCache.test.ts b/src/ghidra/GhidraSnapshotCache.test.ts index 31e4733d73..252d767681 100644 --- a/src/ghidra/GhidraSnapshotCache.test.ts +++ b/src/ghidra/GhidraSnapshotCache.test.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from "vitest"; import { createTestBinarySession } from "../../tests/fixtures/binarySession.js"; import { parseConfig } from "../config/parseConfig.js"; -import type { AnalysisOperation } from "../application/AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; import type { BinaryTarget } from "../domain/binaryTargetTypes.js"; import { functionDossierSchema } from "../domain/native/functionDossier.js"; import { createAnalysisProfile } from "../domain/analysisProfile.js"; diff --git a/src/ghidra/GhidraSocketConnection.ts b/src/ghidra/GhidraSocketConnection.ts index e8274c8362..35e4319b03 100644 --- a/src/ghidra/GhidraSocketConnection.ts +++ b/src/ghidra/GhidraSocketConnection.ts @@ -1,4 +1,4 @@ -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import type { Socket } from "node:net"; import { connectLocalSocketOnce } from "../process/LocalSocketConnection.js"; diff --git a/src/ghidra/GhidraTargetSnapshot.ts b/src/ghidra/GhidraTargetSnapshot.ts index 71e611e977..d7f935aea6 100644 --- a/src/ghidra/GhidraTargetSnapshot.ts +++ b/src/ghidra/GhidraTargetSnapshot.ts @@ -7,9 +7,10 @@ import { withArtifactFileHandle, assertArtifactReadActive, mapArtifactFileFailure, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { readArtifactFileChunks } from "../artifacts/readArtifactFileChunks.js"; + ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; +import { readArtifactFileChunks } from "../resources/index.js"; import { NonRegularFileReadError, sameRegularFileState, @@ -20,7 +21,6 @@ import { AnalysisArtifactChangedError, AnalysisAccessDeniedError, } from "../domain/analysisErrorCore.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { WindowsSnapshotCancelledError, windowsPrivateRuntime, diff --git a/src/ghidra/GhidraTemporaryDirectory.ts b/src/ghidra/GhidraTemporaryDirectory.ts index 4147b2003b..be94de2683 100644 --- a/src/ghidra/GhidraTemporaryDirectory.ts +++ b/src/ghidra/GhidraTemporaryDirectory.ts @@ -2,13 +2,13 @@ import { randomUUID } from "node:crypto"; import { join } from "node:path"; import { open, unlink } from "node:fs/promises"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { + ArtifactResourceScope, ArtifactFileCleanupFailure, artifactFilePrimaryFacts, withArtifactFileHandle, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { ghidraSessionRoot } from "./GhidraSessionRoot.js"; /** diff --git a/src/ghidra/GhidraTransport.ts b/src/ghidra/GhidraTransport.ts index 2b152572b6..1414db0291 100644 --- a/src/ghidra/GhidraTransport.ts +++ b/src/ghidra/GhidraTransport.ts @@ -6,16 +6,16 @@ import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; import { readWindowsPrivateRuntimeFile } from "../windows/WindowsPrivateRuntime.js"; import { err, ok, type Result } from "../domain/result.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactResourceScope, + ArtifactReaderFailure, assertArtifactReadActive, artifactFilePrimaryFacts, artifactFileCancellationCause, bindArtifactFileCleanup, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; -import { readArtifactFileChunks } from "../artifacts/readArtifactFileChunks.js"; +} from "../resources/index.js"; +import { readArtifactFileChunks } from "../resources/index.js"; import { sameRegularFileState } from "../filesystem/RegularFile.js"; import { GhidraSessionError, diff --git a/src/ghidra/extensions/GhidraExtensions.test.ts b/src/ghidra/extensions/GhidraExtensions.test.ts index a3f5b835a4..2706e643bc 100644 --- a/src/ghidra/extensions/GhidraExtensions.test.ts +++ b/src/ghidra/extensions/GhidraExtensions.test.ts @@ -1,4 +1,4 @@ -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { execFile } from "node:child_process"; import { constants } from "node:fs"; import { promisify } from "node:util"; diff --git a/src/ghidra/extensions/GhidraExtensions.ts b/src/ghidra/extensions/GhidraExtensions.ts index 4a0fb4f8bd..1631de49fd 100644 --- a/src/ghidra/extensions/GhidraExtensions.ts +++ b/src/ghidra/extensions/GhidraExtensions.ts @@ -10,8 +10,10 @@ import { AnalysisUnsupportedTargetError, cancelledBy, } from "../../domain/analysisErrorCore.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { + type ArtifactResourceScope, + assertArtifactReadActive, +} from "../../resources/index.js"; import { readGhidraProfileArtifact, writeGhidraProfileArtifact, diff --git a/src/go/GoBinaryProvider.ts b/src/go/GoBinaryProvider.ts index 88a3d9f987..9857d6c20f 100644 --- a/src/go/GoBinaryProvider.ts +++ b/src/go/GoBinaryProvider.ts @@ -7,20 +7,16 @@ import { projectStableArtifactFailure, projectArtifactCloseFailure, stableArtifactInputFailure, -} from "../artifacts/StableArtifactFailure.js"; -import { type StableArtifactSnapshot, readStableArtifact, -} from "../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, assertArtifactReadActive, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; -import type { GoBinaryPort } from "../application/go/GoBinaryPort.js"; + ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; +import type { GoBinaryPort } from "../ports/go/GoBinaryPort.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisOutputError, diff --git a/src/gpu/ClangOffloadBundle.ts b/src/gpu/ClangOffloadBundle.ts index 9a9e568c07..e0bad8f2e6 100644 --- a/src/gpu/ClangOffloadBundle.ts +++ b/src/gpu/ClangOffloadBundle.ts @@ -5,7 +5,7 @@ import { BinaryFormatFailure, BinaryResourceFailure, } from "../domain/binaryContainer.js"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import { gpuCount, GPU_OBJECT_BYTES, diff --git a/src/gpu/CudaFatbinary.ts b/src/gpu/CudaFatbinary.ts index 8089507dbb..de24479add 100644 --- a/src/gpu/CudaFatbinary.ts +++ b/src/gpu/CudaFatbinary.ts @@ -1,5 +1,5 @@ import type { GpuObject } from "../domain/gpu/gpuCodeObjects.js"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import { gpuCount, nextGpuContainerOffset, diff --git a/src/gpu/GpuCodeObjectsProvider.ts b/src/gpu/GpuCodeObjectsProvider.ts index 40c771a207..2f7a89c480 100644 --- a/src/gpu/GpuCodeObjectsProvider.ts +++ b/src/gpu/GpuCodeObjectsProvider.ts @@ -1,12 +1,21 @@ -import { readerIntegrityFailure } from "../artifacts/StableArtifactFailure.js"; +import { + readerIntegrityFailure, + ArtifactResourceScope, + ArtifactReaderFailure, + withArtifactRegularFile, + bindArtifactFileCleanup, + artifactFilePrimaryFacts, + artifactFileCancellationCause, + artifactFileCompletion, +} from "../resources/index.js"; import { GPU_CODE_OBJECTS_PROVIDER_IDENTITY } from "./GpuCodeObjectsProviderIdentity.js"; import { lstat, type FileHandle } from "node:fs/promises"; -import type { GpuCodeObjectsPort } from "../application/gpu/GpuCodeObjectsPort.js"; +import type { GpuCodeObjectsPort } from "../ports/gpu/GpuCodeObjectsPort.js"; import { createGpuCodeObjectsEvidence, createGpuCodeObjectsPartialEvidence, } from "../domain/gpu/gpuCodeObjectsEvidence.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { GpuCodeObjects, GpuCodeObjectsInput, @@ -26,15 +35,6 @@ import { import { parseFailureAnalysisError } from "../domain/parseFailureAnalysisError.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; import { err, ok, type Result } from "../domain/result.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { - withArtifactRegularFile, - bindArtifactFileCleanup, - artifactFilePrimaryFacts, - artifactFileCancellationCause, - artifactFileCompletion, -} from "../artifacts/ArtifactFileOperation.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { BinaryResourceFailure } from "../domain/binaryContainer.js"; import { diff --git a/src/gpu/GpuInventory.test.ts b/src/gpu/GpuInventory.test.ts index 97efe073c2..c21851400b 100644 --- a/src/gpu/GpuInventory.test.ts +++ b/src/gpu/GpuInventory.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; import { GpuInventory } from "./GpuInventory.js"; import { GpuBufferSource } from "./GpuSource.js"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/ArtifactFileOperation.js"; import { ccobFixture, cubinFixture, diff --git a/src/gpu/GpuInventory.ts b/src/gpu/GpuInventory.ts index ab4e72a1e5..ad6d67db25 100644 --- a/src/gpu/GpuInventory.ts +++ b/src/gpu/GpuInventory.ts @@ -29,7 +29,7 @@ import { readPeSectionDirectory, type NativeSectionDirectory, } from "../native/metadata/NativeSectionDirectory.js"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import { jsonValueByteLength } from "../domain/jsonValueByteLength.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { diff --git a/src/gpu/GpuPayloadCodec.ts b/src/gpu/GpuPayloadCodec.ts index c58af14b87..3c6271d454 100644 --- a/src/gpu/GpuPayloadCodec.ts +++ b/src/gpu/GpuPayloadCodec.ts @@ -1,7 +1,7 @@ import { nodeCodecResult } from "../compression/NodeCodecResult.js"; import { constants, inflate, zstdDecompress } from "node:zlib"; import { promisify } from "node:util"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import { decodeLz4Block } from "../artifacts/Lz4Block.js"; import { GPU_OBJECT_BYTES, rejectGpu } from "./GpuSource.js"; const unzip = promisify(inflate); diff --git a/src/gpu/GpuSource.ts b/src/gpu/GpuSource.ts index 0d5153c79c..d23dbe2dd7 100644 --- a/src/gpu/GpuSource.ts +++ b/src/gpu/GpuSource.ts @@ -1,7 +1,9 @@ import { createHash } from "node:crypto"; import type { FileHandle } from "node:fs/promises"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, +} from "../resources/index.js"; import { BinaryFormatFailure, BinaryResourceFailure, diff --git a/src/hopper/BridgeLauncher.ts b/src/hopper/BridgeLauncher.ts index 110fb5a869..2f0a85b44c 100644 --- a/src/hopper/BridgeLauncher.ts +++ b/src/hopper/BridgeLauncher.ts @@ -14,9 +14,9 @@ import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { ArtifactReaderFailure, artifactPrimaryCleanupLeases, -} from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLeaseGroup } from "../artifacts/AnalysisCleanupLease.js"; + ArtifactResourceScope, + AnalysisCleanupLeaseGroup, +} from "../resources/index.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { cleanupOwnedProcessGroup } from "../process/ProcessOwnership.js"; import type { @@ -57,8 +57,7 @@ import { import type { BridgeMaxRequestBytes } from "../config/bridgeMaxRequestBytes.js"; import { HOPPER_SHUTDOWN_TIMEOUT_MS } from "./HopperSessionValues.js"; import { verifyMacHopperNativeHelper } from "./HopperMacPublisher.js"; -import { inspectLinuxHopperLauncher } from "../application/LinuxHopper.js"; -import { retryLinuxHopperPublisherCleanup } from "../application/LinuxHopperPublisher.js"; +import type { LinuxHopperLauncherVerification } from "../ports/LinuxHopperLauncherVerification.js"; const execFileAsync = promisify(execFile); const HOPPER_BACKGROUND_STARTUP_MS = 5_000; @@ -161,8 +160,12 @@ export type HopperApplicationLauncherOptions = export interface HopperApplicationLauncherDependencies { readonly imageFileSystem?: HopperImageCopyFileSystem; readonly verifyNativeHelper?: typeof verifyMacHopperNativeHelper; - readonly verifyLinuxLauncher?: typeof inspectLinuxHopperLauncher; - readonly retryPublisherCleanup?: typeof retryLinuxHopperPublisherCleanup; + /** + * Linux launcher authentication, supplied by composition. Without it a + * Linux demo launch is refused before the launcher runs. + */ + readonly verifyLinuxLauncher?: LinuxHopperLauncherVerification["inspect"]; + readonly retryPublisherCleanup?: LinuxHopperLauncherVerification["retryCleanup"]; readonly platform?: NodeJS.Platform; readonly acquireTargetLease?: typeof acquireHopperTargetLease; readonly acquireApplicationLease?: typeof acquireLinuxHopperApplicationLease; @@ -237,10 +240,8 @@ export class HopperApplicationLauncher implements BridgeLauncher { } if (usesLinuxDemo(this.options)) { try { - await ( - this.dependencies.retryPublisherCleanup ?? - retryLinuxHopperPublisherCleanup - )(); + // Without a verification owner nothing was verified, so nothing is retained. + await this.dependencies.retryPublisherCleanup?.(); } catch (cause: unknown) { const observation = ArtifactReaderFailure.cleanupObservation( cause, @@ -439,7 +440,7 @@ export class HopperApplicationLauncher implements BridgeLauncher { let expectedLinuxSha256: string | undefined; if (usesLinuxDemo(this.options)) { const inspected = await ( - this.dependencies.verifyLinuxLauncher ?? inspectLinuxHopperLauncher + this.dependencies.verifyLinuxLauncher ?? unverifiableLinuxLauncher )(this.options.launcherPath, this.options.environment, signal); if (!inspected.ok) return inspected.error.reason === "cancelled" @@ -780,6 +781,20 @@ export const linuxDemoLaunch = ( }; }; +/** Refuse a Linux launcher when no verification owner was supplied. */ +const unverifiableLinuxLauncher: LinuxHopperLauncherVerification["inspect"] = + () => + Promise.resolve( + err( + Object.assign( + new Error( + "Linux Hopper launcher verification is not configured; REA does not run an unverified launcher.", + ), + { reason: "verification_unavailable" }, + ), + ), + ); + const cancelledLauncherVerification = ( signal: AbortSignal | undefined, error: Error, diff --git a/src/hopper/HopperAnalysisProfile.ts b/src/hopper/HopperAnalysisProfile.ts index a798265e64..5f12d8096f 100644 --- a/src/hopper/HopperAnalysisProfile.ts +++ b/src/hopper/HopperAnalysisProfile.ts @@ -1,6 +1,8 @@ -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceRetryFailure } from "../artifacts/ArtifactResourceScope.js"; +import { + AnalysisCleanupLease, + bindArtifactFileCleanup, + ArtifactResourceRetryFailure, +} from "../resources/index.js"; import { hashStableFile, stableFileHashCause, @@ -19,7 +21,7 @@ import type { AnalysisProfileResolution, RetainedResourceScope, ProviderIdentity, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { createFunctionCoordinateContext } from "../domain/native/functionCoordinateContext.js"; import { createAnalysisProfile } from "../domain/analysisProfile.js"; import { diff --git a/src/hopper/HopperCallerReconciliation.test.ts b/src/hopper/HopperCallerReconciliation.test.ts index 7194a759d5..aed0be0ac6 100644 --- a/src/hopper/HopperCallerReconciliation.test.ts +++ b/src/hopper/HopperCallerReconciliation.test.ts @@ -2,7 +2,7 @@ import { expect, it, vi } from "vitest"; import { err, ok } from "../domain/result.js"; import type { HopperClient } from "./HopperClient.js"; import { reconcileHopperCallers } from "./HopperCallerReconciliation.js"; -import { AnalysisWorkScope } from "../application/AnalysisWorkScope.js"; +import { AnalysisWorkScope } from "../ports/AnalysisWorkScope.js"; import { formatHopperCallerScanReason, HOPPER_CALLER_SCAN_RETENTION_BYTES, diff --git a/src/hopper/HopperCallerReconciliation.ts b/src/hopper/HopperCallerReconciliation.ts index 3d2e09bf89..c4b6bed961 100644 --- a/src/hopper/HopperCallerReconciliation.ts +++ b/src/hopper/HopperCallerReconciliation.ts @@ -1,6 +1,6 @@ import { performance } from "node:perf_hooks"; import { z } from "zod"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisOutputError, diff --git a/src/hopper/HopperCleanup.ts b/src/hopper/HopperCleanup.ts index 2022213ab3..aaa1435989 100644 --- a/src/hopper/HopperCleanup.ts +++ b/src/hopper/HopperCleanup.ts @@ -1,6 +1,6 @@ import type { Socket } from "node:net"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import type { HopperError } from "../domain/hopperErrors.js"; import { HopperProcessError } from "../domain/hopperErrors.js"; diff --git a/src/hopper/HopperClient.ts b/src/hopper/HopperClient.ts index 8bf051535a..c548939827 100644 --- a/src/hopper/HopperClient.ts +++ b/src/hopper/HopperClient.ts @@ -53,7 +53,7 @@ import { err, ok, type Result } from "../domain/result.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { jsonValueByteLength } from "../domain/jsonValueByteLength.js"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import { silentLogger } from "../logger.js"; import type { Logger } from "pino"; import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; diff --git a/src/hopper/HopperImageCopy.test.ts b/src/hopper/HopperImageCopy.test.ts index 1a3cbc01ea..45497ef235 100644 --- a/src/hopper/HopperImageCopy.test.ts +++ b/src/hopper/HopperImageCopy.test.ts @@ -2,7 +2,7 @@ import { createHash } from "node:crypto"; import { readFile, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { prepareHopperExecutableImage } from "./HopperImageCopy.js"; diff --git a/src/hopper/HopperImageCopy.ts b/src/hopper/HopperImageCopy.ts index 380633f5b0..2022daca5d 100644 --- a/src/hopper/HopperImageCopy.ts +++ b/src/hopper/HopperImageCopy.ts @@ -1,6 +1,6 @@ import { createHash } from "node:crypto"; import { open } from "node:fs/promises"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { HopperCancelledError, diff --git a/src/hopper/HopperMachOImage.copyLifecycle.test.ts b/src/hopper/HopperMachOImage.copyLifecycle.test.ts index cb2c924d95..b696b9c897 100644 --- a/src/hopper/HopperMachOImage.copyLifecycle.test.ts +++ b/src/hopper/HopperMachOImage.copyLifecycle.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { afterEach, expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { createInspectionResources } from "../../tests/fixtures/inspectionResources.js"; import { hopperImageCopyFileSystem } from "../../tests/fixtures/hopperImageCopyFileSystem.js"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; diff --git a/src/hopper/HopperMachOImage.test.ts b/src/hopper/HopperMachOImage.test.ts index c9c16c397a..ef4bc59c4a 100644 --- a/src/hopper/HopperMachOImage.test.ts +++ b/src/hopper/HopperMachOImage.test.ts @@ -17,7 +17,7 @@ import { afterEach, expect, it, vi } from "vitest"; import { createInspectionResources } from "../../tests/fixtures/inspectionResources.js"; import { hopperImageCopyFileSystem } from "../../tests/fixtures/hopperImageCopyFileSystem.js"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { BinaryTargetError } from "../domain/configurationErrors.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { diff --git a/src/hopper/HopperMachOImage.ts b/src/hopper/HopperMachOImage.ts index b1513eedd6..d187ed9bbc 100644 --- a/src/hopper/HopperMachOImage.ts +++ b/src/hopper/HopperMachOImage.ts @@ -2,12 +2,12 @@ import { createHash } from "node:crypto"; import { open, type FileHandle } from "node:fs/promises"; import { z } from "zod"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { + type ArtifactResourceScope, AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +} from "../resources/index.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import type { BinaryTarget } from "../domain/binaryTargetTypes.js"; import { BinaryTargetError } from "../domain/configurationErrors.js"; diff --git a/src/hopper/HopperProvider.ts b/src/hopper/HopperProvider.ts index aa9abf3891..832ac10deb 100644 --- a/src/hopper/HopperProvider.ts +++ b/src/hopper/HopperProvider.ts @@ -1,10 +1,15 @@ -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { + bindArtifactFileCleanup, + AnalysisCleanupLease, + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../resources/index.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { absoluteCallerPath } from "../filesystem/callerPath.js"; import { fileURLToPath } from "node:url"; import { accessSync, constants, statSync } from "node:fs"; -import { createAnalysisExecution } from "../application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import type { AnalysisClient, AnalysisOperation, @@ -16,9 +21,11 @@ import type { ProviderIdentity, ProviderTargetSupport, RetainedResourceScope, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js"; import type { AppConfig } from "../config/types.js"; +import type { LinuxHopperLauncherVerification } from "../ports/LinuxHopperLauncherVerification.js"; +import { selectedHopperLauncherPath } from "../hopperPaths/HopperLauncherDiscovery.js"; import type { BinaryTarget } from "../domain/binaryTargetTypes.js"; import type { JsonValue } from "../domain/jsonValue.js"; import type { Logger } from "pino"; @@ -26,9 +33,6 @@ import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup. import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisCapabilityUnavailableError } from "../domain/analysisErrorCore.js"; import { err, ok, type Result } from "../domain/result.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import type { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; @@ -64,6 +68,8 @@ import { HOPPER_PROVIDER_IDENTITY } from "./HopperProviderMetadata.js"; /** Concrete analysis provider backed by REA's private Hopper bridge. */ export class HopperProvider implements AnalysisProviderCandidate { private readonly environment: Readonly; + /** The configured launcher, else the one automatic discovery selected. */ + readonly #launcherSpelling: string; readonly #launcherPath: string; readonly #ownedResources = new ArtifactResourceScope(); readonly #inspectionOwner: RetainedResourceScope = { @@ -87,10 +93,20 @@ export class HopperProvider implements AnalysisProviderCandidate { private readonly logger: Logger, environment: Readonly, private readonly platform: NodeJS.Platform = process.platform, + /** + * Linux launcher authentication from Hopper setup, supplied by + * composition. Without it a Linux launch is refused before Hopper runs. + */ + private readonly linuxLauncherVerification?: LinuxHopperLauncherVerification, ) { this.environment = snapshotEnvironment(environment, platform); - // Bind lookup once; retain config's selected spelling for diagnostics. - this.#launcherPath = absoluteCallerPath(config.hopperLauncherPath); + this.#launcherSpelling = selectedHopperLauncherPath( + config.hopperLauncherPath, + platform, + environment, + ); + // Bind lookup once; retain the selected spelling for diagnostics. + this.#launcherPath = absoluteCallerPath(this.#launcherSpelling); } identity(): ProviderIdentity { @@ -106,7 +122,7 @@ export class HopperProvider implements AnalysisProviderCandidate { inspectAvailability(): ProviderAvailability { const diagnostics = { - launcher_path: this.config.hopperLauncherPath, + launcher_path: this.#launcherSpelling, platform: this.platform, }; if (this.platform !== "darwin" && this.platform !== "linux") @@ -135,7 +151,7 @@ export class HopperProvider implements AnalysisProviderCandidate { return { status: "unavailable", code: "executable_missing", - reason: `Hopper launcher is missing or not executable: ${this.config.hopperLauncherPath}`, + reason: `Hopper launcher is missing or not executable: ${this.#launcherSpelling}`, remediation: "Run rea setup to install Hopper, or set HOPPER_LAUNCHER_PATH to an executable Hopper launcher in the environment that starts REA, then restart REA.", diagnostics, @@ -300,39 +316,48 @@ export class HopperProvider implements AnalysisProviderCandidate { }; const executionProvider = profile?.provider ?? HOPPER_PROVIDER_IDENTITY; const client = new HopperClient({ - launcher: new HopperApplicationLauncher({ - environment: this.environment, - launcherPath: this.#launcherPath, - targetPath: target.path, - targetKind: target.kind, - ...(target.kind === "executable" - ? { targetSha256: target.sha256 } - : {}), - ...(preparedImage === undefined + launcher: new HopperApplicationLauncher( + { + environment: this.environment, + launcherPath: this.#launcherPath, + targetPath: target.path, + targetKind: target.kind, + ...(target.kind === "executable" + ? { targetSha256: target.sha256 } + : {}), + ...(preparedImage === undefined + ? {} + : { + preparedImage: { + image: preparedImage, + sourceSha256: target.sha256, + }, + }), + loaderArgs: + this.config.hopperLoaderArgs.length > 0 + ? this.config.hopperLoaderArgs + : derivedLoaderArgs.value, + bridgeScriptPath: fileURLToPath( + new URL("../../bridge/hopper_bridge.py", import.meta.url), + ), + bridgeMaxRequestBytes: this.config.bridgeMaxRequestBytes, + ...(this.platform === "linux" + ? { + launchMode: "verified_linux_demo" as const, + demoHelperPath: fileURLToPath( + new URL("../../scripts/hopper-demo-x11.py", import.meta.url), + ), + } + : { launchMode: "native" as const }), + }, + this.linuxLauncherVerification === undefined ? {} : { - preparedImage: { - image: preparedImage, - sourceSha256: target.sha256, - }, - }), - loaderArgs: - this.config.hopperLoaderArgs.length > 0 - ? this.config.hopperLoaderArgs - : derivedLoaderArgs.value, - bridgeScriptPath: fileURLToPath( - new URL("../../bridge/hopper_bridge.py", import.meta.url), - ), - bridgeMaxRequestBytes: this.config.bridgeMaxRequestBytes, - ...(this.platform === "linux" - ? { - launchMode: "verified_linux_demo" as const, - demoHelperPath: fileURLToPath( - new URL("../../scripts/hopper-demo-x11.py", import.meta.url), - ), - } - : { launchMode: "native" as const }), - }), + verifyLinuxLauncher: this.linuxLauncherVerification.inspect, + retryPublisherCleanup: + this.linuxLauncherVerification.retryCleanup, + }, + ), ...(context === undefined ? {} : { runId: context.runId }), readStartupTimeoutMs: () => this.config.hopperStartupTimeoutMs, readStartupTimeoutSource: () => this.config.hopperStartupTimeoutSource, diff --git a/src/hopper/HopperProviderCapabilities.ts b/src/hopper/HopperProviderCapabilities.ts index d9c893b1ac..5a769ecc85 100644 --- a/src/hopper/HopperProviderCapabilities.ts +++ b/src/hopper/HopperProviderCapabilities.ts @@ -11,7 +11,7 @@ import { type RegexWorkerHeapRequest, } from "../config/regexWorkerHeapRequest.js"; import { launchRegexMatchingLimitation } from "../process/RegexMatcher.js"; -import type { CapabilityDescriptor } from "../application/AnalysisProvider.js"; +import type { CapabilityDescriptor } from "../ports/AnalysisProvider.js"; const MUTATING_OPERATIONS = new Set([ "set_address_name", diff --git a/src/hopper/HopperProviderDiscovery.test.ts b/src/hopper/HopperProviderDiscovery.test.ts index 892a0007b8..aca9393a4d 100644 --- a/src/hopper/HopperProviderDiscovery.test.ts +++ b/src/hopper/HopperProviderDiscovery.test.ts @@ -1,7 +1,10 @@ -import { dirname } from "node:path"; +import { existsSync } from "node:fs"; +import { mkdir, symlink } from "node:fs/promises"; +import { dirname, join } from "node:path"; import { describe, expect, it } from "vitest"; +import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { parseConfig } from "../config/parseConfig.js"; import type { BinaryTarget } from "../domain/binaryTargetTypes.js"; import { silentLogger } from "../logger.js"; @@ -36,6 +39,30 @@ describe("Hopper provider discovery", () => { }, ); + it.skipIf( + process.platform === "win32" || existsSync("/opt/hopper/bin/Hopper"), + )( + "discovers the launcher from the provider's host and home when none is configured", + async () => { + const home = await createTestTempDirectory("rea-hopper-discovery-"); + const launcher = join(home, ".local/share/rea/hopper/bin/Hopper"); + await mkdir(dirname(launcher), { recursive: true }); + await symlink(process.execPath, launcher); + const config = parseConfig({}); + if (!config.ok) throw config.error; + const hopper = new HopperProvider( + config.value, + silentLogger, + { HOME: home }, + "linux", + ); + expect(hopper.inspectAvailability()).toMatchObject({ + status: "available", + diagnostics: { launcher_path: launcher, platform: "linux" }, + }); + }, + ); + it.skipIf(process.platform === "win32")( "reports a directory launcher path as missing", () => { diff --git a/src/hopper/HopperProviderMetadata.ts b/src/hopper/HopperProviderMetadata.ts index 0d2f6f8a5b..0060055803 100644 --- a/src/hopper/HopperProviderMetadata.ts +++ b/src/hopper/HopperProviderMetadata.ts @@ -1,4 +1,4 @@ -import type { ProviderIdentity } from "../application/AnalysisProvider.js"; +import type { ProviderIdentity } from "../ports/AnalysisProvider.js"; import type { OfficialToolName } from "../contracts/officialToolContracts.js"; /** Public identity committed by every Hopper-backed observation. */ diff --git a/src/hopper/HopperRegexSearch.ts b/src/hopper/HopperRegexSearch.ts index 73dac17d54..72ac5ad2cd 100644 --- a/src/hopper/HopperRegexSearch.ts +++ b/src/hopper/HopperRegexSearch.ts @@ -1,6 +1,6 @@ import { z } from "zod"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { cancelledBy, OwnerCancellation } from "../domain/analysisErrorCore.js"; import { HopperRemoteError } from "../domain/hopperErrors.js"; diff --git a/src/hopper/HopperRequestQueue.ts b/src/hopper/HopperRequestQueue.ts index 8b49ed7ff6..b1060e6e91 100644 --- a/src/hopper/HopperRequestQueue.ts +++ b/src/hopper/HopperRequestQueue.ts @@ -2,7 +2,7 @@ import { MAX_NODE_TIMER_DELAY_MS } from "../domain/analysisResourceLimits.js"; import type { ProgressReporter, ProgressUpdate, -} from "../application/ProgressReporter.js"; +} from "../ports/ProgressReporter.js"; import { hopperOperationStage } from "./HopperOperationStage.js"; import type { HopperBridgeEvent } from "./protocol.js"; import { diff --git a/src/hopper/LinuxPrivateDisplayProbe.ts b/src/hopper/LinuxPrivateDisplayProbe.ts index e40e08745b..c3ecbec45d 100644 --- a/src/hopper/LinuxPrivateDisplayProbe.ts +++ b/src/hopper/LinuxPrivateDisplayProbe.ts @@ -1,5 +1,5 @@ import { randomUUID } from "node:crypto"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; import { hopperStartupExitCode, diff --git a/src/hopperPaths/HopperLauncherDiscovery.test.ts b/src/hopperPaths/HopperLauncherDiscovery.test.ts new file mode 100644 index 0000000000..4ffdbf5c87 --- /dev/null +++ b/src/hopperPaths/HopperLauncherDiscovery.test.ts @@ -0,0 +1,61 @@ +import { describe, expect, it } from "vitest"; + +import { defaultHopperLauncherPath } from "./HopperLauncherDiscovery.js"; + +describe("default Linux Hopper launcher", () => { + const home = "/fixture/home"; + const withExecutables = + (paths: readonly string[]) => + (path: string): boolean => + paths.includes(path); + + it.each([["/opt/hopper-v4/bin/hopper"], ["/usr/bin/hopper"]])( + "selects an existing system launcher %s", + (path) => { + expect( + defaultHopperLauncherPath("linux", home, withExecutables([path])), + ).toBe(path); + }, + ); + + it("prefers REA-managed and user-local launchers over system paths", () => { + expect( + defaultHopperLauncherPath( + "linux", + home, + withExecutables([ + "/opt/hopper/bin/Hopper", + "/opt/hopper-v4/bin/hopper", + "/usr/bin/hopper", + ]), + ), + ).toBe("/opt/hopper/bin/Hopper"); + expect( + defaultHopperLauncherPath( + "linux", + home, + withExecutables([ + `${home}/.local/share/rea/hopper/bin/Hopper`, + "/usr/bin/hopper", + ]), + ), + ).toBe(`${home}/.local/share/rea/hopper/bin/Hopper`); + }); +}); + +describe("default macOS Hopper launcher", () => { + it("selects the system path before the installer user path", () => { + const home = "/fixture/home"; + const system = + "/Applications/Hopper Disassembler.app/Contents/MacOS/hopper"; + const user = + "/fixture/home/Applications/Hopper Disassembler.app/Contents/MacOS/hopper"; + const executable = (path: string): boolean => + path === system || path === user; + + expect(defaultHopperLauncherPath("darwin", home, executable)).toBe(system); + expect( + defaultHopperLauncherPath("darwin", home, (path) => path === user), + ).toBe(user); + }); +}); diff --git a/src/hopperPaths/HopperLauncherDiscovery.ts b/src/hopperPaths/HopperLauncherDiscovery.ts new file mode 100644 index 0000000000..a5c17621ac --- /dev/null +++ b/src/hopperPaths/HopperLauncherDiscovery.ts @@ -0,0 +1,99 @@ +import { accessSync, constants, statSync } from "node:fs"; + +import { homeDirectoryFromEnvironment } from "../config/homeDirectory.js"; + +import { + linuxHopperLauncherCandidates, + REA_MANAGED_LINUX_HOPPER_LAUNCHER, +} from "./LinuxHopperPaths.js"; +import { + localMacHopperRenamedLauncherCandidates, + MAC_HOPPER_SYSTEM_LAUNCHER, + macHopperCanonicalLauncherCandidates, +} from "./MacHopperPaths.js"; + +/** + * Where automatic Hopper discovery looks on one platform. The Hopper provider + * and doctor both read it, so doctor checks the same candidates, in the same + * order, as CLI/MCP startup. + */ +export interface HopperLauncherDiscovery { + /** Fixed launcher paths, probed in order. */ + readonly candidates: readonly string[]; + /** + * Whether renamed `Hopper*.app` bundles are probed after the fixed paths. + * Doctor also reports the Homebrew cask application only when this is set. + */ + readonly probesMacApplicationBundles: boolean; + /** Launcher selected when no candidate is executable. */ + readonly fallback: string; +} + +/** Select the automatic Hopper launcher candidates for one platform. */ +export const hopperLauncherDiscovery = ( + platform: NodeJS.Platform, + homeDirectory: string, +): HopperLauncherDiscovery => { + if (platform === "darwin") + return { + candidates: macHopperCanonicalLauncherCandidates(homeDirectory), + probesMacApplicationBundles: true, + fallback: MAC_HOPPER_SYSTEM_LAUNCHER, + }; + if (platform === "linux") + return { + candidates: linuxHopperLauncherCandidates(homeDirectory), + probesMacApplicationBundles: false, + fallback: REA_MANAGED_LINUX_HOPPER_LAUNCHER, + }; + return { + candidates: [], + probesMacApplicationBundles: false, + fallback: MAC_HOPPER_SYSTEM_LAUNCHER, + }; +}; + +const executableAvailable = (path: string): boolean => { + try { + accessSync(path, constants.X_OK); + return statSync(path).isFile(); + } catch { + return false; + } +}; + +/** + * The launcher automatic discovery selects: the first executable candidate, + * then renamed macOS application bundles, else the platform's fallback. + */ +export const defaultHopperLauncherPath = ( + platform: NodeJS.Platform, + homeDirectory: string, + executable: (path: string) => boolean = executableAvailable, +): string => { + const discovery = hopperLauncherDiscovery(platform, homeDirectory); + for (const candidate of discovery.candidates) + if (executable(candidate)) return candidate; + if (discovery.probesMacApplicationBundles) + for (const candidate of localMacHopperRenamedLauncherCandidates( + homeDirectory, + )) + if (executable(candidate)) return candidate; + return discovery.fallback; +}; + +/** + * The launcher the Hopper provider uses: the caller's `HOPPER_LAUNCHER_PATH` + * spelling unchanged, else the one automatic discovery selects from the + * caller environment's home. + */ +export const selectedHopperLauncherPath = ( + configured: string | undefined, + platform: NodeJS.Platform, + environment: Readonly, +): string => + configured ?? + defaultHopperLauncherPath( + platform, + homeDirectoryFromEnvironment(environment, platform), + ); diff --git a/src/hopperPaths/LinuxHopperPaths.ts b/src/hopperPaths/LinuxHopperPaths.ts new file mode 100644 index 0000000000..71fdf662ea --- /dev/null +++ b/src/hopperPaths/LinuxHopperPaths.ts @@ -0,0 +1,23 @@ +import { appendCallerPath } from "../filesystem/callerPath.js"; + +/** Canonical launcher path for a legacy user-local Linux Hopper installation. */ +const linuxHopperLauncherPath = (home: string): string => + appendCallerPath(home, ".local/share/rea/hopper/bin/Hopper", "linux"); + +/** REA's managed Linux install path, preferred when no explicit launcher is set. */ +export const REA_MANAGED_LINUX_HOPPER_LAUNCHER = "/opt/hopper/bin/Hopper"; + +/** Other system-wide Hopper paths used by package installations. */ +const systemLinuxHopperLauncherCandidates: readonly string[] = [ + "/opt/hopper-v4/bin/hopper", + "/usr/bin/hopper", +]; + +/** Probe REA-managed and user-local installs before arbitrary system builds. */ +export const linuxHopperLauncherCandidates = ( + home: string, +): readonly string[] => [ + REA_MANAGED_LINUX_HOPPER_LAUNCHER, + linuxHopperLauncherPath(home), + ...systemLinuxHopperLauncherCandidates, +]; diff --git a/src/application/MacHopperPaths.test.ts b/src/hopperPaths/MacHopperPaths.test.ts similarity index 97% rename from src/application/MacHopperPaths.test.ts rename to src/hopperPaths/MacHopperPaths.test.ts index 83be4a56b6..c789023331 100644 --- a/src/application/MacHopperPaths.test.ts +++ b/src/hopperPaths/MacHopperPaths.test.ts @@ -10,8 +10,8 @@ import { } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join, posix, relative } from "node:path"; -import { installMacHopperBundle } from "./MacHopper.js"; -import { linuxHopperLauncherCandidates } from "./LinuxHopper.js"; +import { installMacHopperBundle } from "../application/MacHopper.js"; +import { linuxHopperLauncherCandidates } from "./LinuxHopperPaths.js"; import { homeDirectoryFromEnvironment } from "../config/homeDirectory.js"; import { describe, expect, it } from "vitest"; diff --git a/src/application/MacHopperPaths.ts b/src/hopperPaths/MacHopperPaths.ts similarity index 100% rename from src/application/MacHopperPaths.ts rename to src/hopperPaths/MacHopperPaths.ts diff --git a/src/ida/IdaConfiguration.test.ts b/src/ida/IdaConfiguration.test.ts index 46459057fd..666b70546d 100644 --- a/src/ida/IdaConfiguration.test.ts +++ b/src/ida/IdaConfiguration.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { afterEach, describe, expect, it, vi } from "vitest"; import { createIdaTarget } from "../../tests/fixtures/idaMcp.js"; import { readIdaConfiguration } from "./IdaConfiguration.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import * as regularFile from "../filesystem/RegularFile.js"; diff --git a/src/ida/IdaConfiguration.ts b/src/ida/IdaConfiguration.ts index 6df4066984..021555a78d 100644 --- a/src/ida/IdaConfiguration.ts +++ b/src/ida/IdaConfiguration.ts @@ -2,8 +2,8 @@ import { MAX_NODE_TIMER_DELAY_MS } from "../domain/analysisResourceLimits.js"; import { isAbsolute } from "node:path"; import { z } from "zod"; import { jsonRecordSchema } from "../domain/jsonRecord.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { ConfigurationError } from "../domain/configurationErrors.js"; import { AnalysisCancelledError, diff --git a/src/ida/IdaDoctor.test.ts b/src/ida/IdaDoctor.test.ts index d5e9120de3..c0625ccfa3 100644 --- a/src/ida/IdaDoctor.test.ts +++ b/src/ida/IdaDoctor.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { afterEach, expect, it } from "vitest"; import { inspectIdaRegistration } from "./IdaDoctor.js"; import { providerRegistrationEnvironment } from "../application/SetupRegistrationEnvironment.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; const resourceScope: RetainedResourceScope = { retain: () => undefined, diff --git a/src/ida/IdaDoctor.ts b/src/ida/IdaDoctor.ts index 80d66a802c..6606041886 100644 --- a/src/ida/IdaDoctor.ts +++ b/src/ida/IdaDoctor.ts @@ -1,7 +1,7 @@ import type { DoctorProviderCheck, DoctorProviderInspection, -} from "../application/Doctor.js"; +} from "../ports/DoctorProviderInspection.js"; import { readIdaConfiguration, type IdaConfiguration, @@ -14,7 +14,7 @@ import { IDA_WORKSPACE_ROOT_REMEDIATION, type IdaAdmission, } from "./IdaAdmission.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; /** Client settings consulted by this readiness probe. */ export const IDA_DOCTOR_SETTINGS = ["REA_IDA_MCP_CONFIG"] as const; diff --git a/src/ida/IdaMcpConnection.ts b/src/ida/IdaMcpConnection.ts index 72d96a0eab..f0d6e63696 100644 --- a/src/ida/IdaMcpConnection.ts +++ b/src/ida/IdaMcpConnection.ts @@ -1,9 +1,9 @@ import { ArtifactResourceScope, type ArtifactResourceOwner, -} from "../artifacts/ArtifactResourceScope.js"; + bindArtifactFileCleanup, +} from "../resources/index.js"; import { ResponseBodyCleanup } from "../providers/ResponseBodyCleanup.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { mcpToolResultSchema, diff --git a/src/ida/IdaNativeProtocol.test.ts b/src/ida/IdaNativeProtocol.test.ts index d474abe5e0..09d540a67f 100644 --- a/src/ida/IdaNativeProtocol.test.ts +++ b/src/ida/IdaNativeProtocol.test.ts @@ -26,8 +26,8 @@ import { IdaSessionClient } from "./IdaSessionClient.js"; import type { RetainedResourceScope, AnalysisProfileResolution, -} from "../application/AnalysisProvider.js"; -import { ProviderInspectionScope } from "../application/ProviderInspectionScope.js"; +} from "../ports/AnalysisProvider.js"; +import { ProviderInspectionScope } from "../ports/ProviderInspectionScope.js"; import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js"; const resourceScope: RetainedResourceScope = { diff --git a/src/ida/IdaOperationFailures.test.ts b/src/ida/IdaOperationFailures.test.ts index dd2712ddcb..0d7c2f99f5 100644 --- a/src/ida/IdaOperationFailures.test.ts +++ b/src/ida/IdaOperationFailures.test.ts @@ -13,7 +13,7 @@ import { AnalysisInputError } from "../domain/analysisErrorCore.js"; import { createIdaDiagnosticRedactor } from "./IdaDiagnosticRedactor.js"; import { decodeIdaToolResult } from "./IdaMcpConnection.js"; import { IDA_PROVIDER_IDENTITY } from "./IdaProviderMetadata.js"; -import type { AnalysisOperation } from "../application/AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; import { IdaSessionClient } from "./IdaSessionClient.js"; const roots: string[] = []; diff --git a/src/ida/IdaProvider.test.ts b/src/ida/IdaProvider.test.ts index 694e886b6a..e4753ec0b7 100644 --- a/src/ida/IdaProvider.test.ts +++ b/src/ida/IdaProvider.test.ts @@ -397,9 +397,7 @@ it.each(["http", "stdio"] as const)( it("applies runtime regex budgets through a bound IDA client and recovers in the same session", async () => { const { root, target } = await createIdaTarget(); const path = join(root, "registration.json"); - let client: - | import("../application/AnalysisProvider.js").AnalysisClient - | undefined; + let client: import("../ports/AnalysisProvider.js").AnalysisClient | undefined; let provider: IdaProvider | undefined; try { await writeFile( diff --git a/src/ida/IdaProvider.ts b/src/ida/IdaProvider.ts index 7f1791ab28..8ca9b10cc2 100644 --- a/src/ida/IdaProvider.ts +++ b/src/ida/IdaProvider.ts @@ -1,4 +1,8 @@ -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { + bindArtifactFileCleanup, + ArtifactResourceScope, + AnalysisCleanupLease, +} from "../resources/index.js"; import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { launchRegexMatchingLimitation } from "../process/RegexMatcher.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; @@ -26,7 +30,7 @@ import type { ProviderAvailability, ProviderTargetSupport, RetainedResourceScope, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { AppConfig } from "../config/types.js"; import type { ConfigurationError } from "../domain/configurationErrors.js"; import { idaRegistrationDigest } from "./IdaRegistrationIdentity.js"; @@ -51,10 +55,8 @@ import { IDA_WORKSPACE_ROOT_REMEDIATION, type IdaAdmission, } from "./IdaAdmission.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import type { ProviderInspectionScope } from "../application/ProviderInspectionScope.js"; +import type { ProviderInspectionScope } from "../ports/ProviderInspectionScope.js"; /** * Families IDA admits today. Every other family is refused, including families diff --git a/src/ida/IdaProviderCapabilities.ts b/src/ida/IdaProviderCapabilities.ts index f999817d24..ae5af1d00c 100644 --- a/src/ida/IdaProviderCapabilities.ts +++ b/src/ida/IdaProviderCapabilities.ts @@ -3,7 +3,7 @@ import { IDA_OPERATIONS, } from "./IdaProviderMetadata.js"; import type { IdaCompatibilityProfile } from "./IdaConfiguration.js"; -import type { CapabilityDescriptor } from "../application/AnalysisProvider.js"; +import type { CapabilityDescriptor } from "../ports/AnalysisProvider.js"; import { REGEX_MATCHING_LIMITATION } from "../process/RegexMatcher.js"; export type IdaOperation = (typeof IDA_OPERATIONS)[number]; diff --git a/src/ida/IdaProviderMetadata.ts b/src/ida/IdaProviderMetadata.ts index 874ab45f86..77a5066ef4 100644 --- a/src/ida/IdaProviderMetadata.ts +++ b/src/ida/IdaProviderMetadata.ts @@ -1,4 +1,4 @@ -import type { AnalysisOperation } from "../application/AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; /** This version identifies REA's adapter, not IDA or the upstream MCP server. */ export const IDA_PROVIDER_IDENTITY = Object.freeze({ diff --git a/src/ida/IdaSessionClient.ts b/src/ida/IdaSessionClient.ts index 5c85710da0..a57fc57b47 100644 --- a/src/ida/IdaSessionClient.ts +++ b/src/ida/IdaSessionClient.ts @@ -6,7 +6,7 @@ import { type AnalysisClient, type AnalysisOperation, type ExecutionOptions, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisCapabilityUnavailableError, @@ -58,8 +58,10 @@ import { } from "./IdaWorkspace.js"; import { parseIdaInput } from "./IdaInput.js"; import { createEvidence } from "../domain/evidence.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + bindArtifactFileCleanup, +} from "../resources/index.js"; import { classifyProviderFailure } from "../providers/classifyProviderFailure.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; diff --git a/src/ida/IdaStartupFailures.test.ts b/src/ida/IdaStartupFailures.test.ts index 1d56a62817..49077731b4 100644 --- a/src/ida/IdaStartupFailures.test.ts +++ b/src/ida/IdaStartupFailures.test.ts @@ -10,7 +10,7 @@ import { AnalysisResourceConstraintError, } from "../domain/analysisErrorCore.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { IdaSessionClient } from "./IdaSessionClient.js"; it.each(["timeout", "resource"] as const)( diff --git a/src/ida/IdaWorkspace.ts b/src/ida/IdaWorkspace.ts index eaab49f41c..67494a82d9 100644 --- a/src/ida/IdaWorkspace.ts +++ b/src/ida/IdaWorkspace.ts @@ -9,11 +9,11 @@ import { AnalysisProtocolError } from "../domain/analysisErrorCore.js"; import { ConfigurationError } from "../domain/configurationErrors.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { + ArtifactResourceScope, assertArtifactReadActive, withArtifactFileHandle, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; /** Read a file digest with bounded memory rather than retaining binary bytes. */ export const idaFileDigest = async (path: string): Promise => { diff --git a/src/il2cpp/Il2cppGhidraSeedWriter.ts b/src/il2cpp/Il2cppGhidraSeedWriter.ts index 337c8f6257..195ac4fb57 100644 --- a/src/il2cpp/Il2cppGhidraSeedWriter.ts +++ b/src/il2cpp/Il2cppGhidraSeedWriter.ts @@ -1,15 +1,17 @@ import { lstat } from "node:fs/promises"; import { isAbsolute } from "node:path"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { Il2cppSeedWriterPort, Il2cppSeedOutput, Il2cppSeedReceipt, -} from "../application/il2cpp/Il2cppSeedWriterPort.js"; -import { writeTextParts } from "../application/JsonFiles.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +} from "../ports/il2cpp/Il2cppSeedWriterPort.js"; +import { + writeTextParts, + ArtifactResourceScope, + ArtifactReaderFailure, + AnalysisCleanupLease, +} from "../resources/index.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisInputError, diff --git a/src/il2cpp/Il2cppMetadataProvider.ts b/src/il2cpp/Il2cppMetadataProvider.ts index 2e2d630e98..eb32b256d1 100644 --- a/src/il2cpp/Il2cppMetadataProvider.ts +++ b/src/il2cpp/Il2cppMetadataProvider.ts @@ -11,24 +11,20 @@ import { setImmediate } from "node:timers/promises"; import { readStableArtifact, type StableArtifactSnapshot, -} from "../artifacts/readStableArtifact.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { + ArtifactResourceScope, + ArtifactReaderFailure, projectOwnedArtifactIdentityFailure, projectSelectedArtifactFileFailure, stableArtifactInputFailure, -} from "../artifacts/StableArtifactFailure.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, artifactFileCompletion, bindArtifactFileCleanup, assertArtifactReadActive, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; -import type { Il2cppMetadataPort } from "../application/il2cpp/Il2cppMetadataPort.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; +import type { Il2cppMetadataPort } from "../ports/il2cpp/Il2cppMetadataPort.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { createEvidence } from "../domain/evidence.js"; import { createIl2cppMetadataAdmission } from "./Il2cppMetadataAdmission.js"; diff --git a/src/inspector/V8InspectorProvider.ts b/src/inspector/V8InspectorProvider.ts index 23299a829e..eeb6470cdb 100644 --- a/src/inspector/V8InspectorProvider.ts +++ b/src/inspector/V8InspectorProvider.ts @@ -6,8 +6,8 @@ import { import type { ExecutionOptions, ProviderIdentity, -} from "../application/AnalysisProvider.js"; -import type { JavaScriptRuntimeObservationPort } from "../application/javascript/JavaScriptRuntimeObservationPort.js"; +} from "../ports/AnalysisProvider.js"; +import type { JavaScriptRuntimeObservationPort } from "../ports/javascript/JavaScriptRuntimeObservationPort.js"; import { javascriptRuntimeObservationSchema, javascriptRuntimeTargetListSchema, diff --git a/src/inspector/providerIdentity.ts b/src/inspector/providerIdentity.ts index b8d8fadf81..b48feeb501 100644 --- a/src/inspector/providerIdentity.ts +++ b/src/inspector/providerIdentity.ts @@ -1,4 +1,4 @@ -import type { ProviderIdentity } from "../application/AnalysisProvider.js"; +import type { ProviderIdentity } from "../ports/AnalysisProvider.js"; /** Identity available without loading the V8InspectorProvider implementation. */ export const V8_INSPECTOR_PROVIDER_IDENTITY: ProviderIdentity = Object.freeze({ diff --git a/src/javascript/analysis/JavaScriptAnalysisWorker.ts b/src/javascript/analysis/JavaScriptAnalysisWorker.ts index c776117042..bb6f2902ac 100644 --- a/src/javascript/analysis/JavaScriptAnalysisWorker.ts +++ b/src/javascript/analysis/JavaScriptAnalysisWorker.ts @@ -5,9 +5,11 @@ import { reportsJavaScriptMemberMutationRefusal, } from "../../domain/javascript/javascriptSemanticWorkAllowance.js"; import { MAX_NODE_TIMER_DELAY_MS } from "../../domain/analysisResourceLimits.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../../artifacts/ArtifactFileOperation.js"; +import { + ArtifactResourceScope, + ArtifactReaderFailure, + bindArtifactFileCleanup, +} from "../../resources/index.js"; import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; import { retainProcessInspectionCleanup, @@ -56,7 +58,7 @@ import { javaScriptRuntime } from "../../domain/runtimeVersion.js"; import { RuntimeControlUnavailableError, runtimeControlCapabilityError, -} from "../../process/RuntimeControlUnavailableError.js"; +} from "../../domain/runtimeControlUnavailableError.js"; import { javaScriptWorkerMemoryLimitBytes } from "../../process/JavaScriptWorkerMemoryLimit.js"; import { spawnOwnedProviderProcess, diff --git a/src/javascript/recovery/RecoveryFiles.ownership.test.ts b/src/javascript/recovery/RecoveryFiles.ownership.test.ts index 62dd807cc9..5ea4d55c52 100644 --- a/src/javascript/recovery/RecoveryFiles.ownership.test.ts +++ b/src/javascript/recovery/RecoveryFiles.ownership.test.ts @@ -1,11 +1,11 @@ import { renameSync, writeFileSync, type Dir } from "node:fs"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { createHash } from "node:crypto"; import { writeFile, type FileHandle } from "node:fs/promises"; import { dirname, join } from "node:path"; import { afterEach, expect, it, onTestFinished, vi } from "vitest"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { ArtifactFileCleanupFailure } from "../../artifacts/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; +import { ArtifactFileCleanupFailure } from "../../resources/ArtifactFileOperation.js"; import { AnalysisCancelledError, AnalysisArtifactChangedError, diff --git a/src/javascript/recovery/RecoveryFiles.test.ts b/src/javascript/recovery/RecoveryFiles.test.ts index 0d60069697..62b2e461a9 100644 --- a/src/javascript/recovery/RecoveryFiles.test.ts +++ b/src/javascript/recovery/RecoveryFiles.test.ts @@ -15,7 +15,7 @@ import { AnalysisInputError, AnalysisOutputError, } from "../../domain/analysisErrorCore.js"; -import { ArtifactFileCleanupFailure } from "../../artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../../resources/ArtifactFileOperation.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { openRegularFile, diff --git a/src/javascript/recovery/RecoveryFiles.ts b/src/javascript/recovery/RecoveryFiles.ts index d03a74af5a..2e49cb3a30 100644 --- a/src/javascript/recovery/RecoveryFiles.ts +++ b/src/javascript/recovery/RecoveryFiles.ts @@ -3,10 +3,10 @@ import { ArtifactFileCancelled, ArtifactFileCleanupFailure, withArtifactRegularFile, -} from "../../artifacts/ArtifactFileOperation.js"; + ArtifactReaderFailure, + ArtifactResourceScope, +} from "../../resources/index.js"; import { fileSnapshotPartialObservationSchema } from "../../domain/fileSnapshotObservation.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; import { OwnedDirectoryHandle } from "../../filesystem/OwnedDirectoryHandle.js"; import { createHash } from "node:crypto"; import { @@ -18,7 +18,7 @@ import { writeFile, } from "node:fs/promises"; import { basename, dirname, isAbsolute, join, relative, sep } from "node:path"; -import { normalizeArtifactPath } from "../../artifacts/ArtifactPaths.js"; +import { normalizeArtifactPath } from "../../resources/index.js"; import { AnalysisAccessDeniedError, AnalysisArtifactChangedError, diff --git a/src/javascript/recovery/WakaruCommand.ts b/src/javascript/recovery/WakaruCommand.ts index 4ff72bb4fa..4d9bcedbaf 100644 --- a/src/javascript/recovery/WakaruCommand.ts +++ b/src/javascript/recovery/WakaruCommand.ts @@ -11,8 +11,10 @@ import { AnalysisOutputError, cancelledBy, } from "../../domain/analysisErrorCore.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../../resources/index.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; diff --git a/src/javascript/recovery/WakaruExecution.ts b/src/javascript/recovery/WakaruExecution.ts index 4e8a41c21c..e8281df50f 100644 --- a/src/javascript/recovery/WakaruExecution.ts +++ b/src/javascript/recovery/WakaruExecution.ts @@ -3,9 +3,9 @@ import { join } from "node:path"; import { createAnalysisExecution, type ExecutionOptions, -} from "../../application/AnalysisProvider.js"; -import type { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +} from "../../ports/AnalysisProvider.js"; +import type { SafeOutputTree } from "../../resources/index.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import { AnalysisArtifactChangedError, AnalysisCapabilityUnavailableError, diff --git a/src/javascript/recovery/WakaruProvider.ts b/src/javascript/recovery/WakaruProvider.ts index 5619a3305d..cfba3df7fe 100644 --- a/src/javascript/recovery/WakaruProvider.ts +++ b/src/javascript/recovery/WakaruProvider.ts @@ -3,15 +3,21 @@ import { HOST_PLATFORM } from "../../platform/HostPlatform.js"; import { mkdir, mkdtemp, rm } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import type { JavaScriptRecoveryPort } from "../../application/javascript/JavaScriptRecoveryPort.js"; +import type { JavaScriptRecoveryPort } from "../../ports/javascript/JavaScriptRecoveryPort.js"; import type { AnalysisExecution, ExecutionOptions, -} from "../../application/AnalysisProvider.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; -import { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; -import { SafeOutputTreeCreationFailure } from "../../artifacts/SafeOutputTreeCreationFailure.js"; +} from "../../ports/AnalysisProvider.js"; +import { + ArtifactResourceScope, + AnalysisCleanupLease, + ArtifactReaderFailure, + artifactFileCancellationCause, +} from "../../resources/index.js"; +import { + SafeOutputTree, + SafeOutputTreeCreationFailure, +} from "../../resources/index.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { analysisErrorWithCancellation } from "../../domain/analysisErrorCancellation.js"; import { @@ -20,8 +26,6 @@ import { cancelledBy, carriedReason, } from "../../domain/analysisErrorCore.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { artifactFileCancellationCause } from "../../artifacts/ArtifactFileOperation.js"; import { javascriptRecoveryResultSchema, type JavaScriptRecoveryInput, diff --git a/src/javascript/recovery/WakaruPublication.ts b/src/javascript/recovery/WakaruPublication.ts index 23a5ddea57..56ebb23f4b 100644 --- a/src/javascript/recovery/WakaruPublication.ts +++ b/src/javascript/recovery/WakaruPublication.ts @@ -1,7 +1,7 @@ import { join } from "node:path"; import { Readable } from "node:stream"; -import type { SafeOutputTree } from "../../artifacts/SafeOutputTree.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { SafeOutputTree } from "../../resources/index.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { javascriptRecoveryResultSchema, diff --git a/src/javascript/recovery/WakaruReport.ts b/src/javascript/recovery/WakaruReport.ts index 41c2f1f8c5..0da9bbe8a2 100644 --- a/src/javascript/recovery/WakaruReport.ts +++ b/src/javascript/recovery/WakaruReport.ts @@ -1,12 +1,14 @@ import { z } from "zod"; import { safeParseUtf8Json } from "../../domain/safeJson.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../../resources/index.js"; import type { AnalysisCapturedOutput } from "../../domain/analysisErrorBase.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; import { normalizeArtifactPath, ArtifactPathRegistry, -} from "../../artifacts/ArtifactPaths.js"; +} from "../../resources/index.js"; import { AnalysisAccessDeniedError, AnalysisArtifactChangedError, diff --git a/src/javascript/sourceMaps/SourceMapCodecProcess.ts b/src/javascript/sourceMaps/SourceMapCodecProcess.ts index 2d3ff9a994..e6fce95481 100644 --- a/src/javascript/sourceMaps/SourceMapCodecProcess.ts +++ b/src/javascript/sourceMaps/SourceMapCodecProcess.ts @@ -1,4 +1,4 @@ -import { readStableArtifact } from "../../artifacts/readStableArtifact.js"; +import { readStableArtifact } from "../../resources/index.js"; import { selectedSourceMapLimits, sourceMapLimitRecovery, diff --git a/src/javascript/sourceMaps/SourceMapCommand.ts b/src/javascript/sourceMaps/SourceMapCommand.ts index bd001f56a2..5b9d0ade86 100644 --- a/src/javascript/sourceMaps/SourceMapCommand.ts +++ b/src/javascript/sourceMaps/SourceMapCommand.ts @@ -8,7 +8,7 @@ import { randomUUID } from "node:crypto"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { fileURLToPath } from "node:url"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisCleanupRelease } from "../../domain/analysisCleanupRelease.js"; import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; @@ -36,7 +36,7 @@ import { ProcessAdmissionError } from "../../process/ProcessAdmissionError.js"; import { RuntimeControlUnavailableError, runtimeControlCapabilityError, -} from "../../process/RuntimeControlUnavailableError.js"; +} from "../../domain/runtimeControlUnavailableError.js"; import { ProviderStartupDeadline } from "../../process/ProviderDeadline.js"; import { javaScriptWorkerMemoryLimitBytes } from "../../process/JavaScriptWorkerMemoryLimit.js"; import { cleanupOwnedProcessGroup } from "../../process/ProcessOwnership.js"; diff --git a/src/javascript/sourceMaps/SourceMapDecoder.ts b/src/javascript/sourceMaps/SourceMapDecoder.ts index ced145a540..32874b5a67 100644 --- a/src/javascript/sourceMaps/SourceMapDecoder.ts +++ b/src/javascript/sourceMaps/SourceMapDecoder.ts @@ -3,8 +3,8 @@ import { localSourceMapLimitsSchema, sourceMapLimitRecovery, } from "../../domain/sourceMapLimits.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; -import type { WebSourceMapPort } from "../../application/WebSourceLocationPorts.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; +import type { WebSourceMapPort } from "../../ports/WebSourceLocationPorts.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import { analysisErrorWithCancellation } from "../../domain/analysisErrorCancellation.js"; import { diff --git a/src/jeb/JebMcpConnectionOwner.ts b/src/jeb/JebMcpConnectionOwner.ts index 9e02099f0f..18d939f7c5 100644 --- a/src/jeb/JebMcpConnectionOwner.ts +++ b/src/jeb/JebMcpConnectionOwner.ts @@ -4,7 +4,7 @@ import { SdkErrorCode, StreamableHTTPClientTransport, } from "@modelcontextprotocol/client"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { SharedStartupAttempt } from "../process/SharedStartupAttempt.js"; import type { Result } from "../domain/result.js"; diff --git a/src/jeb/JebProvider.ts b/src/jeb/JebProvider.ts index 247c237223..83ac06489a 100644 --- a/src/jeb/JebProvider.ts +++ b/src/jeb/JebProvider.ts @@ -10,13 +10,13 @@ import { z } from "zod"; import type { JebAnalysisPort, JebAnalysisAvailability, -} from "../application/jeb/JebAnalysisPort.js"; +} from "../ports/jeb/JebAnalysisPort.js"; import type { AnalysisExecution, ExecutionOptions, ProviderIdentity, -} from "../application/AnalysisProvider.js"; -import { createAnalysisExecution } from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import type { JebOperation, JebRequest } from "../domain/jeb/jebAnalysis.js"; import { jebResultSchemas } from "../domain/jeb/jebAnalysis.js"; import { diff --git a/src/jeb/JebProviderIdentity.ts b/src/jeb/JebProviderIdentity.ts index 3d75f7ca89..69a587d257 100644 --- a/src/jeb/JebProviderIdentity.ts +++ b/src/jeb/JebProviderIdentity.ts @@ -1,4 +1,4 @@ -import type { ProviderIdentity } from "../application/AnalysisProvider.js"; +import type { ProviderIdentity } from "../ports/AnalysisProvider.js"; /** Source-owned static provider identity and public operation names. */ export const JEB_PROVIDER_IDENTITY: ProviderIdentity = { diff --git a/src/kuna/KunaCommand.ts b/src/kuna/KunaCommand.ts index f572e009cf..2245fe6367 100644 --- a/src/kuna/KunaCommand.ts +++ b/src/kuna/KunaCommand.ts @@ -23,9 +23,9 @@ import { artifactFilePrimaryFacts, bindArtifactFileCleanup, withArtifactFileHandle, -} from "../artifacts/ArtifactFileOperation.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; + type ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import { OwnedCommandFailure, runOwnedCommand, diff --git a/src/kuna/KunaConfiguration.ts b/src/kuna/KunaConfiguration.ts index 00386f9a08..3fab61be63 100644 --- a/src/kuna/KunaConfiguration.ts +++ b/src/kuna/KunaConfiguration.ts @@ -3,7 +3,7 @@ import { isAbsolute } from "node:path"; import { ConfigurationError } from "../domain/configurationErrors.js"; import { currentAnalysisOperationSnapshot } from "../domain/analysisOperationSnapshot.js"; -import { defaultKunaCacheDirectory } from "../config/kunaCacheDirectory.js"; +import { defaultKunaCacheDirectory } from "../filesystem/cacheDirectory.js"; import { homeDirectoryFromEnvironment } from "../config/homeDirectory.js"; import { providerStartupTimeoutSchema } from "../config/providerStartupTimeout.js"; import { err, ok, type Result } from "../domain/result.js"; diff --git a/src/kuna/KunaCopy.test.ts b/src/kuna/KunaCopy.test.ts index d5d5973f5b..0681024b38 100644 --- a/src/kuna/KunaCopy.test.ts +++ b/src/kuna/KunaCopy.test.ts @@ -5,15 +5,15 @@ import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { ArtifactFileCleanupFailure, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/ArtifactFileOperation.js"; import { createHash } from "node:crypto"; import * as fs from "node:fs/promises"; import { readFile, writeFile, type FileHandle } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, onTestFinished, vi } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { copyAndHash, kunaCopyFailureFacts } from "./KunaCommand.js"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { awaitAcknowledgement } from "../../tests/fixtures/lifecycleAcknowledgement.js"; diff --git a/src/kuna/KunaDoctor.ts b/src/kuna/KunaDoctor.ts index 1be19881dc..1b2af90313 100644 --- a/src/kuna/KunaDoctor.ts +++ b/src/kuna/KunaDoctor.ts @@ -5,12 +5,12 @@ import { dirname, posix, win32 } from "node:path"; import type { DoctorProviderCheck, DoctorProviderInspection, -} from "../application/Doctor.js"; +} from "../ports/DoctorProviderInspection.js"; import { admitKunaCommand, type KunaAdmissionRefusal, } from "./KunaAdmission.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; import { kunaRetainedResourceCleanupError } from "./KunaCommand.js"; import { diff --git a/src/kuna/KunaInstallation.ts b/src/kuna/KunaInstallation.ts index 495370ce49..4529a847e6 100644 --- a/src/kuna/KunaInstallation.ts +++ b/src/kuna/KunaInstallation.ts @@ -15,17 +15,17 @@ import { carriedReason, } from "../domain/analysisErrorCore.js"; import { err, ok, type Result } from "../domain/result.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactReaderFailure, AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/index.js"; import { hashStableFile, observeStableFile, stableFileHashCause, } from "../filesystem/StableFileHash.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { RegularFileCleanupFailure, RegularFileCancelled, diff --git a/src/kuna/KunaProjectCache.ts b/src/kuna/KunaProjectCache.ts index b82f2e61c2..f19bc75855 100644 --- a/src/kuna/KunaProjectCache.ts +++ b/src/kuna/KunaProjectCache.ts @@ -28,9 +28,11 @@ import writeFileAtomic from "write-file-atomic"; import { z } from "zod"; import { utcDateTimeSchema } from "../domain/offsetDateTime.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { + ArtifactResourceScope, + bindArtifactFileCleanup, + AnalysisCleanupLease, +} from "../resources/index.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { diff --git a/src/kuna/KunaProjectExport.ts b/src/kuna/KunaProjectExport.ts index 5162518769..41eeda961e 100644 --- a/src/kuna/KunaProjectExport.ts +++ b/src/kuna/KunaProjectExport.ts @@ -1,9 +1,9 @@ -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + type ArtifactResourceScope, + ArtifactReaderFailure, artifactFileCancellationCause, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import type { RegularFileState } from "../filesystem/RegularFile.js"; import { createHash } from "node:crypto"; diff --git a/src/kuna/KunaProvider.ts b/src/kuna/KunaProvider.ts index 8efe22196d..068e62d8d3 100644 --- a/src/kuna/KunaProvider.ts +++ b/src/kuna/KunaProvider.ts @@ -6,7 +6,7 @@ import type { AnalysisProviderCandidate, ProviderAvailability, ProviderTargetSupport, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { cancelledBy } from "../domain/analysisErrorCore.js"; import { createAnalysisProfile, diff --git a/src/kuna/KunaProviderCapabilities.ts b/src/kuna/KunaProviderCapabilities.ts index 9f3bbd91ba..822fdffc1e 100644 --- a/src/kuna/KunaProviderCapabilities.ts +++ b/src/kuna/KunaProviderCapabilities.ts @@ -6,7 +6,7 @@ import type { AnalysisOperation, CapabilityDescriptor, ProviderAvailability, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { DEFAULT_REGEX_MATCHING_DEADLINE, diff --git a/src/kuna/KunaProviderMetadata.ts b/src/kuna/KunaProviderMetadata.ts index 54b38571b7..4db1945cf3 100644 --- a/src/kuna/KunaProviderMetadata.ts +++ b/src/kuna/KunaProviderMetadata.ts @@ -1,4 +1,4 @@ -import type { AnalysisOperation } from "../application/AnalysisProvider.js"; +import type { AnalysisOperation } from "../ports/AnalysisProvider.js"; import { KUNA_PROVIDER_ID } from "./KunaRelease.js"; /** Static identity; the observed Kuna release is reported in each analysis profile. */ diff --git a/src/kuna/KunaSessionClient.ts b/src/kuna/KunaSessionClient.ts index 8f83c4dcf8..1172ed04b6 100644 --- a/src/kuna/KunaSessionClient.ts +++ b/src/kuna/KunaSessionClient.ts @@ -4,17 +4,19 @@ import { snapshotRegexConfiguration, type RegexConfigurationSnapshot, } from "../process/RegexMatcher.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { + bindArtifactFileCleanup, + AnalysisCleanupLease, + AnalysisCleanupLeaseGroup, + type ArtifactResourceOwner, + ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import { basename, join } from "node:path"; import { regularFileCancellation, RegularFileCleanupFailure, } from "../filesystem/OwnedRegularFile.js"; -import { - AnalysisCleanupLease, - AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import type { ArtifactResourceOwner } from "../artifacts/ArtifactResourceScope.js"; import { z } from "zod"; import { @@ -24,7 +26,7 @@ import { type AnalysisOperation, type ExecutionOptions, type RetainedResourceScope, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisCancelledError, @@ -131,8 +133,6 @@ import { type KunaProjectFileSpan, } from "./KunaProjectReader.js"; import { kunaUnavailable } from "./KunaUnavailable.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import type { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { kunaQueryFailureForCaller } from "./KunaQueryErrors.js"; import type { PseudocodeAbsence } from "../domain/native/pseudocodeAbsence.js"; diff --git a/src/kuna/KunaTargetCommands.ts b/src/kuna/KunaTargetCommands.ts index 4e056b5764..68b9b10e91 100644 --- a/src/kuna/KunaTargetCommands.ts +++ b/src/kuna/KunaTargetCommands.ts @@ -2,7 +2,11 @@ import { ArtifactFileCleanupFailure, artifactFilePrimaryFacts, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; + ArtifactResourceScope, + AnalysisCleanupLease, + AnalysisCleanupLeaseGroup, + ArtifactReaderFailure, +} from "../resources/index.js"; import { analysisErrorWithCancellation } from "../domain/analysisErrorCancellation.js"; import { retainProcessInspectionCleanup, @@ -37,12 +41,6 @@ import type { KunaDeadline } from "./KunaConfiguration.js"; import type { KunaInstallation } from "./KunaInstallation.js"; import { KUNA_PROVIDER_ID } from "./KunaRelease.js"; import type { KunaRunRelease } from "./KunaRunSlots.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { - AnalysisCleanupLease, - AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { classifyProviderFailure, type ProviderFailureDialect, diff --git a/src/main/transport.ts b/src/main/transport.ts index 536faeffa2..7d6f2198bc 100644 --- a/src/main/transport.ts +++ b/src/main/transport.ts @@ -1,6 +1,6 @@ import type { AnalysisSettings } from "../application/AnalysisSettings.js"; import { createAndroidAnalysisProvider } from "../composition/android.js"; -import type { AndroidAnalysisPort } from "../application/android/AndroidAnalysisPort.js"; +import type { AndroidAnalysisPort } from "../ports/android/AndroidAnalysisPort.js"; import type { BinarySession } from "../application/binary/BinarySession.js"; import type { Logger } from "pino"; @@ -8,7 +8,7 @@ import { createServer } from "../server/createServer.js"; import { StreamableHttpListenError } from "../server/http/streamableHttpListenError.js"; import type { ToolResultDelivery } from "../server/ToolResultDelivery.js"; import type { McpServerHandle, RuntimeDependencies } from "./types.js"; -import type { OptionalProviderLoadResult } from "../application/OptionalObservationProviders.js"; +import type { OptionalProviderLoadResult } from "../ports/OptionalObservationProviders.js"; import { OwnedMcpServers } from "./OwnedMcpServers.js"; import { MCP_CONNECTION_START_FAILED, diff --git a/src/main/types.ts b/src/main/types.ts index 4ff380322c..89e49ee6c7 100644 --- a/src/main/types.ts +++ b/src/main/types.ts @@ -2,7 +2,7 @@ import type { Readable } from "node:stream"; import type { McpServerFactory } from "@modelcontextprotocol/server"; import type { Logger } from "pino"; -import type { OptionalProviderLoadResult } from "../application/OptionalObservationProviders.js"; +import type { OptionalProviderLoadResult } from "../ports/OptionalObservationProviders.js"; /** Teardown handle every MCP transport returns to the runtime. */ export interface McpServerHandle { diff --git a/src/model/ModelArtifactProvider.ts b/src/model/ModelArtifactProvider.ts index d5c2a61cc2..e0040abe16 100644 --- a/src/model/ModelArtifactProvider.ts +++ b/src/model/ModelArtifactProvider.ts @@ -1,12 +1,21 @@ -import { readerIntegrityFailure } from "../artifacts/StableArtifactFailure.js"; +import { + readerIntegrityFailure, + ArtifactResourceScope, + ArtifactReaderFailure, + withArtifactRegularFile, + bindArtifactFileCleanup, + artifactFilePrimaryFacts, + artifactFileCancellationCause, + artifactFileCompletion, +} from "../resources/index.js"; import { MODEL_ARTIFACT_PROVIDER_IDENTITY } from "./ModelArtifactProviderIdentity.js"; import { lstat, type FileHandle } from "node:fs/promises"; -import type { ModelArtifactPort } from "../application/model/ModelArtifactPort.js"; +import type { ModelArtifactPort } from "../ports/model/ModelArtifactPort.js"; import { createModelArtifactEvidence, createModelArtifactPartialEvidence, } from "../domain/model/modelArtifactEvidence.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { ModelArtifact, ModelArtifactPartial, @@ -25,15 +34,6 @@ import { } from "../domain/analysisErrorCore.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; import { err, ok, type Result } from "../domain/result.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { - withArtifactRegularFile, - bindArtifactFileCleanup, - artifactFilePrimaryFacts, - artifactFileCancellationCause, - artifactFileCompletion, -} from "../artifacts/ArtifactFileOperation.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { ModelHeaderReader } from "./ModelHeaderReader.js"; import { GgufHeader } from "./GgufHeader.js"; diff --git a/src/model/ModelHeaderReader.ts b/src/model/ModelHeaderReader.ts index c229f8e1c2..ae2f9ffaaa 100644 --- a/src/model/ModelHeaderReader.ts +++ b/src/model/ModelHeaderReader.ts @@ -1,7 +1,9 @@ import { createHash } from "node:crypto"; import type { FileHandle } from "node:fs/promises"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, +} from "../resources/index.js"; import { modelCapacityFailure, MODEL_HEADER_BYTES, diff --git a/src/model/SafetensorsHeader.ts b/src/model/SafetensorsHeader.ts index 34da2c0097..a19cd3be85 100644 --- a/src/model/SafetensorsHeader.ts +++ b/src/model/SafetensorsHeader.ts @@ -1,7 +1,7 @@ import { decodeStrictUtf8 } from "../domain/strictUtf8.js"; import { escapeJsonPointerToken } from "../domain/jsonPointer.js"; import { setImmediate } from "node:timers/promises"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../resources/index.js"; import type { ModelMetadata, ModelTensor, diff --git a/src/native/AppleDispatchMetadata.failure.test.ts b/src/native/AppleDispatchMetadata.failure.test.ts index 342414fb30..4cd3962710 100644 --- a/src/native/AppleDispatchMetadata.failure.test.ts +++ b/src/native/AppleDispatchMetadata.failure.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { appleDispatchMetadataFailure } from "./AppleDispatchMetadata.js"; import { BinaryFormatFailure } from "../domain/binaryContainer.js"; diff --git a/src/native/AppleDispatchMetadata.ts b/src/native/AppleDispatchMetadata.ts index c65a515b6b..a4ffb34bc9 100644 --- a/src/native/AppleDispatchMetadata.ts +++ b/src/native/AppleDispatchMetadata.ts @@ -1,5 +1,15 @@ import { decodeStrictUtf8 } from "../domain/strictUtf8.js"; -import { readerIntegrityFailure } from "../artifacts/StableArtifactFailure.js"; +import { + readerIntegrityFailure, + ArtifactFileCleanupFailure, + artifactFileCancellationCause, + artifactFilePrimaryFacts, + type ArtifactFilePrimaryFacts, + bindArtifactFileCleanup, + withArtifactRegularFile, + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../resources/index.js"; import { malformedInput, parseFailureFromCause, @@ -28,16 +38,6 @@ import { cancelledBy, carriedReason, } from "../domain/analysisErrorCore.js"; -import { - ArtifactFileCleanupFailure, - artifactFileCancellationCause, - artifactFilePrimaryFacts, - type ArtifactFilePrimaryFacts, - bindArtifactFileCleanup, - withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; diff --git a/src/native/CommandRunner.ts b/src/native/CommandRunner.ts index cbe67ea30a..2bbfc10801 100644 --- a/src/native/CommandRunner.ts +++ b/src/native/CommandRunner.ts @@ -24,7 +24,7 @@ import { selectArtifactCommandPath, type ArtifactCommandPath, } from "../process/ArtifactCommandPath.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; /** Retain complete command output up to a bounded aggregate size. */ export const NATIVE_COMMAND_OUTPUT_BUDGET_BYTES = 64 * 1024 * 1024; diff --git a/src/native/LldbCallTracer.ts b/src/native/LldbCallTracer.ts index cb7a023736..8b78b068ac 100644 --- a/src/native/LldbCallTracer.ts +++ b/src/native/LldbCallTracer.ts @@ -1,8 +1,11 @@ import { decodeStrictUtf8 } from "../domain/strictUtf8.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { + bindArtifactFileCleanup, + ArtifactResourceScope, + AnalysisCleanupLease, +} from "../resources/index.js"; import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { invariantViolation } from "../domain/internalInvariant.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { translateNativeCommandFailure } from "./NativeCommandAnalysisError.js"; import { DEFAULT_NATIVE_COMMAND_TIMEOUT_MS } from "../domain/native/nativeDeadlines.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; @@ -66,7 +69,6 @@ import { } from "./CommandRunner.js"; import { projectPartialNativeCalls } from "./NativeCallObservation.js"; import { LldbReadbackFiles } from "./LldbReadbackFiles.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { resolvedAnalysisError } from "../domain/analysisErrorBase.js"; import { runOwned } from "../providers/runOwned.js"; diff --git a/src/native/LldbReadbackFiles.ts b/src/native/LldbReadbackFiles.ts index 2c91f82a6d..aca0aa1b8d 100644 --- a/src/native/LldbReadbackFiles.ts +++ b/src/native/LldbReadbackFiles.ts @@ -1,11 +1,11 @@ import type { FileHandle } from "node:fs/promises"; import { err, ok, type Result } from "../domain/result.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { + ArtifactResourceScope, ArtifactFileCleanupFailure, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; -import type { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; + type AnalysisCleanupLease, +} from "../resources/index.js"; /** PID publication is decimal; allow the largest safe PID and a CRLF ending. */ const TARGET_PID_FILE_MAX_BYTES = String(Number.MAX_SAFE_INTEGER).length + 2; diff --git a/src/native/NativeCallObservation.test.ts b/src/native/NativeCallObservation.test.ts index a64dc667ee..85a7b987bf 100644 --- a/src/native/NativeCallObservation.test.ts +++ b/src/native/NativeCallObservation.test.ts @@ -5,7 +5,7 @@ import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { ok, type Result } from "../domain/result.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import type { NativeCallTrace, NativeCallTracer } from "./LldbCallTracer.js"; import { observeNativeCalls } from "./NativeCallObservation.js"; import { nativeMachoTargetForFile } from "../../tests/fixtures/nativeCommands.js"; diff --git a/src/native/NativeCallObservation.ts b/src/native/NativeCallObservation.ts index 9143ee92dd..d11647caec 100644 --- a/src/native/NativeCallObservation.ts +++ b/src/native/NativeCallObservation.ts @@ -21,7 +21,7 @@ import { nativeCallTargetFailure, verifyNativeCallTarget, } from "./NativeCallTarget.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { err, ok, type Result } from "../domain/result.js"; import { nativeCallPartialObservationSchema, diff --git a/src/native/NativeCallTarget.ts b/src/native/NativeCallTarget.ts index 70078a0f25..b6dc6b3523 100644 --- a/src/native/NativeCallTarget.ts +++ b/src/native/NativeCallTarget.ts @@ -20,15 +20,13 @@ import { RegularFileCleanupFailure, regularFileCancellation, } from "../filesystem/OwnedRegularFile.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; import { + AnalysisCleanupLease, ArtifactResourceRetryFailure, type ArtifactResourceScope, -} from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactFileCleanupFailure, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; const OPERATION = "observe_native_calls"; diff --git a/src/native/NativeCommandAnalysisError.test.ts b/src/native/NativeCommandAnalysisError.test.ts index c3f1b59a1d..1fa6abd82e 100644 --- a/src/native/NativeCommandAnalysisError.test.ts +++ b/src/native/NativeCommandAnalysisError.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { AnalysisTimeoutError } from "../domain/analysisErrorCore.js"; import { MAX_NODE_TIMER_DELAY_MS } from "../domain/analysisResourceLimits.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; diff --git a/src/native/NativeCommandAnalysisError.ts b/src/native/NativeCommandAnalysisError.ts index 4f8eb7676c..a852d942f7 100644 --- a/src/native/NativeCommandAnalysisError.ts +++ b/src/native/NativeCommandAnalysisError.ts @@ -1,4 +1,4 @@ -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { DarwinProcessOwnershipInspectionError } from "../process/DarwinProcessRunTokenReader.js"; import { ProcessOwnershipInspectionCancelled, diff --git a/src/native/NativeMacOSProvider.ts b/src/native/NativeMacOSProvider.ts index ac3884eacc..f76127aabe 100644 --- a/src/native/NativeMacOSProvider.ts +++ b/src/native/NativeMacOSProvider.ts @@ -1,4 +1,15 @@ -import { readerIntegrityFailure } from "../artifacts/StableArtifactFailure.js"; +import { + readerIntegrityFailure, + bindArtifactFileCleanup, + artifactFileCompletion, + artifactFilePrimaryFacts, + artifactFileCancellationCause, + ArtifactFileCleanupFailure, + type ArtifactFilePrimaryFacts, + AnalysisCleanupLeaseGroup, + ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import { MAX_NODE_TIMER_DELAY_MS } from "../domain/analysisResourceLimits.js"; import { withArtifactTargetIdentity } from "../artifacts/withArtifactTargetIdentity.js"; import { @@ -17,14 +28,6 @@ import { type NativePlistSelection, resolveBundleResourcePlistSelection, } from "./NativePlistSource.js"; -import { - bindArtifactFileCleanup, - artifactFileCompletion, - artifactFilePrimaryFacts, - artifactFileCancellationCause, - ArtifactFileCleanupFailure, - type ArtifactFilePrimaryFacts, -} from "../artifacts/ArtifactFileOperation.js"; import { readMachoEncryption } from "../artifacts/apple/MachoEncryptionReader.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { @@ -46,7 +49,6 @@ import { observeNativeCalls } from "./NativeCallObservation.js"; import { realpath, symlink } from "node:fs/promises"; import { basename, join } from "node:path"; import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; -import { AnalysisCleanupLeaseGroup } from "../artifacts/AnalysisCleanupLease.js"; import { createAnalysisExecutionEvidence } from "../domain/analysisObservation.js"; import { z } from "zod"; @@ -58,7 +60,7 @@ import { type AnalysisProvider, type CapabilityDescriptor, type ProviderIdentity, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { NATIVE_TOOL_CONTRACTS, type NativeToolName, @@ -149,8 +151,6 @@ import { } from "./NativeMachoInspection.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { analysisErrorWithCancellation } from "../domain/analysisErrorCancellation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { withNativeMachoSource, @@ -170,7 +170,7 @@ import { type NativeUiHelperRuntime, } from "./NativeUiHelperRuntime.js"; import { NativeUiInterruptionControl } from "./NativeUiInterruptionControl.js"; -import type { ResolvedAppBundleResourceRoot } from "../application/AppBundleExecutable.js"; +import type { ResolvedAppBundleResourceRoot } from "../domain/apple/bundleResourceRoot.js"; import { UnsupportedBinaryPlistUidError } from "../artifacts/apple/PlistScalars.js"; type SignatureRuntimeRootFactory = () => Promise< diff --git a/src/native/NativeMacOSProviderMetadata.ts b/src/native/NativeMacOSProviderMetadata.ts index 7835b48143..9e3a2da4fb 100644 --- a/src/native/NativeMacOSProviderMetadata.ts +++ b/src/native/NativeMacOSProviderMetadata.ts @@ -1,5 +1,5 @@ import { NATIVE_MACOS_PROVIDER_IDENTITY } from "./NativeMacosProviderIdentity.js"; -import type { CapabilityDescriptor } from "../application/AnalysisProvider.js"; +import type { CapabilityDescriptor } from "../ports/AnalysisProvider.js"; import { createAnalysisProfile } from "../domain/analysisProfile.js"; import { NATIVE_TOOL_CONTRACTS } from "../contracts/native/nativeToolContracts.js"; import { APPLE_DISPATCH_TARGET_APPLICABILITY } from "../domain/native/objcSwiftMetadata.js"; diff --git a/src/native/NativeMachoSource.test.ts b/src/native/NativeMachoSource.test.ts index 8af92e5415..7a09ab4f04 100644 --- a/src/native/NativeMachoSource.test.ts +++ b/src/native/NativeMachoSource.test.ts @@ -3,8 +3,8 @@ import { mkdtemp, rename, rm, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { afterEach, expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactFileCleanupFailure } from "../artifacts/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; +import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js"; import { withNativeMachoSource } from "./NativeMachoSource.js"; const control = vi.hoisted(() => ({ failClose: false, attempts: 0 })); diff --git a/src/native/NativeMachoSource.ts b/src/native/NativeMachoSource.ts index 6c45acdaf7..e35f1acfd4 100644 --- a/src/native/NativeMachoSource.ts +++ b/src/native/NativeMachoSource.ts @@ -4,9 +4,9 @@ import { withArtifactRegularFile, assertArtifactReadActive, artifactSelectedPathErrno, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../resources/index.js"; import { hashStableRootArtifactHandle } from "../artifacts/inventory/hashStableRootArtifact.js"; import { targetDigestChangedFailure } from "../artifacts/withArtifactTargetIdentity.js"; diff --git a/src/native/NativeMacosProviderIdentity.ts b/src/native/NativeMacosProviderIdentity.ts index 317d20c684..df87ba327b 100644 --- a/src/native/NativeMacosProviderIdentity.ts +++ b/src/native/NativeMacosProviderIdentity.ts @@ -1,4 +1,4 @@ -import type { ProviderIdentity } from "../application/AnalysisProvider.js"; +import type { ProviderIdentity } from "../ports/AnalysisProvider.js"; /** Public identity committed by macOS-native inspection observations. */ export const NATIVE_MACOS_PROVIDER_IDENTITY: ProviderIdentity = Object.freeze({ diff --git a/src/native/NativePlistSource.ts b/src/native/NativePlistSource.ts index 72dbf0b22a..586fbaf058 100644 --- a/src/native/NativePlistSource.ts +++ b/src/native/NativePlistSource.ts @@ -1,4 +1,15 @@ -import { readerIntegrityFailure } from "../artifacts/StableArtifactFailure.js"; +import { + readerIntegrityFailure, + ArtifactReaderFailure, + ArtifactFileCleanupFailure, + artifactFilePrimaryFacts, + type ArtifactFilePrimaryFacts, + artifactFileCancellationCause, + bindArtifactFileCleanup, + assertArtifactReadActive, + withArtifactRegularFile, + type ArtifactResourceScope, +} from "../resources/index.js"; import { absoluteCallerPath } from "../filesystem/callerPath.js"; import { readFileHandleRange } from "../filesystem/readFileHandleRange.js"; import { stat } from "node:fs/promises"; @@ -7,7 +18,7 @@ import type { BinaryTarget } from "../domain/binaryTargetTypes.js"; import type { FileHandle } from "node:fs/promises"; import type { z } from "zod"; import type { inspectPlistSchema } from "../domain/native/nativeInspection.js"; -import type { ResolvedAppBundleResourceRoot } from "../application/AppBundleExecutable.js"; +import type { ResolvedAppBundleResourceRoot } from "../domain/apple/bundleResourceRoot.js"; import type { AnalysisError, AnalysisErrorOptions, @@ -26,17 +37,6 @@ import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { fixedAllowanceOptions } from "../domain/fixedAllowanceRemediation.js"; import { err, ok, type Result } from "../domain/result.js"; import { sameRegularFileState } from "../filesystem/RegularFile.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { - ArtifactFileCleanupFailure, - artifactFilePrimaryFacts, - type ArtifactFilePrimaryFacts, - artifactFileCancellationCause, - bindArtifactFileCleanup, - assertArtifactReadActive, - withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { NATIVE_MACOS_PROVIDER_IDENTITY as IDENTITY } from "./NativeMacosProviderIdentity.js"; import { MAX_NATIVE_PLIST_BYTES, diff --git a/src/native/NativeUiCleanupError.ts b/src/native/NativeUiCleanupError.ts index d3e8685e1c..c5db91803a 100644 --- a/src/native/NativeUiCleanupError.ts +++ b/src/native/NativeUiCleanupError.ts @@ -1,4 +1,4 @@ -import { AnalysisCleanupLeaseGroup } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLeaseGroup } from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import type { NativeUiObservationResult } from "../domain/native/nativeUiObservation.js"; import type { NativeUiHelperRuntime } from "./NativeUiHelperRuntime.js"; diff --git a/src/native/NativeUiHelperRuntime.ts b/src/native/NativeUiHelperRuntime.ts index 225ba1da3e..454a4267b0 100644 --- a/src/native/NativeUiHelperRuntime.ts +++ b/src/native/NativeUiHelperRuntime.ts @@ -1,6 +1,8 @@ -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + ArtifactResourceScope, + AnalysisCleanupLease, +} from "../resources/index.js"; import { HOST_PLATFORM } from "../platform/HostPlatform.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { mkdir, mkdtemp, rm, symlink } from "node:fs/promises"; import { tmpdir } from "node:os"; diff --git a/src/native/NativeUiObservation.test.ts b/src/native/NativeUiObservation.test.ts index 023fe0ea11..0085cef5aa 100644 --- a/src/native/NativeUiObservation.test.ts +++ b/src/native/NativeUiObservation.test.ts @@ -10,7 +10,7 @@ import { AnalysisTimeoutError, } from "../domain/analysisErrorCore.js"; import { ExecFileOutputCancelledError } from "../process/ExecFileOutput.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import type { BinaryTarget } from "../domain/binaryTargetTypes.js"; const target: BinaryTarget = { diff --git a/src/native/SignatureTargetBinding.test.ts b/src/native/SignatureTargetBinding.test.ts index b3cd981844..22407c6c17 100644 --- a/src/native/SignatureTargetBinding.test.ts +++ b/src/native/SignatureTargetBinding.test.ts @@ -16,7 +16,7 @@ import { afterEach, expect, it, vi, onTestFinished } from "vitest"; import { withVerifierCleanup } from "../../scripts/lib/verifier-cleanup.mjs"; import { phaseGate } from "../../tests/support/lifecycleHarness.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import type { BinaryTarget } from "../domain/binaryTargetTypes.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { ok, err } from "../domain/result.js"; diff --git a/src/native/SignatureTargetBinding.ts b/src/native/SignatureTargetBinding.ts index 652f72f087..f8a7fabd22 100644 --- a/src/native/SignatureTargetBinding.ts +++ b/src/native/SignatureTargetBinding.ts @@ -26,16 +26,16 @@ import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup. import { analysisErrorWithCancellation } from "../domain/analysisErrorCancellation.js"; import { err, ok, type Result } from "../domain/result.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactResourceScope, + ArtifactReaderFailure, AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; + bindArtifactFileCleanup, + type ArtifactResourceOwner, +} from "../resources/index.js"; +import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; import { finalizedResult, runOwned } from "../providers/runOwned.js"; -import type { ArtifactResourceOwner } from "../artifacts/ArtifactResourceScope.js"; import { NATIVE_MACOS_PROVIDER_IDENTITY } from "./NativeMacosProviderIdentity.js"; diff --git a/src/native/apple/AppleIpsProvider.ts b/src/native/apple/AppleIpsProvider.ts index 6da56baf68..9e8b577b2e 100644 --- a/src/native/apple/AppleIpsProvider.ts +++ b/src/native/apple/AppleIpsProvider.ts @@ -1,4 +1,18 @@ -import { completedStableArtifactObservation } from "../../artifacts/StableArtifactObservation.js"; +import { + completedStableArtifactObservation, + type StableArtifactSnapshot, + projectOwnedArtifactIdentityFailure, + projectSelectedArtifactFileFailure, + projectStableArtifactFailure, + stableArtifactInputFailure, + projectArtifactCloseFailure, + ArtifactReaderFailure, + readStableArtifact, + artifactFilePrimaryFacts, + type ArtifactFilePrimaryFacts, + assertArtifactReadActive, + ArtifactResourceScope, +} from "../../resources/index.js"; import { FieldReader } from "./AppleIpsFieldReader.js"; import { type AppleIps, @@ -12,24 +26,8 @@ import { MAX_INSPECT_APPLE_IPS_THREADS, type InspectAppleIpsInput, } from "../../domain/native/appleIps.js"; -import type { StableArtifactSnapshot } from "../../artifacts/readStableArtifact.js"; -import { - projectOwnedArtifactIdentityFailure, - projectSelectedArtifactFileFailure, - projectStableArtifactFailure, - stableArtifactInputFailure, - projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { readStableArtifact } from "../../artifacts/readStableArtifact.js"; -import { - artifactFilePrimaryFacts, - type ArtifactFilePrimaryFacts, - assertArtifactReadActive, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { AppleIpsPort } from "../../application/binaryDiagnostics/AppleIpsPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; +import type { AppleIpsPort } from "../../ports/binaryDiagnostics/AppleIpsPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js"; import { parseFailureAnalysisError } from "../../domain/parseFailureAnalysisError.js"; diff --git a/src/native/elf/ElfNoteParser.test.ts b/src/native/elf/ElfNoteParser.test.ts index 23fe677c01..eaa47d0481 100644 --- a/src/native/elf/ElfNoteParser.test.ts +++ b/src/native/elf/ElfNoteParser.test.ts @@ -2,7 +2,7 @@ import { createHash } from "node:crypto"; import { readFileSync } from "node:fs"; import { expect, it } from "vitest"; import { inspectElfNotesInputSchema } from "../../domain/native/elfNotes.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { decodeElfSectionNameTable } from "../metadata/ElfSectionNameTable.js"; import { readElfDirectoryFromBuffer } from "../metadata/NativeSectionDirectory.js"; import { diff --git a/src/native/elf/ElfNoteParser.ts b/src/native/elf/ElfNoteParser.ts index afbd07f063..d6e7221a14 100644 --- a/src/native/elf/ElfNoteParser.ts +++ b/src/native/elf/ElfNoteParser.ts @@ -7,8 +7,10 @@ import { readElfProgramHeader } from "../../domain/elfProgramHeader.js"; import { validateElfSectionTablePresence } from "../../domain/elfDeclaredRanges.js"; import { readElfRawTableDeclarations } from "../../domain/elfRawTableDeclarations.js"; import { createHash } from "node:crypto"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + assertArtifactReadActive, +} from "../../resources/index.js"; import { readElfFixedHeader, type ElfFixedHeader, diff --git a/src/native/elf/ElfNotesProvider.ts b/src/native/elf/ElfNotesProvider.ts index cbcbfcfa14..100765311e 100644 --- a/src/native/elf/ElfNotesProvider.ts +++ b/src/native/elf/ElfNotesProvider.ts @@ -5,19 +5,15 @@ import { projectStableArtifactFailure, stableArtifactInputFailure, projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, type StableArtifactSnapshot, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { ElfNotesPort } from "../../application/binaryDiagnostics/ElfNotesPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { ElfNotesPort } from "../../ports/binaryDiagnostics/ElfNotesPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { ArtifactOperationError } from "../../domain/artifactOperationError.js"; import { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js"; import { fixedAllowanceOptions } from "../../domain/fixedAllowanceRemediation.js"; diff --git a/src/native/elf/ElfUnwindRangesProvider.ts b/src/native/elf/ElfUnwindRangesProvider.ts index 10f2747ebd..bcf8330621 100644 --- a/src/native/elf/ElfUnwindRangesProvider.ts +++ b/src/native/elf/ElfUnwindRangesProvider.ts @@ -5,16 +5,14 @@ import { projectStableArtifactFailure, stableArtifactInputFailure, projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { readStableArtifact } from "../../artifacts/readStableArtifact.js"; -import { + ArtifactReaderFailure, + readStableArtifact, artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { ElfUnwindRangesPort } from "../../application/binaryDiagnostics/ElfUnwindRangesPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { ElfUnwindRangesPort } from "../../ports/binaryDiagnostics/ElfUnwindRangesPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { ArtifactOperationError } from "../../domain/artifactOperationError.js"; import { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js"; import { fixedAllowanceOptions } from "../../domain/fixedAllowanceRemediation.js"; diff --git a/src/native/elf/ElfUnwindTables.test.ts b/src/native/elf/ElfUnwindTables.test.ts index 830de8923d..f6d2276140 100644 --- a/src/native/elf/ElfUnwindTables.test.ts +++ b/src/native/elf/ElfUnwindTables.test.ts @@ -1,7 +1,7 @@ import { createHash } from "node:crypto"; import { expect, it, vi } from "vitest"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { elfUnwindRangesSchema, inspectElfUnwindRangesInputSchema, diff --git a/src/native/elf/ElfUnwindTables.ts b/src/native/elf/ElfUnwindTables.ts index 69d03f9d53..7f5f80b069 100644 --- a/src/native/elf/ElfUnwindTables.ts +++ b/src/native/elf/ElfUnwindTables.ts @@ -5,8 +5,10 @@ import { keyedBy, uniqueKeyed, } from "../../domain/keyedCollection.js"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, +} from "../../resources/index.js"; import { readElfDynamicEntry } from "../../domain/elfDynamicEntry.js"; import { readElfSymbol } from "../../domain/elfSymbol.js"; import { diff --git a/src/native/elf/KernelBuildConfig.test.ts b/src/native/elf/KernelBuildConfig.test.ts index bd58c42061..8829319c58 100644 --- a/src/native/elf/KernelBuildConfig.test.ts +++ b/src/native/elf/KernelBuildConfig.test.ts @@ -3,7 +3,7 @@ import { setFlagsFromString } from "node:v8"; import { runInNewContext } from "node:vm"; import { gzipSync } from "node:zlib"; import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { inspectKernelBuildConfigInputSchema, kernelBuildConfigSchema, diff --git a/src/native/elf/KernelBuildConfig.ts b/src/native/elf/KernelBuildConfig.ts index 4ed233876f..7d4e320c30 100644 --- a/src/native/elf/KernelBuildConfig.ts +++ b/src/native/elf/KernelBuildConfig.ts @@ -2,8 +2,10 @@ import { createHash } from "node:crypto"; import { setImmediate as nextTurn } from "node:timers/promises"; import { crc32, inflateRaw } from "node:zlib"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + assertArtifactReadActive, +} from "../../resources/index.js"; import { KERNEL_BUILD_CONFIG_CODECS, KERNEL_BUILD_CONFIG_NUMBER, diff --git a/src/native/elf/KernelBuildConfigProvider.ts b/src/native/elf/KernelBuildConfigProvider.ts index 49f3a74f6b..cd4fc154e5 100644 --- a/src/native/elf/KernelBuildConfigProvider.ts +++ b/src/native/elf/KernelBuildConfigProvider.ts @@ -4,16 +4,14 @@ import { projectStableArtifactFailure, stableArtifactInputFailure, projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { readStableArtifact } from "../../artifacts/readStableArtifact.js"; -import { + ArtifactReaderFailure, + readStableArtifact, artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { KernelBuildConfigPort } from "../../application/binaryDiagnostics/KernelBuildConfigPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { KernelBuildConfigPort } from "../../ports/binaryDiagnostics/KernelBuildConfigPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { ArtifactOperationError } from "../../domain/artifactOperationError.js"; import { AnalysisInputError, diff --git a/src/native/elf/KernelModuleParser.test.ts b/src/native/elf/KernelModuleParser.test.ts index d469dd0ac7..cbe02623e9 100644 --- a/src/native/elf/KernelModuleParser.test.ts +++ b/src/native/elf/KernelModuleParser.test.ts @@ -1,6 +1,6 @@ import { createHash } from "node:crypto"; import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { inspectKernelModuleInputSchema, kernelModuleSchema, diff --git a/src/native/elf/KernelModuleParser.ts b/src/native/elf/KernelModuleParser.ts index 5accde3887..40257097f4 100644 --- a/src/native/elf/KernelModuleParser.ts +++ b/src/native/elf/KernelModuleParser.ts @@ -1,6 +1,6 @@ import { createHash } from "node:crypto"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import { allKeyed, firstKeyed, keyedBy } from "../../domain/keyedCollection.js"; import { elfObjectTypeName } from "../../domain/native/elfNotes.js"; import { diff --git a/src/native/elf/KernelModuleProvider.ts b/src/native/elf/KernelModuleProvider.ts index 6f22b98dca..d6df3e4149 100644 --- a/src/native/elf/KernelModuleProvider.ts +++ b/src/native/elf/KernelModuleProvider.ts @@ -5,19 +5,15 @@ import { projectStableArtifactFailure, stableArtifactInputFailure, projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, type StableArtifactSnapshot, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { KernelModulePort } from "../../application/binaryDiagnostics/KernelModulePort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { KernelModulePort } from "../../ports/binaryDiagnostics/KernelModulePort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { ArtifactOperationError } from "../../domain/artifactOperationError.js"; import { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js"; import { fixedAllowanceOptions } from "../../domain/fixedAllowanceRemediation.js"; diff --git a/src/native/exports/NativeExportsProvider.ts b/src/native/exports/NativeExportsProvider.ts index 8053f01c61..0e66a0a371 100644 --- a/src/native/exports/NativeExportsProvider.ts +++ b/src/native/exports/NativeExportsProvider.ts @@ -6,20 +6,16 @@ import { projectStableArtifactFailure, stableArtifactInputFailure, projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, type StableArtifactSnapshot, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, assertArtifactReadActive, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { NativeExportsPort } from "../../application/binaryDiagnostics/NativeExportsPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { NativeExportsPort } from "../../ports/binaryDiagnostics/NativeExportsPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { ResourceConstraintRecovery } from "../../domain/analysisErrorCore.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js"; diff --git a/src/native/hardening/BinaryHardeningParsers.test.ts b/src/native/hardening/BinaryHardeningParsers.test.ts index 9a11e29dab..5e3a21bbe6 100644 --- a/src/native/hardening/BinaryHardeningParsers.test.ts +++ b/src/native/hardening/BinaryHardeningParsers.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { ELF_HARDENING_PROPERTIES, MACHO_HARDENING_PROPERTIES, diff --git a/src/native/hardening/BinaryHardeningProvider.ts b/src/native/hardening/BinaryHardeningProvider.ts index 4c5c463f73..1ca022ed52 100644 --- a/src/native/hardening/BinaryHardeningProvider.ts +++ b/src/native/hardening/BinaryHardeningProvider.ts @@ -6,20 +6,16 @@ import { stableArtifactInputFailure, projectStableArtifactFailure, projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, type StableArtifactSnapshot, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, assertArtifactReadActive, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { BinaryHardeningPort } from "../../application/binaryDiagnostics/BinaryHardeningPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { BinaryHardeningPort } from "../../ports/binaryDiagnostics/BinaryHardeningPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js"; import { fixedAllowanceOptions } from "../../domain/fixedAllowanceRemediation.js"; diff --git a/src/native/hardening/ElfHardening.ts b/src/native/hardening/ElfHardening.ts index 7b8471c680..78480be1b5 100644 --- a/src/native/hardening/ElfHardening.ts +++ b/src/native/hardening/ElfHardening.ts @@ -1,10 +1,12 @@ -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, +} from "../../resources/index.js"; import { firstKeyed, keyedBy, uniqueKeyed, } from "../../domain/keyedCollection.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; import { readElfDynamicEntry } from "../../domain/elfDynamicEntry.js"; import { elfArchitecture } from "../../domain/elfFixedHeader.js"; import { admitElfLoadSegment } from "../../domain/elfProgramHeader.js"; diff --git a/src/native/hardening/MachoHardening.ts b/src/native/hardening/MachoHardening.ts index 730e307825..3bef48869c 100644 --- a/src/native/hardening/MachoHardening.ts +++ b/src/native/hardening/MachoHardening.ts @@ -33,7 +33,7 @@ import { MAX_BINARY_HARDENING_SYMBOL_SCAN_BYTES, MAX_BINARY_HARDENING_TABLE_ENTRIES, } from "../../domain/native/binaryHardening.js"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../../resources/index.js"; import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { readMachoEncryption } from "../../artifacts/apple/MachoEncryptionReader.js"; import { diff --git a/src/native/hardening/PeHardening.ts b/src/native/hardening/PeHardening.ts index ff483338fc..2eeffbbf10 100644 --- a/src/native/hardening/PeHardening.ts +++ b/src/native/hardening/PeHardening.ts @@ -1,5 +1,7 @@ -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { + assertArtifactReadActive, + ArtifactReaderFailure, +} from "../../resources/index.js"; import { type BinaryHardeningImage, type BinaryHardeningRow, diff --git a/src/native/initializers/ElfInitializerSymbols.ts b/src/native/initializers/ElfInitializerSymbols.ts index 824a1a2665..3a29525415 100644 --- a/src/native/initializers/ElfInitializerSymbols.ts +++ b/src/native/initializers/ElfInitializerSymbols.ts @@ -1,5 +1,5 @@ import { setImmediate as immediate } from "node:timers/promises"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../../resources/index.js"; import { readElfRelocationEntry } from "../../domain/elfRelocation.js"; import { readElfSymbol } from "../../domain/elfSymbol.js"; import { diff --git a/src/native/initializers/ElfInitializers.ts b/src/native/initializers/ElfInitializers.ts index b11e7f1245..6eb1d16773 100644 --- a/src/native/initializers/ElfInitializers.ts +++ b/src/native/initializers/ElfInitializers.ts @@ -1,5 +1,5 @@ import { setImmediate as immediate } from "node:timers/promises"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../../resources/index.js"; import { readElfDynamicEntry } from "../../domain/elfDynamicEntry.js"; import { elfArchitecture } from "../../domain/elfFixedHeader.js"; import { diff --git a/src/native/initializers/MachoInitializers.ts b/src/native/initializers/MachoInitializers.ts index 6497f87649..078da6cd8e 100644 --- a/src/native/initializers/MachoInitializers.ts +++ b/src/native/initializers/MachoInitializers.ts @@ -1,6 +1,6 @@ import { LC } from "../../domain/apple/machoLoadCommandCodes.js"; import { setImmediate as immediate } from "node:timers/promises"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../../resources/index.js"; import { MachoLoadCommandCursor, readMachoLoadCommandTableHeader, diff --git a/src/native/initializers/NativeInitializersParsers.test.ts b/src/native/initializers/NativeInitializersParsers.test.ts index 003a91c740..9fbf6915f7 100644 --- a/src/native/initializers/NativeInitializersParsers.test.ts +++ b/src/native/initializers/NativeInitializersParsers.test.ts @@ -49,7 +49,7 @@ import { import { buildAddressRangeIndex } from "./addressRangeIndex.js"; import { InitializerNotes } from "./initializerNotes.js"; import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; const artifact = (bytes: Buffer) => ({ path: "/artifacts/image", diff --git a/src/native/initializers/NativeInitializersProvider.ts b/src/native/initializers/NativeInitializersProvider.ts index cdfdbf9645..9ffbc72ef7 100644 --- a/src/native/initializers/NativeInitializersProvider.ts +++ b/src/native/initializers/NativeInitializersProvider.ts @@ -6,17 +6,15 @@ import { projectArtifactCloseFailure, projectOwnedArtifactIdentityFailure, projectStableArtifactFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { readStableArtifact } from "../../artifacts/readStableArtifact.js"; -import { + ArtifactReaderFailure, + readStableArtifact, artifactFilePrimaryFacts, assertArtifactReadActive, type ArtifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { NativeInitializersPort } from "../../application/binaryDiagnostics/NativeInitializersPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { NativeInitializersPort } from "../../ports/binaryDiagnostics/NativeInitializersPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js"; import { fixedAllowanceOptions } from "../../domain/fixedAllowanceRemediation.js"; diff --git a/src/native/pe/PeBinaryFailure.ts b/src/native/pe/PeBinaryFailure.ts index b8f776c4d0..25cd5981ce 100644 --- a/src/native/pe/PeBinaryFailure.ts +++ b/src/native/pe/PeBinaryFailure.ts @@ -4,14 +4,12 @@ import { stableArtifactInputFailure, projectStableArtifactFailure, readerIntegrityFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import type { StableArtifactSnapshot } from "../../artifacts/readStableArtifact.js"; -import { + ArtifactReaderFailure, + type StableArtifactSnapshot, artifactFilePrimaryFacts, artifactFileCancellationCause, type ArtifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; +} from "../../resources/index.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisResourceConstraintError, diff --git a/src/native/pe/PeCertificateParser.test.ts b/src/native/pe/PeCertificateParser.test.ts index 4b4c39895d..a75b7bf867 100644 --- a/src/native/pe/PeCertificateParser.test.ts +++ b/src/native/pe/PeCertificateParser.test.ts @@ -4,7 +4,7 @@ import { inspectPeCertificatesInputSchema, peCertificatesSchema, } from "../../domain/native/peCertificates.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { peCertificateFixture, peWithoutCertificateTableFixture, diff --git a/src/native/pe/PeCertificateParser.ts b/src/native/pe/PeCertificateParser.ts index 1c9ef18504..e9b0bf1730 100644 --- a/src/native/pe/PeCertificateParser.ts +++ b/src/native/pe/PeCertificateParser.ts @@ -1,5 +1,5 @@ import { createHash } from "node:crypto"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/index.js"; import type { InspectPeCertificatesInput, PeCertificates, diff --git a/src/native/pe/PeCertificatesProvider.ts b/src/native/pe/PeCertificatesProvider.ts index e5e319d0f8..4c5cb74e91 100644 --- a/src/native/pe/PeCertificatesProvider.ts +++ b/src/native/pe/PeCertificatesProvider.ts @@ -5,19 +5,15 @@ import { projectStableArtifactFailure, stableArtifactInputFailure, projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, type StableArtifactSnapshot, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { PeCertificatesPort } from "../../application/binaryDiagnostics/PeCertificatesPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { PeCertificatesPort } from "../../ports/binaryDiagnostics/PeCertificatesPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { ArtifactOperationError } from "../../domain/artifactOperationError.js"; import { AnalysisInputError, diff --git a/src/native/pe/PeImportParser.ts b/src/native/pe/PeImportParser.ts index 1c012c1a1b..0645d0d2c3 100644 --- a/src/native/pe/PeImportParser.ts +++ b/src/native/pe/PeImportParser.ts @@ -5,7 +5,7 @@ import { } from "./PeRvaSpans.js"; import { createPefileReadCompatibility } from "./PefileReadCompatibility.js"; import { setImmediate } from "node:timers/promises"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../../resources/index.js"; import { BinaryFormatFailure, BinaryMappingFailure, diff --git a/src/native/pe/PeImportsProvider.ts b/src/native/pe/PeImportsProvider.ts index 80593baf46..c40cccbf12 100644 --- a/src/native/pe/PeImportsProvider.ts +++ b/src/native/pe/PeImportsProvider.ts @@ -2,15 +2,13 @@ import { projectPeBinaryFailure } from "./PeBinaryFailure.js"; import { projectArtifactCloseFailure, imageFileSizeRemediation, -} from "../../artifacts/StableArtifactFailure.js"; -import { type StableArtifactSnapshot, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { PeImportsPort } from "../../application/binaryDiagnostics/PeImportsPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + assertArtifactReadActive, + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { PeImportsPort } from "../../ports/binaryDiagnostics/PeImportsPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import type { ResourceConstraintRecovery } from "../../domain/analysisErrorCore.js"; import { fixedAllowanceOptions } from "../../domain/fixedAllowanceRemediation.js"; diff --git a/src/native/pe/PeLoadConfigParser.test.ts b/src/native/pe/PeLoadConfigParser.test.ts index 8e44ffc465..60c9002130 100644 --- a/src/native/pe/PeLoadConfigParser.test.ts +++ b/src/native/pe/PeLoadConfigParser.test.ts @@ -1,4 +1,4 @@ -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { describe, expect, it } from "vitest"; import { inspectPeLoadConfigInputSchema, diff --git a/src/native/pe/PeLoadConfigParser.ts b/src/native/pe/PeLoadConfigParser.ts index 314b357724..12ff5197ed 100644 --- a/src/native/pe/PeLoadConfigParser.ts +++ b/src/native/pe/PeLoadConfigParser.ts @@ -3,7 +3,7 @@ import { appendPeConsumedSpan as consume, } from "./PeRvaSpans.js"; import { setImmediate } from "node:timers/promises"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../../resources/index.js"; import { BinaryFormatFailure, BinaryMappingFailure, diff --git a/src/native/pe/PeLoadConfigProvider.ts b/src/native/pe/PeLoadConfigProvider.ts index 9cf50ac520..e07eb441c7 100644 --- a/src/native/pe/PeLoadConfigProvider.ts +++ b/src/native/pe/PeLoadConfigProvider.ts @@ -2,15 +2,13 @@ import { projectPeBinaryFailure } from "./PeBinaryFailure.js"; import { projectArtifactCloseFailure, imageFileSizeRemediation, -} from "../../artifacts/StableArtifactFailure.js"; -import { type StableArtifactSnapshot, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { PeLoadConfigPort } from "../../application/binaryDiagnostics/PeLoadConfigPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + assertArtifactReadActive, + ArtifactResourceScope, +} from "../../resources/index.js"; +import type { PeLoadConfigPort } from "../../ports/binaryDiagnostics/PeLoadConfigPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AnalysisError } from "../../domain/analysisErrorBase.js"; import type { ResourceConstraintRecovery } from "../../domain/analysisErrorCore.js"; import { fixedAllowanceOptions } from "../../domain/fixedAllowanceRemediation.js"; diff --git a/src/native/pe/PeResourcesProvider.test.ts b/src/native/pe/PeResourcesProvider.test.ts index d94f35e5fc..85f265c133 100644 --- a/src/native/pe/PeResourcesProvider.test.ts +++ b/src/native/pe/PeResourcesProvider.test.ts @@ -11,7 +11,7 @@ import { import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { PeResourcesProvider } from "./PeResourcesProvider.js"; import { peResourceFixture } from "../../artifacts/pe/PeResources.fixture.js"; -import { imageFileSizeRemediation } from "../../artifacts/StableArtifactFailure.js"; +import { imageFileSizeRemediation } from "../../resources/StableArtifactFailure.js"; const inspect = async ( path: string, diff --git a/src/native/pe/PeResourcesProvider.ts b/src/native/pe/PeResourcesProvider.ts index a623210911..dfd58c4e9f 100644 --- a/src/native/pe/PeResourcesProvider.ts +++ b/src/native/pe/PeResourcesProvider.ts @@ -6,20 +6,16 @@ import { projectStableArtifactFailure, stableArtifactInputFailure, projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { fixedNativeAllowance } from "../../domain/native/nativeDeadlines.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, type StableArtifactSnapshot, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { PeResourcesPort } from "../../application/binaryDiagnostics/PeResourcesPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import { fixedNativeAllowance } from "../../domain/native/nativeDeadlines.js"; +import type { PeResourcesPort } from "../../ports/binaryDiagnostics/PeResourcesPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { ArtifactOperationError } from "../../domain/artifactOperationError.js"; import { AnalysisInputError, diff --git a/src/native/pwndbg/PwndbgCoreContext.ts b/src/native/pwndbg/PwndbgCoreContext.ts index 70da35c0dc..c7d1e815c2 100644 --- a/src/native/pwndbg/PwndbgCoreContext.ts +++ b/src/native/pwndbg/PwndbgCoreContext.ts @@ -6,7 +6,11 @@ import { classifyProviderFailure } from "../../providers/classifyProviderFailure import { bindArtifactFileCleanup, artifactFileCancellationCause, -} from "../../artifacts/ArtifactFileOperation.js"; + completedStableArtifact, + readStableArtifact, + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../../resources/index.js"; import { safeParseUtf8Json } from "../../domain/safeJson.js"; import { access, mkdir, stat, writeFile } from "node:fs/promises"; import { constants, type Stats } from "node:fs"; @@ -14,7 +18,7 @@ import { randomUUID } from "node:crypto"; import { isAbsolute, join } from "node:path"; import { fileURLToPath } from "node:url"; import { z } from "zod"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { AnalysisCapturedOutput } from "../../domain/analysisErrorBase.js"; import { AnalysisCancelledError, @@ -28,12 +32,6 @@ import { recordedCrashDebuggerSchema, type RecordedCrash, } from "../../domain/native/recordedCrash.js"; -import { - completedStableArtifact, - readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; diff --git a/src/native/pwntools/PwntoolsDecoder.ts b/src/native/pwntools/PwntoolsDecoder.ts index 35d60235bd..5394398777 100644 --- a/src/native/pwntools/PwntoolsDecoder.ts +++ b/src/native/pwntools/PwntoolsDecoder.ts @@ -10,11 +10,13 @@ import { safeParseUtf8Json } from "../../domain/safeJson.js"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../../artifacts/AnalysisCleanupLease.js"; -import { bindArtifactFileCleanup, artifactFileCancellationCause, -} from "../../artifacts/ArtifactFileOperation.js"; + completedStableArtifact, + readStableArtifact, + ArtifactResourceScope, + ArtifactReaderFailure, +} from "../../resources/index.js"; import { pwntoolsFailureDialect, pwntoolsUnavailable, @@ -29,17 +31,11 @@ import { z } from "zod"; import type { ExecutionOptions, ProviderIdentity, -} from "../../application/AnalysisProvider.js"; +} from "../../ports/AnalysisProvider.js"; import type { AnalysisCapturedOutput, AnalysisPartialObservation, } from "../../domain/analysisErrorBase.js"; -import { - completedStableArtifact, - readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisCapabilityUnavailableError, @@ -82,7 +78,7 @@ import { } from "../../domain/native/pwntoolsResourceLimits.js"; import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js"; import { PWNTOOLS_PROVIDER_IDENTITY } from "./PwntoolsProviderIdentity.js"; -import { pwntoolsInputBytes } from "./PwntoolsInputLimit.js"; +import { pwntoolsInputBytes } from "../../config/pwntoolsInputLimit.js"; /** Names the detected host so a host refusal is not read as a target refusal. */ const pwntoolsHostRequirement = ( diff --git a/src/native/pwntools/PwntoolsFailures.test.ts b/src/native/pwntools/PwntoolsFailures.test.ts index e34331bc25..c0953bfccf 100644 --- a/src/native/pwntools/PwntoolsFailures.test.ts +++ b/src/native/pwntools/PwntoolsFailures.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { OwnedCommandFailure } from "../../process/OwnedCommand.js"; import { pwntoolsHostSupported } from "./PwntoolsDecoder.js"; diff --git a/src/native/pwntools/PwntoolsLayoutProvider.ts b/src/native/pwntools/PwntoolsLayoutProvider.ts index 6e42ea1b42..d0c49e47d7 100644 --- a/src/native/pwntools/PwntoolsLayoutProvider.ts +++ b/src/native/pwntools/PwntoolsLayoutProvider.ts @@ -8,7 +8,7 @@ import { AnalysisOutputError } from "../../domain/analysisErrorCore.js"; import { PwntoolsDecoder, type PwntoolsLauncher } from "./PwntoolsDecoder.js"; import { PWNTOOLS_PROVIDER_IDENTITY } from "./PwntoolsProviderIdentity.js"; import { PrivateRuntimeRoot } from "../../process/PrivateRuntimeRoot.js"; -import type { BinaryLayoutPort } from "../../application/binaryDiagnostics/BinaryLayoutPort.js"; +import type { BinaryLayoutPort } from "../../ports/binaryDiagnostics/BinaryLayoutPort.js"; import type { z } from "zod"; /** ELF-specific projection around the shared owned pwntools decoder boundary. */ diff --git a/src/native/pwntools/PwntoolsRecordedCrashProvider.ts b/src/native/pwntools/PwntoolsRecordedCrashProvider.ts index fc6b3ca835..e27e579ce7 100644 --- a/src/native/pwntools/PwntoolsRecordedCrashProvider.ts +++ b/src/native/pwntools/PwntoolsRecordedCrashProvider.ts @@ -10,7 +10,7 @@ import { type RecordedCrash, type RecordedCrashPartialObservation, } from "../../domain/native/recordedCrash.js"; -import type { RecordedCrashPort } from "../../application/binaryDiagnostics/RecordedCrashPort.js"; +import type { RecordedCrashPort } from "../../ports/binaryDiagnostics/RecordedCrashPort.js"; import { PrivateRuntimeRoot } from "../../process/PrivateRuntimeRoot.js"; import { PwntoolsDecoder, type PwntoolsLauncher } from "./PwntoolsDecoder.js"; import { PWNTOOLS_PROVIDER_IDENTITY } from "./PwntoolsProviderIdentity.js"; diff --git a/src/native/pwntools/PwntoolsResourceLimits.test.ts b/src/native/pwntools/PwntoolsResourceLimits.test.ts index 65d7c73c7a..d543faee0f 100644 --- a/src/native/pwntools/PwntoolsResourceLimits.test.ts +++ b/src/native/pwntools/PwntoolsResourceLimits.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { OwnedCommandFailure } from "../../process/OwnedCommand.js"; import type { ProviderProcessSnapshot } from "../../process/ProviderProcess.js"; import { readPwntoolsFailureEvidence } from "./PwntoolsResourceLimits.js"; diff --git a/src/native/pwntools/PwntoolsResourceLimits.ts b/src/native/pwntools/PwntoolsResourceLimits.ts index ebed3427b6..86399c5e77 100644 --- a/src/native/pwntools/PwntoolsResourceLimits.ts +++ b/src/native/pwntools/PwntoolsResourceLimits.ts @@ -7,14 +7,14 @@ import { join } from "node:path"; import { completedStableArtifact, readStableArtifact, -} from "../../artifacts/readStableArtifact.js"; + type ArtifactResourceScope, +} from "../../resources/index.js"; import { OwnedCommandFailure } from "../../process/OwnedCommand.js"; import { PWNTOOLS_MEMORY_FAILURE_EXIT, PWNTOOLS_FILE_SIZE_FAILURE_EXIT, } from "./PwntoolsRelease.js"; import { z } from "zod"; -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; /** Actual limits reported by the owned bridge after lowering inherited soft limits. */ export const pwntoolsResourceLimitsSchema = z.strictObject({ diff --git a/src/native/windows/WindowsShortcutParser.ts b/src/native/windows/WindowsShortcutParser.ts index 371ca5e090..48021bb240 100644 --- a/src/native/windows/WindowsShortcutParser.ts +++ b/src/native/windows/WindowsShortcutParser.ts @@ -1,7 +1,7 @@ import { createHash } from "node:crypto"; import { setImmediate } from "node:timers/promises"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; +import { assertArtifactReadActive } from "../../resources/index.js"; import type { InspectWindowsShortcutInput, WindowsShortcut, diff --git a/src/native/windows/WindowsShortcutProvider.ts b/src/native/windows/WindowsShortcutProvider.ts index 549bd8356c..364767f151 100644 --- a/src/native/windows/WindowsShortcutProvider.ts +++ b/src/native/windows/WindowsShortcutProvider.ts @@ -5,22 +5,18 @@ import { projectOwnedArtifactIdentityFailure, projectStableArtifactFailure, projectArtifactCloseFailure, -} from "../../artifacts/StableArtifactFailure.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, readStableArtifact, type StableArtifactFileSystem, type StableArtifactSnapshot, -} from "../../artifacts/readStableArtifact.js"; -import { fileSnapshotPartialObservationSchema } from "../../domain/fileSnapshotObservation.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, assertArtifactReadActive, -} from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; -import type { WindowsShortcutPort } from "../../application/binaryDiagnostics/WindowsShortcutPort.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../../resources/index.js"; +import { fileSnapshotPartialObservationSchema } from "../../domain/fileSnapshotObservation.js"; +import type { WindowsShortcutPort } from "../../ports/binaryDiagnostics/WindowsShortcutPort.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { AnalysisInputError, diff --git a/src/pcap/PcapCommand.ts b/src/pcap/PcapCommand.ts index ed201bbebf..c14b56e066 100644 --- a/src/pcap/PcapCommand.ts +++ b/src/pcap/PcapCommand.ts @@ -5,8 +5,10 @@ import { assertArtifactCommandPath, type ArtifactCommandPath, } from "../process/ArtifactCommandPath.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { artifactFileCancellationCause } from "../artifacts/ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + artifactFileCancellationCause, +} from "../resources/index.js"; import { randomUUID } from "node:crypto"; import { fixedAllowanceOptions } from "../domain/fixedAllowanceRemediation.js"; import { diff --git a/src/pcap/PcapConfiguration.ts b/src/pcap/PcapConfiguration.ts index b04d35bd24..9b89ffedf2 100644 --- a/src/pcap/PcapConfiguration.ts +++ b/src/pcap/PcapConfiguration.ts @@ -3,7 +3,7 @@ import { isAbsolute } from "node:path"; import { posixPathCandidates } from "../process/executableSearch.js"; -import type { ProviderAvailability } from "../application/AnalysisProvider.js"; +import type { ProviderAvailability } from "../ports/AnalysisProvider.js"; import type { ProviderRejectionCode } from "../domain/providerSelection.js"; import type { AnalysisErrorOptions } from "../domain/analysisErrorBase.js"; import { diff --git a/src/pcap/PcapProvider.ts b/src/pcap/PcapProvider.ts index f76d0382ff..066d9583d5 100644 --- a/src/pcap/PcapProvider.ts +++ b/src/pcap/PcapProvider.ts @@ -10,7 +10,7 @@ import { type ProviderAvailability, createAnalysisExecution, type AnalysisExecution, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { pcapResultSchemas, PCAP_CAPTURE_HOST_REMEDIATION, @@ -65,8 +65,10 @@ import { jsonValueSchema } from "../domain/jsonValue.js"; import { createPcapEvidence } from "../domain/pcap/pcapEvidence.js"; import { preparePcapNativeBound } from "./PcapNativeBound.js"; import { PcapSnapshot } from "./PcapSnapshot.js"; -import { readStableArtifact } from "../artifacts/readStableArtifact.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { + readStableArtifact, + ArtifactReaderFailure, +} from "../resources/index.js"; import { ArtifactAnalysisResources } from "../process/ArtifactAnalysisResources.js"; import { createArtifactAnalysisResources } from "../providers/artifactResourceFailure.js"; import { readLinuxResourceLimits } from "../process/LinuxResourceLimits.js"; diff --git a/src/pcap/PcapSnapshot.ts b/src/pcap/PcapSnapshot.ts index a09449e008..594aa6338d 100644 --- a/src/pcap/PcapSnapshot.ts +++ b/src/pcap/PcapSnapshot.ts @@ -3,7 +3,7 @@ import { createHash } from "node:crypto"; import { chmod, open, stat, mkdir } from "node:fs/promises"; import { join } from "node:path"; import { AnalysisError } from "../domain/analysisErrorBase.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/index.js"; import { AnalysisAccessDeniedError, AnalysisArtifactChangedError, @@ -25,7 +25,7 @@ import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; import { RuntimeControlUnavailableError, runtimeControlCapabilityError, -} from "../process/RuntimeControlUnavailableError.js"; +} from "../domain/runtimeControlUnavailableError.js"; import { privateWorkspaceFailure } from "../process/privateWorkspaceFailure.js"; const OPERATION = "inspect_pcap_capture"; diff --git a/src/application/AnalysisProvider.test.ts b/src/ports/AnalysisProvider.test.ts similarity index 100% rename from src/application/AnalysisProvider.test.ts rename to src/ports/AnalysisProvider.test.ts diff --git a/src/application/AnalysisProvider.ts b/src/ports/AnalysisProvider.ts similarity index 100% rename from src/application/AnalysisProvider.ts rename to src/ports/AnalysisProvider.ts diff --git a/src/application/AnalysisWorkScope.ts b/src/ports/AnalysisWorkScope.ts similarity index 100% rename from src/application/AnalysisWorkScope.ts rename to src/ports/AnalysisWorkScope.ts diff --git a/src/application/BrowserObservationPort.ts b/src/ports/BrowserObservationPort.ts similarity index 100% rename from src/application/BrowserObservationPort.ts rename to src/ports/BrowserObservationPort.ts diff --git a/src/application/BrowserScenarioCapturePort.ts b/src/ports/BrowserScenarioCapturePort.ts similarity index 100% rename from src/application/BrowserScenarioCapturePort.ts rename to src/ports/BrowserScenarioCapturePort.ts diff --git a/src/ports/DesktopBuildHost.ts b/src/ports/DesktopBuildHost.ts new file mode 100644 index 0000000000..1ddc5aaa4b --- /dev/null +++ b/src/ports/DesktopBuildHost.ts @@ -0,0 +1,149 @@ +import type { execFileOutput } from "../process/ExecFileOutput.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; + +/** + * The desktop build host contract: what doctor and `rea setup --desktop-build` + * read from, and ask of, the host that runs Docker, uv and agentenv. The + * desktop provider implements it; application workflows consume it. + */ + +/** Setting names a registration does not carry as the value selected here. */ +export interface RecordedProviderSettings { + /** Selected here and absent from the registration's recorded environment. */ + readonly unrecorded: readonly string[]; + /** Recorded with text other than the value selected here. */ + readonly differing: readonly string[]; + /** Recorded as an expression, or in a map REA could not read. */ + readonly unresolved: readonly string[]; + /** Recorded with a value the caller owns, as an archive setup packed for another version. */ + readonly owned?: readonly string[]; +} + +/** Whether a recorded value is the caller's own, which it may replace; the value never leaves the reader. */ +export type OwnedProviderSetting = (name: string, value: string) => boolean; + +/** + * The registration facts a desktop build host reads for one client: setting + * names only, never recorded values. Client registration status satisfies it. + */ +export interface DesktopBuildRegistration { + readonly client: string; + /** Empty when the client has no usable registration. */ + readonly command: readonly string[]; + readonly provider_settings?: RecordedProviderSettings; +} + +/** Reads each selected client's registration against the settings selected here. */ +export type DesktopBuildRegistrationReader = ( + selectedClientIds?: readonly string[], + providerSettings?: Readonly>, + ownedProviderSetting?: OwnedProviderSetting, + observeProviderSetting?: ( + client: string, + name: string, + value: string, + ) => void, +) => Promise; + +/** How a build setting's program was found: set in the environment, or on PATH. */ +export type DesktopBuildCommand = + | { + readonly status: "found"; + readonly path: string; + readonly source: "environment" | "path"; + } + | { readonly status: "missing" } + | { readonly status: "invalid"; readonly value: string }; + +/** What a desktop build host has, read without changing anything. */ +export interface DesktopBuildFacts { + readonly ps: { readonly found: boolean; readonly detail: string }; + readonly docker: DesktopBuildCommand; + readonly daemon: + | { readonly status: "reachable"; readonly rootDirectory: string } + | { + readonly status: "permission_denied" | "unreachable"; + readonly detail: string; + } + | { readonly status: "unchecked" }; + readonly disk: + | { readonly path: string; readonly freeBytes: number } + | { readonly path: string; readonly error: string }; + readonly agentEnv: DesktopBuildCommand & { + readonly version?: string | undefined; + }; + readonly archive: { + readonly path: string; + readonly source: "environment" | "cache"; + readonly status: "current" | "missing" | "stale" | "unknown"; + readonly detail?: string; + }; + /** Each considered client's registration, by setting names only. */ + readonly registrations: readonly { + readonly client: string; + readonly registered: boolean; + readonly unrecorded: readonly string[]; + readonly unresolved: readonly string[]; + readonly differing?: readonly string[]; + readonly unchecked?: readonly string[]; + /** Version check of this client's recorded runner, without the recorded path. */ + readonly runner?: { + readonly status: "current" | "stale" | "invalid" | "unknown"; + readonly version?: string; + }; + }[]; + /** Build settings this terminal's environment sets. */ + readonly environmentSettings: readonly string[]; + /** Where a solve endpoint is configured; null means its configuration is unknown. */ + readonly solveEndpoint: string | null | undefined; + /** Names of agentenv sandbox containers; undefined when Docker was not reachable. */ + readonly leftoverContainers: readonly string[] | undefined; +} + +/** What a facts reader gets from doctor: its environment, bounded runner and registration reader. */ +export interface DesktopBuildFactsInput { + readonly signal: AbortSignal; + readonly resources: ArtifactResourceScope; + readonly environment: Readonly; + readonly platform: NodeJS.Platform; + readonly run: typeof execFileOutput; + readonly clientIds: readonly string[]; + readonly registrations: ( + clientIds: readonly string[] | undefined, + settings: Readonly>, + owned?: undefined, + observe?: (client: string, name: string, value: string) => void, + ) => Promise; +} + +/** What setup reads from a host before it plans a desktop build setup. */ +export interface DesktopBuildSetupFacts { + /** Each build setting resolved to an absolute path; absent when none resolves. */ + readonly settings: Readonly>; + /** Settings the caller's environment selected, which setup records as they are. */ + readonly selected: readonly string[]; + readonly archive: string; + readonly archivePacked: boolean; + /** Why this REA cannot pack its runtime, when it cannot. */ + readonly packBlocker?: string; + readonly agentEnvVersion?: string | undefined; + /** uv on PATH and the agent-env its tool install places. */ + readonly uv?: { readonly path: string; readonly agentEnv: string }; + /** Per client, the build settings its registration already records with a value of its own. */ + readonly recorded: Readonly>; +} + +/** Effects `rea setup --desktop-build` needs from its host. */ +export interface DesktopBuildSetupHost { + facts(clientIds: readonly string[]): Promise; + /** Pack this REA as the build-computer runtime; the reason when it failed. */ + packRuntime( + archive: string, + signal?: AbortSignal, + ): Promise; + /** Install the pinned agentenv-framework with uv; the reason when it failed. */ + installAgentenv( + uv: string, + signal?: AbortSignal, + ): Promise; +} diff --git a/src/ports/DoctorProviderInspection.ts b/src/ports/DoctorProviderInspection.ts new file mode 100644 index 0000000000..f5c67101bb --- /dev/null +++ b/src/ports/DoctorProviderInspection.ts @@ -0,0 +1,44 @@ +import type { JsonValue } from "../domain/jsonValue.js"; + +/** One actionable environment diagnostic. */ +export interface DoctorCheck { + readonly name: string; + readonly ok: boolean; + readonly classification: + | "healthy" + | "missing_dependency" + | "runtime_failure" + | "unsupported_host" + | "unsupported_target" + | "missing_analysis_engine" + | "unknown" + | "config_drift"; + readonly detail?: string; + readonly details?: Readonly>; + readonly remediation?: string; +} + +/** One provider-owned check projected without importing its adapter types. */ +export interface DoctorProviderCheck { + readonly name: string; + readonly ok: boolean; + readonly code: string | null; + readonly detail: string; + readonly remediation: string | null; + readonly classification: Exclude; + readonly details?: Readonly>; +} + +/** Read-only provider inspection supplied by an outer composition adapter. */ +export interface DoctorProviderInspection { + readonly id: string; + /** Null means the selected client's setting could not be determined. */ + readonly configured: boolean | null; + /** Null means readiness cannot be established for the selected client. */ + readonly available: boolean | null; + readonly providerVersion: string | null; + /** Validated discoveries used as registration defaults. Setup preserves + * caller-selected configuration separately from these readiness facts. */ + readonly registrationEnvironment: Readonly>; + readonly checks: readonly DoctorProviderCheck[]; +} diff --git a/src/ports/LinuxHopperLauncherVerification.ts b/src/ports/LinuxHopperLauncherVerification.ts new file mode 100644 index 0000000000..3062a4be1f --- /dev/null +++ b/src/ports/LinuxHopperLauncherVerification.ts @@ -0,0 +1,25 @@ +import type { Result } from "../domain/result.js"; + +/** Why the verification owner refused to authenticate a Linux launcher. */ +export interface LinuxHopperLauncherRejection extends Error { + /** Parsed failure reason; `cancelled` when the caller's signal stopped it. */ + readonly reason: string; +} + +/** + * Read-only authentication of a Linux Hopper launcher before REA runs it. + * Hopper setup (src/application/LinuxHopper.ts) implements it; production + * composition supplies it to the Hopper provider. + */ +export interface LinuxHopperLauncherVerification { + /** Authenticate the launcher and report the launcher bytes it verified. */ + readonly inspect: ( + path: string, + environment: Readonly, + signal?: AbortSignal, + ) => Promise< + Result<{ readonly sha256: string }, LinuxHopperLauncherRejection> + >; + /** Retry cleanup the verification owner retained after a failed close. */ + readonly retryCleanup: () => Promise; +} diff --git a/src/application/OptionalObservationProviders.ts b/src/ports/OptionalObservationProviders.ts similarity index 100% rename from src/application/OptionalObservationProviders.ts rename to src/ports/OptionalObservationProviders.ts diff --git a/src/application/ProgressReporter.test.ts b/src/ports/ProgressReporter.test.ts similarity index 100% rename from src/application/ProgressReporter.test.ts rename to src/ports/ProgressReporter.test.ts diff --git a/src/application/ProgressReporter.ts b/src/ports/ProgressReporter.ts similarity index 100% rename from src/application/ProgressReporter.ts rename to src/ports/ProgressReporter.ts diff --git a/src/application/ProviderInspectionScope.ts b/src/ports/ProviderInspectionScope.ts similarity index 100% rename from src/application/ProviderInspectionScope.ts rename to src/ports/ProviderInspectionScope.ts diff --git a/src/application/WebModulePorts.ts b/src/ports/WebModulePorts.ts similarity index 100% rename from src/application/WebModulePorts.ts rename to src/ports/WebModulePorts.ts diff --git a/src/application/WebRuntimePort.ts b/src/ports/WebRuntimePort.ts similarity index 100% rename from src/application/WebRuntimePort.ts rename to src/ports/WebRuntimePort.ts diff --git a/src/application/WebScriptArtifactPort.ts b/src/ports/WebScriptArtifactPort.ts similarity index 100% rename from src/application/WebScriptArtifactPort.ts rename to src/ports/WebScriptArtifactPort.ts diff --git a/src/application/WebSourceLocationPorts.ts b/src/ports/WebSourceLocationPorts.ts similarity index 100% rename from src/application/WebSourceLocationPorts.ts rename to src/ports/WebSourceLocationPorts.ts diff --git a/src/application/android/AndroidAnalysisPort.ts b/src/ports/android/AndroidAnalysisPort.ts similarity index 100% rename from src/application/android/AndroidAnalysisPort.ts rename to src/ports/android/AndroidAnalysisPort.ts diff --git a/src/application/apkSignature/ApkSignaturePort.ts b/src/ports/apkSignature/ApkSignaturePort.ts similarity index 100% rename from src/application/apkSignature/ApkSignaturePort.ts rename to src/ports/apkSignature/ApkSignaturePort.ts diff --git a/src/application/artifacts/DesktopApplicationPort.ts b/src/ports/artifacts/DesktopApplicationPort.ts similarity index 100% rename from src/application/artifacts/DesktopApplicationPort.ts rename to src/ports/artifacts/DesktopApplicationPort.ts diff --git a/src/application/binaryDiagnostics/AppleIpsPort.ts b/src/ports/binaryDiagnostics/AppleIpsPort.ts similarity index 100% rename from src/application/binaryDiagnostics/AppleIpsPort.ts rename to src/ports/binaryDiagnostics/AppleIpsPort.ts diff --git a/src/application/binaryDiagnostics/BinaryHardeningPort.ts b/src/ports/binaryDiagnostics/BinaryHardeningPort.ts similarity index 100% rename from src/application/binaryDiagnostics/BinaryHardeningPort.ts rename to src/ports/binaryDiagnostics/BinaryHardeningPort.ts diff --git a/src/application/binaryDiagnostics/BinaryLayoutPort.ts b/src/ports/binaryDiagnostics/BinaryLayoutPort.ts similarity index 100% rename from src/application/binaryDiagnostics/BinaryLayoutPort.ts rename to src/ports/binaryDiagnostics/BinaryLayoutPort.ts diff --git a/src/application/binaryDiagnostics/DevicetreePort.ts b/src/ports/binaryDiagnostics/DevicetreePort.ts similarity index 100% rename from src/application/binaryDiagnostics/DevicetreePort.ts rename to src/ports/binaryDiagnostics/DevicetreePort.ts diff --git a/src/application/binaryDiagnostics/ElfNotesPort.ts b/src/ports/binaryDiagnostics/ElfNotesPort.ts similarity index 100% rename from src/application/binaryDiagnostics/ElfNotesPort.ts rename to src/ports/binaryDiagnostics/ElfNotesPort.ts diff --git a/src/application/binaryDiagnostics/ElfUnwindRangesPort.ts b/src/ports/binaryDiagnostics/ElfUnwindRangesPort.ts similarity index 100% rename from src/application/binaryDiagnostics/ElfUnwindRangesPort.ts rename to src/ports/binaryDiagnostics/ElfUnwindRangesPort.ts diff --git a/src/application/binaryDiagnostics/KernelBuildConfigPort.ts b/src/ports/binaryDiagnostics/KernelBuildConfigPort.ts similarity index 100% rename from src/application/binaryDiagnostics/KernelBuildConfigPort.ts rename to src/ports/binaryDiagnostics/KernelBuildConfigPort.ts diff --git a/src/application/binaryDiagnostics/KernelModulePort.ts b/src/ports/binaryDiagnostics/KernelModulePort.ts similarity index 100% rename from src/application/binaryDiagnostics/KernelModulePort.ts rename to src/ports/binaryDiagnostics/KernelModulePort.ts diff --git a/src/application/binaryDiagnostics/NativeExportsPort.ts b/src/ports/binaryDiagnostics/NativeExportsPort.ts similarity index 100% rename from src/application/binaryDiagnostics/NativeExportsPort.ts rename to src/ports/binaryDiagnostics/NativeExportsPort.ts diff --git a/src/application/binaryDiagnostics/NativeInitializersPort.ts b/src/ports/binaryDiagnostics/NativeInitializersPort.ts similarity index 100% rename from src/application/binaryDiagnostics/NativeInitializersPort.ts rename to src/ports/binaryDiagnostics/NativeInitializersPort.ts diff --git a/src/application/binaryDiagnostics/PeCertificatesPort.ts b/src/ports/binaryDiagnostics/PeCertificatesPort.ts similarity index 100% rename from src/application/binaryDiagnostics/PeCertificatesPort.ts rename to src/ports/binaryDiagnostics/PeCertificatesPort.ts diff --git a/src/application/binaryDiagnostics/PeImportsPort.ts b/src/ports/binaryDiagnostics/PeImportsPort.ts similarity index 100% rename from src/application/binaryDiagnostics/PeImportsPort.ts rename to src/ports/binaryDiagnostics/PeImportsPort.ts diff --git a/src/application/binaryDiagnostics/PeLoadConfigPort.ts b/src/ports/binaryDiagnostics/PeLoadConfigPort.ts similarity index 100% rename from src/application/binaryDiagnostics/PeLoadConfigPort.ts rename to src/ports/binaryDiagnostics/PeLoadConfigPort.ts diff --git a/src/application/binaryDiagnostics/PeResourcesPort.ts b/src/ports/binaryDiagnostics/PeResourcesPort.ts similarity index 100% rename from src/application/binaryDiagnostics/PeResourcesPort.ts rename to src/ports/binaryDiagnostics/PeResourcesPort.ts diff --git a/src/application/binaryDiagnostics/RecordedCrashPort.ts b/src/ports/binaryDiagnostics/RecordedCrashPort.ts similarity index 100% rename from src/application/binaryDiagnostics/RecordedCrashPort.ts rename to src/ports/binaryDiagnostics/RecordedCrashPort.ts diff --git a/src/application/binaryDiagnostics/WindowsShortcutPort.ts b/src/ports/binaryDiagnostics/WindowsShortcutPort.ts similarity index 100% rename from src/application/binaryDiagnostics/WindowsShortcutPort.ts rename to src/ports/binaryDiagnostics/WindowsShortcutPort.ts diff --git a/src/ports/captures/PacketCapturePort.ts b/src/ports/captures/PacketCapturePort.ts new file mode 100644 index 0000000000..a6d1c50acf --- /dev/null +++ b/src/ports/captures/PacketCapturePort.ts @@ -0,0 +1,21 @@ +import type { + AnalysisExecution, + ExecutionOptions, +} from "../AnalysisProvider.js"; +import type { AnalysisError } from "../../domain/analysisErrorBase.js"; +import type { InspectPacketFieldsInput } from "../../domain/captures/packetFields.js"; +import type { InspectPacketCaptureInput } from "../../domain/captures/packetCapture.js"; +import type { Result } from "../../domain/result.js"; + +export interface PacketCapturePort { + /** Release per-call resources before returning, or retain failed cleanup for close/retry. */ + inspect( + input: InspectPacketCaptureInput, + options?: ExecutionOptions, + ): Promise>; + inspectFields( + input: InspectPacketFieldsInput, + options?: ExecutionOptions, + ): Promise>; + close(): Promise; +} diff --git a/src/application/electron/ElectronFusePort.ts b/src/ports/electron/ElectronFusePort.ts similarity index 100% rename from src/application/electron/ElectronFusePort.ts rename to src/ports/electron/ElectronFusePort.ts diff --git a/src/application/erlang/BeamPort.ts b/src/ports/erlang/BeamPort.ts similarity index 100% rename from src/application/erlang/BeamPort.ts rename to src/ports/erlang/BeamPort.ts diff --git a/src/application/evm/EvmInterfacePort.ts b/src/ports/evm/EvmInterfacePort.ts similarity index 100% rename from src/application/evm/EvmInterfacePort.ts rename to src/ports/evm/EvmInterfacePort.ts diff --git a/src/application/firmware/FirmwareAnalysisPort.ts b/src/ports/firmware/FirmwareAnalysisPort.ts similarity index 100% rename from src/application/firmware/FirmwareAnalysisPort.ts rename to src/ports/firmware/FirmwareAnalysisPort.ts diff --git a/src/application/frida/FridaInstrumentationPort.ts b/src/ports/frida/FridaInstrumentationPort.ts similarity index 100% rename from src/application/frida/FridaInstrumentationPort.ts rename to src/ports/frida/FridaInstrumentationPort.ts diff --git a/src/application/go/GoBinaryPort.ts b/src/ports/go/GoBinaryPort.ts similarity index 100% rename from src/application/go/GoBinaryPort.ts rename to src/ports/go/GoBinaryPort.ts diff --git a/src/application/gpu/GpuCodeObjectsPort.ts b/src/ports/gpu/GpuCodeObjectsPort.ts similarity index 100% rename from src/application/gpu/GpuCodeObjectsPort.ts rename to src/ports/gpu/GpuCodeObjectsPort.ts diff --git a/src/application/il2cpp/Il2cppMetadataPort.ts b/src/ports/il2cpp/Il2cppMetadataPort.ts similarity index 100% rename from src/application/il2cpp/Il2cppMetadataPort.ts rename to src/ports/il2cpp/Il2cppMetadataPort.ts diff --git a/src/application/il2cpp/Il2cppSeedWriterPort.ts b/src/ports/il2cpp/Il2cppSeedWriterPort.ts similarity index 100% rename from src/application/il2cpp/Il2cppSeedWriterPort.ts rename to src/ports/il2cpp/Il2cppSeedWriterPort.ts diff --git a/src/application/javascript/ElectronActiveObservationPort.ts b/src/ports/javascript/ElectronActiveObservationPort.ts similarity index 100% rename from src/application/javascript/ElectronActiveObservationPort.ts rename to src/ports/javascript/ElectronActiveObservationPort.ts diff --git a/src/application/javascript/ElectronObservationPort.ts b/src/ports/javascript/ElectronObservationPort.ts similarity index 100% rename from src/application/javascript/ElectronObservationPort.ts rename to src/ports/javascript/ElectronObservationPort.ts diff --git a/src/application/javascript/JavaScriptRecoveryPort.ts b/src/ports/javascript/JavaScriptRecoveryPort.ts similarity index 100% rename from src/application/javascript/JavaScriptRecoveryPort.ts rename to src/ports/javascript/JavaScriptRecoveryPort.ts diff --git a/src/application/javascript/JavaScriptRuntimeObservationPort.ts b/src/ports/javascript/JavaScriptRuntimeObservationPort.ts similarity index 100% rename from src/application/javascript/JavaScriptRuntimeObservationPort.ts rename to src/ports/javascript/JavaScriptRuntimeObservationPort.ts diff --git a/src/application/jeb/JebAnalysisPort.ts b/src/ports/jeb/JebAnalysisPort.ts similarity index 100% rename from src/application/jeb/JebAnalysisPort.ts rename to src/ports/jeb/JebAnalysisPort.ts diff --git a/src/application/model/ModelArtifactPort.ts b/src/ports/model/ModelArtifactPort.ts similarity index 100% rename from src/application/model/ModelArtifactPort.ts rename to src/ports/model/ModelArtifactPort.ts diff --git a/src/application/playwrightTrace/PlaywrightTracePort.ts b/src/ports/playwrightTrace/PlaywrightTracePort.ts similarity index 100% rename from src/application/playwrightTrace/PlaywrightTracePort.ts rename to src/ports/playwrightTrace/PlaywrightTracePort.ts diff --git a/src/application/python/PythonPycPort.ts b/src/ports/python/PythonPycPort.ts similarity index 100% rename from src/application/python/PythonPycPort.ts rename to src/ports/python/PythonPycPort.ts diff --git a/src/application/releaseExposure/ReleaseExposurePort.ts b/src/ports/releaseExposure/ReleaseExposurePort.ts similarity index 100% rename from src/application/releaseExposure/ReleaseExposurePort.ts rename to src/ports/releaseExposure/ReleaseExposurePort.ts diff --git a/src/application/rust/RustBinaryPort.ts b/src/ports/rust/RustBinaryPort.ts similarity index 100% rename from src/application/rust/RustBinaryPort.ts rename to src/ports/rust/RustBinaryPort.ts diff --git a/src/ports/signals/SignalRecordingPort.ts b/src/ports/signals/SignalRecordingPort.ts new file mode 100644 index 0000000000..c766feb631 --- /dev/null +++ b/src/ports/signals/SignalRecordingPort.ts @@ -0,0 +1,21 @@ +import type { + AnalysisExecution, + ExecutionOptions, +} from "../AnalysisProvider.js"; +import type { AnalysisError } from "../../domain/analysisErrorBase.js"; +import type { InspectSignalDecodersInput } from "../../domain/signals/signalDecoders.js"; +import type { DecodeSignalRecordingInput } from "../../domain/signals/signalRecording.js"; +import type { Result } from "../../domain/result.js"; + +export interface SignalRecordingPort { + /** Release per-call resources before returning, or retain failed cleanup for close/retry. */ + decode( + input: DecodeSignalRecordingInput, + options?: ExecutionOptions, + ): Promise>; + inspectDecoders( + input: InspectSignalDecodersInput, + options?: ExecutionOptions, + ): Promise>; + close(): Promise; +} diff --git a/src/application/sqlite/SqliteDatabasePort.ts b/src/ports/sqlite/SqliteDatabasePort.ts similarity index 100% rename from src/application/sqlite/SqliteDatabasePort.ts rename to src/ports/sqlite/SqliteDatabasePort.ts diff --git a/src/application/v8CodeCache/V8CodeCachePort.ts b/src/ports/v8CodeCache/V8CodeCachePort.ts similarity index 100% rename from src/application/v8CodeCache/V8CodeCachePort.ts rename to src/ports/v8CodeCache/V8CodeCachePort.ts diff --git a/src/application/wasm/WasmArtifactPort.ts b/src/ports/wasm/WasmArtifactPort.ts similarity index 100% rename from src/application/wasm/WasmArtifactPort.ts rename to src/ports/wasm/WasmArtifactPort.ts diff --git a/src/process/ArtifactAnalysisResources.test.ts b/src/process/ArtifactAnalysisResources.test.ts index f239f6a284..d77d9cfa80 100644 --- a/src/process/ArtifactAnalysisResources.test.ts +++ b/src/process/ArtifactAnalysisResources.test.ts @@ -1,4 +1,4 @@ -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { artifactResourceDialect, createArtifactAnalysisResources, @@ -7,8 +7,8 @@ import { classifyProviderFailure } from "../providers/classifyProviderFailure.js import { ArtifactResourceRetryFailure, ArtifactResourceScope, -} from "../artifacts/ArtifactResourceScope.js"; -import { withArtifactRegularFile } from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/ArtifactResourceScope.js"; +import { withArtifactRegularFile } from "../resources/ArtifactFileOperation.js"; import { symlink, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; @@ -18,8 +18,8 @@ import { OwnedCommandFailure } from "./OwnedCommand.js"; import { EventEmitter } from "node:events"; import { PassThrough } from "node:stream"; import { expect, it } from "vitest"; -import { readStableArtifact } from "../artifacts/readStableArtifact.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { readStableArtifact } from "../resources/readStableArtifact.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { AnalysisCancelledError, AnalysisOutputError, diff --git a/src/process/ArtifactAnalysisResources.ts b/src/process/ArtifactAnalysisResources.ts index 52fd3df2cd..3714b4b00a 100644 --- a/src/process/ArtifactAnalysisResources.ts +++ b/src/process/ArtifactAnalysisResources.ts @@ -2,13 +2,11 @@ import { capturedProviderOutput } from "./capturedProviderOutput.js"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure, type CleanupFailedRead, -} from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { readStableArtifact } from "../artifacts/readStableArtifact.js"; + ArtifactResourceScope, + readStableArtifact, +} from "../resources/index.js"; import { AnalysisError, type AnalysisCapturedOutput, diff --git a/src/process/ArtifactCommandPath.ts b/src/process/ArtifactCommandPath.ts index 51b92922b7..7ea3f4084d 100644 --- a/src/process/ArtifactCommandPath.ts +++ b/src/process/ArtifactCommandPath.ts @@ -4,7 +4,7 @@ import { realpath } from "node:fs/promises"; import { artifactSelectedPathErrno, assertArtifactReadActive, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import type { AnalysisCapturedOutput } from "../domain/analysisErrorBase.js"; import { AnalysisAccessDeniedError, diff --git a/src/process/HopperLease.ts b/src/process/HopperLease.ts index cee9991d2a..e70f873463 100644 --- a/src/process/HopperLease.ts +++ b/src/process/HopperLease.ts @@ -4,8 +4,8 @@ import { join } from "node:path"; import { ArtifactFileCleanupFailure, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; + type ArtifactResourceScope, +} from "../resources/index.js"; import { HopperStartError } from "../domain/hopperErrors.js"; import { acquireOwnedLease, diff --git a/src/process/LinuxResourceLimits.test.ts b/src/process/LinuxResourceLimits.test.ts index 02e50a2d01..92a83b2195 100644 --- a/src/process/LinuxResourceLimits.test.ts +++ b/src/process/LinuxResourceLimits.test.ts @@ -4,11 +4,11 @@ import { expect, it, onTestFinished, vi } from "vitest"; import { writeFile, type FileHandle } from "node:fs/promises"; import { join } from "node:path"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -import { ArtifactFileCleanupFailure } from "../artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js"; import { ArtifactAnalysisResources } from "./ArtifactAnalysisResources.js"; -import { readStableArtifact } from "../artifacts/readStableArtifact.js"; +import { readStableArtifact } from "../resources/readStableArtifact.js"; import { ok } from "../domain/result.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { clampLinuxResourceLimits, prlimitArgumentVector, diff --git a/src/process/LinuxResourceLimits.ts b/src/process/LinuxResourceLimits.ts index f6b7e09e79..c6ec49eae4 100644 --- a/src/process/LinuxResourceLimits.ts +++ b/src/process/LinuxResourceLimits.ts @@ -1,8 +1,10 @@ import { ProcessAdmissionError } from "./ProcessAdmissionError.js"; import { open } from "node:fs/promises"; import { readFileHandleRange } from "../filesystem/readFileHandleRange.js"; -import { withArtifactFileHandle } from "../artifacts/ArtifactFileOperation.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + withArtifactFileHandle, + type ArtifactResourceScope, +} from "../resources/index.js"; /** Per-process ceilings inherited by an owned Linux producer. */ export interface LinuxResourceLimits { diff --git a/src/process/OwnedLease.test.ts b/src/process/OwnedLease.test.ts index e438da07a1..7fdeae90c0 100644 --- a/src/process/OwnedLease.test.ts +++ b/src/process/OwnedLease.test.ts @@ -7,8 +7,8 @@ import { join } from "node:path"; import { afterEach, describe, expect, it, onTestFinished, vi } from "vitest"; import { phaseGate } from "../../tests/support/lifecycleHarness.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { HopperStartError } from "../domain/hopperErrors.js"; // Unix socket paths have a short platform limit; the canonical system temp path can exceed it. const createTestTempDirectory = async (prefix: string): Promise => { diff --git a/src/process/OwnedLease.ts b/src/process/OwnedLease.ts index 1713eb7f76..3bda3e1535 100644 --- a/src/process/OwnedLease.ts +++ b/src/process/OwnedLease.ts @@ -13,9 +13,9 @@ import { join } from "node:path"; import { ArtifactFileCleanupFailure, withArtifactFileHandle, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; + ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import { safeParseJson } from "../domain/safeJson.js"; diff --git a/src/process/OwnedMcpStdioTransport.ts b/src/process/OwnedMcpStdioTransport.ts index 743d310a9f..435053971b 100644 --- a/src/process/OwnedMcpStdioTransport.ts +++ b/src/process/OwnedMcpStdioTransport.ts @@ -29,7 +29,7 @@ import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; +} from "../resources/index.js"; /** Injectable acquisition seam; production owns a POSIX group or Windows job. */ export type OwnedMcpLauncher = ( diff --git a/src/process/PrivateRuntimeRoot.ts b/src/process/PrivateRuntimeRoot.ts index 759c4860e4..242e4f9065 100644 --- a/src/process/PrivateRuntimeRoot.ts +++ b/src/process/PrivateRuntimeRoot.ts @@ -4,7 +4,7 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; import { WindowsPrivateRuntime } from "../windows/WindowsPrivateRuntime.js"; -import { PrivateRuntimeRootUnavailableError } from "./PrivateRuntimeRootUnavailableError.js"; +import { PrivateRuntimeRootUnavailableError } from "../domain/privateRuntimeRootUnavailableError.js"; import { windowsNativeCapabilities, diff --git a/src/process/ProcessInspectionCleanup.test.ts b/src/process/ProcessInspectionCleanup.test.ts index 1df228b226..a2cf327709 100644 --- a/src/process/ProcessInspectionCleanup.test.ts +++ b/src/process/ProcessInspectionCleanup.test.ts @@ -5,7 +5,7 @@ import { open, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { primaryAnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../domain/analysisErrorCore.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; diff --git a/src/application/RegularFileRead.ts b/src/process/RegularFileRead.ts similarity index 97% rename from src/application/RegularFileRead.ts rename to src/process/RegularFileRead.ts index 3449b587ce..da253495d0 100644 --- a/src/application/RegularFileRead.ts +++ b/src/process/RegularFileRead.ts @@ -16,16 +16,14 @@ import { OwnedRegularFileOperationFailure, type RegularFileOperationOutcome, } from "../filesystem/OwnedRegularFile.js"; -import { readBoundedFileBytes } from "../process/BoundedFileBytes.js"; +import { readBoundedFileBytes } from "./BoundedFileBytes.js"; import { AnalysisCleanupLeaseGroup, AnalysisCleanupLease, -} from "../artifacts/AnalysisCleanupLease.js"; -import type { - ArtifactResourceOwner, - ArtifactResourceScope, -} from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; + type ArtifactResourceOwner, + type ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; import type { AnalysisCleanupObservation, AnalysisError, diff --git a/src/process/capture/FilesystemRootAdmission.test.ts b/src/process/capture/FilesystemRootAdmission.test.ts index a0c7876927..377526086f 100644 --- a/src/process/capture/FilesystemRootAdmission.test.ts +++ b/src/process/capture/FilesystemRootAdmission.test.ts @@ -1,7 +1,7 @@ import { createTestProcessCaptureResourceScope } from "../../../tests/fixtures/processCaptureResourceScope.js"; import { expect, it } from "vitest"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; -import { analysisErrorProjectionSchema } from "../../contracts/errorSchemas.js"; +import { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; +import { analysisErrorProjectionSchema } from "../../domain/analysisErrorProjectionSchema.js"; import { AnalysisAccessDeniedError } from "../../domain/analysisErrorCore.js"; import { AnalysisError, diff --git a/src/process/capture/FilesystemSnapshot.ts b/src/process/capture/FilesystemSnapshot.ts index c6f71a9ed4..a66e4d5e2e 100644 --- a/src/process/capture/FilesystemSnapshot.ts +++ b/src/process/capture/FilesystemSnapshot.ts @@ -20,7 +20,7 @@ import type { import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../../artifacts/AnalysisCleanupLease.js"; +} from "../../resources/index.js"; import { normalizeCaptureFailure, describeProcessCaptureExecutionFailure, diff --git a/src/process/capture/ProcessCaptureCleanupOutcome.test.ts b/src/process/capture/ProcessCaptureCleanupOutcome.test.ts index 1f55f7ab16..348c9b4f98 100644 --- a/src/process/capture/ProcessCaptureCleanupOutcome.test.ts +++ b/src/process/capture/ProcessCaptureCleanupOutcome.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; import { emptyProcessCapture } from "../../domain/process/processCapture.fixture.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; -import { analysisErrorProjectionSchema } from "../../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../domain/analysisErrorProjectionSchema.js"; import { ProcessCaptureError } from "./ProcessCaptureError.js"; import { PROCESS_CAPTURE_CLEANUP_INTERVENTION_UNKNOWN, diff --git a/src/process/capture/ProcessCaptureError.test.ts b/src/process/capture/ProcessCaptureError.test.ts index 7d0f8f334a..3a0d77bd4b 100644 --- a/src/process/capture/ProcessCaptureError.test.ts +++ b/src/process/capture/ProcessCaptureError.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import { AnalysisCleanupLease } from "../../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../resources/AnalysisCleanupLease.js"; import { ProcessCaptureReadFailure } from "./ProcessCaptureRead.js"; import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; diff --git a/src/process/capture/ProcessCaptureError.ts b/src/process/capture/ProcessCaptureError.ts index 907778086b..25f41d9d93 100644 --- a/src/process/capture/ProcessCaptureError.ts +++ b/src/process/capture/ProcessCaptureError.ts @@ -3,7 +3,7 @@ import { analysisErrorWithCancellation } from "../../domain/analysisErrorCancell import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../../artifacts/AnalysisCleanupLease.js"; +} from "../../resources/index.js"; import { AnalysisCancelledError, cancelledBy, diff --git a/src/process/capture/ProcessCaptureLifecycle.ts b/src/process/capture/ProcessCaptureLifecycle.ts index 64bb238635..13a6cd2824 100644 --- a/src/process/capture/ProcessCaptureLifecycle.ts +++ b/src/process/capture/ProcessCaptureLifecycle.ts @@ -11,7 +11,7 @@ import type { IPty } from "@lydell/node-pty"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../../artifacts/AnalysisCleanupLease.js"; +} from "../../resources/index.js"; import type { ProcessCapture } from "../../domain/process/processCaptureParsing.js"; import type { ProcessScenario } from "../../domain/process/processScenario.js"; diff --git a/src/process/capture/ProcessCaptureRead.ts b/src/process/capture/ProcessCaptureRead.ts index 52ed22e133..38c698f6df 100644 --- a/src/process/capture/ProcessCaptureRead.ts +++ b/src/process/capture/ProcessCaptureRead.ts @@ -3,7 +3,7 @@ import type { FileHandle } from "node:fs/promises"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../../artifacts/AnalysisCleanupLease.js"; +} from "../../resources/index.js"; import { ProcessCaptureError, describeProcessCaptureExecutionFailure, diff --git a/src/process/capture/ProcessHarness.test.ts b/src/process/capture/ProcessHarness.test.ts index 3b8194620b..0f06813d3f 100644 --- a/src/process/capture/ProcessHarness.test.ts +++ b/src/process/capture/ProcessHarness.test.ts @@ -24,7 +24,7 @@ import { accountFullyObservedProcessCapture, emptyProcessCapture, } from "../../domain/process/processCapture.fixture.js"; -import { analysisErrorProjectionSchema } from "../../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../domain/analysisErrorProjectionSchema.js"; import { ProcessCaptureError, normalizeCaptureFailure, diff --git a/src/application/binary/AnalysisClientCleanup.test.ts b/src/providers/AnalysisClientCleanup.test.ts similarity index 90% rename from src/application/binary/AnalysisClientCleanup.test.ts rename to src/providers/AnalysisClientCleanup.test.ts index 9100fe2ac3..e9751fe5a5 100644 --- a/src/application/binary/AnalysisClientCleanup.test.ts +++ b/src/providers/AnalysisClientCleanup.test.ts @@ -3,13 +3,13 @@ import { expect, it } from "vitest"; import { projectAnalysisError, projectAnalysisErrorWithoutCapturedOutput, -} from "../../domain/analysisErrorProjection.js"; -import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; -import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; -import { err } from "../../domain/result.js"; -import type { AnalysisClient } from "../AnalysisProvider.js"; -import { closeAnalysisClient } from "../AnalysisClientCleanup.js"; -import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js"; +} from "../domain/analysisErrorProjection.js"; +import { ProviderAdapterError } from "../domain/providerAdapterError.js"; +import { ProviderCleanupError } from "../domain/providerCleanupError.js"; +import { err } from "../domain/result.js"; +import type { AnalysisClient } from "../ports/AnalysisProvider.js"; +import { closeAnalysisClient } from "./AnalysisClientCleanup.js"; +import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; const clientClosingWith = (cause: unknown): AnalysisClient => ({ execute: () => Promise.resolve(err(new ProviderCleanupError("x", [], {}))), diff --git a/src/application/AnalysisClientCleanup.ts b/src/providers/AnalysisClientCleanup.ts similarity index 95% rename from src/application/AnalysisClientCleanup.ts rename to src/providers/AnalysisClientCleanup.ts index 4aea451470..34bfcbea79 100644 --- a/src/application/AnalysisClientCleanup.ts +++ b/src/providers/AnalysisClientCleanup.ts @@ -1,7 +1,7 @@ import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { err, type Result } from "../domain/result.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; -import type { AnalysisClient } from "./AnalysisProvider.js"; +import type { AnalysisClient } from "../ports/AnalysisProvider.js"; /** Close one provider client and normalize unexpected adapter rejection. */ export const closeAnalysisClient = async ( diff --git a/src/providers/AnalysisClientCreation.ts b/src/providers/AnalysisClientCreation.ts index 32d77eaa3d..b984919b3d 100644 --- a/src/providers/AnalysisClientCreation.ts +++ b/src/providers/AnalysisClientCreation.ts @@ -1,14 +1,16 @@ import { analysisClientFailureForOperation } from "./AnalysisClientFailure.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { + ArtifactResourceScope, + ArtifactReaderFailure, + bindArtifactFileCleanup, + AnalysisCleanupLease, +} from "../resources/index.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import type { AnalysisClient, RetainedResourceScope, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisCancelledError, @@ -22,7 +24,7 @@ import { import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { err, ok, type Result } from "../domain/result.js"; import { SharedStartupAttempt } from "../process/SharedStartupAttempt.js"; -import { closeAnalysisClient } from "../application/AnalysisClientCleanup.js"; +import { closeAnalysisClient } from "./AnalysisClientCleanup.js"; /** Own deferred client creation while callers wait independently and close joins it. */ export class AnalysisClientCreation { diff --git a/src/providers/AnalysisClientFailure.ts b/src/providers/AnalysisClientFailure.ts index c539155a59..481130e4dc 100644 --- a/src/providers/AnalysisClientFailure.ts +++ b/src/providers/AnalysisClientFailure.ts @@ -22,8 +22,10 @@ import { import { ProviderAdapterError } from "../domain/providerAdapterError.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import type { JsonValue } from "../domain/jsonValue.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + bindArtifactFileCleanup, +} from "../resources/index.js"; /** Copy authored outcome facts; semantic attribution never inspects a later signal. */ export const analysisClientFailureContext = ( diff --git a/src/providers/DeferredAnalysisClient.ts b/src/providers/DeferredAnalysisClient.ts index 17b5a29e2a..8917097f70 100644 --- a/src/providers/DeferredAnalysisClient.ts +++ b/src/providers/DeferredAnalysisClient.ts @@ -3,7 +3,7 @@ import type { RetainedResourceScope, ProviderRuntimeLineageSnapshot, ProviderRequestActivitySnapshot, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { ProviderOperationHealth } from "../domain/providerOperationHealth.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { diff --git a/src/providers/OwnedCommandCleanup.test.ts b/src/providers/OwnedCommandCleanup.test.ts index c78b6e8987..fd8e80c6c8 100644 --- a/src/providers/OwnedCommandCleanup.test.ts +++ b/src/providers/OwnedCommandCleanup.test.ts @@ -8,7 +8,7 @@ import { retainOwnedCommandCleanup, retainProcessInspectionCleanup, } from "./OwnedCommandCleanup.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { AnalysisOutputError } from "../domain/analysisErrorCore.js"; import { primaryAnalysisError } from "../domain/analysisErrorBase.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; diff --git a/src/providers/OwnedCommandCleanup.ts b/src/providers/OwnedCommandCleanup.ts index 0e31d03126..7ae8034f53 100644 --- a/src/providers/OwnedCommandCleanup.ts +++ b/src/providers/OwnedCommandCleanup.ts @@ -10,12 +10,14 @@ import { processInspectionCancellations, type ProcessInspectionFailure, } from "../process/ProcessInspectionCleanup.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + type ArtifactResourceScope, + AnalysisCleanupLease, +} from "../resources/index.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { jsonValueSchema } from "../domain/jsonValue.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; -import type { RetainedResourceScope } from "../application/AnalysisProvider.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import type { RetainedResourceScope } from "../ports/AnalysisProvider.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { DarwinProcessOwnershipInspectionError } from "../process/DarwinProcessRunTokenReader.js"; import { OwnedCommandFailure } from "../process/OwnedCommand.js"; diff --git a/src/providers/ResponseBodyCleanup.ts b/src/providers/ResponseBodyCleanup.ts index fa70f9b4af..e64f4c536a 100644 --- a/src/providers/ResponseBodyCleanup.ts +++ b/src/providers/ResponseBodyCleanup.ts @@ -1,7 +1,7 @@ import { ArtifactResourceScope, type ArtifactResourceOwner, -} from "../artifacts/ArtifactResourceScope.js"; +} from "../resources/index.js"; /** Retain a cancelled response branch until its underlying cancellation settles. */ export class ResponseBodyCleanup { diff --git a/src/providers/artifactResourceFailure.ts b/src/providers/artifactResourceFailure.ts index 6e122399d2..b80c313201 100644 --- a/src/providers/artifactResourceFailure.ts +++ b/src/providers/artifactResourceFailure.ts @@ -1,6 +1,8 @@ -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { readStableArtifact } from "../artifacts/readStableArtifact.js"; -import { stableArtifactInputRecovery } from "../artifacts/StableArtifactFailure.js"; +import { + ArtifactReaderFailure, + type readStableArtifact, + stableArtifactInputRecovery, +} from "../resources/index.js"; import { AnalysisInputError } from "../domain/analysisErrorCore.js"; import type { JsonValue } from "../domain/jsonValue.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; diff --git a/src/providers/classifyProviderFailure.test.ts b/src/providers/classifyProviderFailure.test.ts index 2755c6a5af..d646a74d33 100644 --- a/src/providers/classifyProviderFailure.test.ts +++ b/src/providers/classifyProviderFailure.test.ts @@ -5,9 +5,9 @@ import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory import { ArtifactFileCleanupFailure, withArtifactRegularFile, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +} from "../resources/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import type { AnalysisPartialObservation } from "../domain/analysisErrorBase.js"; import { AnalysisOutputError, diff --git a/src/providers/classifyProviderFailure.ts b/src/providers/classifyProviderFailure.ts index e3d311249f..7d2b66da92 100644 --- a/src/providers/classifyProviderFailure.ts +++ b/src/providers/classifyProviderFailure.ts @@ -1,21 +1,17 @@ import { ArtifactReaderFailure, type CleanupFailedRead, -} from "../artifacts/ArtifactReader.js"; -import { ArtifactFileCleanupFailure, artifactFileCancellationCause, artifactFileCompletion, artifactFilePrimaryFacts, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; -import { projectSelectedArtifactFileFailure, stableArtifactInputFailure, type RequestField, readerIntegrityFailure, -} from "../artifacts/StableArtifactFailure.js"; -import { completedStableArtifactObservation } from "../artifacts/StableArtifactObservation.js"; + completedStableArtifactObservation, +} from "../resources/index.js"; import { AnalysisError, type AnalysisCapturedOutput, diff --git a/src/application/ownedProcessAvailability.test.ts b/src/providers/ownedProcessAvailability.test.ts similarity index 100% rename from src/application/ownedProcessAvailability.test.ts rename to src/providers/ownedProcessAvailability.test.ts diff --git a/src/application/ownedProcessAvailability.ts b/src/providers/ownedProcessAvailability.ts similarity index 98% rename from src/application/ownedProcessAvailability.ts rename to src/providers/ownedProcessAvailability.ts index 9646e11e98..3c53b21a48 100644 --- a/src/application/ownedProcessAvailability.ts +++ b/src/providers/ownedProcessAvailability.ts @@ -8,7 +8,7 @@ import { LINUX_PROCESS_OWNERSHIP_REMEDIATION, LinuxOwnedProcessPrerequisiteError, } from "../process/ProcessOwnershipObservation.js"; -import type { ProviderAvailability } from "./AnalysisProvider.js"; +import type { ProviderAvailability } from "../ports/AnalysisProvider.js"; // Provider adapters re-attribute capability errors and keep the original as cause. const prerequisiteRefusal = ( diff --git a/src/providers/runOwned.deadline.test.ts b/src/providers/runOwned.deadline.test.ts index 05b5867bef..dfa0cbd25a 100644 --- a/src/providers/runOwned.deadline.test.ts +++ b/src/providers/runOwned.deadline.test.ts @@ -1,6 +1,6 @@ import { expect, it } from "vitest"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { primaryAnalysisError, type AnalysisError, diff --git a/src/providers/runOwned.lifecycle.test.ts b/src/providers/runOwned.lifecycle.test.ts index 15c0ea3437..e7c0bd7ddb 100644 --- a/src/providers/runOwned.lifecycle.test.ts +++ b/src/providers/runOwned.lifecycle.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "vitest"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { primaryAnalysisError, type AnalysisError, diff --git a/src/providers/runOwned.test.ts b/src/providers/runOwned.test.ts index 185a2a7f80..d9d564c83a 100644 --- a/src/providers/runOwned.test.ts +++ b/src/providers/runOwned.test.ts @@ -9,8 +9,8 @@ import { type AnalysisError, type AnalysisPartialObservation, } from "../domain/analysisErrorBase.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { err, ok, type Result } from "../domain/result.js"; diff --git a/src/providers/runOwned.ts b/src/providers/runOwned.ts index 672df31d01..0ea57b09a6 100644 --- a/src/providers/runOwned.ts +++ b/src/providers/runOwned.ts @@ -1,8 +1,8 @@ import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; + ArtifactReaderFailure, +} from "../resources/index.js"; import { AnalysisError, primaryAnalysisError, diff --git a/src/python/PythonPycProvider.ts b/src/python/PythonPycProvider.ts index a06ad6867b..e789424285 100644 --- a/src/python/PythonPycProvider.ts +++ b/src/python/PythonPycProvider.ts @@ -5,19 +5,15 @@ import { projectStableArtifactFailure, stableArtifactInputFailure, projectArtifactCloseFailure, -} from "../artifacts/StableArtifactFailure.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { + ArtifactReaderFailure, type StableArtifactSnapshot, readStableArtifact, -} from "../artifacts/readStableArtifact.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import type { PythonPycPort } from "../application/python/PythonPycPort.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; + ArtifactResourceScope, +} from "../resources/index.js"; +import type { PythonPycPort } from "../ports/python/PythonPycPort.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisResourceConstraintError } from "../domain/analysisErrorCore.js"; import { diff --git a/src/reference/ReferenceSourceReader.ts b/src/reference/ReferenceSourceReader.ts index bc7d83f8dd..c3ef086496 100644 --- a/src/reference/ReferenceSourceReader.ts +++ b/src/reference/ReferenceSourceReader.ts @@ -3,8 +3,10 @@ import { posix } from "node:path"; import { compareUnicodeCodePoints } from "../domain/unicodeCodePointOrder.js"; import { createReferenceSourcePathLookup } from "../domain/referenceSourcePathIdentity.js"; import { err, ok } from "../domain/result.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../resources/index.js"; import { traverseDirectory } from "./ReferenceSourceReaderEntries.js"; import type { ReferenceSourceReaderOptions, diff --git a/src/reference/ReferenceSourceReaderEntries.ts b/src/reference/ReferenceSourceReaderEntries.ts index cdefe2c03c..b5bb1e9555 100644 --- a/src/reference/ReferenceSourceReaderEntries.ts +++ b/src/reference/ReferenceSourceReaderEntries.ts @@ -2,8 +2,10 @@ import { decodeStrictUtf8 } from "../domain/strictUtf8.js"; import type { BigIntStats, Dir, Dirent } from "node:fs"; import { opendir, readlink, realpath, stat } from "node:fs/promises"; import { basename, dirname, join, sep } from "node:path"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ArtifactCleanupAttempt } from "../artifacts/ArtifactResourceScope.js"; +import { + ArtifactReaderFailure, + type ArtifactCleanupAttempt, +} from "../resources/index.js"; import { OwnedDirectoryHandle } from "../filesystem/OwnedDirectoryHandle.js"; import { absoluteCallerPath, diff --git a/src/reference/ReferenceSourceReaderErrors.ts b/src/reference/ReferenceSourceReaderErrors.ts index 14856e1c15..d7a9e60798 100644 --- a/src/reference/ReferenceSourceReaderErrors.ts +++ b/src/reference/ReferenceSourceReaderErrors.ts @@ -1,4 +1,4 @@ -import type { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import type { ArtifactReaderFailure } from "../resources/index.js"; import type { ReferenceSourceEntry, ReferenceSourceFailureCode, diff --git a/src/reference/ReferenceSourceReaderFile.ts b/src/reference/ReferenceSourceReaderFile.ts index 3fb2c1214b..f85931a032 100644 --- a/src/reference/ReferenceSourceReaderFile.ts +++ b/src/reference/ReferenceSourceReaderFile.ts @@ -9,7 +9,7 @@ import { openRegularFile, } from "../filesystem/RegularFile.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/index.js"; import type { AnalysisCleanupObservation } from "../domain/analysisErrorBase.js"; import { diff --git a/src/reference/ReferenceSourceReaderTypes.ts b/src/reference/ReferenceSourceReaderTypes.ts index 2f0f90e942..eff57b1cb9 100644 --- a/src/reference/ReferenceSourceReaderTypes.ts +++ b/src/reference/ReferenceSourceReaderTypes.ts @@ -2,7 +2,7 @@ import type { BigIntStats } from "node:fs"; import type { Result } from "../domain/result.js"; import type { AnalysisCleanupObservation } from "../domain/analysisErrorBase.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; export type ReferenceSourceEntryKind = | "file" diff --git a/src/artifacts/AnalysisCleanupLease.test.ts b/src/resources/AnalysisCleanupLease.test.ts similarity index 100% rename from src/artifacts/AnalysisCleanupLease.test.ts rename to src/resources/AnalysisCleanupLease.test.ts diff --git a/src/artifacts/AnalysisCleanupLease.ts b/src/resources/AnalysisCleanupLease.ts similarity index 100% rename from src/artifacts/AnalysisCleanupLease.ts rename to src/resources/AnalysisCleanupLease.ts diff --git a/src/artifacts/ArtifactFileOperation.ts b/src/resources/ArtifactFileOperation.ts similarity index 100% rename from src/artifacts/ArtifactFileOperation.ts rename to src/resources/ArtifactFileOperation.ts diff --git a/src/artifacts/ArtifactPaths.test.ts b/src/resources/ArtifactPaths.test.ts similarity index 100% rename from src/artifacts/ArtifactPaths.test.ts rename to src/resources/ArtifactPaths.test.ts diff --git a/src/artifacts/ArtifactPaths.ts b/src/resources/ArtifactPaths.ts similarity index 100% rename from src/artifacts/ArtifactPaths.ts rename to src/resources/ArtifactPaths.ts diff --git a/src/artifacts/ArtifactReader.test.ts b/src/resources/ArtifactReader.test.ts similarity index 100% rename from src/artifacts/ArtifactReader.test.ts rename to src/resources/ArtifactReader.test.ts diff --git a/src/artifacts/ArtifactReader.ts b/src/resources/ArtifactReader.ts similarity index 100% rename from src/artifacts/ArtifactReader.ts rename to src/resources/ArtifactReader.ts diff --git a/src/artifacts/ArtifactResourceScope.test.ts b/src/resources/ArtifactResourceScope.test.ts similarity index 99% rename from src/artifacts/ArtifactResourceScope.test.ts rename to src/resources/ArtifactResourceScope.test.ts index 46beb1feeb..906cf2e2ce 100644 --- a/src/artifacts/ArtifactResourceScope.test.ts +++ b/src/resources/ArtifactResourceScope.test.ts @@ -19,7 +19,7 @@ import { ArtifactReaderFailure, type ArtifactReader, } from "./ArtifactReader.js"; -import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../artifacts/ArtifactOperationFailure.js"; const deferred = () => { let resolve: (value: T) => void = () => {}; diff --git a/src/artifacts/ArtifactResourceScope.ts b/src/resources/ArtifactResourceScope.ts similarity index 96% rename from src/artifacts/ArtifactResourceScope.ts rename to src/resources/ArtifactResourceScope.ts index 8c8e53f798..23c1889b54 100644 --- a/src/artifacts/ArtifactResourceScope.ts +++ b/src/resources/ArtifactResourceScope.ts @@ -10,10 +10,22 @@ import { ArtifactReaderFailure, artifactPrimaryCleanupLeases, } from "./ArtifactReader.js"; -import type { SafeOutputTree } from "./SafeOutputTree.js"; -import type { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; import { AnalysisCleanupLease } from "./AnalysisCleanupLease.js"; +/** + * Capabilities the scope needs from an output tree and a private runtime + * root. Their owners (SafeOutputTree in src/artifacts, PrivateRuntimeRoot in + * src/process) implement them; the scope names no higher unit. + */ +export interface ArtifactOutputTreeOwner { + /** Remove the tree's unpublished output, or close a published one's handles. */ + rollback(): Promise; +} +export interface ArtifactPrivateRootOwner { + readonly path: string; + close(): Promise; +} + /** One artifact resource and the capability that owns its cleanup. */ export type ArtifactResourceOwner = | { @@ -44,7 +56,7 @@ export type ArtifactResourceOwner = | { readonly kind: "output-tree"; readonly resource: string; - readonly tree: SafeOutputTree; + readonly tree: ArtifactOutputTreeOwner; } | { readonly kind: "staged-output"; @@ -54,7 +66,7 @@ export type ArtifactResourceOwner = | { readonly kind: "private-runtime-root"; readonly resource: string; - readonly root: Pick; + readonly root: ArtifactPrivateRootOwner; }; export type ArtifactCleanupAttempt = diff --git a/src/artifacts/SafeOutputTree.ts b/src/resources/SafeOutputTree.ts similarity index 100% rename from src/artifacts/SafeOutputTree.ts rename to src/resources/SafeOutputTree.ts diff --git a/src/artifacts/SafeOutputTreeAdmission.test.ts b/src/resources/SafeOutputTreeAdmission.test.ts similarity index 100% rename from src/artifacts/SafeOutputTreeAdmission.test.ts rename to src/resources/SafeOutputTreeAdmission.test.ts diff --git a/src/artifacts/SafeOutputTreeAdmission.ts b/src/resources/SafeOutputTreeAdmission.ts similarity index 100% rename from src/artifacts/SafeOutputTreeAdmission.ts rename to src/resources/SafeOutputTreeAdmission.ts diff --git a/src/artifacts/SafeOutputTreeCleanup.ts b/src/resources/SafeOutputTreeCleanup.ts similarity index 100% rename from src/artifacts/SafeOutputTreeCleanup.ts rename to src/resources/SafeOutputTreeCleanup.ts diff --git a/src/artifacts/SafeOutputTreeCreationFailure.ts b/src/resources/SafeOutputTreeCreationFailure.ts similarity index 100% rename from src/artifacts/SafeOutputTreeCreationFailure.ts rename to src/resources/SafeOutputTreeCreationFailure.ts diff --git a/src/artifacts/SafeOutputTreeIdentity.ts b/src/resources/SafeOutputTreeIdentity.ts similarity index 100% rename from src/artifacts/SafeOutputTreeIdentity.ts rename to src/resources/SafeOutputTreeIdentity.ts diff --git a/src/artifacts/SafeOutputTreeReadback.ts b/src/resources/SafeOutputTreeReadback.ts similarity index 100% rename from src/artifacts/SafeOutputTreeReadback.ts rename to src/resources/SafeOutputTreeReadback.ts index 7de73e7244..0caa1a84b5 100644 --- a/src/artifacts/SafeOutputTreeReadback.ts +++ b/src/resources/SafeOutputTreeReadback.ts @@ -2,9 +2,9 @@ import { createHash } from "node:crypto"; import type { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { readArtifactFileChunks } from "./readArtifactFileChunks.js"; import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; +import { ArtifactReaderFailure } from "./ArtifactReader.js"; import { streamChunkToBuffer } from "./StreamBytes.js"; -import { ArtifactReaderFailure } from "./ArtifactReader.js"; import { assertFilePathIdentity, readFileIdentity, diff --git a/src/artifacts/StableArtifactFailure.ts b/src/resources/StableArtifactFailure.ts similarity index 100% rename from src/artifacts/StableArtifactFailure.ts rename to src/resources/StableArtifactFailure.ts diff --git a/src/artifacts/StableArtifactObservation.ts b/src/resources/StableArtifactObservation.ts similarity index 100% rename from src/artifacts/StableArtifactObservation.ts rename to src/resources/StableArtifactObservation.ts diff --git a/src/artifacts/StreamBytes.ts b/src/resources/StreamBytes.ts similarity index 100% rename from src/artifacts/StreamBytes.ts rename to src/resources/StreamBytes.ts diff --git a/src/resources/TextFileWrite.ts b/src/resources/TextFileWrite.ts new file mode 100644 index 0000000000..c8a11c8725 --- /dev/null +++ b/src/resources/TextFileWrite.ts @@ -0,0 +1,419 @@ +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; +import { + link, + lstat, + mkdtemp, + open, + realpath, + rename, + stat, + type FileHandle, +} from "node:fs/promises"; +import { basename, dirname, resolve } from "node:path"; + +import { + EvidenceFileError, + type PublishedEvidenceFile, +} from "../domain/evidenceErrors.js"; +import { + AnalysisCancelledError, + cancelledBy, + carriedReason, +} from "../domain/analysisErrorCore.js"; +import { err, ok, type Result } from "../domain/result.js"; +import type { ArtifactResourceScope } from "./ArtifactResourceScope.js"; +import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { bindArtifactFileCleanup } from "./ArtifactFileOperation.js"; +import { + type AnalysisCleanupLease, + AnalysisCleanupLeaseGroup, +} from "./AnalysisCleanupLease.js"; +import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; +import { OwnedStagedOutput } from "../filesystem/OwnedStagedOutput.js"; +import { StagedOutputError } from "../filesystem/StagedOutputError.js"; +import { absoluteCallerPath } from "../filesystem/callerPath.js"; + +/** Request control and its owning operation for an interruptible atomic write. */ +export interface TextWriteCancellation { + readonly signal: AbortSignal; + readonly operation: string; +} + +type TextWriteResult = + Result<{ readonly path: string; readonly bytes: number }, Failure>; + +/** Atomically write text to the caller-supplied path. */ +export const writeTextFile = async ( + encoded: string, + path: string, + overwrite: boolean, + resources: ArtifactResourceScope, +): Promise> => + writeTextParts([encoded], path, overwrite, resources); + +/** Publish streamed text atomically unless cancellation wins before publication. */ +export function writeTextParts( + parts: Iterable, + path: string, + overwrite: boolean, + resources: ArtifactResourceScope, +): Promise>; +export function writeTextParts( + parts: Iterable, + path: string, + overwrite: boolean, + resources: ArtifactResourceScope, + cancellation: TextWriteCancellation | undefined, +): Promise; +export function writeTextParts( + parts: Iterable, + path: string, + overwrite: boolean, + resources: ArtifactResourceScope, + cancellation?: TextWriteCancellation, +): Promise { + return resources + .run(() => + writeTextPartsOwned(parts, path, overwrite, resources, cancellation), + ) + .catch((cause: unknown) => { + const cleanup = + cause instanceof ArtifactReaderFailure && cause.cleanup !== undefined + ? cause.cleanup + : undefined; + const error = new EvidenceFileError("write", "io", { + cause, + path: absoluteCallerPath(path), + ...(cleanup === undefined ? {} : { cleanup }), + }); + // A failed admission retry names its exact retained leases. + bindArtifactFileCleanup(cause, error); + return err(error); + }); +} + +const writeTextPartsOwned = async ( + parts: Iterable, + path: string, + overwrite: boolean, + resources: ArtifactResourceScope, + cancellation?: TextWriteCancellation, +): Promise => { + const requestedPath = absoluteCallerPath(path); + try { + assertWriteActive(cancellation); + if (HOST_PLATFORM.platform !== "win32" && requestedPath.endsWith("/")) + return err( + new EvidenceFileError("write", "not-file", { path: requestedPath }), + ); + const selectedParent = dirname(requestedPath); + // Native lookup must accept the parent before realpath can collapse it. + // On macOS realpath(file/..) succeeds even though that traversal is ENOTDIR. + if (!(await stat(selectedParent)).isDirectory()) + return err( + new EvidenceFileError("write", "missing", { path: requestedPath }), + ); + const canonicalParent = await realpath(selectedParent); + const destination = resolve(canonicalParent, basename(requestedPath)); + const existing = await lstat(destination).catch((cause: unknown) => { + if (fileErrorCode(cause) === "ENOENT") return undefined; + throw cause; + }); + if (existing !== undefined) { + if (!existing.isFile() || existing.isSymbolicLink()) + return err( + new EvidenceFileError("write", "not-file", { path: requestedPath }), + ); + if (!overwrite) + return err( + new EvidenceFileError("write", "exists", { path: requestedPath }), + ); + } + assertWriteActive(cancellation); + const bytes = await publishFile( + destination, + parts, + overwrite, + resources, + cancellation, + ); + return ok({ path: requestedPath, bytes }); + } catch (cause: unknown) { + if (cause instanceof StagedOutputCleanupFailure) { + const cleanup = { + reason: failureMessage(cause.cleanupCause), + resources: [cause.owner.directory], + }; + if (cause.outcome.ok) + return stagedCleanupFailure( + new EvidenceFileError("write", "io", { + cause, + path: requestedPath, + cleanup, + published: { ...cause.outcome.value, path: requestedPath }, + ...stagedOutputDiagnostics(cause.cleanupCause), + }), + cause.lease, + ); + if (cause.outcome.error instanceof AnalysisCancelledError) + return stagedCleanupFailure( + cancelledBy( + cause.outcome.error.operation, + carriedReason(cause.outcome.error.cause), + { cleanupPrimary: cause.outcome.error, cleanup }, + ), + cause.lease, + ); + const failure = classifyWriteFailure(cause.outcome.error); + return stagedCleanupFailure( + new EvidenceFileError("write", failure.reason, { + cause, + path: requestedPath, + cleanup, + ...(failure.systemCode === undefined + ? {} + : { systemCode: failure.systemCode }), + ...stagedOutputDiagnostics( + !cause.outcome.ok && + cause.outcome.error instanceof StagedOutputError + ? cause.outcome.error + : cause.cleanupCause, + ), + }), + cause.lease, + ); + } + if ( + cancellation?.signal.aborted === true && + cause instanceof AnalysisCancelledError && + cause.operation === cancellation.operation + ) + return err(cause); + if (!overwrite && fileErrorCode(cause) === "EEXIST") + return err( + new EvidenceFileError("write", "exists", { + cause, + path: requestedPath, + }), + ); + const failure = classifyWriteFailure(cause); + return err( + new EvidenceFileError("write", failure.reason, { + cause, + path: requestedPath, + ...(failure.systemCode === undefined + ? {} + : { systemCode: failure.systemCode }), + ...stagedOutputDiagnostics(cause), + }), + ); + } +}; + +/** Recognize only host codes that establish a publication resource refusal. */ +const classifyWriteFailure = ( + cause: unknown, +): { + readonly reason: EvidenceFileError["reason"]; + readonly systemCode?: "EFBIG" | "ENOSPC" | "EDQUOT"; +} => { + const code = fileErrorCode(cause); + return code === "EFBIG" || code === "ENOSPC" || code === "EDQUOT" + ? { reason: "storage-limit", systemCode: code } + : { reason: fileAccessFailureReason(cause) }; +}; + +/** The retained staging lease clears this error only when a retry confirms release. */ +const stagedCleanupFailure = < + Failure extends EvidenceFileError | AnalysisCancelledError, +>( + error: Failure, + lease: AnalysisCleanupLease, +): Result => { + new AnalysisCleanupLeaseGroup(error, [lease]); + return err(error); +}; + +/** A missing path or parent is a selection error, not a permission failure; JSON reads classify with it too. */ +export const fileAccessFailureReason = ( + cause: unknown, +): "missing" | "io" | "path-limit" | "symlink-traversal" => { + const code = fileErrorCode(cause); + if (code === "ENAMETOOLONG") return "path-limit"; + if (code === "ELOOP") return "symlink-traversal"; + return code === "ENOENT" || code === "ENOTDIR" ? "missing" : "io"; +}; + +const publishFile = async ( + destination: string, + parts: Iterable, + overwrite: boolean, + resources: ArtifactResourceScope, + cancellation?: TextWriteCancellation, +): Promise => { + const { owner, staged, file } = await acquireStagedFile( + dirname(destination), + resources, + cancellation, + ); + let outcome: Result; + try { + let written: Result; + try { + const bytes = await writeStagedParts(file, parts, cancellation); + assertWriteActive(cancellation); + await file.sync(); + written = ok(bytes); + } catch (cause: unknown) { + written = err(cause); + } + try { + await owner.closeFile(); + } catch (cause: unknown) { + if (written.ok) written = err(cause); + } + if (!written.ok) throw written.error; + // Once submitted, atomic publication can win a later cancellation race. + assertWriteActive(cancellation); + await owner.assertReadyForPublication(staged); + assertWriteActive(cancellation); + if (overwrite) { + await rename(staged, destination); + owner.recordPublishedRename(); + } + // A hard link publishes complete bytes atomically and cannot replace an existing name. + else await link(staged, destination); + outcome = ok({ path: destination, bytes: written.value }); + } catch (cause: unknown) { + outcome = err(cause); + } + + // One cleanup phase owns both the open descriptor (if any) and its staging directory. + const released = await resources.release({ + kind: "staged-output", + resource: owner.directory, + output: owner, + }); + if (released.kind === "failed") + throw new StagedOutputCleanupFailure( + outcome, + released.cause, + owner, + released.lease, + ); + if (!outcome.ok) throw outcome.error; + return outcome.value.bytes; +}; + +/** Keep staging on the destination filesystem without imposing a shorter path ceiling. */ +const acquireStagedFile = async ( + destinationParent: string, + resources: ArtifactResourceScope, + cancellation?: TextWriteCancellation, +): Promise<{ + readonly owner: OwnedStagedOutput; + readonly staged: string; + readonly file: FileHandle; +}> => { + const destinationDevice = (await lstat(destinationParent)).dev; + let parent = destinationParent; + for (;;) { + assertWriteActive(cancellation); + let failure: unknown; + let directory: string | undefined; + try { + directory = await mkdtemp(resolve(parent, ".rea-write-")); + } catch (cause: unknown) { + if (fileErrorCode(cause) !== "ENAMETOOLONG") throw cause; + failure = cause; + } + if (directory !== undefined) { + const owner = await OwnedStagedOutput.create(directory); + const staged = resolve(directory, "content"); + try { + const file = await open(staged, "wx", 0o600); + owner.setFile(new OwnedFileHandle(file)); + return { owner, staged, file }; + } catch (cause: unknown) { + const released = await resources.release({ + kind: "staged-output", + resource: owner.directory, + output: owner, + }); + if (released.kind === "failed") + throw new StagedOutputCleanupFailure( + err(cause), + released.cause, + owner, + released.lease, + ); + if (fileErrorCode(cause) !== "ENAMETOOLONG") throw cause; + failure = cause; + } + } + const ancestor = dirname(parent); + if (ancestor === parent) throw failure; + const metadata = await lstat(ancestor); + if (metadata.dev !== destinationDevice) throw failure; + parent = ancestor; + } +}; + +class StagedOutputCleanupFailure extends Error { + constructor( + readonly outcome: Result, + readonly cleanupCause: unknown, + readonly owner: OwnedStagedOutput, + readonly lease: AnalysisCleanupLease, + ) { + super("Staged output cleanup failed", { + cause: outcome.ok ? cleanupCause : outcome.error, + }); + } +} + +const stagedOutputDiagnostics = ( + cause: unknown, +): { + readonly diagnostics?: Readonly>; +} => { + if (!(cause instanceof StagedOutputError)) return {}; + return { diagnostics: { code: cause.code, ...cause.detail } }; +}; + +const failureMessage = (cause: unknown): string => + cause instanceof Error ? cause.message || cause.name : String(cause); + +const writeStagedParts = async ( + file: FileHandle, + parts: Iterable, + cancellation?: TextWriteCancellation, +): Promise => { + assertWriteActive(cancellation); + const iterator = parts[Symbol.iterator](); + let exhausted = false; + let bytes = 0; + try { + for (;;) { + assertWriteActive(cancellation); + const part = iterator.next(); + if (part.done) exhausted = true; + assertWriteActive(cancellation); + if (part.done) return bytes; + await file.writeFile(part.value, { encoding: "utf8" }); + bytes += Buffer.byteLength(part.value, "utf8"); + } + } finally { + if (!exhausted) iterator.return?.(); + } +}; + +const assertWriteActive = (cancellation?: TextWriteCancellation): void => { + if (cancellation?.signal.aborted === true) + throw cancelledBy(cancellation.operation, cancellation.signal); +}; + +const fileErrorCode = (cause: unknown): unknown => + typeof cause === "object" && cause !== null && "code" in cause + ? cause.code + : undefined; diff --git a/src/resources/index.ts b/src/resources/index.ts new file mode 100644 index 0000000000..a528872cd4 --- /dev/null +++ b/src/resources/index.ts @@ -0,0 +1,97 @@ +/** + * Entry file of the shared provider toolkit. Production code outside + * src/resources imports the toolkit only from here; verify:module-boundaries + * counts any other import as an import past the entry file. Export a name + * here when a new outside use needs it. + */ +export { + AnalysisCleanupLease, + AnalysisCleanupLeaseGroup, +} from "./AnalysisCleanupLease.js"; +export { + ArtifactFileCancelled, + ArtifactFileCleanupFailure, + artifactFileCancellationCause, + artifactFileCompletion, + artifactFilePrimaryFacts, + artifactOperationCause, + artifactReadCancelledBy, + artifactSelectedPathErrno, + assertArtifactReadActive, + bindArtifactFileCleanup, + mapArtifactFileFailure, + withArtifactFileHandle, + withArtifactRegularFile, +} from "./ArtifactFileOperation.js"; +export type { ArtifactFilePrimaryFacts } from "./ArtifactFileOperation.js"; +export { + ArtifactEntryContentUnavailable, + ArtifactReaderFailure, + artifactFixedLimitFailure, + artifactPrimaryCleanupLeases, + assertProducedEntry, + copyArtifactEntry, + sameArtifactEntry, + sameArtifactSourceIdentity, +} from "./ArtifactReader.js"; +export type { + ArtifactEntry, + ArtifactReader, + ArtifactReaderFailureOptions, + ArtifactReaderTraversal, + ArtifactTraversalOmission, + ArtifactTraversalOptions, + ArtifactTraversalSink, + CleanupFailedRead, +} from "./ArtifactReader.js"; +export { + ArtifactResourceRetryFailure, + ArtifactResourceScope, +} from "./ArtifactResourceScope.js"; +export type { + ArtifactCleanupAttempt, + ArtifactResourceOwner, +} from "./ArtifactResourceScope.js"; +export { + imageFileSizeRemediation, + projectArtifactCloseFailure, + projectOwnedArtifactIdentityFailure, + projectSelectedArtifactFileFailure, + projectStableArtifactFailure, + readerIntegrityFailure, + regularFileSymlinkRecovery, + stableArtifactInputFailure, + stableArtifactInputRecovery, +} from "./StableArtifactFailure.js"; +export type { RequestField } from "./StableArtifactFailure.js"; +export { completedStableArtifactObservation } from "./StableArtifactObservation.js"; +export { + fileAccessFailureReason, + writeTextFile, + writeTextParts, +} from "./TextFileWrite.js"; +export { + assertStableArtifactState, + completedStableArtifact, + readStableArtifact, +} from "./readStableArtifact.js"; +export type { + StableArtifactFileSystem, + StableArtifactSnapshot, +} from "./readStableArtifact.js"; +export { + ArtifactPathRegistry, + DestinationCaseCollisionFailure, + DestinationPathUnrepresentableFailure, + annotateEnglishUnicodeCaseCollisions, + hasDestinationPath, + normalizeArtifactPath, +} from "./ArtifactPaths.js"; +export { SafeOutputTree } from "./SafeOutputTree.js"; +export { + SafeOutputTreeDestinationRefusal, + outputDirectoryAdmissionRefusal, +} from "./SafeOutputTreeAdmission.js"; +export { SafeOutputTreeCreationFailure } from "./SafeOutputTreeCreationFailure.js"; +export { streamChunkToBuffer } from "./StreamBytes.js"; +export { readArtifactFileChunks } from "./readArtifactFileChunks.js"; diff --git a/src/artifacts/readArtifactFileChunks.ts b/src/resources/readArtifactFileChunks.ts similarity index 100% rename from src/artifacts/readArtifactFileChunks.ts rename to src/resources/readArtifactFileChunks.ts diff --git a/src/artifacts/readStableArtifact.ts b/src/resources/readStableArtifact.ts similarity index 100% rename from src/artifacts/readStableArtifact.ts rename to src/resources/readStableArtifact.ts diff --git a/src/rizin/RizinDebugSessionManager.ts b/src/rizin/RizinDebugSessionManager.ts index e20baa7f55..4ab34b81ab 100644 --- a/src/rizin/RizinDebugSessionManager.ts +++ b/src/rizin/RizinDebugSessionManager.ts @@ -7,9 +7,11 @@ import { isUtf8 } from "node:buffer"; import { open, readlink, realpath, stat } from "node:fs/promises"; import { constants as fsConstants, type Stats } from "node:fs"; import { isatty } from "node:tty"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { + ArtifactResourceScope, + AnalysisCleanupLease, + bindArtifactFileCleanup, +} from "../resources/index.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { RegularFileCleanupFailure, diff --git a/src/rust/RustBinaryProvider.ts b/src/rust/RustBinaryProvider.ts index 183b6108eb..daef8f1770 100644 --- a/src/rust/RustBinaryProvider.ts +++ b/src/rust/RustBinaryProvider.ts @@ -5,21 +5,17 @@ import { stableArtifactInputFailure, projectArtifactCloseFailure, readerIntegrityFailure, -} from "../artifacts/StableArtifactFailure.js"; -import { type StableArtifactSnapshot, readStableArtifact, -} from "../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, type ArtifactFilePrimaryFacts, artifactFileCancellationCause, assertArtifactReadActive, -} from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; -import type { RustBinaryPort } from "../application/rust/RustBinaryPort.js"; + ArtifactResourceScope, + ArtifactReaderFailure, +} from "../resources/index.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; +import type { RustBinaryPort } from "../ports/rust/RustBinaryPort.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { AnalysisOutputError, diff --git a/src/server/BundleResourcesMcp.test.ts b/src/server/BundleResourcesMcp.test.ts index 80f6c3eac9..eec15cbbe4 100644 --- a/src/server/BundleResourcesMcp.test.ts +++ b/src/server/BundleResourcesMcp.test.ts @@ -11,7 +11,7 @@ import { createAnalysisExecution, type AnalysisClient, type ProviderIdentity, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { InvestigationRecords } from "../application/investigation/InvestigationRecords.js"; import { BinarySession } from "../application/binary/BinarySession.js"; import { AnalysisProviderRegistry } from "../application/binary/AnalysisProviderRegistry.js"; diff --git a/src/server/EvidenceMcpServerCore.ts b/src/server/EvidenceMcpServerCore.ts index a37bc1af0a..7d2df836cf 100644 --- a/src/server/EvidenceMcpServerCore.ts +++ b/src/server/EvidenceMcpServerCore.ts @@ -27,7 +27,7 @@ import { type TransportSendOptions, } from "@modelcontextprotocol/server"; -import { analysisErrorProjectionSchema } from "../contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../domain/analysisErrorProjectionSchema.js"; import { transportClosedByOwner } from "./transportOwnerClose.js"; import type { CompactInputSchemaPresentation } from "../contracts/compactInputSchema.js"; import { diff --git a/src/server/McpToolRequest.ts b/src/server/McpToolRequest.ts index 479b97073f..af1d5f8690 100644 --- a/src/server/McpToolRequest.ts +++ b/src/server/McpToolRequest.ts @@ -2,7 +2,7 @@ import { AsyncLocalStorage } from "node:async_hooks"; import type { RequestId } from "@modelcontextprotocol/server"; import type { z } from "zod"; -import type { AnalysisOperationPort } from "../application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../ports/AnalysisProvider.js"; import type { BinarySessionPort } from "../application/binary/BinarySessionPort.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { diff --git a/src/server/analysisAdmission.ts b/src/server/analysisAdmission.ts index 691745c0ed..a44fd4946d 100644 --- a/src/server/analysisAdmission.ts +++ b/src/server/analysisAdmission.ts @@ -1,4 +1,4 @@ -import type { AnalysisOperationPort } from "../application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../ports/AnalysisProvider.js"; import type { BinarySessionPort } from "../application/binary/BinarySessionPort.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import { cancelledBy } from "../domain/analysisErrorCore.js"; diff --git a/src/server/contractToolBindings.ts b/src/server/contractToolBindings.ts index a0807707f1..c197602113 100644 --- a/src/server/contractToolBindings.ts +++ b/src/server/contractToolBindings.ts @@ -1,7 +1,7 @@ import type { Logger } from "pino"; import type { z } from "zod"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import type { AnalysisViewRetention } from "../application/analysisView/AnalysisViewService.js"; import type { EvidenceLookup } from "../application/EvidenceInputResolver.js"; import type { EvidenceWriter } from "../application/investigation/InvestigationRecordPort.js"; diff --git a/src/server/contractToolHandler.ts b/src/server/contractToolHandler.ts index 86921df6c1..44fc10c26b 100644 --- a/src/server/contractToolHandler.ts +++ b/src/server/contractToolHandler.ts @@ -5,13 +5,13 @@ import type { import type { Logger } from "pino"; import type { z } from "zod"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import { optionalProviderUnavailable, type OptionalProviderLoadFailure, -} from "../application/OptionalObservationProviders.js"; +} from "../ports/OptionalObservationProviders.js"; import { mcpProgressReporter } from "./mcpProgress.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; import { projectRetainedAnalysis, requireAnalysisViewRetention, diff --git a/src/server/environment/environmentDataPlane.ts b/src/server/environment/environmentDataPlane.ts index 73610c1f28..509b85aff8 100644 --- a/src/server/environment/environmentDataPlane.ts +++ b/src/server/environment/environmentDataPlane.ts @@ -1,7 +1,7 @@ import { escapeJsonPointerToken } from "../../domain/jsonPointer.js"; import { ResponseBodyCleanup } from "../../providers/ResponseBodyCleanup.js"; import type { EnvironmentStateStore } from "../../application/environment/environmentStateStore.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/index.js"; import type { AnalysisInputError } from "../../domain/analysisErrorCore.js"; import { CANCELLED, diff --git a/src/server/environment/serveEnvironment.ts b/src/server/environment/serveEnvironment.ts index 56586dd673..267b9c5da0 100644 --- a/src/server/environment/serveEnvironment.ts +++ b/src/server/environment/serveEnvironment.ts @@ -21,7 +21,7 @@ import { type EnvironmentToolAnswer, } from "../../application/environment/environmentToolAnswer.js"; import { EnvironmentStateStore } from "../../application/environment/environmentStateStore.js"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/index.js"; import { transformAdvertisedInputJsonSchema } from "../../contracts/toolSchemaMetadata.js"; import { advertisedEnvironmentTool, diff --git a/src/server/environment/serveEnvironmentState.test.ts b/src/server/environment/serveEnvironmentState.test.ts index 8559a1efac..bd40764fbf 100644 --- a/src/server/environment/serveEnvironmentState.test.ts +++ b/src/server/environment/serveEnvironmentState.test.ts @@ -42,7 +42,7 @@ import { } from "../../../tests/fixtures/environmentServe.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { EnvironmentStateStore } from "../../application/environment/environmentStateStore.js"; -import { ArtifactResourceRetryFailure } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceRetryFailure } from "../../resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { environmentCard } from "../../application/environment/environmentTools.js"; import { stateDataPlane } from "./environmentDataPlane.js"; diff --git a/src/server/environment/stateIntake.test.ts b/src/server/environment/stateIntake.test.ts index 73b2b3580a..0200cd7697 100644 --- a/src/server/environment/stateIntake.test.ts +++ b/src/server/environment/stateIntake.test.ts @@ -1,7 +1,7 @@ import { ResponseBodyCleanup } from "../../providers/ResponseBodyCleanup.js"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { STATE_INTAKE_LIMIT_BYTES } from "../../application/environment/environmentStateDocument.js"; import { DEFAULT_STATE_INTAKE, partDocument } from "./stateIntake.js"; diff --git a/src/server/environment/stateIntake.ts b/src/server/environment/stateIntake.ts index e0ea1cf944..8c6edd3d9f 100644 --- a/src/server/environment/stateIntake.ts +++ b/src/server/environment/stateIntake.ts @@ -5,7 +5,7 @@ import { mediaTypeEssence } from "../../domain/analysisView/recordedMediaType.js import { ArtifactResourceRetryFailure, type ArtifactResourceScope, -} from "../../artifacts/ArtifactResourceScope.js"; +} from "../../resources/index.js"; import { STATE_INTAKE_LIMIT_BYTES } from "../../application/environment/environmentStateDocument.js"; import { isExactJsonNumber } from "../../domain/exactJsonNumber.js"; import { paddedBase64ByteLength } from "../../domain/paddedBase64.js"; diff --git a/src/server/mcpProgress.ts b/src/server/mcpProgress.ts index 41363777c3..68cd126342 100644 --- a/src/server/mcpProgress.ts +++ b/src/server/mcpProgress.ts @@ -1,9 +1,9 @@ import type { ServerContext } from "@modelcontextprotocol/server"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import { createProgressReporter, silentProgressReporter, -} from "../application/ProgressReporter.js"; +} from "../ports/ProgressReporter.js"; export interface McpProgressContext { readonly mcpReq: Pick; diff --git a/src/server/operationProgress.ts b/src/server/operationProgress.ts index 0fa3d56df2..b1f2eda0ab 100644 --- a/src/server/operationProgress.ts +++ b/src/server/operationProgress.ts @@ -1,4 +1,4 @@ -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; /** Report one operation start through the shared monotonic boundary. */ export const reportOperationStart = ( diff --git a/src/server/promptCompletion.ts b/src/server/promptCompletion.ts index aab542e7d1..3b09cc1528 100644 --- a/src/server/promptCompletion.ts +++ b/src/server/promptCompletion.ts @@ -2,7 +2,7 @@ import { z } from "zod"; import { uniqueSorted } from "../domain/canonicalOrdering.js"; import type { JsonValue } from "../domain/jsonValue.js"; -import type { AnalysisOperationPort } from "../application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../ports/AnalysisProvider.js"; import { parseProcessCaptureEvidence } from "../application/process/ProcessEvidence.js"; import type { BinarySessionPort } from "../application/binary/BinarySessionPort.js"; import type { PromptCompletionKind } from "../contracts/promptContracts.js"; diff --git a/src/server/registerAnalysisViewTool.ts b/src/server/registerAnalysisViewTool.ts index 3a3c980786..c4e273ea65 100644 --- a/src/server/registerAnalysisViewTool.ts +++ b/src/server/registerAnalysisViewTool.ts @@ -5,7 +5,7 @@ import { analysisViewSourceSchema } from "../domain/analysisView/analysisViewReq import { jsonValueSchema, type JsonValue } from "../domain/jsonValue.js"; import type { EvidenceMcpServer } from "./EvidenceMcpServer.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { inspectAnalysisView } from "../application/analysisView/AnalysisViewService.js"; import type { EvidenceLookup } from "../application/EvidenceInputResolver.js"; diff --git a/src/server/registerApplicationTools/projectMobileApplicationGraph.ts b/src/server/registerApplicationTools/projectMobileApplicationGraph.ts index 66ab0f0041..701d4bb756 100644 --- a/src/server/registerApplicationTools/projectMobileApplicationGraph.ts +++ b/src/server/registerApplicationTools/projectMobileApplicationGraph.ts @@ -1,5 +1,5 @@ import type { EvidenceLookup } from "../../application/EvidenceInputResolver.js"; -import type { ExecutionOptions } from "../../application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../../ports/AnalysisProvider.js"; import type { EvidenceMcpServer } from "../EvidenceMcpServer.js"; import type { ServerContext } from "@modelcontextprotocol/server"; import { runAdmittedToolOperation } from "../admittedToolOperation.js"; diff --git a/src/server/registerApplicationTools/types.ts b/src/server/registerApplicationTools/types.ts index 802900dfa9..42e4d01772 100644 --- a/src/server/registerApplicationTools/types.ts +++ b/src/server/registerApplicationTools/types.ts @@ -1,4 +1,4 @@ -import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../resources/index.js"; import type { EvidenceWriter, EvidenceReader, diff --git a/src/server/registerArtifactComparisonTool.test.ts b/src/server/registerArtifactComparisonTool.test.ts index dd36aac57f..530acd25eb 100644 --- a/src/server/registerArtifactComparisonTool.test.ts +++ b/src/server/registerArtifactComparisonTool.test.ts @@ -6,7 +6,7 @@ import { type ToolCallback, } from "@modelcontextprotocol/server"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; import { ARTIFACT_COMPARISON_EXAMPLE } from "../contracts/artifactComparisonExample.js"; import { toolContract } from "../contracts/toolContracts.js"; import { diff --git a/src/server/registerArtifactComparisonTool.ts b/src/server/registerArtifactComparisonTool.ts index 1bb5284271..250711bbf2 100644 --- a/src/server/registerArtifactComparisonTool.ts +++ b/src/server/registerArtifactComparisonTool.ts @@ -1,6 +1,6 @@ import type { EvidenceMcpServer } from "./EvidenceMcpServer.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import type { BinarySessionPort } from "../application/binary/BinarySessionPort.js"; import { toolContract } from "../contracts/toolContracts.js"; import type { ArtifactComparisonResult } from "../domain/artifactComparison.js"; diff --git a/src/server/registerBrowserScenarioTool.ts b/src/server/registerBrowserScenarioTool.ts index 811bb9f5f5..08e523cc2e 100644 --- a/src/server/registerBrowserScenarioTool.ts +++ b/src/server/registerBrowserScenarioTool.ts @@ -4,11 +4,11 @@ import type { EvidenceLookup } from "../application/EvidenceInputResolver.js"; import { optionalProviderUnavailable, type OptionalProviderLoadFailure, -} from "../application/OptionalObservationProviders.js"; +} from "../ports/OptionalObservationProviders.js"; import { err } from "../domain/result.js"; import { browserScenarioSchema } from "../domain/browserScenario.js"; import { analysisInputErrorFromIssues } from "../domain/inputIssueProjection.js"; -import type { BrowserScenarioCapturePort } from "../application/BrowserScenarioCapturePort.js"; +import type { BrowserScenarioCapturePort } from "../ports/BrowserScenarioCapturePort.js"; import { captureBrowserScenario } from "../application/BrowserScenarioCaptureService.js"; import { toolContract } from "../contracts/toolContracts.js"; import type { Logger } from "pino"; diff --git a/src/server/registerBrowserTools.ts b/src/server/registerBrowserTools.ts index 71ec079101..8a4429be26 100644 --- a/src/server/registerBrowserTools.ts +++ b/src/server/registerBrowserTools.ts @@ -5,9 +5,9 @@ import { } from "../application/analysisView/AnalysisViewService.js"; import type { EvidenceMcpServer } from "./EvidenceMcpServer.js"; import type { EvidenceWriter } from "../application/investigation/InvestigationRecordPort.js"; -import type { OptionalProviderLoadFailure } from "../application/OptionalObservationProviders.js"; +import type { OptionalProviderLoadFailure } from "../ports/OptionalObservationProviders.js"; -import type { BrowserObservationPort } from "../application/BrowserObservationPort.js"; +import type { BrowserObservationPort } from "../ports/BrowserObservationPort.js"; import { analyzeWebBundle, captureWebScreenshot, diff --git a/src/server/registerBundleComparisonTool.ts b/src/server/registerBundleComparisonTool.ts index 1004c6b600..af0f891731 100644 --- a/src/server/registerBundleComparisonTool.ts +++ b/src/server/registerBundleComparisonTool.ts @@ -11,7 +11,7 @@ import { BUNDLE_COMPARISON_PROVIDER } from "../domain/investigationProviders.js" import { toolRegistrationOptions } from "./toolRegistrationOptions.js"; import { withAdmittedAnalysis } from "./analysisAdmission.js"; import { runAdmittedToolOperation } from "./admittedToolOperation.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; /** Register canonical Evidence bundle comparison. */ export const registerBundleComparisonTool = ( diff --git a/src/server/registerDesktopBuildTools.ts b/src/server/registerDesktopBuildTools.ts index 2dcbf44848..3a28b86cf2 100644 --- a/src/server/registerDesktopBuildTools.ts +++ b/src/server/registerDesktopBuildTools.ts @@ -9,7 +9,7 @@ import type { DesktopBuildComputers, ForwardedResult, } from "../application/desktop/DesktopBuildComputers.js"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import { DesktopBuildSteps } from "../application/desktop/DesktopBuildSteps.js"; import { toolContract } from "../contracts/toolContracts.js"; import type { ToolContract } from "../contracts/toolContractTypes.js"; diff --git a/src/server/registerElectronTools.ts b/src/server/registerElectronTools.ts index c2b669a493..6e0ff901d2 100644 --- a/src/server/registerElectronTools.ts +++ b/src/server/registerElectronTools.ts @@ -5,17 +5,17 @@ import { } from "../application/analysisView/AnalysisViewService.js"; import type { EvidenceLookup } from "../application/EvidenceInputResolver.js"; import type { EvidenceWriter } from "../application/investigation/InvestigationRecordPort.js"; -import type { OptionalProviderLoadFailure } from "../application/OptionalObservationProviders.js"; +import type { OptionalProviderLoadFailure } from "../ports/OptionalObservationProviders.js"; -import type { ElectronActiveObservationPort } from "../application/javascript/ElectronActiveObservationPort.js"; +import type { ElectronActiveObservationPort } from "../ports/javascript/ElectronActiveObservationPort.js"; import { captureElectronScenario } from "../application/javascript/ElectronActiveObservationService.js"; -import type { ElectronObservationPort } from "../application/javascript/ElectronObservationPort.js"; +import type { ElectronObservationPort } from "../ports/javascript/ElectronObservationPort.js"; import { inspectElectronPage, listElectronTargets, } from "../application/javascript/ElectronObservationService.js"; import { analyzeJavaScriptApplicationValidated } from "../application/javascript/JavaScriptApplicationService.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { reconcileJavaScriptRuntimeEvidence } from "../application/javascript/JavaScriptRuntimeReconciliationService.js"; import { recordEvidenceSources } from "../application/investigation/recordEvidenceSources.js"; import type { ElectronFuseService } from "../application/electron/ElectronFuseService.js"; diff --git a/src/server/registerEnhancedTools.ts b/src/server/registerEnhancedTools.ts index ae783ca807..4ba5679e16 100644 --- a/src/server/registerEnhancedTools.ts +++ b/src/server/registerEnhancedTools.ts @@ -10,9 +10,9 @@ import type { ServerContext, } from "@modelcontextprotocol/server"; -import type { AnalysisOperationPort } from "../application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../ports/AnalysisProvider.js"; import type { BinarySessionPort } from "../application/binary/BinarySessionPort.js"; -import type { ProgressReporter } from "../application/ProgressReporter.js"; +import type { ProgressReporter } from "../ports/ProgressReporter.js"; import { EnhancedTools } from "../application/EnhancedTools.js"; import type { ValidatedEnhancedCall } from "../application/EnhancedToolTypes.js"; import { diff --git a/src/server/registerEvidenceTools.ts b/src/server/registerEvidenceTools.ts index b77b1285ee..029460874a 100644 --- a/src/server/registerEvidenceTools.ts +++ b/src/server/registerEvidenceTools.ts @@ -10,7 +10,7 @@ import { import type { AnalysisOperation, AnalysisOperationPort, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import type { ToolContract } from "../contracts/toolContractTypes.js"; import { ok } from "../domain/result.js"; import { admitCompletedAnalysis } from "../application/investigation/admitCompletedAnalysis.js"; diff --git a/src/server/registerFridaTools.ts b/src/server/registerFridaTools.ts index e6c9335650..0d034434f5 100644 --- a/src/server/registerFridaTools.ts +++ b/src/server/registerFridaTools.ts @@ -5,7 +5,7 @@ import type { Logger } from "pino"; import type { EvidenceWriter } from "../application/investigation/InvestigationRecordPort.js"; import type { EvidenceLookup } from "../application/EvidenceInputResolver.js"; import { FridaInstrumentationService } from "../application/frida/FridaInstrumentationService.js"; -import type { FridaInstrumentationPort } from "../application/frida/FridaInstrumentationPort.js"; +import type { FridaInstrumentationPort } from "../ports/frida/FridaInstrumentationPort.js"; import { toolContract } from "../contracts/toolContracts.js"; import { AnalysisInputError } from "../domain/analysisErrorCore.js"; import { diff --git a/src/server/registerGuidanceTools.ts b/src/server/registerGuidanceTools.ts index 304da79a6e..cc1b0f99aa 100644 --- a/src/server/registerGuidanceTools.ts +++ b/src/server/registerGuidanceTools.ts @@ -2,7 +2,7 @@ import { readGuidanceSection, searchGuidance, } from "../application/GuidanceAccess.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { toolContract } from "../contracts/toolContracts.js"; import { jsonValueSchema } from "../domain/jsonValue.js"; import type { EvidenceMcpServer } from "./EvidenceMcpServer.js"; diff --git a/src/server/registerGuidedWorkflowTool.test.ts b/src/server/registerGuidedWorkflowTool.test.ts index 6cb72220b6..ec6a1ece82 100644 --- a/src/server/registerGuidedWorkflowTool.test.ts +++ b/src/server/registerGuidedWorkflowTool.test.ts @@ -1,6 +1,6 @@ import { InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, vi } from "vitest"; -import type { AnalysisOperationPort } from "../application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../ports/AnalysisProvider.js"; import { parseMcpToolError } from "../../tests/fixtures/mcpToolError.js"; import { mcpTest as it, diff --git a/src/server/registerJavaScriptRuntimeObservationTools.ts b/src/server/registerJavaScriptRuntimeObservationTools.ts index 263f748288..30d819b040 100644 --- a/src/server/registerJavaScriptRuntimeObservationTools.ts +++ b/src/server/registerJavaScriptRuntimeObservationTools.ts @@ -1,8 +1,8 @@ import type { EvidenceMcpServer } from "./EvidenceMcpServer.js"; import type { EvidenceWriter } from "../application/investigation/InvestigationRecordPort.js"; -import type { OptionalProviderLoadFailure } from "../application/OptionalObservationProviders.js"; +import type { OptionalProviderLoadFailure } from "../ports/OptionalObservationProviders.js"; -import type { JavaScriptRuntimeObservationPort } from "../application/javascript/JavaScriptRuntimeObservationPort.js"; +import type { JavaScriptRuntimeObservationPort } from "../ports/javascript/JavaScriptRuntimeObservationPort.js"; import { listJavaScriptRuntimeTargets, observeJavaScriptRuntime, diff --git a/src/server/registerManagedTools.ts b/src/server/registerManagedTools.ts index 01bcef8a64..5ac230eb25 100644 --- a/src/server/registerManagedTools.ts +++ b/src/server/registerManagedTools.ts @@ -1,5 +1,5 @@ import type { EvidenceMcpServer } from "./EvidenceMcpServer.js"; -import type { AnalysisOperationPort } from "../application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../ports/AnalysisProvider.js"; import { MANAGED_TOOL_CONTRACTS, isManagedToolName, diff --git a/src/server/registerPrompts.ts b/src/server/registerPrompts.ts index 6b6614fe1d..f621f682d0 100644 --- a/src/server/registerPrompts.ts +++ b/src/server/registerPrompts.ts @@ -3,7 +3,7 @@ import type { EvidenceMcpServer } from "./EvidenceMcpServer.js"; import { currentMcpRequestSignal } from "./EvidenceMcpServerCore.js"; import type { RegisteredPrompt } from "@modelcontextprotocol/server"; -import type { AnalysisOperationPort } from "../application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../ports/AnalysisProvider.js"; import type { BinarySessionPort } from "../application/binary/BinarySessionPort.js"; import { guidedPromptArgumentValues, diff --git a/src/server/registerResetInvestigationTool.ts b/src/server/registerResetInvestigationTool.ts index 8344885927..347828b5b6 100644 --- a/src/server/registerResetInvestigationTool.ts +++ b/src/server/registerResetInvestigationTool.ts @@ -1,6 +1,8 @@ import { toolContract } from "../contracts/toolContracts.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + bindArtifactFileCleanup, +} from "../resources/index.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { err, ok } from "../domain/result.js"; diff --git a/src/server/registerSessionRecordTools.ts b/src/server/registerSessionRecordTools.ts index 17f2411b0c..181088b783 100644 --- a/src/server/registerSessionRecordTools.ts +++ b/src/server/registerSessionRecordTools.ts @@ -9,7 +9,7 @@ import { evidenceBundleExportReceipt, } from "../application/EvidenceBundleFiles.js"; import { toolContract } from "../contracts/toolContracts.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { err, ok } from "../domain/result.js"; import { cancelledBy } from "../domain/analysisErrorCore.js"; import { inspectEvidenceBundle } from "../application/investigation/InspectEvidenceBundle.js"; diff --git a/src/server/registerSessionStatusTool.ts b/src/server/registerSessionStatusTool.ts index c71626d556..c231efe2d4 100644 --- a/src/server/registerSessionStatusTool.ts +++ b/src/server/registerSessionStatusTool.ts @@ -6,8 +6,8 @@ import { import type { EvidenceMcpServer } from "./EvidenceMcpServer.js"; import type { BinarySessionPort } from "../application/binary/BinarySessionPort.js"; -import type { ProviderAvailability } from "../application/AnalysisProvider.js"; -import type { JebAnalysisAvailability } from "../application/jeb/JebAnalysisPort.js"; +import type { ProviderAvailability } from "../ports/AnalysisProvider.js"; +import type { JebAnalysisAvailability } from "../ports/jeb/JebAnalysisPort.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; diff --git a/src/server/registerSessionTools.ts b/src/server/registerSessionTools.ts index e0996f14cc..01070b5071 100644 --- a/src/server/registerSessionTools.ts +++ b/src/server/registerSessionTools.ts @@ -2,7 +2,7 @@ import type { CapabilityAvailabilityProbes } from "../application/CapabilityAvai import { openBinaryTargetSelection } from "../contracts/sessionLifecycleInputs.js"; import { registerNativeFunctionMatchingTool } from "./registerNativeFunctionMatchingTool.js"; import type { EvidenceMcpServer } from "./EvidenceMcpServer.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { workflowUnknownInput } from "../application/investigation/WorkflowUnknown.js"; import { @@ -27,7 +27,7 @@ import type { Evidence } from "../domain/evidence.js"; import type { ProcessCapture } from "../domain/process/processCaptureParsing.js"; import { err, ok, type Result } from "../domain/result.js"; import type { Logger } from "pino"; -import type { ProviderAvailability } from "../application/AnalysisProvider.js"; +import type { ProviderAvailability } from "../ports/AnalysisProvider.js"; import { mcpProgressReporter } from "./mcpProgress.js"; import { registerArtifactComparisonTool } from "./registerArtifactComparisonTool.js"; import { registerBundleComparisonTool } from "./registerBundleComparisonTool.js"; diff --git a/src/server/registerWebScriptTool.ts b/src/server/registerWebScriptTool.ts index 297e92782e..cd66bdaa9f 100644 --- a/src/server/registerWebScriptTool.ts +++ b/src/server/registerWebScriptTool.ts @@ -8,7 +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"; +import type { ArtifactResourceScope } from "../resources/index.js"; import { deliverEvidenceResult } from "./contractToolHandler.js"; /** Register local script export without requiring a live browser provider. */ diff --git a/src/signals/SigrokRecordingProvider.ts b/src/signals/SigrokRecordingProvider.ts index 811c891fca..1818a4ed56 100644 --- a/src/signals/SigrokRecordingProvider.ts +++ b/src/signals/SigrokRecordingProvider.ts @@ -35,9 +35,12 @@ import { createAnalysisExecution, type AnalysisExecution, type ExecutionOptions, -} from "../application/AnalysisProvider.js"; -import type { SignalRecordingPort } from "../application/signals/SignalRecordingService.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +} from "../ports/AnalysisProvider.js"; +import type { SignalRecordingPort } from "../ports/signals/SignalRecordingPort.js"; +import { + ArtifactReaderFailure, + readStableArtifact, +} from "../resources/index.js"; import { ARTIFACT_PRODUCER_LIMITATION, ArtifactAnalysisResources, @@ -47,7 +50,6 @@ import { artifactResourceDialect, createArtifactAnalysisResources, } from "../providers/artifactResourceFailure.js"; -import { readStableArtifact } from "../artifacts/readStableArtifact.js"; import { assertArtifactCommandPath, selectArtifactCommandPath, diff --git a/src/sqlite/SqliteDatabaseFailures.ts b/src/sqlite/SqliteDatabaseFailures.ts index 7a94b08a5e..07e8c94495 100644 --- a/src/sqlite/SqliteDatabaseFailures.ts +++ b/src/sqlite/SqliteDatabaseFailures.ts @@ -1,14 +1,12 @@ import { capturedProviderOutput } from "../process/capturedProviderOutput.js"; import { MAX_NODE_TIMER_DELAY_MS } from "../domain/analysisResourceLimits.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactReaderFailure, stableArtifactInputFailure, readerIntegrityFailure, -} from "../artifacts/StableArtifactFailure.js"; -import { ArtifactFileCleanupFailure, bindArtifactFileCleanup, -} from "../artifacts/ArtifactFileOperation.js"; +} from "../resources/index.js"; import { projectAnalysisError, projectAnalysisErrorWithoutCapturedOutput, diff --git a/src/sqlite/SqliteDatabaseProvider.ts b/src/sqlite/SqliteDatabaseProvider.ts index 8727671ed0..c049216ff4 100644 --- a/src/sqlite/SqliteDatabaseProvider.ts +++ b/src/sqlite/SqliteDatabaseProvider.ts @@ -2,12 +2,14 @@ import { createAnalysisExecution, type AnalysisExecution, type ExecutionOptions, -} from "../application/AnalysisProvider.js"; +} from "../ports/AnalysisProvider.js"; import { classifyProviderFailure } from "../providers/classifyProviderFailure.js"; -import type { SqliteDatabasePort } from "../application/sqlite/SqliteDatabasePort.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import type { SqliteDatabasePort } from "../ports/sqlite/SqliteDatabasePort.js"; +import { + ArtifactResourceScope, + ArtifactReaderFailure, + bindArtifactFileCleanup, +} from "../resources/index.js"; import type { AnalysisCapturedOutput, AnalysisError, diff --git a/src/sqlite/SqliteDatabaseSnapshot.ts b/src/sqlite/SqliteDatabaseSnapshot.ts index 25eee1f738..af40b534ff 100644 --- a/src/sqlite/SqliteDatabaseSnapshot.ts +++ b/src/sqlite/SqliteDatabaseSnapshot.ts @@ -1,24 +1,22 @@ import { lstat, open, realpath, writeFile } from "node:fs/promises"; import { constants, type BigIntStats } from "node:fs"; import { join } from "node:path"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { + ArtifactReaderFailure, + type ArtifactResourceScope, + withArtifactFileHandle, + assertArtifactReadActive, + completedStableArtifact, + readStableArtifact, + type StableArtifactSnapshot, + type StableArtifactFileSystem, +} from "../resources/index.js"; import { AnalysisCapabilityUnavailableError, AnalysisInputError, AnalysisResourceConstraintError, } from "../domain/analysisErrorCore.js"; import { SQLITE_PROVIDER_IDENTITY } from "../domain/sqlite/SqliteProviderIdentity.js"; -import { - withArtifactFileHandle, - assertArtifactReadActive, -} from "../artifacts/ArtifactFileOperation.js"; -import { - completedStableArtifact, - readStableArtifact, - type StableArtifactSnapshot, - type StableArtifactFileSystem, -} from "../artifacts/readStableArtifact.js"; import { SQLITE_DATABASE_LIMITS } from "./SqliteDatabaseLimits.js"; const fileSystem: StableArtifactFileSystem = { diff --git a/src/sqlite/SqliteDatabaseSnapshotLimits.test.ts b/src/sqlite/SqliteDatabaseSnapshotLimits.test.ts index 35993ce5b6..bc2d4b0ae4 100644 --- a/src/sqlite/SqliteDatabaseSnapshotLimits.test.ts +++ b/src/sqlite/SqliteDatabaseSnapshotLimits.test.ts @@ -13,9 +13,9 @@ import { join } from "node:path"; import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import type { StableArtifactFileSystem } from "../artifacts/readStableArtifact.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; +import { ArtifactResourceScope } from "../resources/ArtifactResourceScope.js"; +import type { StableArtifactFileSystem } from "../resources/readStableArtifact.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { AnalysisCancelledError } from "../domain/analysisErrorCore.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; diff --git a/src/sqlite/SqliteDatabaseWorkerExecution.ts b/src/sqlite/SqliteDatabaseWorkerExecution.ts index e1425648e6..abecc67db8 100644 --- a/src/sqlite/SqliteDatabaseWorkerExecution.ts +++ b/src/sqlite/SqliteDatabaseWorkerExecution.ts @@ -3,7 +3,11 @@ import { safeParseUtf8Json } from "../domain/safeJson.js"; import { bindArtifactFileCleanup, artifactFileCancellationCause, -} from "../artifacts/ArtifactFileOperation.js"; + completedStableArtifact, + readStableArtifact, + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../resources/index.js"; import { randomUUID } from "node:crypto"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; @@ -27,16 +31,10 @@ import { sqliteDatabaseSchema, type InspectSqliteDatabaseInput, } from "../domain/sqlite/sqliteDatabase.js"; -import { - completedStableArtifact, - readStableArtifact, -} from "../artifacts/readStableArtifact.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { classifyProviderFailure, type ProviderFailureDialect, } from "../providers/classifyProviderFailure.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { runOwnedCommand } from "../process/OwnedCommand.js"; import type { ProviderProcessSupervisor, diff --git a/src/v8/V8CodeCacheProvider.ts b/src/v8/V8CodeCacheProvider.ts index 54317035d3..d06b97dad4 100644 --- a/src/v8/V8CodeCacheProvider.ts +++ b/src/v8/V8CodeCacheProvider.ts @@ -1,23 +1,19 @@ import { parseFailureAnalysisError } from "../domain/parseFailureAnalysisError.js"; -import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { + ArtifactResourceScope, + ArtifactReaderFailure, type StableArtifactSnapshot, readStableArtifact, -} from "../artifacts/readStableArtifact.js"; -import { artifactFilePrimaryFacts, artifactSelectedPathErrno, type ArtifactFilePrimaryFacts, -} from "../artifacts/ArtifactFileOperation.js"; -import { projectArtifactCloseFailure, projectOwnedArtifactIdentityFailure, projectStableArtifactFailure, stableArtifactInputFailure, -} from "../artifacts/StableArtifactFailure.js"; -import type { ExecutionOptions } from "../application/AnalysisProvider.js"; -import type { V8CodeCachePort } from "../application/v8CodeCache/V8CodeCachePort.js"; +} from "../resources/index.js"; +import type { ExecutionOptions } from "../ports/AnalysisProvider.js"; +import type { V8CodeCachePort } from "../ports/v8CodeCache/V8CodeCachePort.js"; import { AnalysisAccessDeniedError, AnalysisInputError, diff --git a/src/wasm/WabtArtifactProvider.test.ts b/src/wasm/WabtArtifactProvider.test.ts index ce69a18a38..1df7271933 100644 --- a/src/wasm/WabtArtifactProvider.test.ts +++ b/src/wasm/WabtArtifactProvider.test.ts @@ -10,7 +10,7 @@ import { WASM_RESOURCE_DEFAULTS, } from "../domain/wasm/wasmArtifact.js"; import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; -import { PrivateRuntimeRootUnavailableError } from "../process/PrivateRuntimeRootUnavailableError.js"; +import { PrivateRuntimeRootUnavailableError } from "../domain/privateRuntimeRootUnavailableError.js"; import { spawnOwnedProviderProcess } from "../process/ProviderProcess.js"; import { OwnedCommandFailure } from "../process/OwnedCommand.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; diff --git a/src/wasm/WabtArtifactProvider.ts b/src/wasm/WabtArtifactProvider.ts index ccbb595a13..6c59e01844 100644 --- a/src/wasm/WabtArtifactProvider.ts +++ b/src/wasm/WabtArtifactProvider.ts @@ -11,21 +11,19 @@ import type { WasmArtifactExecutionOptions, WasmArtifactExecution, WasmArtifactPort, -} from "../application/wasm/WasmArtifactPort.js"; -import { createAnalysisExecution } from "../application/AnalysisProvider.js"; +} from "../ports/wasm/WasmArtifactPort.js"; +import { createAnalysisExecution } from "../ports/AnalysisProvider.js"; import { classifyProviderFailure } from "../providers/classifyProviderFailure.js"; import { completedStableArtifact, readStableArtifact, type StableArtifactSnapshot, -} from "../artifacts/readStableArtifact.js"; -import { ArtifactResourceScope, ArtifactResourceRetryFailure, -} from "../artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLeaseGroup } from "../artifacts/AnalysisCleanupLease.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; + AnalysisCleanupLeaseGroup, + bindArtifactFileCleanup, + ArtifactReaderFailure, +} from "../resources/index.js"; import type { AnalysisError, AnalysisCapturedOutput, diff --git a/src/wasm/WabtFailures.test.ts b/src/wasm/WabtFailures.test.ts index 5a031e248f..5badb6498d 100644 --- a/src/wasm/WabtFailures.test.ts +++ b/src/wasm/WabtFailures.test.ts @@ -1,6 +1,6 @@ import { spawn } from "node:child_process"; import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { wabtFailureDialect } from "./WabtFailures.js"; import { classifyProviderFailure } from "../providers/classifyProviderFailure.js"; diff --git a/src/wasm/WabtFailures.ts b/src/wasm/WabtFailures.ts index 0520e50378..35ecbf329c 100644 --- a/src/wasm/WabtFailures.ts +++ b/src/wasm/WabtFailures.ts @@ -1,7 +1,9 @@ import { MAX_NODE_TIMER_DELAY_MS } from "../domain/analysisResourceLimits.js"; import { analysisSettingLimit } from "../domain/analysisSettingDefinitions.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { artifactFilePrimaryFacts } from "../artifacts/ArtifactFileOperation.js"; +import { + ArtifactReaderFailure, + artifactFilePrimaryFacts, +} from "../resources/index.js"; import { utf8HeadExcerpt } from "../domain/utf8HeadExcerpt.js"; import type { ProviderProcessSnapshot } from "../process/ProviderProcess.js"; import type { AnalysisCapturedOutput } from "../domain/analysisErrorBase.js"; @@ -19,7 +21,7 @@ import type { ProviderFailureDialect } from "../providers/classifyProviderFailur import { RuntimeControlUnavailableError, runtimeControlCapabilityError, -} from "../process/RuntimeControlUnavailableError.js"; +} from "../domain/runtimeControlUnavailableError.js"; import { WabtAdmissionError } from "./WabtAdmissionError.js"; import { DEFAULT_WASM_COMMAND_TIMEOUT_MS, diff --git a/src/wasm/WabtRuntime.test.ts b/src/wasm/WabtRuntime.test.ts index 6b7d734e9a..333ee78adc 100644 --- a/src/wasm/WabtRuntime.test.ts +++ b/src/wasm/WabtRuntime.test.ts @@ -1,11 +1,11 @@ import { EventEmitter } from "node:events"; import { PassThrough } from "node:stream"; import { expect, it, vi } from "vitest"; -import { AnalysisCleanupLeaseGroup } from "../artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLeaseGroup } from "../resources/AnalysisCleanupLease.js"; import { ArtifactResourceScope, ArtifactResourceRetryFailure, -} from "../artifacts/ArtifactResourceScope.js"; +} from "../resources/ArtifactResourceScope.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { OwnedCommandFailure } from "../process/OwnedCommand.js"; import { ProviderProcessSupervisor } from "../process/ProviderProcess.js"; diff --git a/src/wasm/WabtRuntime.ts b/src/wasm/WabtRuntime.ts index ffd9589c23..a6295d158c 100644 --- a/src/wasm/WabtRuntime.ts +++ b/src/wasm/WabtRuntime.ts @@ -1,9 +1,9 @@ import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; + ArtifactReaderFailure, + type ArtifactResourceScope, +} from "../resources/index.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import type { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; import type { ProviderProcessSupervisor } from "../process/ProviderProcess.js"; diff --git a/src/windows/WindowsNativeLoader.ts b/src/windows/WindowsNativeLoader.ts index a56740acf3..dd47c4d113 100644 --- a/src/windows/WindowsNativeLoader.ts +++ b/src/windows/WindowsNativeLoader.ts @@ -11,7 +11,7 @@ import { parseWindowsNativeManifest, validateWindowsNativeArtifact, } from "../domain/windowsNativeArtifact.js"; -import { RuntimeControlUnavailableError } from "../process/RuntimeControlUnavailableError.js"; +import { RuntimeControlUnavailableError } from "../domain/runtimeControlUnavailableError.js"; /** A native resource remains opaque until the addon validates its object tag. */ export const windowsHandleSchema = z.custom( diff --git a/src/windows/WindowsOwnedProcess.test.ts b/src/windows/WindowsOwnedProcess.test.ts index ba507aac2f..9f9626ad3d 100644 --- a/src/windows/WindowsOwnedProcess.test.ts +++ b/src/windows/WindowsOwnedProcess.test.ts @@ -1,7 +1,7 @@ import { once } from "node:events"; import { describe, expect, it, vi } from "vitest"; -import { RuntimeControlUnavailableError } from "../process/RuntimeControlUnavailableError.js"; +import { RuntimeControlUnavailableError } from "../domain/runtimeControlUnavailableError.js"; import type { WindowsNativeAuthority } from "./WindowsNativeLoader.js"; import { quoteWindowsProcessArgument, diff --git a/src/windows/WindowsOwnedProcess.ts b/src/windows/WindowsOwnedProcess.ts index 316b6ced85..8316a0d53d 100644 --- a/src/windows/WindowsOwnedProcess.ts +++ b/src/windows/WindowsOwnedProcess.ts @@ -3,8 +3,7 @@ import { PassThrough, Writable } from "node:stream"; import { z } from "zod"; -import type { ProcessCleanupResult } from "../process/ProcessOwnership.js"; -import { RuntimeControlUnavailableError } from "../process/RuntimeControlUnavailableError.js"; +import { RuntimeControlUnavailableError } from "../domain/runtimeControlUnavailableError.js"; import { requireWindowsNativeAuthority, windowsHandleSchema, @@ -32,6 +31,16 @@ const limitedPollSchema = pollSchema.extend({ peakJobMemoryBytes: z.int().nonnegative().max(Number.MAX_SAFE_INTEGER), }); +/** + * The outcome of stopping one Job Object tree: settled (and whether this call + * signalled it), or the reason it did not settle. It is the subset of + * process-ownership cleanup results a Windows job can report; the process + * supervisor reads it as one. + */ +export type WindowsJobCleanupResult = + | { readonly cleaned: true; readonly signaled: boolean } + | { readonly cleaned: false; readonly reason: string }; + /** Optional native job controls for one owned Windows process tree. */ export interface WindowsOwnedProcessOptions { /** Open a writable protocol pipe; otherwise stdin is NUL. */ @@ -230,7 +239,7 @@ export class WindowsOwnedProcess extends EventEmitter { #blockedWake: NodeJS.Timeout | undefined; readonly #blockedOutput = new Set(); #unreferenced = false; - #cleanup: Promise | undefined; + #cleanup: Promise | undefined; readonly #memoryLimitBytes: number | undefined; #memoryLimitReached = false; #peakJobMemoryBytes: number | undefined; @@ -394,7 +403,7 @@ export class WindowsOwnedProcess extends EventEmitter { } /** Terminate and verify that the entire job has settled before releasing it. */ - cleanup(): Promise { + cleanup(): Promise { this.#cleanup ??= this.#stop().then((result) => { if (!result.cleaned) this.#cleanup = undefined; return result; @@ -416,7 +425,7 @@ export class WindowsOwnedProcess extends EventEmitter { this.#blockedWake?.ref(); } - async #stop(): Promise { + async #stop(): Promise { if (this.#closed) return { cleaned: true, signaled: false }; if (this.#releasePending) { try { diff --git a/src/windows/WindowsPrivateRuntime.test.ts b/src/windows/WindowsPrivateRuntime.test.ts index 9ea20994b1..af7046ff7d 100644 --- a/src/windows/WindowsPrivateRuntime.test.ts +++ b/src/windows/WindowsPrivateRuntime.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from "vitest"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; +import { bindArtifactFileCleanup } from "../resources/ArtifactFileOperation.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; const nativeCall = vi.hoisted(() => vi.fn()); diff --git a/src/windows/WindowsPrivateRuntime.ts b/src/windows/WindowsPrivateRuntime.ts index 10e151d992..33a0e44891 100644 --- a/src/windows/WindowsPrivateRuntime.ts +++ b/src/windows/WindowsPrivateRuntime.ts @@ -2,9 +2,11 @@ import { win32 } from "node:path"; import { setTimeout as delay } from "node:timers/promises"; import { z } from "zod"; -import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; -import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; -import { PrivateRuntimeRootUnavailableError } from "../process/PrivateRuntimeRootUnavailableError.js"; +import { + ArtifactReaderFailure, + AnalysisCleanupLease, +} from "../resources/index.js"; +import { PrivateRuntimeRootUnavailableError } from "../domain/privateRuntimeRootUnavailableError.js"; import { requireWindowsNativeAuthority, diff --git a/tests/acceptance/analysisSnapshotDiagnostics.test.ts b/tests/acceptance/analysisSnapshotDiagnostics.test.ts index dfec193d14..6390b91a7f 100644 --- a/tests/acceptance/analysisSnapshotDiagnostics.test.ts +++ b/tests/acceptance/analysisSnapshotDiagnostics.test.ts @@ -4,7 +4,7 @@ import { TextReader, Uint8ArrayWriter, ZipWriter } from "@zip.js/zip.js"; import { expect } from "vitest"; import { z } from "zod"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { parseMcpToolError } from "../fixtures/mcpToolError.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; import { cliTest } from "../support/cli/cliFixture.js"; diff --git a/tests/acceptance/apkSignatureLimitsCliMcp.test.ts b/tests/acceptance/apkSignatureLimitsCliMcp.test.ts index 8537dad4e1..70d3418f15 100644 --- a/tests/acceptance/apkSignatureLimitsCliMcp.test.ts +++ b/tests/acceptance/apkSignatureLimitsCliMcp.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect } from "vitest"; import { parseEvidence } from "../../src/domain/evidence.js"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { apkSignatureSummaryViewResultSchema } from "../../src/domain/analysisView/analysisViewResult.js"; import { parseMcpToolError } from "../fixtures/mcpToolError.js"; import { connectLocalToolsMcp } from "../fixtures/localToolsMcp.js"; diff --git a/tests/acceptance/apkZip64FramingCli.test.ts b/tests/acceptance/apkZip64FramingCli.test.ts index 4ed6eb5888..ff1895e800 100644 --- a/tests/acceptance/apkZip64FramingCli.test.ts +++ b/tests/acceptance/apkZip64FramingCli.test.ts @@ -3,7 +3,7 @@ import { readFile, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect } from "vitest"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { apkSignatureResultSchema } from "../../src/domain/apkSignature/apkSignatureReport.js"; import { parseEvidence } from "../../src/domain/evidence.js"; import { zip64Tail } from "../fixtures/apkSignature/zip64Tail.js"; diff --git a/tests/acceptance/applications/adbNumericDeclarations.test.ts b/tests/acceptance/applications/adbNumericDeclarations.test.ts index 6f90f34cb0..7b744f60c2 100644 --- a/tests/acceptance/applications/adbNumericDeclarations.test.ts +++ b/tests/acceptance/applications/adbNumericDeclarations.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect } from "vitest"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { adbDisplayPartialObservationSchema } from "../../../src/domain/adb/adbDeviceAnalysis.js"; import { connectLocalToolsMcp } from "../../fixtures/localToolsMcp.js"; diff --git a/tests/acceptance/browser/browserSourceMapCancellationCli.test.ts b/tests/acceptance/browser/browserSourceMapCancellationCli.test.ts index 52005ab749..3055f77ee6 100644 --- a/tests/acceptance/browser/browserSourceMapCancellationCli.test.ts +++ b/tests/acceptance/browser/browserSourceMapCancellationCli.test.ts @@ -3,7 +3,7 @@ import { resolve } from "node:path"; import { expect } from "vitest"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { webBundleAcquisitionPartialObservationSchema } from "../../../src/domain/webBundleAnalysis.js"; import { startSourceMapCancellationBrowser } from "../../fixtures/browserSourceMapCancellation.js"; diff --git a/tests/acceptance/cliFormattingCapacity.test.ts b/tests/acceptance/cliFormattingCapacity.test.ts index 1b6582764c..57ba5aa3d9 100644 --- a/tests/acceptance/cliFormattingCapacity.test.ts +++ b/tests/acceptance/cliFormattingCapacity.test.ts @@ -5,7 +5,7 @@ import { expect } from "vitest"; import { parse as parseYaml } from "yaml"; import { buildManagedPeFixture } from "../../src/dotnet/ManagedPe.fixture.js"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { workspaceCliTest } from "../support/cli/workspaceCliFixture.js"; // Exercise the real dispatcher and pinned formatter with an authored capacity diff --git a/tests/acceptance/pcapCredentialErrorsCliMcp.test.ts b/tests/acceptance/pcapCredentialErrorsCliMcp.test.ts index 7f8980d64a..def02eeb33 100644 --- a/tests/acceptance/pcapCredentialErrorsCliMcp.test.ts +++ b/tests/acceptance/pcapCredentialErrorsCliMcp.test.ts @@ -4,7 +4,7 @@ import { createHash } from "node:crypto"; import { join } from "node:path"; import { expect, it, onTestFinished } from "vitest"; import { z } from "zod"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { parseEvidence } from "../../src/domain/evidence.js"; import { parseEvidenceBundle } from "../../src/domain/evidenceBundle.js"; import { pcapResultSchemas } from "../../src/domain/pcap/pcapAnalysis.js"; diff --git a/tests/acceptance/tools/wabtLauncherIdentity.test.ts b/tests/acceptance/tools/wabtLauncherIdentity.test.ts index 32fe186fbb..2a8d1ec92b 100644 --- a/tests/acceptance/tools/wabtLauncherIdentity.test.ts +++ b/tests/acceptance/tools/wabtLauncherIdentity.test.ts @@ -13,7 +13,7 @@ import { fileURLToPath } from "node:url"; import { expect } from "vitest"; import { z } from "zod"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { wasmArtifactSchema } from "../../../src/domain/wasm/wasmArtifact.js"; import { observeProcessStartIdentity } from "../../../src/process/ProcessOwnershipObservation.js"; diff --git a/tests/boundary/android/androidJniLibraries.test.ts b/tests/boundary/android/androidJniLibraries.test.ts index e292c734fb..d71cabad98 100644 --- a/tests/boundary/android/androidJniLibraries.test.ts +++ b/tests/boundary/android/androidJniLibraries.test.ts @@ -8,7 +8,7 @@ import { ANDROID_JNI_LIBRARY_LIMITS, } from "../../../src/android/AndroidJniLibraries.js"; import { JadxInterruption } from "../../../src/android/JadxInterruption.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { ZipArtifactReader } from "../../../src/artifacts/ZipArtifactReader.js"; import { AnalysisCancelledError, diff --git a/tests/boundary/android/androidMappingFile.test.ts b/tests/boundary/android/androidMappingFile.test.ts index 6ca6895e0c..82748c9406 100644 --- a/tests/boundary/android/androidMappingFile.test.ts +++ b/tests/boundary/android/androidMappingFile.test.ts @@ -3,7 +3,7 @@ import { stat, unlink, utimes, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, onTestFinished } from "vitest"; import { readAndroidMapping } from "../../../src/android/AndroidMappingFile.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { AnalysisCancelledError, AnalysisInputError, diff --git a/tests/boundary/browser/cdpScriptMetadata.test.ts b/tests/boundary/browser/cdpScriptMetadata.test.ts index 2507f279be..9fdd92c147 100644 --- a/tests/boundary/browser/cdpScriptMetadata.test.ts +++ b/tests/boundary/browser/cdpScriptMetadata.test.ts @@ -9,7 +9,7 @@ import { createJavaScriptRuntimeObservationEvidence } from "../../../src/applica import { CdpBrowserProvider } from "../../../src/browser/CdpBrowserProvider.js"; import { CdpElectronProvider } from "../../../src/browser/CdpElectronProvider.js"; import { publishWebScripts } from "../../../src/browser/assets/PublishWebScripts.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { selectScriptCapture } from "../../../src/browser/assets/ScriptCaptureAdapters.js"; import { inspectWebPageInputSchema } from "../../../src/domain/browserObservation.js"; import { inspectElectronPageInputSchema } from "../../../src/domain/javascript/electronObservation.js"; diff --git a/tests/boundary/captures/captureProvider.test.ts b/tests/boundary/captures/captureProvider.test.ts index 0b6e42824e..116492b485 100644 --- a/tests/boundary/captures/captureProvider.test.ts +++ b/tests/boundary/captures/captureProvider.test.ts @@ -4,7 +4,7 @@ import { OwnedCommandFailure } from "../../../src/process/OwnedCommand.js"; import { it, expect, onTestFinished } from "vitest"; import { writeFile, readdir, chmod, symlink } from "node:fs/promises"; import { join } from "node:path"; -import { readStableArtifact } from "../../../src/artifacts/readStableArtifact.js"; +import { readStableArtifact } from "../../../src/resources/readStableArtifact.js"; import { TsharkCaptureProvider } from "../../../src/captures/TsharkCaptureProvider.js"; import { PacketCaptureService } from "../../../src/application/captures/PacketCaptureService.js"; import { packetCaptureSchema } from "../../../src/domain/captures/packetCapture.js"; diff --git a/tests/boundary/cli/analysisViewCli.test.ts b/tests/boundary/cli/analysisViewCli.test.ts index 4d823b9288..5ef2188780 100644 --- a/tests/boundary/cli/analysisViewCli.test.ts +++ b/tests/boundary/cli/analysisViewCli.test.ts @@ -7,10 +7,8 @@ import { createHash } from "node:crypto"; import { mkdir, readFile, unlink, writeFile } from "node:fs/promises"; import { join, resolve } from "node:path"; import { pathToFileURL } from "node:url"; -import { - analysisCliErrorEnvelopeSchema, - analysisErrorProjectionSchema, -} from "../../../src/contracts/errorSchemas.js"; +import { analysisCliErrorEnvelopeSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { expect } from "vitest"; import { TextReader, Uint8ArrayWriter, ZipWriter } from "@zip.js/zip.js"; diff --git a/tests/boundary/cli/browserScenarioSummaryCli.test.ts b/tests/boundary/cli/browserScenarioSummaryCli.test.ts index 36c3218fb9..2a184d616a 100644 --- a/tests/boundary/cli/browserScenarioSummaryCli.test.ts +++ b/tests/boundary/cli/browserScenarioSummaryCli.test.ts @@ -8,7 +8,7 @@ import { registerBrowserScenarioCommands } from "../../../src/cliBrowserScenario import { ok } from "../../../src/domain/result.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; import { AnalysisOutputError } from "../../../src/domain/analysisErrorCore.js"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import { PlaywrightBrowserScenarioProvider } from "../../../src/browser/PlaywrightBrowserScenarioProvider.js"; import { scenarioCaptureFixture } from "../../fixtures/browserScenarioCapture.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/cli/cliJavaScriptResourceClose.test.ts b/tests/boundary/cli/cliJavaScriptResourceClose.test.ts index cbbceaf5c1..3d4df5a4d3 100644 --- a/tests/boundary/cli/cliJavaScriptResourceClose.test.ts +++ b/tests/boundary/cli/cliJavaScriptResourceClose.test.ts @@ -2,7 +2,7 @@ import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { afterEach, expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { closeCliJavaScriptResources, CliJavaScriptAnalysisHost, diff --git a/tests/boundary/cli/cliJsonCallerPath.test.ts b/tests/boundary/cli/cliJsonCallerPath.test.ts index b52fddc736..11a68442b4 100644 --- a/tests/boundary/cli/cliJsonCallerPath.test.ts +++ b/tests/boundary/cli/cliJsonCallerPath.test.ts @@ -15,8 +15,8 @@ import { Cli } from "incur"; import pino from "pino"; import { expect, it } from "vitest"; -import type { BrowserScenarioCapturePort } from "../../../src/application/BrowserScenarioCapturePort.js"; -import type { ElectronActiveObservationPort } from "../../../src/application/javascript/ElectronActiveObservationPort.js"; +import type { BrowserScenarioCapturePort } from "../../../src/ports/BrowserScenarioCapturePort.js"; +import type { ElectronActiveObservationPort } from "../../../src/ports/javascript/ElectronActiveObservationPort.js"; import { registerBrowserScenarioCommands } from "../../../src/cliBrowserScenarioCommands.js"; import { registerAnalysisViewCommands } from "../../../src/cli/analysisViewCommands.js"; import { registerElectronCommands } from "../../../src/cli/electronCommands.js"; diff --git a/tests/boundary/cli/cliOwnedResources.test.ts b/tests/boundary/cli/cliOwnedResources.test.ts index fb0639c6e7..6fef10e49a 100644 --- a/tests/boundary/cli/cliOwnedResources.test.ts +++ b/tests/boundary/cli/cliOwnedResources.test.ts @@ -1,6 +1,6 @@ import { afterEach, expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { CliGuidanceResources } from "../../../src/cli/guidanceCommands.js"; import { CliJavaScriptAnalysisHost } from "../../../src/cli/javascriptApplicationAnalysis.js"; diff --git a/tests/boundary/cli/cliStartupImports.test.ts b/tests/boundary/cli/cliStartupImports.test.ts index bcfa9b769d..ef1079efed 100644 --- a/tests/boundary/cli/cliStartupImports.test.ts +++ b/tests/boundary/cli/cliStartupImports.test.ts @@ -216,7 +216,7 @@ describe("CLI startup imports", () => { await expect( resolvedPackages( evaluate( - `const { readReferenceSourceVcs } = await import("./dist/application/ReferenceSourceVcsAdapter.js"); const { ArtifactResourceScope } = await import("./dist/artifacts/ArtifactResourceScope.js"); const resources = new ArtifactResourceScope(); try { await readReferenceSourceVcs(${JSON.stringify(source)}, resources); } finally { await resources.close(); }`, + `const { readReferenceSourceVcs } = await import("./dist/application/ReferenceSourceVcsAdapter.js"); const { ArtifactResourceScope } = await import("./dist/resources/ArtifactResourceScope.js"); const resources = new ArtifactResourceScope(); try { await readReferenceSourceVcs(${JSON.stringify(source)}, resources); } finally { await resources.close(); }`, ), ), ).resolves.toContain("isomorphic-git"); diff --git a/tests/boundary/cli/electronFuseCleanupCli.test.ts b/tests/boundary/cli/electronFuseCleanupCli.test.ts index 51373bcf1a..dd48c95a97 100644 --- a/tests/boundary/cli/electronFuseCleanupCli.test.ts +++ b/tests/boundary/cli/electronFuseCleanupCli.test.ts @@ -9,7 +9,7 @@ import { OBSIDIAN_FUSE_BYTES, } from "../../fixtures/electron/fuseImage.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; cliTest.for([ diff --git a/tests/boundary/cli/evidenceOutputPublicationCli.test.ts b/tests/boundary/cli/evidenceOutputPublicationCli.test.ts index b448b08d64..9f6b8ba726 100644 --- a/tests/boundary/cli/evidenceOutputPublicationCli.test.ts +++ b/tests/boundary/cli/evidenceOutputPublicationCli.test.ts @@ -10,7 +10,7 @@ import { join, resolve } from "node:path"; import { expect } from "vitest"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { parseEvidenceBundle } from "../../../src/domain/evidenceBundle.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/cli/firmwareIncompleteRange.test.ts b/tests/boundary/cli/firmwareIncompleteRange.test.ts index d4a288fc83..9ca2b49ac5 100644 --- a/tests/boundary/cli/firmwareIncompleteRange.test.ts +++ b/tests/boundary/cli/firmwareIncompleteRange.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect } from "vitest"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { cliTest } from "../../support/cli/cliFixture.js"; diff --git a/tests/boundary/cli/fridaCli.test.ts b/tests/boundary/cli/fridaCli.test.ts index 4deae8532c..34f4c91f28 100644 --- a/tests/boundary/cli/fridaCli.test.ts +++ b/tests/boundary/cli/fridaCli.test.ts @@ -7,7 +7,7 @@ import type { DeviceManager } from "frida"; import { createCli } from "../../../src/cli.js"; import { FRIDA_TOOL_CONTRACTS } from "../../../src/contracts/fridaToolContracts.js"; -import type { FridaInstrumentationPort } from "../../../src/application/frida/FridaInstrumentationPort.js"; +import type { FridaInstrumentationPort } from "../../../src/ports/frida/FridaInstrumentationPort.js"; import { AnalysisCapabilityUnavailableError } from "../../../src/domain/analysisErrorCore.js"; import { FridaInstrumentationManager } from "../../../src/frida/FridaInstrumentationManager.js"; diff --git a/tests/boundary/cli/jebInputDiagnostics.test.ts b/tests/boundary/cli/jebInputDiagnostics.test.ts index e156135d36..984714068f 100644 --- a/tests/boundary/cli/jebInputDiagnostics.test.ts +++ b/tests/boundary/cli/jebInputDiagnostics.test.ts @@ -2,8 +2,8 @@ import { Cli } from "incur"; import { Ajv2020 } from "ajv/dist/2020.js"; import { expect, it } from "vitest"; -import type { JebAnalysisPort } from "../../../src/application/jeb/JebAnalysisPort.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import type { JebAnalysisPort } from "../../../src/ports/jeb/JebAnalysisPort.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { registerJebCommands } from "../../../src/cli/jebCommands.js"; import { silentLogger } from "../../../src/logger.js"; import { ok } from "../../../src/domain/result.js"; diff --git a/tests/boundary/cli/jsonOutput.test.ts b/tests/boundary/cli/jsonOutput.test.ts index fd0676442f..bc202be1b5 100644 --- a/tests/boundary/cli/jsonOutput.test.ts +++ b/tests/boundary/cli/jsonOutput.test.ts @@ -15,7 +15,7 @@ import { } from "../../../src/cli/cliResultOutput.js"; import { logCliCommand } from "../../../src/cliLogging.js"; import { registerManagedCommands } from "../../../src/cli/managedCommands.js"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { silentLogger } from "../../../src/logger.js"; /** These managed commands inspect one target; none composes Evidence. */ diff --git a/tests/boundary/cli/managedMemberSummaryCli.test.ts b/tests/boundary/cli/managedMemberSummaryCli.test.ts index ab0f40394a..3a3db5e464 100644 --- a/tests/boundary/cli/managedMemberSummaryCli.test.ts +++ b/tests/boundary/cli/managedMemberSummaryCli.test.ts @@ -12,10 +12,8 @@ import { join, resolve } from "node:path"; import { expect } from "vitest"; import { inspectAnalysisView } from "../../../src/application/analysisView/AnalysisViewService.js"; -import { - analysisCliErrorEnvelopeSchema, - analysisErrorProjectionSchema, -} from "../../../src/contracts/errorSchemas.js"; +import { analysisCliErrorEnvelopeSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { analysisViewResultSchema, managedMemberSummaryViewResultSchema, diff --git a/tests/boundary/cli/nativeFeatureTraceDelivery.test.ts b/tests/boundary/cli/nativeFeatureTraceDelivery.test.ts index ae032e7520..a340e48f6a 100644 --- a/tests/boundary/cli/nativeFeatureTraceDelivery.test.ts +++ b/tests/boundary/cli/nativeFeatureTraceDelivery.test.ts @@ -6,7 +6,7 @@ import { expect, it } from "vitest"; import { createAnalysisExecution, type AnalysisProvider, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { runDirectAnalysis } from "../../../src/application/DirectAnalysis.js"; import type { DirectAnalysisDependencies } from "../../../src/application/DirectAnalysisDependencies.js"; import { registerCoreBinaryCommands } from "../../../src/cli/coreBinaryCommands.js"; diff --git a/tests/boundary/cli/overnightBatch1CliSchemas.test.ts b/tests/boundary/cli/overnightBatch1CliSchemas.test.ts index 9576d153ce..1f65be75c6 100644 --- a/tests/boundary/cli/overnightBatch1CliSchemas.test.ts +++ b/tests/boundary/cli/overnightBatch1CliSchemas.test.ts @@ -3,7 +3,7 @@ import { Ajv2020 } from "ajv/dist/2020.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { Cli, z } from "incur"; import { expect, it, vi } from "vitest"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import type { AdbDeviceAnalysisPort } from "../../../src/application/adb/AdbDeviceAnalysisPort.js"; import type { ApktoolResourceAnalysisPort } from "../../../src/application/apktool/ApktoolResourceAnalysisPort.js"; import { ok } from "../../../src/domain/result.js"; diff --git a/tests/boundary/cli/procedureReferencesDelivery.test.ts b/tests/boundary/cli/procedureReferencesDelivery.test.ts index a494e03160..28ee251d66 100644 --- a/tests/boundary/cli/procedureReferencesDelivery.test.ts +++ b/tests/boundary/cli/procedureReferencesDelivery.test.ts @@ -6,7 +6,7 @@ import { expect, it } from "vitest"; import { createAnalysisExecution, type AnalysisProvider, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { runDirectAnalysis } from "../../../src/application/DirectAnalysis.js"; import type { DirectAnalysisDependencies } from "../../../src/application/DirectAnalysisDependencies.js"; import { registerCoreNativeCommands } from "../../../src/cli/coreNativeCommands.js"; diff --git a/tests/boundary/cli/referenceSourceImportStatus.test.ts b/tests/boundary/cli/referenceSourceImportStatus.test.ts index 5fa336b11d..0a7bb5f118 100644 --- a/tests/boundary/cli/referenceSourceImportStatus.test.ts +++ b/tests/boundary/cli/referenceSourceImportStatus.test.ts @@ -4,10 +4,8 @@ import { join } from "node:path"; import { describe, expect } from "vitest"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import { - analysisCliErrorEnvelopeSchema, - analysisErrorProjectionSchema, -} from "../../../src/contracts/errorSchemas.js"; +import { analysisCliErrorEnvelopeSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { cliTest } from "../../support/cli/cliFixture.js"; const unsupportedHostOutput = expect.objectContaining({ diff --git a/tests/boundary/cli/reverseEngineeringTargetInput.test.ts b/tests/boundary/cli/reverseEngineeringTargetInput.test.ts index c120b5afc3..1775d9dd73 100644 --- a/tests/boundary/cli/reverseEngineeringTargetInput.test.ts +++ b/tests/boundary/cli/reverseEngineeringTargetInput.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect } from "vitest"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { REVERSE_ENGINEERING_TOOL_CONTRACTS } from "../../../src/contracts/reverseEngineeringToolContracts.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { cliTest } from "../../support/cli/cliFixture.js"; diff --git a/tests/boundary/cli/traceNativeValuesCompletenessCli.test.ts b/tests/boundary/cli/traceNativeValuesCompletenessCli.test.ts index f2cf696b80..916b26df1a 100644 --- a/tests/boundary/cli/traceNativeValuesCompletenessCli.test.ts +++ b/tests/boundary/cli/traceNativeValuesCompletenessCli.test.ts @@ -10,7 +10,7 @@ import { type AnalysisClient, type AnalysisOperationPort, type AnalysisProvider, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { runDirectAnalysis } from "../../../src/application/DirectAnalysis.js"; import type { DirectAnalysisDependencies } from "../../../src/application/DirectAnalysisDependencies.js"; import { diff --git a/tests/boundary/cli/wasmAcquiredInputsCli.test.ts b/tests/boundary/cli/wasmAcquiredInputsCli.test.ts index a8b0ee8f72..9b9cdd2b3d 100644 --- a/tests/boundary/cli/wasmAcquiredInputsCli.test.ts +++ b/tests/boundary/cli/wasmAcquiredInputsCli.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect } from "vitest"; import { z } from "zod"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { createEvidence, diff --git a/tests/boundary/cli/wasmCleanupCli.test.ts b/tests/boundary/cli/wasmCleanupCli.test.ts index 405b511b42..f112ab2c3b 100644 --- a/tests/boundary/cli/wasmCleanupCli.test.ts +++ b/tests/boundary/cli/wasmCleanupCli.test.ts @@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url"; import { expect } from "vitest"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { cliTest } from "../../support/cli/cliFixture.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/cli/webScriptSelectionCli.test.ts b/tests/boundary/cli/webScriptSelectionCli.test.ts index e3be07aee5..a6bde77439 100644 --- a/tests/boundary/cli/webScriptSelectionCli.test.ts +++ b/tests/boundary/cli/webScriptSelectionCli.test.ts @@ -9,7 +9,7 @@ import * as webScriptExport from "../../../src/application/WebScriptExportServic import { cliCommandFor } from "../../../src/cliCommandNames.js"; import { AnalysisCancelledError } from "../../../src/domain/analysisErrorCore.js"; import { err, ok } from "../../../src/domain/result.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { scriptCaptureEvidenceFixture, diff --git a/tests/boundary/filesystem/adbInputSnapshot.test.ts b/tests/boundary/filesystem/adbInputSnapshot.test.ts index 63228add5f..fd8af9f1cd 100644 --- a/tests/boundary/filesystem/adbInputSnapshot.test.ts +++ b/tests/boundary/filesystem/adbInputSnapshot.test.ts @@ -10,7 +10,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { PrivateRuntimeRoot } from "../../../src/process/PrivateRuntimeRoot.js"; import { AdbInputSnapshotFailure, diff --git a/tests/boundary/filesystem/analysisSnapshot.test.ts b/tests/boundary/filesystem/analysisSnapshot.test.ts index 969528ea07..9e1839131a 100644 --- a/tests/boundary/filesystem/analysisSnapshot.test.ts +++ b/tests/boundary/filesystem/analysisSnapshot.test.ts @@ -8,7 +8,7 @@ import { withArtifactResourceScope } from "../../fixtures/artifactInventory.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { holdFirstFileRead } from "../../support/holdFirstFileRead.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { readAnalysisSnapshot, writeAnalysisSnapshot, diff --git a/tests/boundary/filesystem/artifactInventorySnapshot.test.ts b/tests/boundary/filesystem/artifactInventorySnapshot.test.ts index 093c73f0e2..eece07e64a 100644 --- a/tests/boundary/filesystem/artifactInventorySnapshot.test.ts +++ b/tests/boundary/filesystem/artifactInventorySnapshot.test.ts @@ -11,8 +11,8 @@ import { ArtifactReaderFailure, type ArtifactEntry, type ArtifactReader, -} from "../../../src/artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +} from "../../../src/resources/ArtifactReader.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { AsarArtifactReader } from "../../../src/artifacts/AsarArtifactReader.js"; import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { scanCanonicalArtifactInventoryInScope } from "../../../src/artifacts/inventory/scanCanonical.js"; diff --git a/tests/boundary/filesystem/artifactLiteralBackslash.test.ts b/tests/boundary/filesystem/artifactLiteralBackslash.test.ts index 931e0a9c34..5ef5b1acc2 100644 --- a/tests/boundary/filesystem/artifactLiteralBackslash.test.ts +++ b/tests/boundary/filesystem/artifactLiteralBackslash.test.ts @@ -10,7 +10,7 @@ import { createPackage } from "@electron/asar"; import { expect, it } from "vitest"; import { extractArtifact } from "../../../src/artifacts/extraction/ArtifactExtraction.js"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; import { inventoryArtifact, withArtifactResourceScope, diff --git a/tests/boundary/filesystem/artifactZipRelativePaths.test.ts b/tests/boundary/filesystem/artifactZipRelativePaths.test.ts index 6a346ddb90..fe88f5336b 100644 --- a/tests/boundary/filesystem/artifactZipRelativePaths.test.ts +++ b/tests/boundary/filesystem/artifactZipRelativePaths.test.ts @@ -7,7 +7,7 @@ import { expect, it } from "vitest"; import { writeOrderedZip } from "../../fixtures/artifactEntryOrder.js"; import { inventoryArtifact } from "../../fixtures/artifactInventory.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import type { ArtifactEntry } from "../../../src/artifacts/ArtifactReader.js"; +import type { ArtifactEntry } from "../../../src/resources/ArtifactReader.js"; import { ZipArtifactReader } from "../../../src/artifacts/ZipArtifactReader.js"; it("retains distinct occurrences when ZIP paths normalize to the same child", async () => { diff --git a/tests/boundary/filesystem/asarHeaderAdmission.test.ts b/tests/boundary/filesystem/asarHeaderAdmission.test.ts index 4204733706..f4137e1726 100644 --- a/tests/boundary/filesystem/asarHeaderAdmission.test.ts +++ b/tests/boundary/filesystem/asarHeaderAdmission.test.ts @@ -5,7 +5,7 @@ import { createPackage } from "@electron/asar"; import { afterEach, expect, it, vi } from "vitest"; import { translateArtifactFailure } from "../../../src/artifacts/ArtifactOperationFailure.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { admitAsarHeader, asarHeaderAdmissionRecovery, diff --git a/tests/boundary/filesystem/asarInventoryFreshness.test.ts b/tests/boundary/filesystem/asarInventoryFreshness.test.ts index 675f4d56b4..52b2c5e80a 100644 --- a/tests/boundary/filesystem/asarInventoryFreshness.test.ts +++ b/tests/boundary/filesystem/asarInventoryFreshness.test.ts @@ -6,7 +6,7 @@ import { buffer } from "node:stream/consumers"; import { createPackage, listPackage, uncache } from "@electron/asar"; import { describe, expect, it, onTestFinished } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { inventoryArtifact } from "../../fixtures/artifactInventory.js"; import { AsarArtifactReader } from "../../../src/artifacts/AsarArtifactReader.js"; diff --git a/tests/boundary/filesystem/asarListingAdmission.test.ts b/tests/boundary/filesystem/asarListingAdmission.test.ts index 55b389fc44..f1d350d589 100644 --- a/tests/boundary/filesystem/asarListingAdmission.test.ts +++ b/tests/boundary/filesystem/asarListingAdmission.test.ts @@ -16,7 +16,7 @@ import { nestedAsarHeader, } from "../../fixtures/asarHeader.js"; import { inventoryArtifact } from "../../fixtures/artifactInventory.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { extractArtifact } from "../../../src/artifacts/extraction/ArtifactExtraction.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/asarStreamingAllocation.test.ts b/tests/boundary/filesystem/asarStreamingAllocation.test.ts index 79f61d2380..2cf6cd264a 100644 --- a/tests/boundary/filesystem/asarStreamingAllocation.test.ts +++ b/tests/boundary/filesystem/asarStreamingAllocation.test.ts @@ -24,7 +24,7 @@ import { import { hashReadable } from "../../../src/artifacts/ArtifactHash.js"; import { ARTIFACT_CLASSIFICATION_PREFIX_BYTES } from "../../../src/artifacts/ArtifactClassificationProbe.js"; import { asarHeaderBytes } from "../../fixtures/asarHeader.js"; -import { readArtifactFileChunks } from "../../../src/artifacts/readArtifactFileChunks.js"; +import { readArtifactFileChunks } from "../../../src/resources/readArtifactFileChunks.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; const memberBytes = 64 * 1024 * 1024; diff --git a/tests/boundary/filesystem/assetCatalogFinalization.test.ts b/tests/boundary/filesystem/assetCatalogFinalization.test.ts index 4b8b7fc7c5..a5f8e81ae4 100644 --- a/tests/boundary/filesystem/assetCatalogFinalization.test.ts +++ b/tests/boundary/filesystem/assetCatalogFinalization.test.ts @@ -2,7 +2,7 @@ import { mkdir, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { ArtifactProvider } from "../../../src/artifacts/ArtifactProvider.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; import * as processOutput from "../../../src/process/ExecFileOutput.js"; diff --git a/tests/boundary/filesystem/binaryTargetCleanup.test.ts b/tests/boundary/filesystem/binaryTargetCleanup.test.ts index feb2af429f..a113ddaaa2 100644 --- a/tests/boundary/filesystem/binaryTargetCleanup.test.ts +++ b/tests/boundary/filesystem/binaryTargetCleanup.test.ts @@ -4,9 +4,9 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { parseBinaryTarget } from "../../../src/application/BinaryTargetResolver.js"; -import type { AnalysisOperation } from "../../../src/application/AnalysisProvider.js"; -import { RetainedRegularFileCleanupFailure } from "../../../src/application/RegularFileRead.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import type { AnalysisOperation } from "../../../src/ports/AnalysisProvider.js"; +import { RetainedRegularFileCleanupFailure } from "../../../src/process/RegularFileRead.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; import type { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; diff --git a/tests/boundary/filesystem/bunStandaloneIntegration.test.ts b/tests/boundary/filesystem/bunStandaloneIntegration.test.ts index de2d4ba2f4..d297602146 100644 --- a/tests/boundary/filesystem/bunStandaloneIntegration.test.ts +++ b/tests/boundary/filesystem/bunStandaloneIntegration.test.ts @@ -5,7 +5,7 @@ import { finished } from "node:stream/promises"; import { setImmediate } from "node:timers/promises"; import { expect, it, vi } from "vitest"; import { BunStandaloneArtifactReader } from "../../../src/artifacts/BunStandaloneArtifactReader.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { decodeBunModuleGraph } from "../../../src/artifacts/bun/BunModuleGraphMembers.js"; import { locateBunGraphFixture, diff --git a/tests/boundary/filesystem/cancellationCauseLint.test.ts b/tests/boundary/filesystem/cancellationCauseLint.test.ts index b88562a149..c884ee1c55 100644 --- a/tests/boundary/filesystem/cancellationCauseLint.test.ts +++ b/tests/boundary/filesystem/cancellationCauseLint.test.ts @@ -9,7 +9,7 @@ RuleTester.it = it; const core = 'import { AnalysisCancelledError } from "./domain/analysisErrorCore.js";'; const options = - 'import type { ExecutionOptions } from "./application/AnalysisProvider.js";'; + 'import type { ExecutionOptions } from "./ports/AnalysisProvider.js";'; new RuleTester({ languageOptions: { parserOptions: { lang: "ts" }, sourceType: "module" }, @@ -115,7 +115,7 @@ new RuleTester({ }, { code: `${core}\nimport type { ExecutionOptions as Options } from - "./application/AnalysisProvider.js"; + "./ports/AnalysisProvider.js"; function run(options?: Options) { if (options?.signal?.aborted) return err(new AnalysisCancelledError("inspect")); diff --git a/tests/boundary/filesystem/ciChangeScope.test.ts b/tests/boundary/filesystem/ciChangeScope.test.ts index f8de9015d3..fd9793c04b 100644 --- a/tests/boundary/filesystem/ciChangeScope.test.ts +++ b/tests/boundary/filesystem/ciChangeScope.test.ts @@ -193,6 +193,27 @@ const classifyPackage = (before: string, after: string) => classifyCommit(["package.json"], "pull_request", false, { before, after }); it.each([ + // Shared resource owners moved from src/artifacts keep their lanes. + ["src/resources/AnalysisCleanupLease.ts", "apk_signature"], + ["src/resources/readStableArtifact.ts", "sqlite"], + ["src/resources/readStableArtifact.ts", "browser"], + ["src/resources/readStableArtifact.ts", "binary_layout"], + ["src/resources/readStableArtifact.ts", "evm"], + ["src/resources/readStableArtifact.ts", "recorded_crash"], + ["src/resources/readStableArtifact.ts", "web_network"], + ["src/resources/readStableArtifact.ts", "web_source_map"], + ["src/resources/ArtifactResourceScope.ts", "sqlite"], + ["src/resources/ArtifactResourceScope.ts", "agentenv"], + ["src/resources/ArtifactReader.ts", "sqlite"], + ["src/resources/ArtifactReader.ts", "binary_layout"], + ["src/resources/ArtifactReader.ts", "evm"], + ["src/resources/ArtifactReader.ts", "web_network"], + // Hopper launcher discovery moved out of config; the packaged Hopper + // baseline still checks the launcher it selects. + ["src/hopperPaths/HopperLauncherDiscovery.ts", "package"], + // The pwntools input bound moved from src/native/pwntools to src/config. + ["src/config/pwntoolsInputLimit.ts", "binary_layout"], + ["src/config/pwntoolsInputLimit.ts", "recorded_crash"], ["bridge/native/rea_lldb_tracer.py", "python"], ["bridge/pwndbg/test_core_context.py", "python"], ["tests/support/analysis-efficiency/test_catalog_eval.py", "python"], @@ -227,6 +248,19 @@ it.each([ ["src/process/LinuxResourceLimits.ts", "signal_recording"], ["scripts/ci/require-provider-tests.mjs", "packet_capture"], ["scripts/ci/require-provider-tests.mjs", "signal_recording"], + // Provider ports moved from src/application keep their provider lanes. + ["src/ports/sqlite/SqliteDatabasePort.ts", "sqlite"], + ["src/ports/BrowserScenarioCapturePort.ts", "browser"], + ["src/ports/WebModulePorts.ts", "browser"], + ["src/ports/binaryDiagnostics/ElfNotesPort.ts", "binary_layout"], + ["src/ports/binaryDiagnostics/RecordedCrashPort.ts", "recorded_crash"], + ["src/ports/evm/EvmInterfacePort.ts", "evm"], + ["src/ports/apkSignature/ApkSignaturePort.ts", "apk_signature"], + ["src/ports/javascript/JavaScriptRecoveryPort.ts", "javascript_recovery"], + ["src/ports/WebRuntimePort.ts", "web_runtime"], + ["src/ports/WebSourceLocationPorts.ts", "web_source_map"], + ["src/ports/captures/PacketCapturePort.ts", "packet_capture"], + ["src/ports/signals/SignalRecordingPort.ts", "signal_recording"], ])("selects %s for %s", async (path, scope) => { expect(await classifyPaths([path])).toMatchObject({ [scope]: true, @@ -1389,7 +1423,7 @@ it.each([ { code: true, agentenv: true, runtime: true, package: false }, ], [ - "src/artifacts/SafeOutputTree.ts", + "src/resources/SafeOutputTree.ts", { code: true, agentenv: true, runtime: true }, ], [ diff --git a/tests/boundary/filesystem/claudeDesktopClientConfiguration.test.ts b/tests/boundary/filesystem/claudeDesktopClientConfiguration.test.ts index b2d9f0e346..81c0403a34 100644 --- a/tests/boundary/filesystem/claudeDesktopClientConfiguration.test.ts +++ b/tests/boundary/filesystem/claudeDesktopClientConfiguration.test.ts @@ -32,7 +32,7 @@ import { type UninstallHost, } from "../../../src/application/Uninstall.js"; import { resolveMcpRegistrationClients } from "../../../src/application/McpRegistrationCatalog.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { clearClientLocationEnvironment } from "../../fixtures/clientEnvironment.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/clientNativeConnectionAdmission.test.ts b/tests/boundary/filesystem/clientNativeConnectionAdmission.test.ts index 40a4f8672d..9dc675a8ab 100644 --- a/tests/boundary/filesystem/clientNativeConnectionAdmission.test.ts +++ b/tests/boundary/filesystem/clientNativeConnectionAdmission.test.ts @@ -27,7 +27,7 @@ const PROGRAM = ` const { supportedClients } = await import(${JSON.stringify(new URL("../../../src/application/SupportedClients.ts", import.meta.url).href)}); const { registerMcpClient } = await import(${JSON.stringify(new URL("../../../src/application/McpClientRegistration.ts", import.meta.url).href)}); const { mcpClientRegistrationProfile } = await import(${JSON.stringify(new URL("../../../src/application/McpRegistrationCatalog.ts", import.meta.url).href)}); - const { ArtifactResourceScope } = await import(${JSON.stringify(new URL("../../../src/artifacts/ArtifactResourceScope.ts", import.meta.url).href)}); + const { ArtifactResourceScope } = await import(${JSON.stringify(new URL("../../../src/resources/ArtifactResourceScope.ts", import.meta.url).href)}); const { ConfigurationError } = await import(${JSON.stringify(new URL("../../../src/domain/configurationErrors.ts", import.meta.url).href)}); const [command, ...args] = currentClientRegistrationCommand(); if (!command || !CURRENT_ENTRYPOINT_PATH) throw Error('Missing owned fixture entrypoint.'); diff --git a/tests/boundary/filesystem/denoStandaloneIntegration.test.ts b/tests/boundary/filesystem/denoStandaloneIntegration.test.ts index a15741b5e9..70261209eb 100644 --- a/tests/boundary/filesystem/denoStandaloneIntegration.test.ts +++ b/tests/boundary/filesystem/denoStandaloneIntegration.test.ts @@ -6,7 +6,7 @@ import { Readable } from "node:stream"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { buildDenoSection, defaultDenoMetadata, @@ -14,7 +14,7 @@ import { denoIntelTrailer, } from "../../../src/artifacts/deno/DenoStandalone.fixture.js"; import { extractArtifact } from "../../../src/artifacts/extraction/ArtifactExtraction.js"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; import { scanCanonicalArtifactInventory } from "../../fixtures/artifactInventory.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/desktopApplication.test.ts b/tests/boundary/filesystem/desktopApplication.test.ts index 65793f80ee..a42913f4e0 100644 --- a/tests/boundary/filesystem/desktopApplication.test.ts +++ b/tests/boundary/filesystem/desktopApplication.test.ts @@ -36,8 +36,8 @@ import { } from "../../../src/artifacts/apple/MachoImage.fixture.js"; import { locateGodotPck } from "../../../src/artifacts/GodotPckLocation.js"; import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; -import { artifactFilePrimaryFacts } from "../../../src/artifacts/ArtifactFileOperation.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; +import { artifactFilePrimaryFacts } from "../../../src/resources/ArtifactFileOperation.js"; import { DesktopApplicationReader } from "../../../src/artifacts/DesktopApplicationReader.js"; import { inspectDesktopFile } from "../../../src/artifacts/DesktopFileInspection.js"; import { DesktopApplicationService } from "../../../src/application/artifacts/DesktopApplicationService.js"; diff --git a/tests/boundary/filesystem/directAnalysisSnapshotReplay.test.ts b/tests/boundary/filesystem/directAnalysisSnapshotReplay.test.ts index 2c487c2ac9..a8586775a5 100644 --- a/tests/boundary/filesystem/directAnalysisSnapshotReplay.test.ts +++ b/tests/boundary/filesystem/directAnalysisSnapshotReplay.test.ts @@ -23,7 +23,7 @@ import { type AnalysisProvider, type CapabilityDescriptor, type ProviderIdentity, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import type { DirectAnalysisDependencies } from "../../../src/application/DirectAnalysisDependencies.js"; import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js"; import { err, ok } from "../../../src/domain/result.js"; diff --git a/tests/boundary/filesystem/directoryArtifactReaderOpen.test.ts b/tests/boundary/filesystem/directoryArtifactReaderOpen.test.ts index 1f8c67b785..aff4cec120 100644 --- a/tests/boundary/filesystem/directoryArtifactReaderOpen.test.ts +++ b/tests/boundary/filesystem/directoryArtifactReaderOpen.test.ts @@ -4,7 +4,7 @@ import { buffer } from "node:stream/consumers"; import { describe, expect, it } from "vitest"; -import type { ArtifactEntry } from "../../../src/artifacts/ArtifactReader.js"; +import type { ArtifactEntry } from "../../../src/resources/ArtifactReader.js"; import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/directoryArtifactReaderOwnership.test.ts b/tests/boundary/filesystem/directoryArtifactReaderOwnership.test.ts index 8e3c96191c..3aab658d55 100644 --- a/tests/boundary/filesystem/directoryArtifactReaderOwnership.test.ts +++ b/tests/boundary/filesystem/directoryArtifactReaderOwnership.test.ts @@ -29,7 +29,7 @@ vi.mock("node:fs/promises", async (importOriginal) => { }; }); -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/dotnetBundleArtifacts.test.ts b/tests/boundary/filesystem/dotnetBundleArtifacts.test.ts index f91d2f9197..c78f6549d7 100644 --- a/tests/boundary/filesystem/dotnetBundleArtifacts.test.ts +++ b/tests/boundary/filesystem/dotnetBundleArtifacts.test.ts @@ -6,9 +6,9 @@ import { deflateRawSync } from "node:zlib"; import { expect, it, vi } from "vitest"; import { DEFAULT_DOTNET_BUNDLE_READER_LIMITS } from "../../../src/domain/artifactReaderLimits.js"; -import { artifactFixedLimitFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { artifactFixedLimitFailure } from "../../../src/resources/ArtifactReader.js"; import { DotnetBundleArtifactReader } from "../../../src/artifacts/DotnetBundleArtifactReader.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { extractArtifact } from "../../../src/artifacts/extraction/ArtifactExtraction.js"; import { inventoryArtifact } from "../../../src/artifacts/inventory/ArtifactInventory.js"; import { diff --git a/tests/boundary/filesystem/dotnetBundleIntegration.test.ts b/tests/boundary/filesystem/dotnetBundleIntegration.test.ts index d4aa78da2d..1910799ab2 100644 --- a/tests/boundary/filesystem/dotnetBundleIntegration.test.ts +++ b/tests/boundary/filesystem/dotnetBundleIntegration.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import * as dotnetLayout from "../../../src/artifacts/dotnet/DotnetBundle.js"; import { dotnetBundleFixture } from "../../../src/artifacts/dotnet/DotnetBundle.fixture.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { extractArtifact } from "../../../src/artifacts/extraction/ArtifactExtraction.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/evidenceBundleFiles.test.ts b/tests/boundary/filesystem/evidenceBundleFiles.test.ts index 3ade1181f9..4e727a37b2 100644 --- a/tests/boundary/filesystem/evidenceBundleFiles.test.ts +++ b/tests/boundary/filesystem/evidenceBundleFiles.test.ts @@ -29,7 +29,7 @@ import { publishEvidenceDelivery, } from "../../../src/application/EvidenceBundleCommands.js"; import { EvidenceLedger } from "../../../src/application/investigation/EvidenceLedger.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; import { OwnedStagedOutput } from "../../../src/filesystem/OwnedStagedOutput.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; @@ -39,7 +39,7 @@ import { withEvidenceCallerInputPath, type Evidence, } from "../../../src/domain/evidence.js"; -import { writeTextParts } from "../../../src/application/JsonFiles.js"; +import { writeTextParts } from "../../../src/resources/TextFileWrite.js"; import { failFileReadAfterAbort } from "../../support/failFileReadAfterAbort.js"; import { holdFirstFileRead } from "../../support/holdFirstFileRead.js"; import { JsonInputPhysicalReadFailure } from "../../../src/application/JsonInputFile.js"; diff --git a/tests/boundary/filesystem/extractionSourceCancellation.test.ts b/tests/boundary/filesystem/extractionSourceCancellation.test.ts index 2ce2330432..4d045f8f8a 100644 --- a/tests/boundary/filesystem/extractionSourceCancellation.test.ts +++ b/tests/boundary/filesystem/extractionSourceCancellation.test.ts @@ -1,7 +1,7 @@ import { mkdir, rename, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { materializeArtifactInventoryInScope } from "../../../src/artifacts/extraction/ArtifactExtraction.js"; import { scanArtifactInventory } from "../../fixtures/artifactInventory.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/ghidraLanguageCatalogBound.test.ts b/tests/boundary/filesystem/ghidraLanguageCatalogBound.test.ts index d44c475fec..8f4a816843 100644 --- a/tests/boundary/filesystem/ghidraLanguageCatalogBound.test.ts +++ b/tests/boundary/filesystem/ghidraLanguageCatalogBound.test.ts @@ -3,7 +3,7 @@ import { mkdir, symlink, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { afterEach, expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { readGhidraLanguageCatalog } from "../../../src/ghidra/GhidraLanguageCatalog.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/ghidraLanguageCatalogCleanup.test.ts b/tests/boundary/filesystem/ghidraLanguageCatalogCleanup.test.ts index 03617837b9..b9c1bf3cf7 100644 --- a/tests/boundary/filesystem/ghidraLanguageCatalogCleanup.test.ts +++ b/tests/boundary/filesystem/ghidraLanguageCatalogCleanup.test.ts @@ -5,8 +5,8 @@ import { afterEach, expect, it, vi } from "vitest"; import { ArtifactResourceRetryFailure, ArtifactResourceScope, -} from "../../../src/artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +} from "../../../src/resources/ArtifactResourceScope.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { readGhidraLanguageCatalog } from "../../../src/ghidra/GhidraLanguageCatalog.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/ghidraLanguageCatalogEncoding.test.ts b/tests/boundary/filesystem/ghidraLanguageCatalogEncoding.test.ts index 6053ddca1c..20bb478f35 100644 --- a/tests/boundary/filesystem/ghidraLanguageCatalogEncoding.test.ts +++ b/tests/boundary/filesystem/ghidraLanguageCatalogEncoding.test.ts @@ -1,7 +1,7 @@ import { mkdir, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { readGhidraLanguageCatalog } from "../../../src/ghidra/GhidraLanguageCatalog.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/ghidraProfileArtifactOwnership.test.ts b/tests/boundary/filesystem/ghidraProfileArtifactOwnership.test.ts index d37bd80bd3..d2417bb106 100644 --- a/tests/boundary/filesystem/ghidraProfileArtifactOwnership.test.ts +++ b/tests/boundary/filesystem/ghidraProfileArtifactOwnership.test.ts @@ -17,7 +17,7 @@ import { type FileHandle, } from "node:fs/promises"; import { afterEach, expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { parseConfig } from "../../../src/config/parseConfig.js"; import { resolveGhidraAnalysisSeeds, diff --git a/tests/boundary/filesystem/ghidraPspExtension.test.ts b/tests/boundary/filesystem/ghidraPspExtension.test.ts index df92e6758c..e109fb40fa 100644 --- a/tests/boundary/filesystem/ghidraPspExtension.test.ts +++ b/tests/boundary/filesystem/ghidraPspExtension.test.ts @@ -3,7 +3,7 @@ import { composeBinarySession } from "../../../src/application/binary/BinarySess import { createHash } from "node:crypto"; import type { Dir } from "node:fs"; import { GhidraClient } from "../../../src/ghidra/GhidraClient.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { ok as javaProbeOk } from "../../../src/domain/result.js"; import type { GhidraJavaObservation } from "../../../src/ghidra/GhidraJavaProbe.js"; import { diff --git a/tests/boundary/filesystem/hopperFatCoordinates.test.ts b/tests/boundary/filesystem/hopperFatCoordinates.test.ts index 64f7042dc8..5b0d5e7114 100644 --- a/tests/boundary/filesystem/hopperFatCoordinates.test.ts +++ b/tests/boundary/filesystem/hopperFatCoordinates.test.ts @@ -11,8 +11,8 @@ import { } from "../../../src/artifacts/apple/MachoImage.fixture.js"; import type { BinaryTarget } from "../../../src/domain/binaryTargetTypes.js"; import type { JsonValue } from "../../../src/domain/jsonValue.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import { RegularFileCleanupFailure } from "../../../src/filesystem/OwnedRegularFile.js"; import type { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; import { mapHopperFileOffset } from "../../../src/hopper/HopperFileOffset.js"; diff --git a/tests/boundary/filesystem/hopperLauncherSelection.test.ts b/tests/boundary/filesystem/hopperLauncherSelection.test.ts index 843f54bf8b..11e80edaf3 100644 --- a/tests/boundary/filesystem/hopperLauncherSelection.test.ts +++ b/tests/boundary/filesystem/hopperLauncherSelection.test.ts @@ -8,7 +8,7 @@ import { runDoctor, systemDoctorHost, } from "../../../src/application/Doctor.js"; -import { defaultHopperLauncherPath } from "../../../src/config/parseConfig.js"; +import { defaultHopperLauncherPath } from "../../../src/hopperPaths/HopperLauncherDiscovery.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; // A real system installation legitimately precedes this isolated user fixture. diff --git a/tests/boundary/filesystem/inesArtifact.test.ts b/tests/boundary/filesystem/inesArtifact.test.ts index efe9accf11..415366f50d 100644 --- a/tests/boundary/filesystem/inesArtifact.test.ts +++ b/tests/boundary/filesystem/inesArtifact.test.ts @@ -24,7 +24,7 @@ import { } from "../../fixtures/artifactInventory.js"; import { InesArtifactReader } from "../../../src/artifacts/InesArtifactReader.js"; import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { extractArtifact, materializeArtifactInventoryInScope as materializeInScope, diff --git a/tests/boundary/filesystem/inesCancellation.test.ts b/tests/boundary/filesystem/inesCancellation.test.ts index 14ff5eef64..88b311b550 100644 --- a/tests/boundary/filesystem/inesCancellation.test.ts +++ b/tests/boundary/filesystem/inesCancellation.test.ts @@ -9,15 +9,15 @@ import { hashStableRootArtifactHandle } from "../../../src/artifacts/inventory/h import { inventoryArtifact } from "../../fixtures/artifactInventory.js"; import { inesFixture } from "../../fixtures/ines.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import { RetainedRegularFileCleanupFailure } from "../../../src/application/RegularFileRead.js"; +import { RetainedRegularFileCleanupFailure } from "../../../src/process/RegularFileRead.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { artifactFileCompletion, artifactFilePrimaryFacts, ArtifactFileCleanupFailure, withArtifactFileHandle, -} from "../../../src/artifacts/ArtifactFileOperation.js"; +} from "../../../src/resources/ArtifactFileOperation.js"; import { readFileHandlePrefix } from "../../../src/filesystem/readFileHandlePrefix.js"; import { abortIfNeeded } from "../../../src/artifacts/ArtifactHash.js"; diff --git a/tests/boundary/filesystem/interfaceBuilderBundle.test.ts b/tests/boundary/filesystem/interfaceBuilderBundle.test.ts index 1e2006c562..a2a54c9e12 100644 --- a/tests/boundary/filesystem/interfaceBuilderBundle.test.ts +++ b/tests/boundary/filesystem/interfaceBuilderBundle.test.ts @@ -10,7 +10,7 @@ import { describe, expect, it, onTestFinished, vi } from "vitest"; import { analyzeInterfaceBuilderBundle } from "../../../src/artifacts/apple/InterfaceBuilderAnalysis.js"; import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { InterfaceBuilderDecodeBudget } from "../../../src/artifacts/apple/InterfaceBuilderDecodeBudget.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { encodeNibArchiveFixture } from "../../../src/artifacts/apple/NibArchive.fixture.js"; import { thinMach } from "../../../src/domain/binaryTarget.fixture.js"; import { xcodeIbtoolAvailable } from "../../fixtures/ibtool.js"; diff --git a/tests/boundary/filesystem/javascript-applications/javascriptApplicationService.test.ts b/tests/boundary/filesystem/javascript-applications/javascriptApplicationService.test.ts index 59de2aa807..3c73d88d45 100644 --- a/tests/boundary/filesystem/javascript-applications/javascriptApplicationService.test.ts +++ b/tests/boundary/filesystem/javascript-applications/javascriptApplicationService.test.ts @@ -7,7 +7,7 @@ import { parseEvidence } from "../../../../src/domain/evidence.js"; import { javascriptApplicationAnalysisResultSchema } from "../../../../src/domain/javascript/javascriptApplicationAnalysis.js"; import { writeJavaScriptSourceSelectionFixture } from "../../../fixtures/javascriptSourceSelection.js"; -import { ArtifactReaderFailure } from "../../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../../src/resources/ArtifactReader.js"; import { scanCanonicalArtifactInventory } from "../../../fixtures/artifactInventory.js"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; diff --git a/tests/boundary/filesystem/javascriptArtifactReconstruction.test.ts b/tests/boundary/filesystem/javascriptArtifactReconstruction.test.ts index 4f4dc0435b..5f9e97980d 100644 --- a/tests/boundary/filesystem/javascriptArtifactReconstruction.test.ts +++ b/tests/boundary/filesystem/javascriptArtifactReconstruction.test.ts @@ -16,7 +16,7 @@ import { scanArtifactInventory } from "../../fixtures/artifactInventory.js"; import type { ArtifactEntry, ArtifactReader, -} from "../../../src/artifacts/ArtifactReader.js"; +} from "../../../src/resources/ArtifactReader.js"; import { writeJavaScriptArtifactFixture } from "../../fixtures/javascriptArtifactApplication.js"; it("reads local source maps as part of static artifact analysis", async () => { diff --git a/tests/boundary/filesystem/javascriptNestedReaderCleanup.test.ts b/tests/boundary/filesystem/javascriptNestedReaderCleanup.test.ts index 87dd482d3a..3beaf4995e 100644 --- a/tests/boundary/filesystem/javascriptNestedReaderCleanup.test.ts +++ b/tests/boundary/filesystem/javascriptNestedReaderCleanup.test.ts @@ -5,8 +5,8 @@ import { createPackage } from "@electron/asar"; import { expect, it, onTestFinished, vi } from "vitest"; import { AsarArtifactReader } from "../../../src/artifacts/AsarArtifactReader.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { reconstructJavaScriptArtifact } from "../../../src/application/javascript/JavaScriptArtifactReconstruction.js"; import { analyzeJavaScriptApplicationInputSchema } from "../../../src/domain/javascript/javascriptApplicationAnalysis.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/jsonFileResourceOwnership.test.ts b/tests/boundary/filesystem/jsonFileResourceOwnership.test.ts index e5c2763985..df532a6761 100644 --- a/tests/boundary/filesystem/jsonFileResourceOwnership.test.ts +++ b/tests/boundary/filesystem/jsonFileResourceOwnership.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { readJsonFile } from "../../../src/application/JsonFiles.js"; import { RegularFileCleanupFailure } from "../../../src/filesystem/OwnedRegularFile.js"; import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; diff --git a/tests/boundary/filesystem/jsonOutputOwnership.test.ts b/tests/boundary/filesystem/jsonOutputOwnership.test.ts index 9bb2ab3e3f..ed6a74312e 100644 --- a/tests/boundary/filesystem/jsonOutputOwnership.test.ts +++ b/tests/boundary/filesystem/jsonOutputOwnership.test.ts @@ -5,13 +5,13 @@ import * as fs from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { AnalysisCancelledError } from "../../../src/domain/analysisErrorCore.js"; import { EvidenceFileError } from "../../../src/domain/evidenceErrors.js"; import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; import { OwnedStagedOutput } from "../../../src/filesystem/OwnedStagedOutput.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; -import { writeTextParts } from "../../../src/application/JsonFiles.js"; +import { writeTextParts } from "../../../src/resources/TextFileWrite.js"; import { StagedOutputError } from "../../../src/filesystem/StagedOutputError.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/jsonOutputPathCapacity.test.ts b/tests/boundary/filesystem/jsonOutputPathCapacity.test.ts index caf0194484..fdbf764062 100644 --- a/tests/boundary/filesystem/jsonOutputPathCapacity.test.ts +++ b/tests/boundary/filesystem/jsonOutputPathCapacity.test.ts @@ -45,8 +45,8 @@ vi.mock("node:fs/promises", async (importOriginal) => { }, }; }); -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; -import { writeTextParts } from "../../../src/application/JsonFiles.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; +import { writeTextParts } from "../../../src/resources/TextFileWrite.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; it.each(["directory", "content"] as const)( diff --git a/tests/boundary/filesystem/jsonOutputResourceFailure.test.ts b/tests/boundary/filesystem/jsonOutputResourceFailure.test.ts index 50b4a95f8e..5e49465485 100644 --- a/tests/boundary/filesystem/jsonOutputResourceFailure.test.ts +++ b/tests/boundary/filesystem/jsonOutputResourceFailure.test.ts @@ -17,8 +17,8 @@ vi.mock("node:fs/promises", async (importOriginal) => { }, }; }); -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; -import { writeTextParts } from "../../../src/application/JsonFiles.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; +import { writeTextParts } from "../../../src/resources/TextFileWrite.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; import { redactExplicitFailure } from "../../../src/domain/explicitSensitiveFailure.js"; diff --git a/tests/boundary/filesystem/keyedArchiveSelection.test.ts b/tests/boundary/filesystem/keyedArchiveSelection.test.ts index d6c862d81a..76a9f0f888 100644 --- a/tests/boundary/filesystem/keyedArchiveSelection.test.ts +++ b/tests/boundary/filesystem/keyedArchiveSelection.test.ts @@ -15,7 +15,7 @@ import { expect, it } from "vitest"; import { ArtifactProvider } from "../../../src/artifacts/ArtifactProvider.js"; import { AnalysisProviderRegistry } from "../../../src/application/binary/AnalysisProviderRegistry.js"; import { composeBinarySession } from "../../../src/application/binary/BinarySessionComposition.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { inspectBundleKeyedArchive } from "../../../src/artifacts/apple/KeyedArchiveReader.js"; import { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { diff --git a/tests/boundary/filesystem/keyedArchiveXmlNesting.test.ts b/tests/boundary/filesystem/keyedArchiveXmlNesting.test.ts index 17476f71af..3fe9bb90ce 100644 --- a/tests/boundary/filesystem/keyedArchiveXmlNesting.test.ts +++ b/tests/boundary/filesystem/keyedArchiveXmlNesting.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { inspectBundleKeyedArchive } from "../../../src/artifacts/apple/KeyedArchiveReader.js"; import type { OpenStepPropertyListCode } from "../../../src/domain/propertyListOpenStep.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/kiloClientLocation.test.ts b/tests/boundary/filesystem/kiloClientLocation.test.ts index 10422a3214..0bfc9efb22 100644 --- a/tests/boundary/filesystem/kiloClientLocation.test.ts +++ b/tests/boundary/filesystem/kiloClientLocation.test.ts @@ -23,7 +23,7 @@ import { systemUninstallHost, } from "../../../src/application/Uninstall.js"; import { existingMaintenanceScope } from "../../../src/application/UpdateMaintenance.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { PRODUCT_IDENTITY } from "../../../src/identity.js"; import { clearClientLocationEnvironment } from "../../fixtures/clientEnvironment.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/mcpAddClientLifecycle.test.ts b/tests/boundary/filesystem/mcpAddClientLifecycle.test.ts index 6bb9588ed2..d43dc010df 100644 --- a/tests/boundary/filesystem/mcpAddClientLifecycle.test.ts +++ b/tests/boundary/filesystem/mcpAddClientLifecycle.test.ts @@ -43,7 +43,7 @@ import { } from "../../../src/application/Uninstall.js"; import { ClientConfigurationPublication } from "../../../src/application/ClientConfigurationPublication.js"; import { existingMaintenanceScope } from "../../../src/application/UpdateMaintenance.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; import { clearClientLocationEnvironment } from "../../fixtures/clientEnvironment.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/ownedArtifactReaderCleanup.test.ts b/tests/boundary/filesystem/ownedArtifactReaderCleanup.test.ts index 275f95b290..ba8b85d14b 100644 --- a/tests/boundary/filesystem/ownedArtifactReaderCleanup.test.ts +++ b/tests/boundary/filesystem/ownedArtifactReaderCleanup.test.ts @@ -5,7 +5,7 @@ import { join } from "node:path"; import { expect, it, onTestFinished, vi } from "vitest"; import { awaitAcknowledgement } from "../../fixtures/lifecycleAcknowledgement.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { BunStandaloneArtifactReader } from "../../../src/artifacts/BunStandaloneArtifactReader.js"; import { DenoStandaloneArtifactReader } from "../../../src/artifacts/DenoStandaloneArtifactReader.js"; import { DotnetBundleArtifactReader } from "../../../src/artifacts/DotnetBundleArtifactReader.js"; diff --git a/tests/boundary/filesystem/processCliFileInput.test.ts b/tests/boundary/filesystem/processCliFileInput.test.ts index b0f7508ac1..85528b352d 100644 --- a/tests/boundary/filesystem/processCliFileInput.test.ts +++ b/tests/boundary/filesystem/processCliFileInput.test.ts @@ -13,12 +13,10 @@ 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 { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; -import { - analysisCliErrorEnvelopeSchema, - analysisErrorProjectionSchema, -} from "../../../src/contracts/errorSchemas.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; +import { analysisCliErrorEnvelopeSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { EvidenceFileError } from "../../../src/domain/evidenceErrors.js"; import { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { ProviderAdapterError } from "../../../src/domain/providerAdapterError.js"; @@ -791,7 +789,7 @@ it.each(["plan", "invalid"] as const)( it("retains both prior process and input cleanup authority", async () => { const { AnalysisCleanupLease } = - await import("../../../src/artifacts/AnalysisCleanupLease.js"); + await import("../../../src/resources/AnalysisCleanupLease.js"); const { ProcessCaptureError } = await import("../../../src/process/capture/ProcessCaptureError.js"); const root = await createTestTempDirectory("rea-process-cli-mixed-owners-"); @@ -905,7 +903,7 @@ it("retains prior error and late cancellation with successful cleanup", async () it("retains independent process and input owners after mixed cleanup failure", async () => { const { AnalysisCleanupLease } = - await import("../../../src/artifacts/AnalysisCleanupLease.js"); + await import("../../../src/resources/AnalysisCleanupLease.js"); const { ProcessCaptureError } = await import("../../../src/process/capture/ProcessCaptureError.js"); const harness = @@ -981,7 +979,7 @@ it.each(["completed", "failed"] as const)( "retries transient process cleanup after %s capture", async (outcome) => { const { AnalysisCleanupLease } = - await import("../../../src/artifacts/AnalysisCleanupLease.js"); + await import("../../../src/resources/AnalysisCleanupLease.js"); const { ProcessCaptureError } = await import("../../../src/process/capture/ProcessCaptureError.js"); const { ok } = await import("../../../src/domain/result.js"); @@ -1030,7 +1028,7 @@ it.each(["completed", "failed"] as const)( it("closes the actual process owner when capture Evidence assembly throws", async () => { const { AnalysisCleanupLease } = - await import("../../../src/artifacts/AnalysisCleanupLease.js"); + await import("../../../src/resources/AnalysisCleanupLease.js"); const { ok } = await import("../../../src/domain/result.js"); const harness = await import("../../../src/process/capture/ProcessHarness.js"); @@ -1080,7 +1078,7 @@ it("closes the actual process owner when capture Evidence assembly throws", asyn it("keeps unknown primary cleanup coverage when late cancellation wraps mixed owners", async () => { const { AnalysisCleanupLease } = - await import("../../../src/artifacts/AnalysisCleanupLease.js"); + await import("../../../src/resources/AnalysisCleanupLease.js"); const { ProcessCaptureError } = await import("../../../src/process/capture/ProcessCaptureError.js"); const harness = diff --git a/tests/boundary/filesystem/referenceSourceCleanupOwnership.test.ts b/tests/boundary/filesystem/referenceSourceCleanupOwnership.test.ts index 19868a2d27..74e47f2b77 100644 --- a/tests/boundary/filesystem/referenceSourceCleanupOwnership.test.ts +++ b/tests/boundary/filesystem/referenceSourceCleanupOwnership.test.ts @@ -11,7 +11,7 @@ import type { Dirent } from "node:fs"; import { afterEach, beforeEach, expect, it, onTestFinished, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { importReferenceSource } from "../../../src/application/ReferenceSourceImport.js"; import { referenceSourceImportAnalysisError } from "../../../src/application/ReferenceSourceImportTypes.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; diff --git a/tests/boundary/filesystem/referenceSourceFilenameBytes.test.ts b/tests/boundary/filesystem/referenceSourceFilenameBytes.test.ts index 48c2f3f919..221477b0c3 100644 --- a/tests/boundary/filesystem/referenceSourceFilenameBytes.test.ts +++ b/tests/boundary/filesystem/referenceSourceFilenameBytes.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { readReferenceSource } from "../../../src/reference/ReferenceSourceReader.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/filesystem/referenceSourceImport.test.ts b/tests/boundary/filesystem/referenceSourceImport.test.ts index d35c9e176e..8105b2e20f 100644 --- a/tests/boundary/filesystem/referenceSourceImport.test.ts +++ b/tests/boundary/filesystem/referenceSourceImport.test.ts @@ -22,12 +22,12 @@ import { prepareReferenceSourceImport } from "../../../src/application/Reference import { readRegularFileText, RegularFileReadFailure, -} from "../../../src/application/RegularFileRead.js"; +} from "../../../src/process/RegularFileRead.js"; import { importReferenceSource } from "../../support/referenceSourceResourceScope.js"; import { parseReferenceSourceEntries } from "../../../src/application/ReferenceSourceImportEntries.js"; import type { ReferenceSourceRead } from "../../../src/reference/ReferenceSourceReaderTypes.js"; import { createHistoricalSourceManifest } from "../../../src/domain/referenceSourceGraph.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; import { RegularFileCleanupFailure } from "../../../src/filesystem/OwnedRegularFile.js"; diff --git a/tests/boundary/filesystem/referenceSourceMetadataCleanup.test.ts b/tests/boundary/filesystem/referenceSourceMetadataCleanup.test.ts index cfc4c9e694..34375f756d 100644 --- a/tests/boundary/filesystem/referenceSourceMetadataCleanup.test.ts +++ b/tests/boundary/filesystem/referenceSourceMetadataCleanup.test.ts @@ -13,7 +13,7 @@ import { constants } from "node:fs"; import { afterEach, beforeEach, expect, it, onTestFinished, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { importReferenceSource } from "../../../src/application/ReferenceSourceImport.js"; import { readReferenceSourceVcs } from "../../../src/application/ReferenceSourceVcsAdapter.js"; import { execFileOutput } from "../../../src/process/ExecFileOutput.js"; diff --git a/tests/boundary/filesystem/regularFileCancellation.test.ts b/tests/boundary/filesystem/regularFileCancellation.test.ts index 82a639c63d..cf93872729 100644 --- a/tests/boundary/filesystem/regularFileCancellation.test.ts +++ b/tests/boundary/filesystem/regularFileCancellation.test.ts @@ -11,9 +11,9 @@ import { retryRegularFileCleanupFailures, RetainedRegularFileCleanupFailure, bindRegularFileCleanup, -} from "../../../src/application/RegularFileRead.js"; +} from "../../../src/process/RegularFileRead.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { RegularFileOperationCancelled } from "../../../src/filesystem/RegularFile.js"; import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; import { diff --git a/tests/boundary/filesystem/safeOutputTree.test.ts b/tests/boundary/filesystem/safeOutputTree.test.ts index 8c5c3a4b5d..dbe06dcde4 100644 --- a/tests/boundary/filesystem/safeOutputTree.test.ts +++ b/tests/boundary/filesystem/safeOutputTree.test.ts @@ -19,9 +19,9 @@ import { describe, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; -import { SafeOutputTreeCreationFailure } from "../../../src/artifacts/SafeOutputTreeCreationFailure.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; +import { SafeOutputTreeCreationFailure } from "../../../src/resources/SafeOutputTreeCreationFailure.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; describe("safe artifact output cleanup", () => { it("adopts an empty caller directory without taking authority to remove it", async () => { diff --git a/tests/boundary/filesystem/safeOutputTreeCloseFailures.test.ts b/tests/boundary/filesystem/safeOutputTreeCloseFailures.test.ts index 2ed7830b3c..8f3bf359b7 100644 --- a/tests/boundary/filesystem/safeOutputTreeCloseFailures.test.ts +++ b/tests/boundary/filesystem/safeOutputTreeCloseFailures.test.ts @@ -71,8 +71,8 @@ vi.mock("node:fs/promises", async (importOriginal) => { }); import { ArtifactProvider } from "../../../src/artifacts/ArtifactProvider.js"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; -import { SafeOutputTreeCreationFailure } from "../../../src/artifacts/SafeOutputTreeCreationFailure.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; +import { SafeOutputTreeCreationFailure } from "../../../src/resources/SafeOutputTreeCreationFailure.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; describe("safe artifact output close failures", () => { diff --git a/tests/boundary/filesystem/safeOutputTreePublication.test.ts b/tests/boundary/filesystem/safeOutputTreePublication.test.ts index dbe9c22500..9e781888a3 100644 --- a/tests/boundary/filesystem/safeOutputTreePublication.test.ts +++ b/tests/boundary/filesystem/safeOutputTreePublication.test.ts @@ -27,7 +27,7 @@ vi.mock("node:fs/promises", async (importOriginal) => { }, }; }); -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; it.skipIf(process.platform === "win32")( "syncs nested directory entries before their parents and refuses publication when one cannot sync", diff --git a/tests/boundary/filesystem/safeOutputTreeUnicode.test.ts b/tests/boundary/filesystem/safeOutputTreeUnicode.test.ts index f14e152d9b..c6eb2ceaa9 100644 --- a/tests/boundary/filesystem/safeOutputTreeUnicode.test.ts +++ b/tests/boundary/filesystem/safeOutputTreeUnicode.test.ts @@ -6,7 +6,7 @@ import { Readable } from "node:stream"; import { expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; const boundary = vi.hoisted(() => ({ decomposed: false })); vi.mock("node:fs/promises", async (original) => { diff --git a/tests/boundary/filesystem/setupClientConfigCleanupOwnership.test.ts b/tests/boundary/filesystem/setupClientConfigCleanupOwnership.test.ts index 0e433b2133..c5743eb418 100644 --- a/tests/boundary/filesystem/setupClientConfigCleanupOwnership.test.ts +++ b/tests/boundary/filesystem/setupClientConfigCleanupOwnership.test.ts @@ -22,7 +22,7 @@ import { existingMaintenanceScope, planIntegrationMaintenance, } from "../../../src/application/UpdateMaintenance.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { ok } from "../../../src/domain/result.js"; import type { DoctorHost } from "../../../src/application/Doctor.js"; import { ConfigurationError } from "../../../src/domain/configurationErrors.js"; diff --git a/tests/boundary/filesystem/setupSkillCleanupOwnership.test.ts b/tests/boundary/filesystem/setupSkillCleanupOwnership.test.ts index d10c070727..fd937aa292 100644 --- a/tests/boundary/filesystem/setupSkillCleanupOwnership.test.ts +++ b/tests/boundary/filesystem/setupSkillCleanupOwnership.test.ts @@ -9,7 +9,7 @@ import { dirname, join } from "node:path"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { PRODUCT_IDENTITY } from "../../../src/identity.js"; import { createDoctorHostFixture } from "../../../src/application/Doctor.fixture.js"; import { runDoctorOwned } from "../../../src/application/Doctor.js"; diff --git a/tests/boundary/filesystem/setupSkillPublication.test.ts b/tests/boundary/filesystem/setupSkillPublication.test.ts index 74489aae51..7eabcc82eb 100644 --- a/tests/boundary/filesystem/setupSkillPublication.test.ts +++ b/tests/boundary/filesystem/setupSkillPublication.test.ts @@ -13,7 +13,7 @@ import { import { dirname, join } from "node:path"; import { describe, expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { OwnedStagedOutput } from "../../../src/filesystem/OwnedStagedOutput.js"; import { runSetup } from "../../../src/application/Setup.js"; import { diff --git a/tests/boundary/filesystem/sourceToBundlePaths.test.ts b/tests/boundary/filesystem/sourceToBundlePaths.test.ts index 0e70e41404..589c77c94c 100644 --- a/tests/boundary/filesystem/sourceToBundlePaths.test.ts +++ b/tests/boundary/filesystem/sourceToBundlePaths.test.ts @@ -1,6 +1,6 @@ import { EvidenceIntegrityError } from "../../../src/domain/evidenceErrors.js"; import { resolveSourceToBundleReference } from "../../../src/application/javascript/SourceToBundleReference.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { mkdir, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it } from "vitest"; diff --git a/tests/boundary/filesystem/stableArtifact.test.ts b/tests/boundary/filesystem/stableArtifact.test.ts index fe62f4d10b..8c1cf0f3c3 100644 --- a/tests/boundary/filesystem/stableArtifact.test.ts +++ b/tests/boundary/filesystem/stableArtifact.test.ts @@ -11,14 +11,14 @@ import { join } from "node:path"; import { createHash } from "node:crypto"; import { expect, it, onTestFinished } from "vitest"; import { awaitAcknowledgement } from "../../fixtures/lifecycleAcknowledgement.js"; -import { readStableArtifact } from "../../../src/artifacts/readStableArtifact.js"; +import { readStableArtifact } from "../../../src/resources/readStableArtifact.js"; import { artifactFileCompletion, ArtifactFileCleanupFailure, ArtifactFileCancelled, withArtifactFileHandle, -} from "../../../src/artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +} from "../../../src/resources/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; it("reads exact binary and empty bytes and rejects symlink/size/cancellation boundaries", async () => { diff --git a/tests/boundary/filesystem/symlinkParentOwners.test.ts b/tests/boundary/filesystem/symlinkParentOwners.test.ts index 9da82189a8..00e102b6e3 100644 --- a/tests/boundary/filesystem/symlinkParentOwners.test.ts +++ b/tests/boundary/filesystem/symlinkParentOwners.test.ts @@ -12,7 +12,7 @@ import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { parseBinaryTarget } from "../../../src/application/BinaryTargetResolver.js"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; import { absoluteCallerPath } from "../../../src/filesystem/callerPath.js"; import { FirmwareFileAccess } from "../../../src/firmware/FirmwareFiles.js"; import { associateWasmGlue } from "../../../src/wasm/WasmGlueAdapter.js"; diff --git a/tests/boundary/filesystem/webModuleArtifacts.test.ts b/tests/boundary/filesystem/webModuleArtifacts.test.ts index 36bdf22989..320f47a1dd 100644 --- a/tests/boundary/filesystem/webModuleArtifacts.test.ts +++ b/tests/boundary/filesystem/webModuleArtifacts.test.ts @@ -10,7 +10,7 @@ import { import { dirname, join } from "node:path"; import { describe, expect, it, onTestFinished } from "vitest"; import { exportWebScripts } from "../../../src/application/WebScriptExportService.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { LocalWebScriptArtifacts } from "../../../src/browser/assets/LocalWebScriptArtifacts.js"; import { LocalWebModuleArtifacts } from "../../../src/browser/modules/WebModuleArtifacts.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; diff --git a/tests/boundary/filesystem/webScriptExport.test.ts b/tests/boundary/filesystem/webScriptExport.test.ts index 59564300a7..d9430b0585 100644 --- a/tests/boundary/filesystem/webScriptExport.test.ts +++ b/tests/boundary/filesystem/webScriptExport.test.ts @@ -27,12 +27,12 @@ import { import { analyzeJavaScriptApplication } from "../../support/javascriptApplicationScope.js"; import { exportWebScripts } from "../../../src/application/WebScriptExportService.js"; import { AnalysisCancelledError } from "../../../src/domain/analysisErrorCore.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { publishWebScripts } from "../../../src/browser/assets/PublishWebScripts.js"; -import { DestinationCaseCollisionFailure } from "../../../src/artifacts/ArtifactPaths.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; -import { SafeOutputTreeCreationFailure } from "../../../src/artifacts/SafeOutputTreeCreationFailure.js"; +import { DestinationCaseCollisionFailure } from "../../../src/resources/ArtifactPaths.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; +import { SafeOutputTreeCreationFailure } from "../../../src/resources/SafeOutputTreeCreationFailure.js"; import { selectScriptCapture } from "../../../src/browser/assets/ScriptCaptureAdapters.js"; import { javascriptApplicationAnalysisResultSchema } from "../../../src/domain/javascript/javascriptApplicationAnalysis.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; diff --git a/tests/boundary/filesystem/webScriptManifestPaths.test.ts b/tests/boundary/filesystem/webScriptManifestPaths.test.ts index 91d99d7848..a5dfeb26c8 100644 --- a/tests/boundary/filesystem/webScriptManifestPaths.test.ts +++ b/tests/boundary/filesystem/webScriptManifestPaths.test.ts @@ -3,7 +3,7 @@ import { mkdir, symlink, writeFile } from "node:fs/promises"; import { dirname, isAbsolute, join, relative, sep } from "node:path"; import { expect, it, onTestFinished } from "vitest"; import { exportWebScripts } from "../../../src/application/WebScriptExportService.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { LocalWebScriptArtifacts } from "../../../src/browser/assets/LocalWebScriptArtifacts.js"; import { LocalWebSourceLocationArtifacts } from "../../../src/browser/assets/WebSourceLocationArtifacts.js"; import { LocalWebModuleArtifacts } from "../../../src/browser/modules/WebModuleArtifacts.js"; diff --git a/tests/boundary/filesystem/wideDirectoryTraversal.test.ts b/tests/boundary/filesystem/wideDirectoryTraversal.test.ts index 4df1f1fdb5..d6baf1c168 100644 --- a/tests/boundary/filesystem/wideDirectoryTraversal.test.ts +++ b/tests/boundary/filesystem/wideDirectoryTraversal.test.ts @@ -2,7 +2,7 @@ import { mkdirSync } from "node:fs"; import { join } from "node:path"; import { afterAll, beforeAll, describe, expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { readReferenceSource } from "../../support/referenceSourceResourceScope.js"; import { diff --git a/tests/boundary/firmware/firmwareIntegration.test.ts b/tests/boundary/firmware/firmwareIntegration.test.ts index d6287a6871..163b5a713d 100644 --- a/tests/boundary/firmware/firmwareIntegration.test.ts +++ b/tests/boundary/firmware/firmwareIntegration.test.ts @@ -14,8 +14,8 @@ import { projectAnalysisError } from "../../../src/domain/analysisErrorProjectio import { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { createToolResultDelivery } from "../../../src/server/toolResult.js"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; -import { SafeOutputTreeCreationFailure } from "../../../src/artifacts/SafeOutputTreeCreationFailure.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; +import { SafeOutputTreeCreationFailure } from "../../../src/resources/SafeOutputTreeCreationFailure.js"; // Extraction-stage assertions use producer-reported gaps. Unclassified byte // coverage has its own oracle in the selected-interval workflow below. diff --git a/tests/boundary/firmware/firmwarePublicationPaths.test.ts b/tests/boundary/firmware/firmwarePublicationPaths.test.ts index e0e1fecf4c..911ce82edb 100644 --- a/tests/boundary/firmware/firmwarePublicationPaths.test.ts +++ b/tests/boundary/firmware/firmwarePublicationPaths.test.ts @@ -26,7 +26,7 @@ import { import { publishFirmwareExtraction } from "../../../src/firmware/FirmwarePublication.js"; import { normalizeUnblobReport } from "../../../src/firmware/FirmwareReports.js"; import { startFirmwareDeadline } from "../../../src/firmware/FirmwareDeadline.js"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; const validateAdvertisedFirmwareOutput = async ( diff --git a/tests/boundary/firmware/firmwareReportFiles.test.ts b/tests/boundary/firmware/firmwareReportFiles.test.ts index 370bbf88df..503e3d66de 100644 --- a/tests/boundary/firmware/firmwareReportFiles.test.ts +++ b/tests/boundary/firmware/firmwareReportFiles.test.ts @@ -7,15 +7,15 @@ import { FirmwareFileAccess, } from "../../../src/firmware/FirmwareFiles.js"; import { readFirmwareCommandReport } from "../../../src/firmware/FirmwareCommand.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import { firmwareFailureDialect } from "../../../src/firmware/FirmwareFailures.js"; import { classifyProviderFailure } from "../../../src/providers/classifyProviderFailure.js"; import { FIRMWARE_LIMITS } from "../../../src/firmware/FirmwareRelease.js"; import { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { AnalysisResourceConstraintError } from "../../../src/domain/analysisErrorCore.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; import { normalizeBinwalkReport, normalizeUnblobReport, diff --git a/tests/boundary/firmware/firmwareValidationProjection.test.ts b/tests/boundary/firmware/firmwareValidationProjection.test.ts index 97d1ce9853..05dc564e10 100644 --- a/tests/boundary/firmware/firmwareValidationProjection.test.ts +++ b/tests/boundary/firmware/firmwareValidationProjection.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from "vitest"; import { FirmwareAnalysisService } from "../../../src/application/firmware/FirmwareAnalysisService.js"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; describe("firmware request validation projection", () => { diff --git a/tests/boundary/guidanceSearch.test.ts b/tests/boundary/guidanceSearch.test.ts index b37e0f6d80..097def09d3 100644 --- a/tests/boundary/guidanceSearch.test.ts +++ b/tests/boundary/guidanceSearch.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { readGuidanceSection, searchGuidance, diff --git a/tests/boundary/javascript-recovery/wakaruFileOwnership.test.ts b/tests/boundary/javascript-recovery/wakaruFileOwnership.test.ts index d331f83461..0336e7f79b 100644 --- a/tests/boundary/javascript-recovery/wakaruFileOwnership.test.ts +++ b/tests/boundary/javascript-recovery/wakaruFileOwnership.test.ts @@ -2,7 +2,7 @@ import { createHash } from "node:crypto"; import { access, readFile, type FileHandle } from "node:fs/promises"; import { basename, join } from "node:path"; import { afterEach, expect, it, onTestFinished, vi } from "vitest"; -import { ArtifactFileCleanupFailure } from "../../../src/artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../../../src/resources/ArtifactFileOperation.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; import { AnalysisCancelledError } from "../../../src/domain/analysisErrorCore.js"; import { diff --git a/tests/boundary/javascript-recovery/wakaruIntegration.test.ts b/tests/boundary/javascript-recovery/wakaruIntegration.test.ts index 6b35c89702..5bb9c7877b 100644 --- a/tests/boundary/javascript-recovery/wakaruIntegration.test.ts +++ b/tests/boundary/javascript-recovery/wakaruIntegration.test.ts @@ -10,8 +10,8 @@ import { import { dirname, join } from "node:path"; import { promisify } from "node:util"; import { describe, expect, it, vi } from "vitest"; -import { SafeOutputTree } from "../../../src/artifacts/SafeOutputTree.js"; -import { SafeOutputTreeCreationFailure } from "../../../src/artifacts/SafeOutputTreeCreationFailure.js"; +import { SafeOutputTree } from "../../../src/resources/SafeOutputTree.js"; +import { SafeOutputTreeCreationFailure } from "../../../src/resources/SafeOutputTreeCreationFailure.js"; import { javascriptRecoveryResultSchema } from "../../../src/domain/javascript/javascriptRecovery.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; diff --git a/tests/boundary/javascript-recovery/wakaruPublicationCancellation.test.ts b/tests/boundary/javascript-recovery/wakaruPublicationCancellation.test.ts index d3b9d98c28..9e9db6982f 100644 --- a/tests/boundary/javascript-recovery/wakaruPublicationCancellation.test.ts +++ b/tests/boundary/javascript-recovery/wakaruPublicationCancellation.test.ts @@ -120,7 +120,7 @@ vi.mock( typeof import("../../../src/javascript/recovery/WakaruExecution.js") >(); const { createAnalysisExecution } = - await import("../../../src/application/AnalysisProvider.js"); + await import("../../../src/ports/AnalysisProvider.js"); return { ...actual, prepareWakaruExecution: async ( diff --git a/tests/boundary/javascript/javascriptApplicationCancellation.test.ts b/tests/boundary/javascript/javascriptApplicationCancellation.test.ts index 28ec16b85c..0fd0764be3 100644 --- a/tests/boundary/javascript/javascriptApplicationCancellation.test.ts +++ b/tests/boundary/javascript/javascriptApplicationCancellation.test.ts @@ -6,7 +6,7 @@ import { z } from "zod"; import { ArtifactResourceScope, type ArtifactResourceOwner, -} from "../../../src/artifacts/ArtifactResourceScope.js"; +} from "../../../src/resources/ArtifactResourceScope.js"; import { analyzeJavaScriptApplication as analyzeOwnedApplication } from "../../../src/application/javascript/JavaScriptApplicationService.js"; import { javascriptApplicationAnalysisResultSchema } from "../../../src/domain/javascript/javascriptApplicationAnalysis.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/javascript/javascriptPreloadDiscovery.test.ts b/tests/boundary/javascript/javascriptPreloadDiscovery.test.ts index 2201eac40e..f7a3cb3592 100644 --- a/tests/boundary/javascript/javascriptPreloadDiscovery.test.ts +++ b/tests/boundary/javascript/javascriptPreloadDiscovery.test.ts @@ -1,5 +1,5 @@ import { beforeEach, expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { AnalysisCancelledError, AnalysisResourceConstraintError, diff --git a/tests/boundary/javascript/javascriptSourceAnalysisWorker.test.ts b/tests/boundary/javascript/javascriptSourceAnalysisWorker.test.ts index d68d0b0699..eaa26b2355 100644 --- a/tests/boundary/javascript/javascriptSourceAnalysisWorker.test.ts +++ b/tests/boundary/javascript/javascriptSourceAnalysisWorker.test.ts @@ -8,7 +8,7 @@ import { withVerifierCleanup } from "../../../scripts/lib/verifier-cleanup.mjs"; import { awaitAcknowledgement } from "../../fixtures/lifecycleAcknowledgement.js"; import { JavaScriptAnalysisWorker } from "../../../src/javascript/analysis/JavaScriptAnalysisWorker.js"; import { createJavaScriptSourceAnalysis } from "../../../src/artifacts/javascript/JavaScriptSourceAnalysis.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { cleanupOwnedProcessGroup } from "../../../src/process/ProcessOwnership.js"; import { ProcessOwnershipEvidenceOwner } from "../../../src/process/ProcessOwnershipEvidence.js"; import type { OwnedProcessGroup } from "../../../src/process/ProcessOwnership.js"; diff --git a/tests/boundary/javascript/nativeTypeBindings.test.ts b/tests/boundary/javascript/nativeTypeBindings.test.ts index 9c73059ee1..f4a08c8a00 100644 --- a/tests/boundary/javascript/nativeTypeBindings.test.ts +++ b/tests/boundary/javascript/nativeTypeBindings.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { javascriptApplicationAnalysisResultSchema } from "../../../src/domain/javascript/javascriptApplicationAnalysis.js"; import { buildJavaScriptNativeHandoffs } from "../../../src/domain/javascript/javascriptNativeHandoff.js"; import { analyzeJavaScriptApplication } from "../../../src/application/javascript/JavaScriptApplicationService.js"; diff --git a/tests/boundary/javascript/sourceMapRuntimeAvailability.test.ts b/tests/boundary/javascript/sourceMapRuntimeAvailability.test.ts index 19970876f7..c81a92cd7e 100644 --- a/tests/boundary/javascript/sourceMapRuntimeAvailability.test.ts +++ b/tests/boundary/javascript/sourceMapRuntimeAvailability.test.ts @@ -4,7 +4,7 @@ import { runSourceMapCommand, type SourceMapCleanupRetention, } from "../../../src/javascript/sourceMaps/SourceMapCommand.js"; -import { PrivateRuntimeRootUnavailableError } from "../../../src/process/PrivateRuntimeRootUnavailableError.js"; +import { PrivateRuntimeRootUnavailableError } from "../../../src/domain/privateRuntimeRootUnavailableError.js"; it.each([false, true])( "preserves private-runtime retryable=%s through the source-map operation", diff --git a/tests/boundary/mcp/adbMcp.test.ts b/tests/boundary/mcp/adbMcp.test.ts index eb315ef82f..f626808cab 100644 --- a/tests/boundary/mcp/adbMcp.test.ts +++ b/tests/boundary/mcp/adbMcp.test.ts @@ -3,7 +3,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it, onTestFinished } from "vitest"; import type { AdbDeviceAnalysisPort } from "../../../src/application/adb/AdbDeviceAnalysisPort.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { ADB_TOOL_CONTRACTS } from "../../../src/contracts/adb/adbToolContracts.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { ok } from "../../../src/domain/result.js"; diff --git a/tests/boundary/mcp/adbStartMcp.test.ts b/tests/boundary/mcp/adbStartMcp.test.ts index 063e33726f..2bbd6e46fc 100644 --- a/tests/boundary/mcp/adbStartMcp.test.ts +++ b/tests/boundary/mcp/adbStartMcp.test.ts @@ -8,7 +8,7 @@ import { join } from "node:path"; import { expect, it, onTestFinished } from "vitest"; import { AdbProvider } from "../../../src/adb/AdbProvider.js"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { createServer } from "../../../src/server/createServer.js"; diff --git a/tests/boundary/mcp/addressContextBookmarks.test.ts b/tests/boundary/mcp/addressContextBookmarks.test.ts index dd668c2b17..40963f16e3 100644 --- a/tests/boundary/mcp/addressContextBookmarks.test.ts +++ b/tests/boundary/mcp/addressContextBookmarks.test.ts @@ -4,7 +4,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it } from "vitest"; import { createTestBinarySession } from "../../fixtures/binarySession.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { AnalysisCapabilityUnavailableError, AnalysisCancelledError, diff --git a/tests/boundary/mcp/addressContextCapacity.test.ts b/tests/boundary/mcp/addressContextCapacity.test.ts index 2fb13afb81..3af9b9f9da 100644 --- a/tests/boundary/mcp/addressContextCapacity.test.ts +++ b/tests/boundary/mcp/addressContextCapacity.test.ts @@ -5,7 +5,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it } from "vitest"; import { createTestProviderRouter } from "../../fixtures/binarySession.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { BinarySession } from "../../../src/application/binary/BinarySession.js"; import { InvestigationRecords } from "../../../src/application/investigation/InvestigationRecords.js"; import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js"; diff --git a/tests/boundary/mcp/addressContextInputErrors.test.ts b/tests/boundary/mcp/addressContextInputErrors.test.ts index f533d7afc9..d78a467309 100644 --- a/tests/boundary/mcp/addressContextInputErrors.test.ts +++ b/tests/boundary/mcp/addressContextInputErrors.test.ts @@ -5,7 +5,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it } from "vitest"; import { createTestBinarySession } from "../../fixtures/binarySession.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { inspectAddressContext } from "../../../src/application/AnalysisContextQueries.js"; import { AnalysisCapabilityUnavailableError, diff --git a/tests/boundary/mcp/analyzeFunctionDetail.test.ts b/tests/boundary/mcp/analyzeFunctionDetail.test.ts index 89b8757670..d5e2fd70bd 100644 --- a/tests/boundary/mcp/analyzeFunctionDetail.test.ts +++ b/tests/boundary/mcp/analyzeFunctionDetail.test.ts @@ -6,7 +6,7 @@ import { EvidenceMcpServer } from "../../../src/server/EvidenceMcpServer.js"; import { registerEnhancedTools } from "../../../src/server/registerEnhancedTools.js"; import { createToolResultDelivery } from "../../../src/server/toolResult.js"; import { withAdmittedAnalysis } from "../../../src/server/analysisAdmission.js"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { createEvidence, parseEvidence, diff --git a/tests/boundary/mcp/androidPackageSummaryMcp.test.ts b/tests/boundary/mcp/androidPackageSummaryMcp.test.ts index ac150abd2e..7acaadd30b 100644 --- a/tests/boundary/mcp/androidPackageSummaryMcp.test.ts +++ b/tests/boundary/mcp/androidPackageSummaryMcp.test.ts @@ -9,8 +9,8 @@ import { import { Ajv2020 } from "ajv/dist/2020.js"; import { expect, it, onTestFinished, vi } from "vitest"; import { AndroidAnalysisService } from "../../../src/application/android/AndroidAnalysisService.js"; -import type { AndroidAnalysisPort } from "../../../src/application/android/AndroidAnalysisPort.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import type { AndroidAnalysisPort } from "../../../src/ports/android/AndroidAnalysisPort.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { inspectAndroidPackage } from "../../../src/application/android/AndroidPackageInspection.js"; import { inspectAnalysisView } from "../../../src/application/analysisView/AnalysisViewService.js"; import { androidResultSchemas } from "../../../src/domain/android/androidAnalysis.js"; diff --git a/tests/boundary/mcp/apktoolMcp.test.ts b/tests/boundary/mcp/apktoolMcp.test.ts index 7ff4e4aa5a..42e08a1616 100644 --- a/tests/boundary/mcp/apktoolMcp.test.ts +++ b/tests/boundary/mcp/apktoolMcp.test.ts @@ -2,7 +2,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it, onTestFinished } from "vitest"; import type { ApktoolResourceAnalysisPort } from "../../../src/application/apktool/ApktoolResourceAnalysisPort.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import type { ApktoolRequest } from "../../../src/domain/apktool/apktoolResourceAnalysis.js"; import { ok } from "../../../src/domain/result.js"; diff --git a/tests/boundary/mcp/applicationMcpHarnessLifecycle.test.ts b/tests/boundary/mcp/applicationMcpHarnessLifecycle.test.ts index 288d14519b..cc5b1d6630 100644 --- a/tests/boundary/mcp/applicationMcpHarnessLifecycle.test.ts +++ b/tests/boundary/mcp/applicationMcpHarnessLifecycle.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import type { AnalysisClient } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisClient } from "../../../src/ports/AnalysisProvider.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; import { err, ok } from "../../../src/domain/result.js"; import { diff --git a/tests/boundary/mcp/batchSourcePublicationCleanup.test.ts b/tests/boundary/mcp/batchSourcePublicationCleanup.test.ts index 599e34e1b3..02a274a041 100644 --- a/tests/boundary/mcp/batchSourcePublicationCleanup.test.ts +++ b/tests/boundary/mcp/batchSourcePublicationCleanup.test.ts @@ -3,7 +3,7 @@ import type { CallToolResult } from "@modelcontextprotocol/server"; import { access, mkdir, rm, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { BinarySession } from "../../../src/application/binary/BinarySession.js"; import { InvestigationRecords } from "../../../src/application/investigation/InvestigationRecords.js"; import { createEvidence } from "../../../src/domain/evidence.js"; diff --git a/tests/boundary/mcp/batchSourcePublicationRecovery.test.ts b/tests/boundary/mcp/batchSourcePublicationRecovery.test.ts index 23739d9783..cfc36f423d 100644 --- a/tests/boundary/mcp/batchSourcePublicationRecovery.test.ts +++ b/tests/boundary/mcp/batchSourcePublicationRecovery.test.ts @@ -4,7 +4,7 @@ import { expect, it, onTestFinished } from "vitest"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { EvidenceLedger } from "../../../src/application/investigation/EvidenceLedger.js"; import { createEvidence } from "../../../src/domain/evidence.js"; import { AnalysisResourceConstraintError } from "../../../src/domain/analysisErrorCore.js"; diff --git a/tests/boundary/mcp/browserMcp.test.ts b/tests/boundary/mcp/browserMcp.test.ts index 10ca044574..52386a5a04 100644 --- a/tests/boundary/mcp/browserMcp.test.ts +++ b/tests/boundary/mcp/browserMcp.test.ts @@ -3,7 +3,7 @@ import { parseMcpToolError } from "../../fixtures/mcpToolError.js"; import { crc32, deflateSync } from "node:zlib"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { err, ok as resultOk } from "../../../src/domain/result.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; import type { Client } from "@modelcontextprotocol/client"; import { Ajv2020 } from "ajv/dist/2020.js"; diff --git a/tests/boundary/mcp/browserScenarioMcp.test.ts b/tests/boundary/mcp/browserScenarioMcp.test.ts index b6108263c5..9e9b3a33d9 100644 --- a/tests/boundary/mcp/browserScenarioMcp.test.ts +++ b/tests/boundary/mcp/browserScenarioMcp.test.ts @@ -3,12 +3,12 @@ import { describe, expect, test } from "vitest"; import { Ajv2020 } from "ajv/dist/2020.js"; import { z } from "zod"; -import type { BrowserScenarioCapturePort } from "../../../src/application/BrowserScenarioCapturePort.js"; +import type { BrowserScenarioCapturePort } from "../../../src/ports/BrowserScenarioCapturePort.js"; import { createTestBinarySession } from "../../fixtures/binarySession.js"; import type { ExecutionOptions, ProviderIdentity, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { CdpBrowserProvider } from "../../../src/browser/CdpBrowserProvider.js"; import { sanitizeBrowserUrl } from "../../../src/domain/browserObservation.js"; import type { BrowserScenario } from "../../../src/domain/browserScenario.js"; diff --git a/tests/boundary/mcp/buildCaptureFailureMcp.test.ts b/tests/boundary/mcp/buildCaptureFailureMcp.test.ts index c05eb069ca..160d1f228f 100644 --- a/tests/boundary/mcp/buildCaptureFailureMcp.test.ts +++ b/tests/boundary/mcp/buildCaptureFailureMcp.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect, it } from "vitest"; import { z } from "zod"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import { captureDesktopApplication } from "../../../src/application/desktop/DesktopApplicationCapture.js"; import { projectFailure, diff --git a/tests/boundary/mcp/callGraphCleanupIncomplete.test.ts b/tests/boundary/mcp/callGraphCleanupIncomplete.test.ts index cb61dd7e17..c49e407464 100644 --- a/tests/boundary/mcp/callGraphCleanupIncomplete.test.ts +++ b/tests/boundary/mcp/callGraphCleanupIncomplete.test.ts @@ -8,7 +8,7 @@ import { z } from "zod"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js"; import { AnalysisCapabilityUnavailableError } from "../../../src/domain/analysisErrorCore.js"; diff --git a/tests/boundary/mcp/callRelationshipAvailability.test.ts b/tests/boundary/mcp/callRelationshipAvailability.test.ts index cbc44f1bf3..fc3bd5b7dd 100644 --- a/tests/boundary/mcp/callRelationshipAvailability.test.ts +++ b/tests/boundary/mcp/callRelationshipAvailability.test.ts @@ -8,8 +8,8 @@ import type { AnalysisClient, AnalysisProvider, CapabilityDescriptor, -} from "../../../src/application/AnalysisProvider.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { ok } from "../../../src/domain/result.js"; import type { ProviderRejectionCode } from "../../../src/domain/providerSelection.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; diff --git a/tests/boundary/mcp/cleanupPrimaryProjection.test.ts b/tests/boundary/mcp/cleanupPrimaryProjection.test.ts index e108e7e4ee..58e5d7e486 100644 --- a/tests/boundary/mcp/cleanupPrimaryProjection.test.ts +++ b/tests/boundary/mcp/cleanupPrimaryProjection.test.ts @@ -1,5 +1,5 @@ import { expect, it, onTestFinished } from "vitest"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import { AnalysisInputError } from "../../../src/domain/analysisErrorCore.js"; import { analysisErrorWithCleanupFailure } from "../../../src/domain/analysisErrorCleanup.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; diff --git a/tests/boundary/mcp/completionInventoryAliasMcp.test.ts b/tests/boundary/mcp/completionInventoryAliasMcp.test.ts index 3aee194978..759b6054bf 100644 --- a/tests/boundary/mcp/completionInventoryAliasMcp.test.ts +++ b/tests/boundary/mcp/completionInventoryAliasMcp.test.ts @@ -1,7 +1,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it } from "vitest"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { ok } from "../../../src/domain/result.js"; import { createServer } from "../../../src/server/createServer.js"; diff --git a/tests/boundary/mcp/contextEvidenceOverflow.test.ts b/tests/boundary/mcp/contextEvidenceOverflow.test.ts index 1c3e538d7a..994cd8f329 100644 --- a/tests/boundary/mcp/contextEvidenceOverflow.test.ts +++ b/tests/boundary/mcp/contextEvidenceOverflow.test.ts @@ -6,7 +6,7 @@ import { expect, it } from "vitest"; import { createTestProviderRouter } from "../../fixtures/binarySession.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { parseMcpToolError } from "../../fixtures/mcpToolError.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { BinarySession } from "../../../src/application/binary/BinarySession.js"; import { InvestigationRecords } from "../../../src/application/investigation/InvestigationRecords.js"; import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js"; diff --git a/tests/boundary/mcp/decompileAllCaveats.test.ts b/tests/boundary/mcp/decompileAllCaveats.test.ts index 7dc18c85bb..6991a3e573 100644 --- a/tests/boundary/mcp/decompileAllCaveats.test.ts +++ b/tests/boundary/mcp/decompileAllCaveats.test.ts @@ -5,7 +5,7 @@ import { afterEach, describe, expect, it, vi } from "vitest"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js"; import { DecompileExport } from "../../../src/application/decompileDirectory/exportTree.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; diff --git a/tests/boundary/mcp/electronMcp.test.ts b/tests/boundary/mcp/electronMcp.test.ts index 3c9e09cf22..a5ba91b9c4 100644 --- a/tests/boundary/mcp/electronMcp.test.ts +++ b/tests/boundary/mcp/electronMcp.test.ts @@ -16,8 +16,8 @@ import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { createStrippedAsarAddon } from "../../fixtures/strippedAsarAddon.js"; import { createTestBinarySession } from "../../fixtures/binarySession.js"; -import type { ElectronActiveObservationPort } from "../../../src/application/javascript/ElectronActiveObservationPort.js"; -import type { ElectronObservationPort } from "../../../src/application/javascript/ElectronObservationPort.js"; +import type { ElectronActiveObservationPort } from "../../../src/ports/javascript/ElectronActiveObservationPort.js"; +import type { ElectronObservationPort } from "../../../src/ports/javascript/ElectronObservationPort.js"; import { analyzeJavaScriptApplication } from "../../support/javascriptApplicationScope.js"; import { CdpElectronProvider } from "../../../src/browser/CdpElectronProvider.js"; import { createServer } from "../../../src/server/createServer.js"; diff --git a/tests/boundary/mcp/enhancedTools.01-lists-the-complete-target-open.test.ts b/tests/boundary/mcp/enhancedTools.01-lists-the-complete-target-open.test.ts index d1eacd2063..1a0bbdc4d6 100644 --- a/tests/boundary/mcp/enhancedTools.01-lists-the-complete-target-open.test.ts +++ b/tests/boundary/mcp/enhancedTools.01-lists-the-complete-target-open.test.ts @@ -5,7 +5,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { afterEach, describe, expect, it } from "vitest"; import { PROCEDURES, inventory, jsonResult } from "./enhancedToolsHarness.js"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "../../../src/contracts/managed/managedWorkflowToolContracts.js"; import { ENHANCED_TOOL_CONTRACTS } from "../../../src/contracts/enhancedToolContracts.js"; import { SESSION_TOOL_CONTRACTS } from "../../../src/contracts/sessionToolContracts.js"; @@ -13,7 +13,7 @@ import { TOOL_CONTRACTS } from "../../../src/contracts/toolContracts.js"; import type {} from "../../../src/domain/jsonValue.js"; import { createServer } from "../../../src/server/createServer.js"; import { observed as ok } from "../../fixtures/analysisExecution.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { ok as resultOk, err } from "../../../src/domain/result.js"; import { AnalysisCapabilityUnavailableError } from "../../../src/domain/analysisErrorCore.js"; import { nativeDispatchMetadataResultSchema } from "../../../src/domain/native/objcSwiftMetadata.js"; diff --git a/tests/boundary/mcp/enhancedTools.03-returns-typed-graph-failures-and.test.ts b/tests/boundary/mcp/enhancedTools.03-returns-typed-graph-failures-and.test.ts index 5f2af27fab..91c68f424d 100644 --- a/tests/boundary/mcp/enhancedTools.03-returns-typed-graph-failures-and.test.ts +++ b/tests/boundary/mcp/enhancedTools.03-returns-typed-graph-failures-and.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it } from "vitest"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { EnhancedTools } from "../../../src/application/EnhancedTools.js"; import { diff --git a/tests/boundary/mcp/enhancedTools.04-uses-complete-inventories-inline.test.ts b/tests/boundary/mcp/enhancedTools.04-uses-complete-inventories-inline.test.ts index cf3ee6b7c8..a72b721bf8 100644 --- a/tests/boundary/mcp/enhancedTools.04-uses-complete-inventories-inline.test.ts +++ b/tests/boundary/mcp/enhancedTools.04-uses-complete-inventories-inline.test.ts @@ -11,7 +11,7 @@ import { type AnalysisExecution, type AnalysisOperation, type AnalysisOperationPort, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import type { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { AnalysisCapabilityUnavailableError, diff --git a/tests/boundary/mcp/enhancedTools.callPathsAndBatches.test.ts b/tests/boundary/mcp/enhancedTools.callPathsAndBatches.test.ts index 4004b7fc31..edf3dadb87 100644 --- a/tests/boundary/mcp/enhancedTools.callPathsAndBatches.test.ts +++ b/tests/boundary/mcp/enhancedTools.callPathsAndBatches.test.ts @@ -1,8 +1,8 @@ import { canonicalInputSchema } from "../../fixtures/canonicalOutputSchema.js"; import { afterEach, describe, expect, it } from "vitest"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { AnalysisCapabilityUnavailableError, AnalysisCancelledError, diff --git a/tests/boundary/mcp/enhancedTools.limitations.test.ts b/tests/boundary/mcp/enhancedTools.limitations.test.ts index 78b0625f69..f7e7bed861 100644 --- a/tests/boundary/mcp/enhancedTools.limitations.test.ts +++ b/tests/boundary/mcp/enhancedTools.limitations.test.ts @@ -1,5 +1,5 @@ import { afterEach, expect, it } from "vitest"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { err, ok } from "../../../src/domain/result.js"; import { AnalysisCapabilityUnavailableError } from "../../../src/domain/analysisErrorCore.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; diff --git a/tests/boundary/mcp/enhancedTools.traceFeatureCoverage.test.ts b/tests/boundary/mcp/enhancedTools.traceFeatureCoverage.test.ts index 40e78fd670..cfc91b4141 100644 --- a/tests/boundary/mcp/enhancedTools.traceFeatureCoverage.test.ts +++ b/tests/boundary/mcp/enhancedTools.traceFeatureCoverage.test.ts @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it } from "vitest"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { EnhancedTools } from "../../../src/application/EnhancedTools.js"; import { AnalysisCapabilityUnavailableError, diff --git a/tests/boundary/mcp/enhancedToolsHarness.ts b/tests/boundary/mcp/enhancedToolsHarness.ts index f59137e3b6..18547618e9 100644 --- a/tests/boundary/mcp/enhancedToolsHarness.ts +++ b/tests/boundary/mcp/enhancedToolsHarness.ts @@ -6,7 +6,7 @@ import { type JsonValue, } from "../../../src/domain/jsonValue.js"; import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { createServer } from "../../../src/server/createServer.js"; export const PROCEDURES = { diff --git a/tests/boundary/mcp/evidenceAtomicRetentionRecovery.test.ts b/tests/boundary/mcp/evidenceAtomicRetentionRecovery.test.ts index ae9bfaf6ef..8f3472a692 100644 --- a/tests/boundary/mcp/evidenceAtomicRetentionRecovery.test.ts +++ b/tests/boundary/mcp/evidenceAtomicRetentionRecovery.test.ts @@ -9,7 +9,7 @@ import { FUNCTION_COMPARISON_EXAMPLE } from "../../../src/contracts/functionComp import { safeParseEvidence } from "../../../src/domain/evidenceValidation.js"; import { parseEvidenceBundle } from "../../../src/domain/evidenceBundle.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; it.each([ { profile: "compact", preexisting: false }, diff --git a/tests/boundary/mcp/evidenceRetentionRecovery.test.ts b/tests/boundary/mcp/evidenceRetentionRecovery.test.ts index 4b3202e9be..338772e88e 100644 --- a/tests/boundary/mcp/evidenceRetentionRecovery.test.ts +++ b/tests/boundary/mcp/evidenceRetentionRecovery.test.ts @@ -10,7 +10,7 @@ import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { parseMcpToolError } from "../../fixtures/mcpToolError.js"; import { BinarySession } from "../../../src/application/binary/BinarySession.js"; import { InvestigationRecords } from "../../../src/application/investigation/InvestigationRecords.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { safeParseEvidence } from "../../../src/domain/evidenceValidation.js"; import { recoveryOmissionRemediation } from "../../../src/domain/analysisErrorProjection.js"; import { UNRETAINED_EVIDENCE_EXPORT_GUIDANCE } from "../../../src/domain/analysisErrorPresentation.js"; diff --git a/tests/boundary/mcp/featureTraceViewsMcp.test.ts b/tests/boundary/mcp/featureTraceViewsMcp.test.ts index 5e70888d6f..42b6c4009e 100644 --- a/tests/boundary/mcp/featureTraceViewsMcp.test.ts +++ b/tests/boundary/mcp/featureTraceViewsMcp.test.ts @@ -13,7 +13,7 @@ import { jsonObjectSchema } from "../../../src/domain/jsonValue.js"; import { createServer } from "../../../src/server/createServer.js"; import { deliverApplicationEvidence } from "../../../src/server/registerApplicationTools/helpers.js"; import { traceApplicationFeatureEvidence } from "../../../src/application/javascript/JavaScriptApplicationWorkflowService.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { silentLogger } from "../../../src/logger.js"; import { createToolResultDelivery } from "../../../src/server/toolResult.js"; import { createApplicationMcpHarness } from "../../fixtures/applicationMcpHarness.js"; diff --git a/tests/boundary/mcp/fixedEvidenceConsumersMcp.test.ts b/tests/boundary/mcp/fixedEvidenceConsumersMcp.test.ts index 9996228ac5..7312a3fa99 100644 --- a/tests/boundary/mcp/fixedEvidenceConsumersMcp.test.ts +++ b/tests/boundary/mcp/fixedEvidenceConsumersMcp.test.ts @@ -1,7 +1,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { afterAll, afterEach, beforeAll, expect, it, vi } from "vitest"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { JAVASCRIPT_APPLICATION_VERSION_COMPARISON_EXAMPLE, JAVASCRIPT_FEATURE_TRACE_EXAMPLE, diff --git a/tests/boundary/mcp/flutterMcp.test.ts b/tests/boundary/mcp/flutterMcp.test.ts index ababb8993d..4812a74656 100644 --- a/tests/boundary/mcp/flutterMcp.test.ts +++ b/tests/boundary/mcp/flutterMcp.test.ts @@ -3,7 +3,7 @@ import { expect, it, onTestFinished } from "vitest"; import { Ajv2020 } from "ajv/dist/2020.js"; import type { FlutterBuildAnalysisPort } from "../../../src/application/flutter/FlutterBuildAnalysisPort.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { assertAdvertisedMcpContracts } from "./mcpContractHarness.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { ok } from "../../../src/domain/result.js"; diff --git a/tests/boundary/mcp/fridaLifecycleMcp.test.ts b/tests/boundary/mcp/fridaLifecycleMcp.test.ts index cea85709c1..a1eb188c40 100644 --- a/tests/boundary/mcp/fridaLifecycleMcp.test.ts +++ b/tests/boundary/mcp/fridaLifecycleMcp.test.ts @@ -15,11 +15,11 @@ import type { import { expect, it, onTestFinished, vi } from "vitest"; import { awaitAcknowledgement } from "../../fixtures/lifecycleAcknowledgement.js"; -import { FridaScriptLoadCancelledError } from "../../../src/application/frida/FridaInstrumentationPort.js"; +import { FridaScriptLoadCancelledError } from "../../../src/ports/frida/FridaInstrumentationPort.js"; import type { FridaInstrumentationPort, FridaScriptObservation, -} from "../../../src/application/frida/FridaInstrumentationPort.js"; +} from "../../../src/ports/frida/FridaInstrumentationPort.js"; import type { EvidenceWriter } from "../../../src/application/investigation/InvestigationRecordPort.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { diff --git a/tests/boundary/mcp/fridaMcp.test.ts b/tests/boundary/mcp/fridaMcp.test.ts index 2ab376a613..083b6aeb21 100644 --- a/tests/boundary/mcp/fridaMcp.test.ts +++ b/tests/boundary/mcp/fridaMcp.test.ts @@ -8,7 +8,7 @@ import type { AnySchema } from "ajv"; import type { DeviceManager } from "frida"; import { afterAll, expect, it, onTestFinished } from "vitest"; -import type { FridaInstrumentationPort } from "../../../src/application/frida/FridaInstrumentationPort.js"; +import type { FridaInstrumentationPort } from "../../../src/ports/frida/FridaInstrumentationPort.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { expandToolAvailability } from "../../../src/contracts/toolOutputSchemaPrimitives.js"; import { FridaInstrumentationManager } from "../../../src/frida/FridaInstrumentationManager.js"; diff --git a/tests/boundary/mcp/gdbRetirementCancellation.test.ts b/tests/boundary/mcp/gdbRetirementCancellation.test.ts index 849b53c754..3f79bff61b 100644 --- a/tests/boundary/mcp/gdbRetirementCancellation.test.ts +++ b/tests/boundary/mcp/gdbRetirementCancellation.test.ts @@ -15,7 +15,7 @@ import { createAnalysisExecution, type AnalysisClient, type AnalysisProvider, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { CompositeProvider } from "../../../src/application/binary/CompositeProvider.js"; import { runWithExternalMutationAdmission } from "../../../src/server/externalMutationAdmission.js"; import { awaitAcknowledgement } from "../../fixtures/lifecycleAcknowledgement.js"; diff --git a/tests/boundary/mcp/ghidraFailureDiagnostics.test.ts b/tests/boundary/mcp/ghidraFailureDiagnostics.test.ts index a40dbe93cf..bb5ce803ef 100644 --- a/tests/boundary/mcp/ghidraFailureDiagnostics.test.ts +++ b/tests/boundary/mcp/ghidraFailureDiagnostics.test.ts @@ -6,7 +6,7 @@ import { import { nativeAotSnapshotObservationSchema } from "../../../src/domain/native/nativeAotSnapshotObservation.js"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; import { fileSnapshotPartialObservationSchema } from "../../../src/domain/fileSnapshotObservation.js"; import { resolvedAnalysisError } from "../../../src/domain/analysisErrorBase.js"; @@ -24,7 +24,7 @@ import { parseMcpToolError } from "../../fixtures/mcpToolError.js"; import { expect, it } from "vitest"; import { logCliCommand } from "../../../src/cliLogging.js"; -import { analysisErrorProjectionSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { GhidraRequestQueue } from "../../../src/ghidra/GhidraRequestQueue.js"; import { silentLogger } from "../../../src/logger.js"; import { connectGhidraMcp } from "./ghidraMcpHarness.js"; diff --git a/tests/boundary/mcp/investigationAnalysisMcp.test.ts b/tests/boundary/mcp/investigationAnalysisMcp.test.ts index c6f537eb57..99cc4d74fc 100644 --- a/tests/boundary/mcp/investigationAnalysisMcp.test.ts +++ b/tests/boundary/mcp/investigationAnalysisMcp.test.ts @@ -12,7 +12,7 @@ import { import { createAnalysisExecution, type AnalysisOperationPort, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import type { BinarySession } from "../../../src/application/binary/BinarySession.js"; import { FUNCTION_COMPARISON_EXAMPLE } from "../../../src/contracts/functionComparisonExample.js"; import { diff --git a/tests/boundary/mcp/investigationLifecycleMcp.test.ts b/tests/boundary/mcp/investigationLifecycleMcp.test.ts index 441ae1ebe3..05034db27a 100644 --- a/tests/boundary/mcp/investigationLifecycleMcp.test.ts +++ b/tests/boundary/mcp/investigationLifecycleMcp.test.ts @@ -5,7 +5,7 @@ import { dirname, join } from "node:path"; import { expect, it, onTestFinished, vi } from "vitest"; import { z } from "zod"; -import type { AnalysisClient } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisClient } from "../../../src/ports/AnalysisProvider.js"; import { FUNCTION_COMPARISON_EXAMPLE } from "../../../src/contracts/functionComparisonExample.js"; import { createEvidenceBundle, diff --git a/tests/boundary/mcp/jebMcp.test.ts b/tests/boundary/mcp/jebMcp.test.ts index a54ea7139e..2e0ab2d5ed 100644 --- a/tests/boundary/mcp/jebMcp.test.ts +++ b/tests/boundary/mcp/jebMcp.test.ts @@ -6,14 +6,14 @@ import { z } from "zod"; import type { JebAnalysisPort, JebAnalysisAvailability, -} from "../../../src/application/jeb/JebAnalysisPort.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/jeb/JebAnalysisPort.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { AnalysisTimeoutError } from "../../../src/domain/analysisErrorCore.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import { JebMcpCleanupFailure } from "../../../src/jeb/JebMcpConnectionOwner.js"; import { jebMcpTimeoutGuidance } from "../../../src/jeb/JebMcpDeadline.js"; import type { JebMcpConnection } from "../../../src/jeb/JebMcpConnection.js"; diff --git a/tests/boundary/mcp/largeToolResult.test.ts b/tests/boundary/mcp/largeToolResult.test.ts index be8e956823..f3d141119c 100644 --- a/tests/boundary/mcp/largeToolResult.test.ts +++ b/tests/boundary/mcp/largeToolResult.test.ts @@ -9,7 +9,7 @@ import { import { describe, expect, it } from "vitest"; import { z } from "zod"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { createEvidence, diff --git a/tests/boundary/mcp/lateAbortApplicationEvidenceMcp.test.ts b/tests/boundary/mcp/lateAbortApplicationEvidenceMcp.test.ts index 337cf2718a..f003d6259b 100644 --- a/tests/boundary/mcp/lateAbortApplicationEvidenceMcp.test.ts +++ b/tests/boundary/mcp/lateAbortApplicationEvidenceMcp.test.ts @@ -10,8 +10,8 @@ import type { GoBinary } from "../../../src/domain/go/goBinary.js"; import { silentLogger } from "../../../src/logger.js"; import { createServer } from "../../../src/server/createServer.js"; import { ok } from "../../../src/domain/result.js"; -import type { JavaScriptRuntimeObservationPort } from "../../../src/application/javascript/JavaScriptRuntimeObservationPort.js"; -import type { BrowserObservationPort } from "../../../src/application/BrowserObservationPort.js"; +import type { JavaScriptRuntimeObservationPort } from "../../../src/ports/javascript/JavaScriptRuntimeObservationPort.js"; +import type { BrowserObservationPort } from "../../../src/ports/BrowserObservationPort.js"; import type { BrowserTargetList } from "../../../src/domain/browserObservationSchemas.js"; import type { JavaScriptRuntimeTargetList } from "../../../src/domain/javascript/javascriptRuntimeObservation.js"; import { waitFor } from "../../support/testWait.js"; diff --git a/tests/boundary/mcp/nativeDispatchAvailability.test.ts b/tests/boundary/mcp/nativeDispatchAvailability.test.ts index b96f5b0acf..de2d2026c5 100644 --- a/tests/boundary/mcp/nativeDispatchAvailability.test.ts +++ b/tests/boundary/mcp/nativeDispatchAvailability.test.ts @@ -9,8 +9,8 @@ import type { AnalysisClient, AnalysisProvider, CapabilityDescriptor, -} from "../../../src/application/AnalysisProvider.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { AnalysisProviderRegistry } from "../../../src/application/binary/AnalysisProviderRegistry.js"; import { composeBinarySession } from "../../../src/application/binary/BinarySessionComposition.js"; import { AnalysisOutputError } from "../../../src/domain/analysisErrorCore.js"; diff --git a/tests/boundary/mcp/nativeInputContracts.test.ts b/tests/boundary/mcp/nativeInputContracts.test.ts index f8a9d183d2..b5eb717b65 100644 --- a/tests/boundary/mcp/nativeInputContracts.test.ts +++ b/tests/boundary/mcp/nativeInputContracts.test.ts @@ -2,11 +2,11 @@ import { Ajv2020 } from "ajv/dist/2020.js"; import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { afterEach, describe, expect, it } from "vitest"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { NATIVE_TOOL_CONTRACTS } from "../../../src/contracts/native/nativeToolContracts.js"; import type { JsonValue } from "../../../src/domain/jsonValue.js"; import { ok } from "../../../src/domain/result.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { createServer } from "../../../src/server/createServer.js"; const provider = { diff --git a/tests/boundary/mcp/nativeInstructionReferencesView.test.ts b/tests/boundary/mcp/nativeInstructionReferencesView.test.ts index 4538496624..8b1dc8e77b 100644 --- a/tests/boundary/mcp/nativeInstructionReferencesView.test.ts +++ b/tests/boundary/mcp/nativeInstructionReferencesView.test.ts @@ -3,7 +3,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { readFile } from "node:fs/promises"; import { join } from "node:path"; import { afterAll, expect, it } from "vitest"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { createServer } from "../../../src/server/createServer.js"; import { createToolResultDelivery } from "../../../src/server/toolResult.js"; import { createEvidence, parseEvidence } from "../../../src/domain/evidence.js"; diff --git a/tests/boundary/mcp/nativeInventoryViewsMcp.test.ts b/tests/boundary/mcp/nativeInventoryViewsMcp.test.ts index 42ba1d91fb..123f4a117e 100644 --- a/tests/boundary/mcp/nativeInventoryViewsMcp.test.ts +++ b/tests/boundary/mcp/nativeInventoryViewsMcp.test.ts @@ -3,7 +3,7 @@ import { Ajv2020 } from "ajv/dist/2020.js"; import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it, onTestFinished } from "vitest"; import { z } from "zod"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { inspectAnalysisViewInputSchema } from "../../../src/domain/analysisView/analysisViewRequest.js"; import { createEvidence, parseEvidence } from "../../../src/domain/evidence.js"; diff --git a/tests/boundary/mcp/nativeLoadImageViewsMcp.test.ts b/tests/boundary/mcp/nativeLoadImageViewsMcp.test.ts index e822344c30..65d8de4b3f 100644 --- a/tests/boundary/mcp/nativeLoadImageViewsMcp.test.ts +++ b/tests/boundary/mcp/nativeLoadImageViewsMcp.test.ts @@ -1,6 +1,6 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it, onTestFinished } from "vitest"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { ok } from "../../../src/domain/result.js"; import { createServer } from "../../../src/server/createServer.js"; diff --git a/tests/boundary/mcp/nativeObservationViewsMcp.test.ts b/tests/boundary/mcp/nativeObservationViewsMcp.test.ts index 59cb0a3427..ad0f026ded 100644 --- a/tests/boundary/mcp/nativeObservationViewsMcp.test.ts +++ b/tests/boundary/mcp/nativeObservationViewsMcp.test.ts @@ -1,5 +1,5 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { createTestBinarySession } from "../../fixtures/binarySession.js"; import { createServer } from "../../../src/server/createServer.js"; import { createToolResultDelivery } from "../../../src/server/toolResult.js"; diff --git a/tests/boundary/mcp/nativeUiAvailability.test.ts b/tests/boundary/mcp/nativeUiAvailability.test.ts index 9f30ae713c..2a1372a3c6 100644 --- a/tests/boundary/mcp/nativeUiAvailability.test.ts +++ b/tests/boundary/mcp/nativeUiAvailability.test.ts @@ -12,8 +12,8 @@ import type { AnalysisProvider, CapabilityDescriptor, AnalysisOperation, -} from "../../../src/application/AnalysisProvider.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import type { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { AnalysisCancelledError, diff --git a/tests/boundary/mcp/nativeUiFactsMcp.test.ts b/tests/boundary/mcp/nativeUiFactsMcp.test.ts index a5dcf58e69..343fb7e1e7 100644 --- a/tests/boundary/mcp/nativeUiFactsMcp.test.ts +++ b/tests/boundary/mcp/nativeUiFactsMcp.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it, onTestFinished, vi } from "vitest"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { expandToolAvailability } from "../../../src/contracts/toolOutputSchemaPrimitives.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; diff --git a/tests/boundary/mcp/nativeUiFinalizationMcp.test.ts b/tests/boundary/mcp/nativeUiFinalizationMcp.test.ts index d1bfee117f..62a60a022a 100644 --- a/tests/boundary/mcp/nativeUiFinalizationMcp.test.ts +++ b/tests/boundary/mcp/nativeUiFinalizationMcp.test.ts @@ -2,7 +2,7 @@ import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it, vi } from "vitest"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import * as runtimes from "../../../src/native/NativeUiHelperRuntime.js"; import { NativeMacOSProvider } from "../../../src/native/NativeMacOSProvider.js"; import { createServer } from "../../../src/server/createServer.js"; diff --git a/tests/boundary/mcp/nativeUiPartialCallRoutesMcp.test.ts b/tests/boundary/mcp/nativeUiPartialCallRoutesMcp.test.ts index 05ae62e416..e72aede1d7 100644 --- a/tests/boundary/mcp/nativeUiPartialCallRoutesMcp.test.ts +++ b/tests/boundary/mcp/nativeUiPartialCallRoutesMcp.test.ts @@ -4,9 +4,9 @@ import { z } from "zod"; import type { AnalysisExecution, AnalysisOperationPort, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import type { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { AnalysisCancelledError, AnalysisCapabilityUnavailableError, diff --git a/tests/boundary/mcp/nativeValueFlowAvailability.test.ts b/tests/boundary/mcp/nativeValueFlowAvailability.test.ts index 7ba546cfc4..111f4a4e9e 100644 --- a/tests/boundary/mcp/nativeValueFlowAvailability.test.ts +++ b/tests/boundary/mcp/nativeValueFlowAvailability.test.ts @@ -1,7 +1,7 @@ import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { afterAll, expect, it } from "vitest"; -import type { AnalysisProvider } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisProvider } from "../../../src/ports/AnalysisProvider.js"; import { valueTraceDiamond, valueTraceProvider, diff --git a/tests/boundary/mcp/nativeValueTraceCleanupIncomplete.test.ts b/tests/boundary/mcp/nativeValueTraceCleanupIncomplete.test.ts index af3a76ba64..b5ca5bed77 100644 --- a/tests/boundary/mcp/nativeValueTraceCleanupIncomplete.test.ts +++ b/tests/boundary/mcp/nativeValueTraceCleanupIncomplete.test.ts @@ -5,7 +5,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { afterEach, describe, expect, it } from "vitest"; import { z } from "zod"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { EXPECTED_CLEANUP_STOPPED_TRACE, failingValueTraceReads, diff --git a/tests/boundary/mcp/nativeValueTraceCompleteness.test.ts b/tests/boundary/mcp/nativeValueTraceCompleteness.test.ts index 65ea6ed5e1..0bcbe06ae9 100644 --- a/tests/boundary/mcp/nativeValueTraceCompleteness.test.ts +++ b/tests/boundary/mcp/nativeValueTraceCompleteness.test.ts @@ -4,7 +4,7 @@ import { valueTraceDiamond, valueTraceUnboundArguments, } from "../../../src/application/native/NativeValueTrace.fixture.js"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { functionDossierSchema } from "../../../src/domain/native/functionDossier.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { evidenceBundleSchema } from "../../../src/domain/evidenceBundle.js"; diff --git a/tests/boundary/mcp/ntfsJournal.test.ts b/tests/boundary/mcp/ntfsJournal.test.ts index e8fcb38b55..f383a5408d 100644 --- a/tests/boundary/mcp/ntfsJournal.test.ts +++ b/tests/boundary/mcp/ntfsJournal.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect, vi } from "vitest"; import { z } from "zod"; import { linkedMftFixture } from "../../fixtures/ntfsMftExtension.js"; -import * as stableArtifact from "../../../src/artifacts/readStableArtifact.js"; +import * as stableArtifact from "../../../src/resources/readStableArtifact.js"; import * as mftDecoder from "../../../src/domain/windows/ntfsMft.js"; import { createBinarySession } from "../../../src/composition/binary.js"; diff --git a/tests/boundary/mcp/officialArguments.test.ts b/tests/boundary/mcp/officialArguments.test.ts index 787bf006ed..398dbf0b9d 100644 --- a/tests/boundary/mcp/officialArguments.test.ts +++ b/tests/boundary/mcp/officialArguments.test.ts @@ -3,7 +3,7 @@ import { parseConfig } from "../../../src/config/parseConfig.js"; import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { describe, expect, it, onTestFinished } from "vitest"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { runDirectAnalysis } from "../../../src/application/DirectAnalysis.js"; import { functionDossierSchema } from "../../../src/domain/native/functionDossier.js"; import { ghidraFunctionDossier } from "../../../src/domain/ghidraValues.fixture.js"; diff --git a/tests/boundary/mcp/officialTools.test.ts b/tests/boundary/mcp/officialTools.test.ts index f262192431..18243212f9 100644 --- a/tests/boundary/mcp/officialTools.test.ts +++ b/tests/boundary/mcp/officialTools.test.ts @@ -3,7 +3,7 @@ import { Ajv2020 } from "ajv/dist/2020.js"; import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { afterEach, describe, expect, it } from "vitest"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { OFFICIAL_TOOL_CONTRACTS } from "../../../src/contracts/officialToolContracts.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { jsonObjectSchema } from "../../../src/domain/jsonValue.js"; diff --git a/tests/boundary/mcp/pcapMcp.test.ts b/tests/boundary/mcp/pcapMcp.test.ts index e36c0087df..0bd7c85264 100644 --- a/tests/boundary/mcp/pcapMcp.test.ts +++ b/tests/boundary/mcp/pcapMcp.test.ts @@ -2,7 +2,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it, onTestFinished } from "vitest"; import type { PcapAnalysisPort } from "../../../src/application/pcap/PcapAnalysisPort.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { assertAdvertisedMcpContracts } from "./mcpContractHarness.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { ok } from "../../../src/domain/result.js"; diff --git a/tests/boundary/mcp/processTraceAdaptersParity.test.ts b/tests/boundary/mcp/processTraceAdaptersParity.test.ts index 8dddeb90ad..8562a1e584 100644 --- a/tests/boundary/mcp/processTraceAdaptersParity.test.ts +++ b/tests/boundary/mcp/processTraceAdaptersParity.test.ts @@ -7,7 +7,7 @@ import { INLINE_EVIDENCE_MCP_ENVIRONMENT } from "../../../scripts/lib/mcp-verifi import { afterEach, describe, expect, it } from "vitest"; import { createTestBinarySession } from "../../fixtures/binarySession.js"; -import type { AnalysisClient } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisClient } from "../../../src/ports/AnalysisProvider.js"; import { compareProcessCaptureFiles } from "../../support/cli/processComparisonCli.js"; import { PROCESS_PROVIDER } from "../../../src/domain/process/processEvidenceProvider.js"; import { processTraceCaptureFixture } from "../../../src/domain/process/processCapture.fixture.js"; diff --git a/tests/boundary/mcp/progressMcp.test.ts b/tests/boundary/mcp/progressMcp.test.ts index 33bedf5f01..388e3436d3 100644 --- a/tests/boundary/mcp/progressMcp.test.ts +++ b/tests/boundary/mcp/progressMcp.test.ts @@ -7,7 +7,7 @@ import { withVerifierCleanup } from "../../../scripts/lib/verifier-cleanup.mjs"; import { createAnalysisExecution, type AnalysisOperationPort, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { FUNCTION_COMPARISON_EXAMPLE } from "../../../src/contracts/functionComparisonExample.js"; import { AnalysisCancelledError } from "../../../src/domain/analysisErrorCore.js"; import { err, ok } from "../../../src/domain/result.js"; diff --git a/tests/boundary/mcp/promptCompletion.test.ts b/tests/boundary/mcp/promptCompletion.test.ts index bca944bef4..6efd2fc77f 100644 --- a/tests/boundary/mcp/promptCompletion.test.ts +++ b/tests/boundary/mcp/promptCompletion.test.ts @@ -8,7 +8,7 @@ import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { createAnalysisExecution, type AnalysisClient, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import type { AnalysisProfileCommitment } from "../../../src/domain/analysisProfile.js"; import { createTestBinarySession } from "../../fixtures/binarySession.js"; import { ARTIFACT_COMPARISON_EXAMPLE } from "../../../src/contracts/artifactComparisonExample.js"; diff --git a/tests/boundary/mcp/promptMcp.test.ts b/tests/boundary/mcp/promptMcp.test.ts index 069b2dfe9a..a627a1d1fe 100644 --- a/tests/boundary/mcp/promptMcp.test.ts +++ b/tests/boundary/mcp/promptMcp.test.ts @@ -28,7 +28,7 @@ import { type AnalysisProviderCandidate, type CapabilityDescriptor, type ProviderIdentity, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import type { JsonValue } from "../../../src/domain/jsonValue.js"; import { AnalysisProviderRegistry } from "../../../src/application/binary/AnalysisProviderRegistry.js"; import { composeBinarySession } from "../../../src/application/binary/BinarySessionComposition.js"; diff --git a/tests/boundary/mcp/providerSelectionMcp.test.ts b/tests/boundary/mcp/providerSelectionMcp.test.ts index fe3748f8e9..c8c0b7c48b 100644 --- a/tests/boundary/mcp/providerSelectionMcp.test.ts +++ b/tests/boundary/mcp/providerSelectionMcp.test.ts @@ -22,7 +22,7 @@ import { type AnalysisProviderInspectionOptions, type CapabilityDescriptor, type ProviderIdentity, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { AnalysisProviderRegistry } from "../../../src/application/binary/AnalysisProviderRegistry.js"; import { composeBinarySession } from "../../../src/application/binary/BinarySessionComposition.js"; import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js"; diff --git a/tests/boundary/mcp/pseudocodeDeliveryMcp.test.ts b/tests/boundary/mcp/pseudocodeDeliveryMcp.test.ts index 55564664cf..20f7b6c1e6 100644 --- a/tests/boundary/mcp/pseudocodeDeliveryMcp.test.ts +++ b/tests/boundary/mcp/pseudocodeDeliveryMcp.test.ts @@ -2,7 +2,7 @@ import { closeVerifierResources } from "../../../scripts/lib/verifier-cleanup.mj import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it, onTestFinished } from "vitest"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { OFFICIAL_TOOL_CONTRACTS } from "../../../src/contracts/officialToolContracts.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { jsonObjectSchema } from "../../../src/domain/jsonValue.js"; diff --git a/tests/boundary/mcp/rawBinaryMcp.test.ts b/tests/boundary/mcp/rawBinaryMcp.test.ts index 43fd458eb5..795c281b46 100644 --- a/tests/boundary/mcp/rawBinaryMcp.test.ts +++ b/tests/boundary/mcp/rawBinaryMcp.test.ts @@ -9,7 +9,7 @@ import { z } from "zod"; import { createServer } from "../../../src/server/createServer.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; -import type { AnalysisProvider } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisProvider } from "../../../src/ports/AnalysisProvider.js"; import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js"; import { ProviderAdapterError } from "../../../src/domain/providerAdapterError.js"; import { err, ok } from "../../../src/domain/result.js"; diff --git a/tests/boundary/mcp/registerGuidanceTools.test.ts b/tests/boundary/mcp/registerGuidanceTools.test.ts index 174f6b3372..dd2e89f517 100644 --- a/tests/boundary/mcp/registerGuidanceTools.test.ts +++ b/tests/boundary/mcp/registerGuidanceTools.test.ts @@ -1,6 +1,6 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { afterEach, expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { readGuidanceSectionOutputSchema, searchGuidanceInputSchema, diff --git a/tests/boundary/mcp/reverseEngineeringPartialMcp.test.ts b/tests/boundary/mcp/reverseEngineeringPartialMcp.test.ts index 31a5157749..092ede93c6 100644 --- a/tests/boundary/mcp/reverseEngineeringPartialMcp.test.ts +++ b/tests/boundary/mcp/reverseEngineeringPartialMcp.test.ts @@ -21,7 +21,7 @@ import { createCacheProvider, createTestBinarySession, } from "../../fixtures/binarySession.js"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { EvidenceIntegrityError } from "../../../src/domain/evidenceErrors.js"; import { err, ok } from "../../../src/domain/result.js"; import type { WithAdmittedAnalysis } from "../../../src/server/analysisAdmission.js"; diff --git a/tests/boundary/mcp/reverseEngineeringProviderEnvironmentMcp.test.ts b/tests/boundary/mcp/reverseEngineeringProviderEnvironmentMcp.test.ts index b7b2d04a3d..882c1d4640 100644 --- a/tests/boundary/mcp/reverseEngineeringProviderEnvironmentMcp.test.ts +++ b/tests/boundary/mcp/reverseEngineeringProviderEnvironmentMcp.test.ts @@ -6,7 +6,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it } from "vitest"; import { createServer } from "../../../src/server/createServer.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { ok } from "../../../src/domain/result.js"; const analysis = { diff --git a/tests/boundary/mcp/serverIdentity.test.ts b/tests/boundary/mcp/serverIdentity.test.ts index af63cee100..f24992d20b 100644 --- a/tests/boundary/mcp/serverIdentity.test.ts +++ b/tests/boundary/mcp/serverIdentity.test.ts @@ -33,7 +33,7 @@ import { buildCapabilityInventory } from "../../../src/application/CapabilityInv import type { AnalysisProvider, CapabilityDescriptor, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; const availabilityProvider = ( operations: readonly CapabilityDescriptor["operation"][] = [ diff --git a/tests/boundary/mcp/serverLifecycleMcp.test.ts b/tests/boundary/mcp/serverLifecycleMcp.test.ts index 2083a89048..6ac1734db1 100644 --- a/tests/boundary/mcp/serverLifecycleMcp.test.ts +++ b/tests/boundary/mcp/serverLifecycleMcp.test.ts @@ -5,7 +5,7 @@ import type { CallToolResult } from "@modelcontextprotocol/server"; import { afterEach, expect, it } from "vitest"; import { awaitAcknowledgement } from "../../fixtures/lifecycleAcknowledgement.js"; -import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; +import type { AnalysisOperationPort } from "../../../src/ports/AnalysisProvider.js"; import { HopperRemoteError } from "../../../src/domain/hopperErrors.js"; import { err } from "../../../src/domain/result.js"; import { observed as ok } from "../../fixtures/analysisExecution.js"; @@ -41,7 +41,7 @@ import { Il2cppMetadataService } from "../../../src/application/il2cpp/Il2cppMet import { WebNetworkCaptureService } from "../../../src/application/WebNetworkCaptureService.js"; import { AnalysisUnsupportedTargetError } from "../../../src/domain/analysisErrorCore.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; -import type { JavaScriptRuntimeObservationPort } from "../../../src/application/javascript/JavaScriptRuntimeObservationPort.js"; +import type { JavaScriptRuntimeObservationPort } from "../../../src/ports/javascript/JavaScriptRuntimeObservationPort.js"; const resources: Array<{ close(): Promise }> = []; diff --git a/tests/boundary/mcp/serverUnknownsMcp.test.ts b/tests/boundary/mcp/serverUnknownsMcp.test.ts index 1c7c0c928f..990dfafb58 100644 --- a/tests/boundary/mcp/serverUnknownsMcp.test.ts +++ b/tests/boundary/mcp/serverUnknownsMcp.test.ts @@ -13,7 +13,7 @@ import type { AnalysisClient, AnalysisProvider, CapabilityDescriptor, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { AnalysisCapabilityUnavailableError } from "../../../src/domain/analysisErrorCore.js"; import { err, ok as resultOk } from "../../../src/domain/result.js"; import { observed as ok } from "../../fixtures/analysisExecution.js"; diff --git a/tests/boundary/mcp/serverWorkflowMcp.test.ts b/tests/boundary/mcp/serverWorkflowMcp.test.ts index ac7931a604..d7304b9bde 100644 --- a/tests/boundary/mcp/serverWorkflowMcp.test.ts +++ b/tests/boundary/mcp/serverWorkflowMcp.test.ts @@ -12,7 +12,7 @@ import { createTestBinarySession } from "../../fixtures/binarySession.js"; import type { AnalysisClient, AnalysisOperationPort, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { observed as ok } from "../../fixtures/analysisExecution.js"; import { createServer } from "../../../src/server/createServer.js"; import { advertisedToolPresentation } from "../../../src/config/mcpOutputSchemaProfile.js"; diff --git a/tests/boundary/mcp/sessionAvailabilityRecovery.test.ts b/tests/boundary/mcp/sessionAvailabilityRecovery.test.ts index 49f1b5b95c..1557744311 100644 --- a/tests/boundary/mcp/sessionAvailabilityRecovery.test.ts +++ b/tests/boundary/mcp/sessionAvailabilityRecovery.test.ts @@ -7,7 +7,7 @@ import { type AnalysisProvider, type CapabilityDescriptor, type ProviderIdentity, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { expandToolAvailability } from "../../../src/contracts/toolOutputSchemaPrimitives.js"; import type { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; diff --git a/tests/boundary/mcp/sessionEvidenceReuseMcp.test.ts b/tests/boundary/mcp/sessionEvidenceReuseMcp.test.ts index 79ceb1586b..09c3ac8810 100644 --- a/tests/boundary/mcp/sessionEvidenceReuseMcp.test.ts +++ b/tests/boundary/mcp/sessionEvidenceReuseMcp.test.ts @@ -2,7 +2,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it } from "vitest"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { BinarySession } from "../../../src/application/binary/BinarySession.js"; import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js"; import { diff --git a/tests/boundary/mcp/sessionMcp.test.ts b/tests/boundary/mcp/sessionMcp.test.ts index c1a98d4687..7140b932e8 100644 --- a/tests/boundary/mcp/sessionMcp.test.ts +++ b/tests/boundary/mcp/sessionMcp.test.ts @@ -21,8 +21,8 @@ import type { AnalysisProvider, CapabilityDescriptor, ProviderAvailability, -} from "../../../src/application/AnalysisProvider.js"; -import type { AndroidAnalysisPort } from "../../../src/application/android/AndroidAnalysisPort.js"; +} from "../../../src/ports/AnalysisProvider.js"; +import type { AndroidAnalysisPort } from "../../../src/ports/android/AndroidAnalysisPort.js"; import type { AdbDeviceAnalysisPort } from "../../../src/application/adb/AdbDeviceAnalysisPort.js"; import type { ApktoolResourceAnalysisPort } from "../../../src/application/apktool/ApktoolResourceAnalysisPort.js"; import { observed as ok } from "../../fixtures/analysisExecution.js"; diff --git a/tests/boundary/mcp/sessionMcpHarness.ts b/tests/boundary/mcp/sessionMcpHarness.ts index 4a5312a38c..3d22454d08 100644 --- a/tests/boundary/mcp/sessionMcpHarness.ts +++ b/tests/boundary/mcp/sessionMcpHarness.ts @@ -13,8 +13,8 @@ import { createEvidence } from "../../../src/domain/evidence.js"; import type { ProviderAvailability, AnalysisProvider, -} from "../../../src/application/AnalysisProvider.js"; -import type { AndroidAnalysisPort } from "../../../src/application/android/AndroidAnalysisPort.js"; +} from "../../../src/ports/AnalysisProvider.js"; +import type { AndroidAnalysisPort } from "../../../src/ports/android/AndroidAnalysisPort.js"; import type { AdbDeviceAnalysisPort } from "../../../src/application/adb/AdbDeviceAnalysisPort.js"; import type { ApktoolResourceAnalysisPort } from "../../../src/application/apktool/ApktoolResourceAnalysisPort.js"; import { diff --git a/tests/boundary/mcp/sourcePublicationContext.test.ts b/tests/boundary/mcp/sourcePublicationContext.test.ts index 8b758b5c0b..803c80138a 100644 --- a/tests/boundary/mcp/sourcePublicationContext.test.ts +++ b/tests/boundary/mcp/sourcePublicationContext.test.ts @@ -8,7 +8,7 @@ import { createTestProviderRouter } from "../../fixtures/binarySession.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { BinarySession } from "../../../src/application/binary/BinarySession.js"; import { InvestigationRecords } from "../../../src/application/investigation/InvestigationRecords.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { createEvidence } from "../../../src/domain/evidence.js"; import { AnalysisCapabilityUnavailableError } from "../../../src/domain/analysisErrorCore.js"; import { err, ok } from "../../../src/domain/result.js"; diff --git a/tests/boundary/mcp/sourcePublicationRecovery.test.ts b/tests/boundary/mcp/sourcePublicationRecovery.test.ts index 3ba705a09a..8f7b63c6b4 100644 --- a/tests/boundary/mcp/sourcePublicationRecovery.test.ts +++ b/tests/boundary/mcp/sourcePublicationRecovery.test.ts @@ -8,7 +8,7 @@ import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { parseMcpToolError } from "../../fixtures/mcpToolError.js"; import { BinarySession } from "../../../src/application/binary/BinarySession.js"; import { InvestigationRecords } from "../../../src/application/investigation/InvestigationRecords.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../../../src/domain/analysisObservation.js"; import { UNRETAINED_EVIDENCE_EXPORT_GUIDANCE } from "../../../src/domain/analysisErrorPresentation.js"; import { createEvidence, type Evidence } from "../../../src/domain/evidence.js"; diff --git a/tests/boundary/mcp/webModuleTraceMcp.test.ts b/tests/boundary/mcp/webModuleTraceMcp.test.ts index da15071868..cc1cc1835d 100644 --- a/tests/boundary/mcp/webModuleTraceMcp.test.ts +++ b/tests/boundary/mcp/webModuleTraceMcp.test.ts @@ -1,10 +1,10 @@ import { withCanonicalOutputSchema } from "../../fixtures/canonicalOutputSchema.js"; import { AnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { WebArtifactCleanup } from "../../../src/browser/WebArtifactCleanup.js"; import { LocalWebScriptArtifacts } from "../../../src/browser/assets/LocalWebScriptArtifacts.js"; -import type { ExecutionOptions } from "../../../src/application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../../../src/ports/AnalysisProvider.js"; import { NativeModuleResolver } from "../../../src/browser/modules/NativeModuleResolver.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; import { parseMcpToolError } from "../../fixtures/mcpToolError.js"; diff --git a/tests/boundary/mcp/webScriptSelectionMcp.test.ts b/tests/boundary/mcp/webScriptSelectionMcp.test.ts index 1127ec2cfa..5404521915 100644 --- a/tests/boundary/mcp/webScriptSelectionMcp.test.ts +++ b/tests/boundary/mcp/webScriptSelectionMcp.test.ts @@ -6,7 +6,7 @@ import { promisify } from "node:util"; import { STDIO_DEFAULT_MAX_BUFFER_SIZE } from "@modelcontextprotocol/server"; import { expect, it, onTestFinished } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { silentLogger } from "../../../src/logger.js"; import { EvidenceMcpServer } from "../../../src/server/EvidenceMcpServer.js"; import { registerWebScriptTool } from "../../../src/server/registerWebScriptTool.js"; diff --git a/tests/boundary/mcp/workflowSnapshotReplayMcp.test.ts b/tests/boundary/mcp/workflowSnapshotReplayMcp.test.ts index 4b91845718..a6d7487478 100644 --- a/tests/boundary/mcp/workflowSnapshotReplayMcp.test.ts +++ b/tests/boundary/mcp/workflowSnapshotReplayMcp.test.ts @@ -11,7 +11,7 @@ import { createAnalysisExecution, type AnalysisProvider, type CapabilityDescriptor, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import type { DirectAnalysisDependencies } from "../../../src/application/DirectAnalysisDependencies.js"; import { runDirectAnalysis } from "../../../src/application/DirectAnalysis.js"; import { diff --git a/tests/boundary/native/PwndbgCoreContext.test.ts b/tests/boundary/native/PwndbgCoreContext.test.ts index 1c89134fc0..4c635d8be0 100644 --- a/tests/boundary/native/PwndbgCoreContext.test.ts +++ b/tests/boundary/native/PwndbgCoreContext.test.ts @@ -9,7 +9,7 @@ import { AnalysisCancelledError, AnalysisTimeoutError, } from "../../../src/domain/analysisErrorCore.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { createTestWorkspace, removeTestWorkspace, diff --git a/tests/boundary/native/pwndbgReplyFinalization.test.ts b/tests/boundary/native/pwndbgReplyFinalization.test.ts index 2cd08457fb..c8d7e6091c 100644 --- a/tests/boundary/native/pwndbgReplyFinalization.test.ts +++ b/tests/boundary/native/pwndbgReplyFinalization.test.ts @@ -34,7 +34,7 @@ vi.mock("node:fs/promises", async (original) => { }; }); -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { AnalysisError, primaryAnalysisError, diff --git a/tests/boundary/pcap/pcapProviderCancellation.test.ts b/tests/boundary/pcap/pcapProviderCancellation.test.ts index 1e66cd42b7..ae378b34e2 100644 --- a/tests/boundary/pcap/pcapProviderCancellation.test.ts +++ b/tests/boundary/pcap/pcapProviderCancellation.test.ts @@ -6,9 +6,9 @@ import { AnalysisArtifactChangedError, AnalysisCancelledError, } from "../../../src/domain/analysisErrorCore.js"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; -import { readStableArtifact } from "../../../src/artifacts/readStableArtifact.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; +import { readStableArtifact } from "../../../src/resources/readStableArtifact.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; import { resolvedAnalysisError } from "../../../src/domain/analysisErrorBase.js"; import { PrivateRuntimeRoot } from "../../../src/process/PrivateRuntimeRoot.js"; diff --git a/tests/boundary/process/androidAnalysisMcp.test.ts b/tests/boundary/process/androidAnalysisMcp.test.ts index 73bb2a0d9f..a8615fd77e 100644 --- a/tests/boundary/process/androidAnalysisMcp.test.ts +++ b/tests/boundary/process/androidAnalysisMcp.test.ts @@ -15,7 +15,7 @@ import { createServer } from "../../../src/server/createServer.js"; import { createToolResultDelivery } from "../../../src/server/toolResult.js"; import { startMcpTransport } from "../../../src/main/transport.js"; import type { RuntimeDependencies } from "../../../src/main/types.js"; -import type { AndroidAnalysisPort } from "../../../src/application/android/AndroidAnalysisPort.js"; +import type { AndroidAnalysisPort } from "../../../src/ports/android/AndroidAnalysisPort.js"; import { silentLogger } from "../../../src/logger.js"; import { parseBinaryTarget } from "../../../src/application/BinaryTargetResolver.js"; import { createTestBinarySession } from "../../fixtures/binarySession.js"; diff --git a/tests/boundary/process/artifactFileOutcomes.test.ts b/tests/boundary/process/artifactFileOutcomes.test.ts index 18427d0e14..b9f47e6892 100644 --- a/tests/boundary/process/artifactFileOutcomes.test.ts +++ b/tests/boundary/process/artifactFileOutcomes.test.ts @@ -6,9 +6,9 @@ import { SigrokRecordingProvider } from "../../../src/signals/SigrokRecordingPro import { TsharkCaptureProvider } from "../../../src/captures/TsharkCaptureProvider.js"; import { SignalRecordingService } from "../../../src/application/signals/SignalRecordingService.js"; import { PacketCaptureService } from "../../../src/application/captures/PacketCaptureService.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; -import { withArtifactRegularFile } from "../../../src/artifacts/ArtifactFileOperation.js"; -import { readStableArtifact } from "../../../src/artifacts/readStableArtifact.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; +import { withArtifactRegularFile } from "../../../src/resources/ArtifactFileOperation.js"; +import { readStableArtifact } from "../../../src/resources/readStableArtifact.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; import { PrivateRuntimeRoot } from "../../../src/process/PrivateRuntimeRoot.js"; import { spawnOwnedProviderProcess } from "../../../src/process/ProviderProcess.js"; diff --git a/tests/boundary/process/artifactProducerCancellation.test.ts b/tests/boundary/process/artifactProducerCancellation.test.ts index 00baf2b7a5..2282b1a112 100644 --- a/tests/boundary/process/artifactProducerCancellation.test.ts +++ b/tests/boundary/process/artifactProducerCancellation.test.ts @@ -10,10 +10,10 @@ import { inspectSignalDecodersInputSchema } from "../../../src/domain/signals/si import { inspectPacketCaptureInputSchema } from "../../../src/domain/captures/packetCapture.js"; import { inspectPacketFieldsInputSchema } from "../../../src/domain/captures/packetFields.js"; import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; -import { readStableArtifact } from "../../../src/artifacts/readStableArtifact.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { readStableArtifact } from "../../../src/resources/readStableArtifact.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; -import type { ExecutionOptions } from "../../../src/application/AnalysisProvider.js"; +import type { ExecutionOptions } from "../../../src/ports/AnalysisProvider.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; // Simulated Linux admission, real descriptors; no producer, limiter or target runs. diff --git a/tests/boundary/process/artifactSelectedCommand.test.ts b/tests/boundary/process/artifactSelectedCommand.test.ts index 375d024a2b..e569fcd395 100644 --- a/tests/boundary/process/artifactSelectedCommand.test.ts +++ b/tests/boundary/process/artifactSelectedCommand.test.ts @@ -31,7 +31,7 @@ import { PacketCaptureService } from "../../../src/application/captures/PacketCa import { SignalRecordingService } from "../../../src/application/signals/SignalRecordingService.js"; import { TsharkCaptureProvider } from "../../../src/captures/TsharkCaptureProvider.js"; import { SigrokRecordingProvider } from "../../../src/signals/SigrokRecordingProvider.js"; -import { readStableArtifact } from "../../../src/artifacts/readStableArtifact.js"; +import { readStableArtifact } from "../../../src/resources/readStableArtifact.js"; import { PrivateRuntimeRoot } from "../../../src/process/PrivateRuntimeRoot.js"; import type { LinuxResourceLimits } from "../../../src/process/LinuxResourceLimits.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/process/binarySessionCleanupRetry.test.ts b/tests/boundary/process/binarySessionCleanupRetry.test.ts index 4791c16a39..d530aa4581 100644 --- a/tests/boundary/process/binarySessionCleanupRetry.test.ts +++ b/tests/boundary/process/binarySessionCleanupRetry.test.ts @@ -1,7 +1,7 @@ import { access, mkdtemp, rmdir } from "node:fs/promises"; import { expect, it, onTestFinished } from "vitest"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { HopperStartError } from "../../../src/domain/hopperErrors.js"; import { err, ok as resultOk } from "../../../src/domain/result.js"; import type { diff --git a/tests/boundary/process/browserScenarioProbeLifecycle.test.ts b/tests/boundary/process/browserScenarioProbeLifecycle.test.ts index 2257890375..7614e0e6df 100644 --- a/tests/boundary/process/browserScenarioProbeLifecycle.test.ts +++ b/tests/boundary/process/browserScenarioProbeLifecycle.test.ts @@ -1,7 +1,7 @@ import { STDIO_DEFAULT_MAX_BUFFER_SIZE } from "@modelcontextprotocol/server"; import { expect, it, vi } from "vitest"; -import type { BrowserScenarioCapturePort } from "../../../src/application/BrowserScenarioCapturePort.js"; +import type { BrowserScenarioCapturePort } from "../../../src/ports/BrowserScenarioCapturePort.js"; import { createBrowserObservationProvider } from "../../../src/composition/browserObservation.js"; import { createElectronObservationProvider } from "../../../src/composition/electronObservation.js"; import { silentLogger } from "../../../src/logger.js"; diff --git a/tests/boundary/process/desktopBuildOwnedCommand.test.ts b/tests/boundary/process/desktopBuildOwnedCommand.test.ts index 4af4abf62b..eee6c588b2 100644 --- a/tests/boundary/process/desktopBuildOwnedCommand.test.ts +++ b/tests/boundary/process/desktopBuildOwnedCommand.test.ts @@ -2,7 +2,7 @@ import { mkdir, readFile, stat } from "node:fs/promises"; import { join } from "node:path"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { runDesktopBuildOwnedCommand } from "../../../src/desktop/DesktopBuildOwnedCommand.js"; import { prepareProcessOwnershipInspection } from "../../../src/process/ProcessOwnershipObservation.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/process/jadxIntegration.test.ts b/tests/boundary/process/jadxIntegration.test.ts index c4fd7decf0..77fba3ada9 100644 --- a/tests/boundary/process/jadxIntegration.test.ts +++ b/tests/boundary/process/jadxIntegration.test.ts @@ -1,6 +1,6 @@ import { SdkErrorCode } from "@modelcontextprotocol/client"; import { packagedJadxBridgeIdentity } from "../../support/packagedJadxBridge.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { expect, it as test, onTestFinished, vi } from "vitest"; import { access, diff --git a/tests/boundary/process/processCli.test.ts b/tests/boundary/process/processCli.test.ts index db77a847f1..aa21f2285d 100644 --- a/tests/boundary/process/processCli.test.ts +++ b/tests/boundary/process/processCli.test.ts @@ -17,10 +17,8 @@ import { parseProcessCaptureEvidence } from "../../../src/application/process/Pr import { PROCESS_PROVIDER } from "../../../src/domain/process/processEvidenceProvider.js"; import { INVESTIGATION_EXAMPLES } from "../../../src/contracts/investigationExamples.js"; import { observeProcessStartIdentity } from "../../../src/process/ProcessOwnershipObservation.js"; -import { - analysisCliErrorEnvelopeSchema, - analysisErrorProjectionSchema, -} from "../../../src/contracts/errorSchemas.js"; +import { analysisCliErrorEnvelopeSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; const execFileAsync = promisify(execFile); const CLI_INTEGRATION_TIMEOUT_MS = 60_000; diff --git a/tests/boundary/process/processSnapshotHandleOwnership.test.ts b/tests/boundary/process/processSnapshotHandleOwnership.test.ts index 1e86e1f034..51904e5b8e 100644 --- a/tests/boundary/process/processSnapshotHandleOwnership.test.ts +++ b/tests/boundary/process/processSnapshotHandleOwnership.test.ts @@ -100,7 +100,7 @@ vi.mock("node:fs/promises", async (importOriginal) => { }; }); -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import { processScenarioSchema } from "../../../src/domain/process/processScenario.js"; import { hashFile, diff --git a/tests/boundary/process/verifierArtifactScope.test.ts b/tests/boundary/process/verifierArtifactScope.test.ts index 68f1ad829c..fe33f99920 100644 --- a/tests/boundary/process/verifierArtifactScope.test.ts +++ b/tests/boundary/process/verifierArtifactScope.test.ts @@ -3,7 +3,7 @@ import { VerifierArtifactCleanupFailure, withVerifierArtifactScope, } from "../../../scripts/lib/verifier-artifact-scope.mjs"; -import type { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { awaitAcknowledgement } from "../../fixtures/lifecycleAcknowledgement.js"; it("retains the exact scope for retry and preserves the operation failure", async () => { diff --git a/tests/boundary/process/verifierFileResources.test.ts b/tests/boundary/process/verifierFileResources.test.ts index fbdb4c480d..4ebaeb5e57 100644 --- a/tests/boundary/process/verifierFileResources.test.ts +++ b/tests/boundary/process/verifierFileResources.test.ts @@ -21,7 +21,7 @@ it("retains an undefined verifier failure alongside real descriptor cleanup and import assert from 'node:assert/strict'; import { open } from 'node:fs/promises'; import { withVerifierResourceOwner } from ${JSON.stringify(new URL("../../../scripts/lib/verifier-file-resources.mjs", import.meta.url).href)}; - import { ArtifactResourceRetryFailure } from ${JSON.stringify(new URL("../../../dist/artifacts/ArtifactResourceScope.js", import.meta.url).href)}; + import { ArtifactResourceRetryFailure } from ${JSON.stringify(new URL("../../../dist/resources/ArtifactResourceScope.js", import.meta.url).href)}; const [path, peerPath] = process.argv.slice(1); const retained = await open(path, 'r'); const closeRetained = retained.close.bind(retained); @@ -103,7 +103,7 @@ it("retains and retries the exact descriptor after a verifier hash close failure const bytes = Buffer.from("owned verifier fixture"); await writeFile(path, bytes); const script = ` - import { ArtifactResourceScope } from ${JSON.stringify(new URL("../../../dist/artifacts/ArtifactResourceScope.js", import.meta.url).href)}; + import { ArtifactResourceScope } from ${JSON.stringify(new URL("../../../dist/resources/ArtifactResourceScope.js", import.meta.url).href)}; import { OwnedFileHandle } from ${JSON.stringify(new URL("../../../dist/filesystem/OwnedFileHandle.js", import.meta.url).href)}; import { hashVerifierFile } from ${JSON.stringify(new URL("../../../scripts/lib/verifier-file-resources.mjs", import.meta.url).href)}; const path = process.argv[1]; @@ -152,7 +152,7 @@ it("hashes and closes a clean verifier input", async () => { const bytes = Buffer.from("clean verifier fixture"); await writeFile(path, bytes); const script = ` - import { ArtifactResourceScope } from ${JSON.stringify(new URL("../../../dist/artifacts/ArtifactResourceScope.js", import.meta.url).href)}; + import { ArtifactResourceScope } from ${JSON.stringify(new URL("../../../dist/resources/ArtifactResourceScope.js", import.meta.url).href)}; import { hashVerifierFile } from ${JSON.stringify(new URL("../../../scripts/lib/verifier-file-resources.mjs", import.meta.url).href)}; const resources = new ArtifactResourceScope(); const identity = await hashVerifierFile(process.argv[1], resources); @@ -285,7 +285,7 @@ it import { syncBuiltinESMExports } from 'node:module'; import { validateVerifierJadxConfiguration } from ${JSON.stringify(new URL("../../../scripts/lib/jadx-configuration-inspection.mjs", import.meta.url).href)}; import { OwnedFileHandle } from ${JSON.stringify(new URL("../../../dist/filesystem/OwnedFileHandle.js", import.meta.url).href)}; - import { ArtifactResourceRetryFailure } from ${JSON.stringify(new URL("../../../dist/artifacts/ArtifactResourceScope.js", import.meta.url).href)}; + import { ArtifactResourceRetryFailure } from ${JSON.stringify(new URL("../../../dist/resources/ArtifactResourceScope.js", import.meta.url).href)}; const [serializedConfiguration, mode] = process.argv.slice(1); const configuration = JSON.parse(serializedConfiguration); const handles = new Set(); @@ -386,7 +386,7 @@ it.each(["late-close", "retry-close", "retained-close", "opaque-cancellation"])( import { SUPPORTED_GHIDRA_VERSION, SUPPORTED_GHIDRA_JAVA_MAJOR } from ${JSON.stringify(new URL("../../../dist/ghidra/GhidraReleasePolicy.js", import.meta.url).href)}; import { OwnedFileHandle } from ${JSON.stringify(new URL("../../../dist/filesystem/OwnedFileHandle.js", import.meta.url).href)}; import { RegularFileCleanupFailure } from ${JSON.stringify(new URL("../../../dist/filesystem/OwnedRegularFile.js", import.meta.url).href)}; - import { ArtifactResourceRetryFailure } from ${JSON.stringify(new URL("../../../dist/artifacts/ArtifactResourceScope.js", import.meta.url).href)}; + import { ArtifactResourceRetryFailure } from ${JSON.stringify(new URL("../../../dist/resources/ArtifactResourceScope.js", import.meta.url).href)}; const root = process.argv[1], mode = process.argv[2], options = JSON.parse(process.argv[3]); await mkdir(join(root, 'Ghidra')); await writeFile(join(root, 'Ghidra', 'application.properties'), 'application.version=' + SUPPORTED_GHIDRA_VERSION + '\napplication.java.min=' + SUPPORTED_GHIDRA_JAVA_MAJOR + '\n'); diff --git a/tests/boundary/providers/android/androidLateCompletion.test.ts b/tests/boundary/providers/android/androidLateCompletion.test.ts index 0293586dad..35f46667fb 100644 --- a/tests/boundary/providers/android/androidLateCompletion.test.ts +++ b/tests/boundary/providers/android/androidLateCompletion.test.ts @@ -4,7 +4,7 @@ import { AndroidAnalysisService } from "../../../../src/application/android/Andr import { AnalysisCancelledError } from "../../../../src/domain/analysisErrorCore.js"; import { ok } from "../../../../src/domain/result.js"; import { parseEvidence } from "../../../../src/domain/evidence.js"; -import type { AnalysisExecution } from "../../../../src/application/AnalysisProvider.js"; +import type { AnalysisExecution } from "../../../../src/ports/AnalysisProvider.js"; import { createJadxProtocolFixture } from "../../../fixtures/android/jadx.js"; it.each([ diff --git a/tests/boundary/providers/ghidra/ghidraCheckpointLifecycle.test.ts b/tests/boundary/providers/ghidra/ghidraCheckpointLifecycle.test.ts index 033e6e7a05..ea9bba9ac2 100644 --- a/tests/boundary/providers/ghidra/ghidraCheckpointLifecycle.test.ts +++ b/tests/boundary/providers/ghidra/ghidraCheckpointLifecycle.test.ts @@ -10,7 +10,7 @@ import { } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; import { createAnalysisProfile } from "../../../../src/domain/analysisProfile.js"; import { GhidraClient } from "../../../../src/ghidra/GhidraClient.js"; import type { BridgeMaxReplyBytes } from "../../../../src/config/bridgeMaxReplyBytes.js"; diff --git a/tests/boundary/providers/ghidra/ghidraClient.test.ts b/tests/boundary/providers/ghidra/ghidraClient.test.ts index bb621f4c0a..7bbbf02f6a 100644 --- a/tests/boundary/providers/ghidra/ghidraClient.test.ts +++ b/tests/boundary/providers/ghidra/ghidraClient.test.ts @@ -3,7 +3,7 @@ import type { BridgeMaxReplyBytes } from "../../../../src/config/bridgeMaxReplyB import { GhidraProvider } from "../../../../src/ghidra/GhidraProvider.js"; import { fixtureDosLoadImage } from "../../../../src/ghidra/GhidraLoadImage.fixture.js"; import { jsonValueSchema } from "../../../../src/domain/jsonValue.js"; -import { artifactFilePrimaryFacts } from "../../../../src/artifacts/ArtifactFileOperation.js"; +import { artifactFilePrimaryFacts } from "../../../../src/resources/ArtifactFileOperation.js"; import { AnalysisCancelledError, OwnerCancellation, @@ -29,7 +29,7 @@ import { ConfigurationError } from "../../../../src/domain/configurationErrors.j import { withVerifierCleanup } from "../../../../scripts/lib/verifier-cleanup.mjs"; import { awaitAcknowledgement } from "../../../fixtures/lifecycleAcknowledgement.js"; import type { Logger } from "pino"; -import type { ProgressUpdate } from "../../../../src/application/ProgressReporter.js"; +import type { ProgressUpdate } from "../../../../src/ports/ProgressReporter.js"; import { err, ok } from "../../../../src/domain/result.js"; import * as GhidraTransport from "../../../../src/ghidra/GhidraTransport.js"; diff --git a/tests/boundary/providers/ghidra/ghidraFileFailure.test.ts b/tests/boundary/providers/ghidra/ghidraFileFailure.test.ts index ab64340eef..8b54289234 100644 --- a/tests/boundary/providers/ghidra/ghidraFileFailure.test.ts +++ b/tests/boundary/providers/ghidra/ghidraFileFailure.test.ts @@ -7,12 +7,12 @@ import { ArtifactFileCleanupFailure, mapArtifactFileFailure, withArtifactRegularFile, -} from "../../../../src/artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; +} from "../../../../src/resources/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../../../../src/artifacts/AnalysisCleanupLease.js"; +} from "../../../../src/resources/AnalysisCleanupLease.js"; import { OwnedRegularFileOperationFailure } from "../../../../src/filesystem/OwnedRegularFile.js"; import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js"; import { diff --git a/tests/boundary/providers/ghidra/ghidraJavaLaunch.test.ts b/tests/boundary/providers/ghidra/ghidraJavaLaunch.test.ts index 6e36174217..0a9401672d 100644 --- a/tests/boundary/providers/ghidra/ghidraJavaLaunch.test.ts +++ b/tests/boundary/providers/ghidra/ghidraJavaLaunch.test.ts @@ -13,8 +13,8 @@ import { existsSync, statSync } from "node:fs"; import { createHash, randomUUID } from "node:crypto"; import { join } from "node:path"; import { describe, expect, it, onTestFinished, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; -import { ArtifactFileCleanupFailure } from "../../../../src/artifacts/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; +import { ArtifactFileCleanupFailure } from "../../../../src/resources/ArtifactFileOperation.js"; import { GhidraLaunchSupportError, ghidraJavaLaunch, @@ -48,7 +48,7 @@ import { GhidraProvider } from "../../../../src/ghidra/GhidraProvider.js"; import { GhidraClient } from "../../../../src/ghidra/GhidraClient.js"; import { parseConfig } from "../../../../src/config/parseConfig.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; -import { analysisErrorProjectionSchema } from "../../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../../src/domain/analysisErrorProjectionSchema.js"; import type { BinaryTarget } from "../../../../src/domain/binaryTargetTypes.js"; import { elf } from "../../../../src/domain/binaryTarget.fixture.js"; import { silentLogger } from "../../../../src/logger.js"; diff --git a/tests/boundary/providers/ghidra/ghidraLaunchOutcome.test.ts b/tests/boundary/providers/ghidra/ghidraLaunchOutcome.test.ts index 7fe758a76a..6a603967c6 100644 --- a/tests/boundary/providers/ghidra/ghidraLaunchOutcome.test.ts +++ b/tests/boundary/providers/ghidra/ghidraLaunchOutcome.test.ts @@ -2,7 +2,7 @@ import { createTestArtifactResourceScope } from "../../../fixtures/artifactResou import { DarwinProcessOwnershipInspectionError } from "../../../../src/process/DarwinProcessRunTokenReader.js"; import { primaryAnalysisError } from "../../../../src/domain/analysisErrorBase.js"; import { open } from "node:fs/promises"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js"; import { RegularFileCleanupFailure, diff --git a/tests/boundary/providers/ghidra/ghidraOomRetention.test.ts b/tests/boundary/providers/ghidra/ghidraOomRetention.test.ts index bd44ace4a3..5c7908fd37 100644 --- a/tests/boundary/providers/ghidra/ghidraOomRetention.test.ts +++ b/tests/boundary/providers/ghidra/ghidraOomRetention.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { describe, expect, it, onTestFinished } from "vitest"; import { parseConfig } from "../../../../src/config/parseConfig.js"; -import { analysisErrorProjectionSchema } from "../../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../../src/domain/analysisErrorProjectionSchema.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; import { elf } from "../../../../src/domain/binaryTarget.fixture.js"; import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js"; diff --git a/tests/boundary/providers/ghidra/ghidraProjectSnapshot.test.ts b/tests/boundary/providers/ghidra/ghidraProjectSnapshot.test.ts index 3da07249c0..d39bce8718 100644 --- a/tests/boundary/providers/ghidra/ghidraProjectSnapshot.test.ts +++ b/tests/boundary/providers/ghidra/ghidraProjectSnapshot.test.ts @@ -11,7 +11,7 @@ import { } from "node:fs/promises"; import { join } from "node:path"; import { afterEach, beforeEach, expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; import { copyExistingGhidraProject, fingerprintGhidraProject, diff --git a/tests/boundary/providers/hopper/bridgeLauncher.test.ts b/tests/boundary/providers/hopper/bridgeLauncher.test.ts index a4f9d64457..5b2d2ba15c 100644 --- a/tests/boundary/providers/hopper/bridgeLauncher.test.ts +++ b/tests/boundary/providers/hopper/bridgeLauncher.test.ts @@ -21,9 +21,9 @@ import { err, ok } from "../../../../src/domain/result.js"; import { HopperReleaseError } from "../../../../src/application/HopperReleaseFeed.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../../../../src/artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../../../../src/artifacts/ArtifactReader.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../../../../src/resources/AnalysisCleanupLease.js"; +import { ArtifactReaderFailure } from "../../../../src/resources/ArtifactReader.js"; import { PrivateRuntimeRoot } from "../../../../src/process/PrivateRuntimeRoot.js"; import { HopperClient } from "../../../../src/hopper/HopperClient.js"; import { selectLinuxPrivateDisplayStrategy } from "../../../../src/hopper/LinuxPrivateDisplayProbe.js"; @@ -649,6 +649,37 @@ it.skipIf(process.platform !== "linux")( }, ); +it("refuses a Linux demo launch when no launcher verification was supplied", async () => { + const directory = await createTestTempDirectory( + "rea-publisher-unconfigured-", + ); + const targetPath = join(directory, "target"); + await writeFile(targetPath, "fixture target"); + const selectPrivateDisplay = vi.fn(readyDirectDisplay); + const launcher = new HopperApplicationLauncher( + { ...options("/unused/Hopper"), targetPath }, + { platform: "linux", selectPrivateDisplay }, + ); + const result = await launcher.launch({ + directory, + socketPath: join(directory, "bridge.sock"), + token: "fixture-token", + runId: randomUUID(), + }); + if (result.ok) throw new Error("Unverified launcher started"); + expect(projectAnalysisError(result.error)).toMatchObject({ + code: "provider_unavailable", + details: { + stage: "launch", + launch_rejection: { + boundary: "publisher_verification", + reason: "verification_unavailable", + }, + }, + }); + expect(selectPrivateDisplay).not.toHaveBeenCalled(); +}); + it.skipIf(process.platform !== "linux")( "asks the demo helper to shut down orderly so its X lock is removed", async () => { diff --git a/tests/boundary/providers/hopper/hopperClient.externalExit.test.ts b/tests/boundary/providers/hopper/hopperClient.externalExit.test.ts index e574a4f743..0998fc9d10 100644 --- a/tests/boundary/providers/hopper/hopperClient.externalExit.test.ts +++ b/tests/boundary/providers/hopper/hopperClient.externalExit.test.ts @@ -10,7 +10,7 @@ import { type AnalysisProviderCandidate, type CapabilityDescriptor, type ProviderIdentity, -} from "../../../../src/application/AnalysisProvider.js"; +} from "../../../../src/ports/AnalysisProvider.js"; import { AnalysisProviderRegistry } from "../../../../src/application/binary/AnalysisProviderRegistry.js"; import { BinarySession } from "../../../../src/application/binary/BinarySession.js"; import { SessionProviderRouter } from "../../../../src/application/binary/SessionProviderRouter.js"; diff --git a/tests/boundary/providers/hopper/linuxPrivateDisplay.test.ts b/tests/boundary/providers/hopper/linuxPrivateDisplay.test.ts index ff2e4aa958..a12b5ad2a2 100644 --- a/tests/boundary/providers/hopper/linuxPrivateDisplay.test.ts +++ b/tests/boundary/providers/hopper/linuxPrivateDisplay.test.ts @@ -17,7 +17,7 @@ import { } from "../../../../src/domain/hopperStartupFailure.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; import { HopperProcessError } from "../../../../src/domain/hopperErrors.js"; -import { analysisErrorProjectionSchema } from "../../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../../src/domain/analysisErrorProjectionSchema.js"; import { runLinuxPrivateDisplayProbe, selectLinuxPrivateDisplayStrategy, diff --git a/tests/boundary/providers/ida/idaCapabilityInventory.test.ts b/tests/boundary/providers/ida/idaCapabilityInventory.test.ts index 3ace7dcdf5..022faf4a00 100644 --- a/tests/boundary/providers/ida/idaCapabilityInventory.test.ts +++ b/tests/boundary/providers/ida/idaCapabilityInventory.test.ts @@ -1,6 +1,6 @@ import { IDA_COMPATIBILITY_PROFILES } from "../../../../src/ida/IdaConfiguration.js"; import { expect, it } from "vitest"; -import type { CapabilityDescriptor } from "../../../../src/application/AnalysisProvider.js"; +import type { CapabilityDescriptor } from "../../../../src/ports/AnalysisProvider.js"; import { buildCapabilityInventory } from "../../../../src/application/CapabilityInventory.js"; import { providerCapabilitySets } from "../../../../src/application/binary/BinarySessionStatus.js"; import { idaCapabilities } from "../../../../src/ida/IdaProviderCapabilities.js"; diff --git a/tests/boundary/providers/kuna/kunaCommandLifetime.test.ts b/tests/boundary/providers/kuna/kunaCommandLifetime.test.ts index 240c9d901a..3acaad8734 100644 --- a/tests/boundary/providers/kuna/kunaCommandLifetime.test.ts +++ b/tests/boundary/providers/kuna/kunaCommandLifetime.test.ts @@ -6,8 +6,8 @@ import { session } from "./kunaSessionFixture.js"; const SCRIPT = String.raw` import assert from "node:assert/strict"; -import { ArtifactResourceScope } from "./dist/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "./dist/artifacts/AnalysisCleanupLease.js"; +import { ArtifactResourceScope } from "./dist/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "./dist/resources/AnalysisCleanupLease.js"; import { inspectKunaInstallation } from "./dist/kuna/KunaInstallation.js"; import { KunaTargetCommands } from "./dist/kuna/KunaTargetCommands.js"; const fixture = JSON.parse(process.env.REA_TEST_KUNA_FIXTURE); diff --git a/tests/boundary/providers/kuna/kunaHashOwnerPropagation.test.ts b/tests/boundary/providers/kuna/kunaHashOwnerPropagation.test.ts index 6b733b7039..6270d2277a 100644 --- a/tests/boundary/providers/kuna/kunaHashOwnerPropagation.test.ts +++ b/tests/boundary/providers/kuna/kunaHashOwnerPropagation.test.ts @@ -14,8 +14,8 @@ import { AnalysisError } from "../../../../src/domain/analysisErrorBase.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; import { awaitAcknowledgement } from "../../../fixtures/lifecycleAcknowledgement.js"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; -import type { RetainedResourceScope } from "../../../../src/application/AnalysisProvider.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; +import type { RetainedResourceScope } from "../../../../src/ports/AnalysisProvider.js"; const injected = vi.hoisted(() => ({ failNextClose: false, diff --git a/tests/boundary/providers/kuna/kunaInstallationLifetime.test.ts b/tests/boundary/providers/kuna/kunaInstallationLifetime.test.ts index 903b0c9122..84dabfd0c6 100644 --- a/tests/boundary/providers/kuna/kunaInstallationLifetime.test.ts +++ b/tests/boundary/providers/kuna/kunaInstallationLifetime.test.ts @@ -61,8 +61,8 @@ vi.mock("../../../../src/filesystem/RegularFile.js", async (importOriginal) => { }; }); -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; -import type { RetainedResourceScope } from "../../../../src/application/AnalysisProvider.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; +import type { RetainedResourceScope } from "../../../../src/ports/AnalysisProvider.js"; import { inspectKunaInstallation, kunaInstallationCancellation, diff --git a/tests/boundary/providers/kuna/kunaInventoryPlacement.test.ts b/tests/boundary/providers/kuna/kunaInventoryPlacement.test.ts index 397ddc4eca..418490cc50 100644 --- a/tests/boundary/providers/kuna/kunaInventoryPlacement.test.ts +++ b/tests/boundary/providers/kuna/kunaInventoryPlacement.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect, it, onTestFinished } from "vitest"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; import { copyAndHash } from "../../../../src/kuna/KunaCommand.js"; import { MACHO_LOAD_COMMAND_PREFIX, diff --git a/tests/boundary/providers/kuna/kunaResourceScope.ts b/tests/boundary/providers/kuna/kunaResourceScope.ts index b151a91760..6bd17842e5 100644 --- a/tests/boundary/providers/kuna/kunaResourceScope.ts +++ b/tests/boundary/providers/kuna/kunaResourceScope.ts @@ -1,5 +1,5 @@ import { createInspectionResources } from "../../../fixtures/inspectionResources.js"; -import type { RetainedResourceScope } from "../../../../src/application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../../../../src/ports/AnalysisProvider.js"; import type { KunaInstallationOptions } from "../../../../src/kuna/KunaInstallation.js"; import { inspectKunaInstallation } from "../../../../src/kuna/KunaInstallation.js"; import { inspectKunaProvider } from "../../../../src/kuna/KunaDoctor.js"; diff --git a/tests/boundary/providers/kuna/kunaSelectedCommand.test.ts b/tests/boundary/providers/kuna/kunaSelectedCommand.test.ts index 2b37a93d3a..f8715816c7 100644 --- a/tests/boundary/providers/kuna/kunaSelectedCommand.test.ts +++ b/tests/boundary/providers/kuna/kunaSelectedCommand.test.ts @@ -10,7 +10,7 @@ import { import { join } from "node:path"; import { expect, it as test } from "vitest"; -import type { RetainedResourceScope } from "../../../../src/application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../../../../src/ports/AnalysisProvider.js"; import { runKunaCommand } from "../../../../src/kuna/KunaCommand.js"; import type { KunaInstallation } from "../../../../src/kuna/KunaInstallation.js"; import { KunaProjectCache } from "../../../../src/kuna/KunaProjectCache.js"; diff --git a/tests/boundary/providers/kuna/kunaSessionFixture.ts b/tests/boundary/providers/kuna/kunaSessionFixture.ts index 993ee77112..9f00cb525e 100644 --- a/tests/boundary/providers/kuna/kunaSessionFixture.ts +++ b/tests/boundary/providers/kuna/kunaSessionFixture.ts @@ -6,7 +6,7 @@ import { awaitAcknowledgement } from "../../../fixtures/lifecycleAcknowledgement import { onTestFinished } from "vitest"; -import type { AnalysisClient } from "../../../../src/application/AnalysisProvider.js"; +import type { AnalysisClient } from "../../../../src/ports/AnalysisProvider.js"; import type { BinaryTarget } from "../../../../src/domain/binaryTargetTypes.js"; import type { JsonValue } from "../../../../src/domain/jsonValue.js"; import type { KunaProcessLauncher } from "../../../../src/kuna/KunaCommand.js"; diff --git a/tests/boundary/providers/kuna/kunaSpanCloseOwnership.test.ts b/tests/boundary/providers/kuna/kunaSpanCloseOwnership.test.ts index 7e81f67fe0..b4a3b5f290 100644 --- a/tests/boundary/providers/kuna/kunaSpanCloseOwnership.test.ts +++ b/tests/boundary/providers/kuna/kunaSpanCloseOwnership.test.ts @@ -3,7 +3,7 @@ import { dirname, join } from "node:path"; import { afterEach, expect, it, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; import { AnalysisCancelledError } from "../../../../src/domain/analysisErrorCore.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; import { ProviderCleanupError } from "../../../../src/domain/providerCleanupError.js"; diff --git a/tests/boundary/providers/kuna/kunaVersionProbeOwnership.test.ts b/tests/boundary/providers/kuna/kunaVersionProbeOwnership.test.ts index eae94f0db0..12c3a9d22b 100644 --- a/tests/boundary/providers/kuna/kunaVersionProbeOwnership.test.ts +++ b/tests/boundary/providers/kuna/kunaVersionProbeOwnership.test.ts @@ -6,14 +6,14 @@ import { setTimeout as delay } from "node:timers/promises"; import { expect, it } from "vitest"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; import { createKunaResourceScope, inspectKunaInstallation, kunaInstallationCancellation, } from "../../../../src/kuna/KunaInstallation.js"; import { KunaProvider } from "../../../../src/kuna/KunaProvider.js"; -import type { RetainedResourceScope } from "../../../../src/application/AnalysisProvider.js"; +import type { RetainedResourceScope } from "../../../../src/ports/AnalysisProvider.js"; import { ProviderAdapterError } from "../../../../src/domain/providerAdapterError.js"; import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js"; import { RegularFileCleanupFailure } from "../../../../src/filesystem/OwnedRegularFile.js"; diff --git a/tests/boundary/providers/managed/managedMemberComparison.test.ts b/tests/boundary/providers/managed/managedMemberComparison.test.ts index 7d87773bb4..7e519aa446 100644 --- a/tests/boundary/providers/managed/managedMemberComparison.test.ts +++ b/tests/boundary/providers/managed/managedMemberComparison.test.ts @@ -7,7 +7,7 @@ import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js"; import { executeManagedMemberComparison } from "../../../../src/application/managed/ManagedMemberComparisonService.js"; -import { RetainedRegularFileCleanupFailure } from "../../../../src/application/RegularFileRead.js"; +import { RetainedRegularFileCleanupFailure } from "../../../../src/process/RegularFileRead.js"; import { createDirectAnalysis } from "../../../../src/composition/directAnalysis.js"; import { managedMemberComparisonResultSchema } from "../../../../src/domain/managed/managedMemberComparison.js"; import { readManagedMemberEvidence } from "../../../../src/domain/managed/managedMemberComparisonMatch.js"; diff --git a/tests/boundary/providers/managed/managedStaticProvider.test.ts b/tests/boundary/providers/managed/managedStaticProvider.test.ts index 4af7679749..3d0995c543 100644 --- a/tests/boundary/providers/managed/managedStaticProvider.test.ts +++ b/tests/boundary/providers/managed/managedStaticProvider.test.ts @@ -7,7 +7,7 @@ import { describe, expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; -import type { AnalysisExecution } from "../../../../src/application/AnalysisProvider.js"; +import type { AnalysisExecution } from "../../../../src/ports/AnalysisProvider.js"; import { parseBinaryTarget } from "../../../../src/application/BinaryTargetResolver.js"; import { managedArtifactInspectionSchema, @@ -18,7 +18,7 @@ import { ManagedStaticProvider } from "../../../../src/dotnet/ManagedStaticProvi import { buildManagedPeFixture } from "../../../../src/dotnet/ManagedPe.fixture.js"; import { readManagedSnapshot } from "../../../../src/dotnet/ManagedSnapshot.js"; import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.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/boundary/providers/native/artifactProvider.archiveSafety.test.ts b/tests/boundary/providers/native/artifactProvider.archiveSafety.test.ts index a064acf1fc..7b67b3855f 100644 --- a/tests/boundary/providers/native/artifactProvider.archiveSafety.test.ts +++ b/tests/boundary/providers/native/artifactProvider.archiveSafety.test.ts @@ -8,7 +8,7 @@ import { describe, expect, it } from "vitest"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; import { createDirectAnalysis } from "../../../../src/composition/directAnalysis.js"; -import { ENGLISH_UNICODE_CASE_INVENTORY_LIMITATION } from "../../../../src/artifacts/ArtifactPaths.js"; +import { ENGLISH_UNICODE_CASE_INVENTORY_LIMITATION } from "../../../../src/resources/ArtifactPaths.js"; import { artifactExtractionExecutionSchema } from "../../../../src/contracts/artifactToolContracts.js"; import { artifactInventoryResultSchema } from "../../../../src/domain/artifactGraph.js"; import type { BinaryTarget } from "../../../../src/domain/binaryTargetTypes.js"; diff --git a/tests/boundary/providers/native/artifactProvider.cleanupRetry.test.ts b/tests/boundary/providers/native/artifactProvider.cleanupRetry.test.ts index 94305038ab..e762093bab 100644 --- a/tests/boundary/providers/native/artifactProvider.cleanupRetry.test.ts +++ b/tests/boundary/providers/native/artifactProvider.cleanupRetry.test.ts @@ -6,9 +6,9 @@ import { expect, it, onTestFinished, vi } from "vitest"; import { ArtifactProvider } from "../../../../src/artifacts/ArtifactProvider.js"; import { parseBinaryTarget } from "../../../../src/application/BinaryTargetResolver.js"; -import { ArtifactReaderFailure } from "../../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../../src/resources/ArtifactReader.js"; import { AsarArtifactReader } from "../../../../src/artifacts/AsarArtifactReader.js"; -import { SafeOutputTree } from "../../../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../../../src/resources/SafeOutputTree.js"; import { ProviderCleanupError } from "../../../../src/domain/providerCleanupError.js"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/providers/native/artifactProvider.extractionSelection.test.ts b/tests/boundary/providers/native/artifactProvider.extractionSelection.test.ts index 56ece3b2bc..651e9b3993 100644 --- a/tests/boundary/providers/native/artifactProvider.extractionSelection.test.ts +++ b/tests/boundary/providers/native/artifactProvider.extractionSelection.test.ts @@ -29,7 +29,7 @@ import { artifactInventoryResultSchema, } from "../../../../src/domain/artifactGraph.js"; import type { BinaryTarget } from "../../../../src/domain/binaryTargetTypes.js"; -import type { ArtifactEntry } from "../../../../src/artifacts/ArtifactReader.js"; +import type { ArtifactEntry } from "../../../../src/resources/ArtifactReader.js"; import { ZipArtifactReader } from "../../../../src/artifacts/ZipArtifactReader.js"; import { cArchiveExecutable, diff --git a/tests/boundary/providers/native/artifactProvider.failureDetail.test.ts b/tests/boundary/providers/native/artifactProvider.failureDetail.test.ts index 94476e4753..0d8d662c2d 100644 --- a/tests/boundary/providers/native/artifactProvider.failureDetail.test.ts +++ b/tests/boundary/providers/native/artifactProvider.failureDetail.test.ts @@ -10,7 +10,7 @@ import { parseBinaryTarget } from "../../../../src/application/BinaryTargetResol import { destinationCaseCollision, ENGLISH_UNICODE_CASE_INVENTORY_LIMITATION, -} from "../../../../src/artifacts/ArtifactPaths.js"; +} from "../../../../src/resources/ArtifactPaths.js"; import { artifactInventoryResultSchema } from "../../../../src/domain/artifactGraph.js"; import { ArtifactOperationError } from "../../../../src/domain/artifactOperationError.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; diff --git a/tests/boundary/providers/native/artifactProvider.sourceCancellation.test.ts b/tests/boundary/providers/native/artifactProvider.sourceCancellation.test.ts index fe231c1e1d..15b8593a8a 100644 --- a/tests/boundary/providers/native/artifactProvider.sourceCancellation.test.ts +++ b/tests/boundary/providers/native/artifactProvider.sourceCancellation.test.ts @@ -11,7 +11,7 @@ import { join } from "node:path"; import type { Readable } from "node:stream"; import { expect, it, vi } from "vitest"; import { ArtifactProvider } from "../../../../src/artifacts/ArtifactProvider.js"; -import { SafeOutputTree } from "../../../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../../../src/resources/SafeOutputTree.js"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; it.each(["cancel", "denied-rollback", "control"] as const)( diff --git a/tests/boundary/providers/native/artifactProvider.universalExtraction.test.ts b/tests/boundary/providers/native/artifactProvider.universalExtraction.test.ts index db9ec952a7..2b43e10b39 100644 --- a/tests/boundary/providers/native/artifactProvider.universalExtraction.test.ts +++ b/tests/boundary/providers/native/artifactProvider.universalExtraction.test.ts @@ -8,7 +8,7 @@ import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js import { CPU_ARM64, universalMacho } from "../../../fixtures/universalMacho.js"; import { thinMach } from "../../../../src/domain/binaryTarget.fixture.js"; -import { ArtifactReaderFailure } from "../../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../../src/resources/ArtifactReader.js"; import { parseBinaryTarget } from "../../../../src/application/BinaryTargetResolver.js"; import { artifactExtractionExecutionSchema } from "../../../../src/contracts/artifactToolContracts.js"; diff --git a/tests/boundary/providers/native/artifactProvider.zipCancellation.test.ts b/tests/boundary/providers/native/artifactProvider.zipCancellation.test.ts index 8af0ae0ccb..abf0adef85 100644 --- a/tests/boundary/providers/native/artifactProvider.zipCancellation.test.ts +++ b/tests/boundary/providers/native/artifactProvider.zipCancellation.test.ts @@ -6,8 +6,8 @@ import { expect, it, vi } from "vitest"; import { parseBinaryTarget } from "../../../../src/application/BinaryTargetResolver.js"; import { ArtifactProvider } from "../../../../src/artifacts/ArtifactProvider.js"; -import { ArtifactReaderFailure } from "../../../../src/artifacts/ArtifactReader.js"; -import { SafeOutputTree } from "../../../../src/artifacts/SafeOutputTree.js"; +import { ArtifactReaderFailure } from "../../../../src/resources/ArtifactReader.js"; +import { SafeOutputTree } from "../../../../src/resources/SafeOutputTree.js"; import { artifactExtractionResultSchema } from "../../../../src/domain/artifactGraph.js"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/providers/native/lipoFieldOwnership.test.ts b/tests/boundary/providers/native/lipoFieldOwnership.test.ts index 16a7609d2d..4904253c1b 100644 --- a/tests/boundary/providers/native/lipoFieldOwnership.test.ts +++ b/tests/boundary/providers/native/lipoFieldOwnership.test.ts @@ -25,7 +25,7 @@ import { import { ArtifactReaderFailure, type ArtifactEntry, -} from "../../../../src/artifacts/ArtifactReader.js"; +} from "../../../../src/resources/ArtifactReader.js"; it.each(["absent", "valid", "uninterpretable"] as const)( "preserves %s lipo fields through native observations and structural slice inventory", diff --git a/tests/boundary/providers/native/lldbCallTracerFailures.test.ts b/tests/boundary/providers/native/lldbCallTracerFailures.test.ts index e35f32bdc1..56a86e6ea6 100644 --- a/tests/boundary/providers/native/lldbCallTracerFailures.test.ts +++ b/tests/boundary/providers/native/lldbCallTracerFailures.test.ts @@ -23,7 +23,7 @@ import { } from "../../../../src/domain/analysisErrorCore.js"; import { ProviderCleanupError } from "../../../../src/domain/providerCleanupError.js"; import { EvidenceIntegrityError } from "../../../../src/domain/evidenceErrors.js"; -import { ArtifactFileCleanupFailure } from "../../../../src/artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../../../../src/resources/ArtifactFileOperation.js"; import { resolvedAnalysisError } from "../../../../src/domain/analysisErrorBase.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; import { nativeCallObservationInputSchema } from "../../../../src/domain/native/nativeCallObservation.js"; diff --git a/tests/boundary/providers/native/nativeCallTargetCleanup.test.ts b/tests/boundary/providers/native/nativeCallTargetCleanup.test.ts index 8c9360f5df..c692304a4e 100644 --- a/tests/boundary/providers/native/nativeCallTargetCleanup.test.ts +++ b/tests/boundary/providers/native/nativeCallTargetCleanup.test.ts @@ -12,7 +12,7 @@ import { AnalysisOutputError } from "../../../../src/domain/analysisErrorCore.js import { resolvedAnalysisError } from "../../../../src/domain/analysisErrorBase.js"; import { err, ok } from "../../../../src/domain/result.js"; import { ProviderCleanupError } from "../../../../src/domain/providerCleanupError.js"; -import { ArtifactFileCleanupFailure } from "../../../../src/artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../../../../src/resources/ArtifactFileOperation.js"; const parameters = { breakpoints: [{ kind: "function", name: "main" }] }; const fixture = async () => { diff --git a/tests/boundary/providers/native/nativeDmgArtifactReader.test.ts b/tests/boundary/providers/native/nativeDmgArtifactReader.test.ts index 061508ab86..f2e18c41c3 100644 --- a/tests/boundary/providers/native/nativeDmgArtifactReader.test.ts +++ b/tests/boundary/providers/native/nativeDmgArtifactReader.test.ts @@ -22,8 +22,8 @@ import { type ArtifactEntry, type ArtifactReaderTraversal, type ArtifactTraversalOmission, -} from "../../../../src/artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; +} from "../../../../src/resources/ArtifactReader.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; import { DirectoryArtifactReader } from "../../../../src/artifacts/DirectoryArtifactReader.js"; import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js"; import { diff --git a/tests/boundary/providers/native/nativePlistBinarySource.test.ts b/tests/boundary/providers/native/nativePlistBinarySource.test.ts index 61786c9e1c..9c78c2ab46 100644 --- a/tests/boundary/providers/native/nativePlistBinarySource.test.ts +++ b/tests/boundary/providers/native/nativePlistBinarySource.test.ts @@ -8,7 +8,7 @@ import { AnalysisInputError, AnalysisResourceConstraintError, } from "../../../../src/domain/analysisErrorCore.js"; -import { ArtifactFileCleanupFailure } from "../../../../src/artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../../../../src/resources/ArtifactFileOperation.js"; import { ProviderAdapterError } from "../../../../src/domain/providerAdapterError.js"; import { buildBinary, type PlistValue } from "plist"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; diff --git a/tests/boundary/providers/native/nativePlistFileCleanup.test.ts b/tests/boundary/providers/native/nativePlistFileCleanup.test.ts index 0afd7da0ff..e5376c0612 100644 --- a/tests/boundary/providers/native/nativePlistFileCleanup.test.ts +++ b/tests/boundary/providers/native/nativePlistFileCleanup.test.ts @@ -2,7 +2,7 @@ import { open, writeFile, type FileHandle } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi, onTestFinished } from "vitest"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; -import { ArtifactFileCleanupFailure } from "../../../../src/artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../../../../src/resources/ArtifactFileOperation.js"; import { NativeFixtureRunner, nativeMachoTarget, @@ -13,8 +13,8 @@ import { awaitAcknowledgement } from "../../../fixtures/lifecycleAcknowledgement import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js"; import { ProviderCleanupError } from "../../../../src/domain/providerCleanupError.js"; import { resolvedAnalysisError } from "../../../../src/domain/analysisErrorBase.js"; -import { AnalysisCleanupLease } from "../../../../src/artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../../../../src/artifacts/ArtifactReader.js"; +import { AnalysisCleanupLease } from "../../../../src/resources/AnalysisCleanupLease.js"; +import { ArtifactReaderFailure } from "../../../../src/resources/ArtifactReader.js"; import { err, ok } from "../../../../src/domain/result.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; import { inspectPlistSchema } from "../../../../src/domain/native/nativeInspection.js"; diff --git a/tests/boundary/providers/native/nativeSelectedArchitecture.test.ts b/tests/boundary/providers/native/nativeSelectedArchitecture.test.ts index a25ab8b6f3..326315c86c 100644 --- a/tests/boundary/providers/native/nativeSelectedArchitecture.test.ts +++ b/tests/boundary/providers/native/nativeSelectedArchitecture.test.ts @@ -13,7 +13,7 @@ import { type NativeCommandRunner, } from "../../../../src/native/CommandRunner.js"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; -import type { AnalysisClient } from "../../../../src/application/AnalysisProvider.js"; +import type { AnalysisClient } from "../../../../src/ports/AnalysisProvider.js"; import { inspectionImage } from "../../../../src/native/NativeMachoInspection.fixture.js"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; import { diff --git a/tests/boundary/providers/native/nativeSignatureTargetBinding.test.ts b/tests/boundary/providers/native/nativeSignatureTargetBinding.test.ts index 2e8f52547a..291076db06 100644 --- a/tests/boundary/providers/native/nativeSignatureTargetBinding.test.ts +++ b/tests/boundary/providers/native/nativeSignatureTargetBinding.test.ts @@ -22,7 +22,7 @@ import { import { resolvedAnalysisError } from "../../../../src/domain/analysisErrorBase.js"; import { parseBinaryTarget } from "../../../../src/application/BinaryTargetResolver.js"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; -import { ArtifactResourceScope } from "../../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; import { withSignatureTarget, verifySignatureTarget, diff --git a/tests/boundary/providers/native/nativeUiFinalization.test.ts b/tests/boundary/providers/native/nativeUiFinalization.test.ts index f642a18c8f..a246c8e150 100644 --- a/tests/boundary/providers/native/nativeUiFinalization.test.ts +++ b/tests/boundary/providers/native/nativeUiFinalization.test.ts @@ -1,4 +1,4 @@ -import { AnalysisCleanupLease } from "../../../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../../../src/resources/AnalysisCleanupLease.js"; import { expect, it, vi, onTestFinished } from "vitest"; import * as runtimes from "../../../../src/native/NativeUiHelperRuntime.js"; import { observeNativeUi } from "../../../../src/native/NativeUiObservation.js"; diff --git a/tests/boundary/providers/native/objcClassMetadataFallback.test.ts b/tests/boundary/providers/native/objcClassMetadataFallback.test.ts index 68bfaa02b9..d9db6f039f 100644 --- a/tests/boundary/providers/native/objcClassMetadataFallback.test.ts +++ b/tests/boundary/providers/native/objcClassMetadataFallback.test.ts @@ -7,8 +7,8 @@ import { describe, expect, it } from "vitest"; import type { AnalysisOperation, AnalysisOperationPort, -} from "../../../../src/application/AnalysisProvider.js"; -import { createAnalysisExecution } from "../../../../src/application/AnalysisProvider.js"; +} from "../../../../src/ports/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../../src/ports/AnalysisProvider.js"; import { EnhancedTools } from "../../../../src/application/EnhancedTools.js"; import { layoutFor } from "../../../../src/native/AppleMachoSelection.fixture.js"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; diff --git a/tests/boundary/providers/ownedCommandCleanup.test.ts b/tests/boundary/providers/ownedCommandCleanup.test.ts index 1a1072882d..de1d6d4dc8 100644 --- a/tests/boundary/providers/ownedCommandCleanup.test.ts +++ b/tests/boundary/providers/ownedCommandCleanup.test.ts @@ -4,7 +4,7 @@ import { expect, it } from "vitest"; import { OwnedCommandFailure } from "../../../src/process/OwnedCommand.js"; import { retainOwnedCommandCleanup } from "../../../src/providers/OwnedCommandCleanup.js"; import { createInspectionResources } from "../../fixtures/inspectionResources.js"; -import { ArtifactResourceRetryFailure } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceRetryFailure } from "../../../src/resources/ArtifactResourceScope.js"; import { releaseOwnedCleanup } from "../../support/cleanupRelease.js"; it("retains every owned label without inventing a missing cleanup capability", async () => { diff --git a/tests/boundary/providers/readinessRemediationInventory.test.ts b/tests/boundary/providers/readinessRemediationInventory.test.ts index 198f56428d..b66e76c37d 100644 --- a/tests/boundary/providers/readinessRemediationInventory.test.ts +++ b/tests/boundary/providers/readinessRemediationInventory.test.ts @@ -1,7 +1,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import type { CapabilityDescriptor } from "../../../src/application/AnalysisProvider.js"; +import type { CapabilityDescriptor } from "../../../src/ports/AnalysisProvider.js"; import { buildCapabilityInventory } from "../../../src/application/CapabilityInventory.js"; import { providerCapabilitySets } from "../../../src/application/binary/BinarySessionStatus.js"; import { parseConfig } from "../../../src/config/parseConfig.js"; diff --git a/tests/boundary/setup/linuxHopperPublisherVerification.test.ts b/tests/boundary/setup/linuxHopperPublisherVerification.test.ts index f53b3ee9f4..f583e16c57 100644 --- a/tests/boundary/setup/linuxHopperPublisherVerification.test.ts +++ b/tests/boundary/setup/linuxHopperPublisherVerification.test.ts @@ -29,7 +29,7 @@ import { LinuxHopperPublisher, retryLinuxHopperPublisherCleanup, } from "../../../src/application/LinuxHopperPublisher.js"; -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { HOPPER_LINUX_PRIMARY_FINGERPRINT, HOPPER_RELEASES_URL, diff --git a/tests/boundary/signals/recordingEnvironment.test.ts b/tests/boundary/signals/recordingEnvironment.test.ts index 9029f1abb0..b050eb924a 100644 --- a/tests/boundary/signals/recordingEnvironment.test.ts +++ b/tests/boundary/signals/recordingEnvironment.test.ts @@ -3,7 +3,7 @@ import { join } from "node:path"; import { expect, it, onTestFinished } from "vitest"; import { SigrokRecordingProvider } from "../../../src/signals/SigrokRecordingProvider.js"; import { SignalRecordingService } from "../../../src/application/signals/SignalRecordingService.js"; -import { readStableArtifact } from "../../../src/artifacts/readStableArtifact.js"; +import { readStableArtifact } from "../../../src/resources/readStableArtifact.js"; import { PrivateRuntimeRoot } from "../../../src/process/PrivateRuntimeRoot.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/signals/recordingProvider.test.ts b/tests/boundary/signals/recordingProvider.test.ts index a5d54ec463..dd0677b0c1 100644 --- a/tests/boundary/signals/recordingProvider.test.ts +++ b/tests/boundary/signals/recordingProvider.test.ts @@ -9,7 +9,7 @@ import { it, expect, onTestFinished } from "vitest"; import { writeFile, readFile, readdir, chmod, symlink } from "node:fs/promises"; import { createHash } from "node:crypto"; import { basename, join } from "node:path"; -import { readStableArtifact } from "../../../src/artifacts/readStableArtifact.js"; +import { readStableArtifact } from "../../../src/resources/readStableArtifact.js"; import { SigrokRecordingProvider } from "../../../src/signals/SigrokRecordingProvider.js"; import { SignalRecordingService } from "../../../src/application/signals/SignalRecordingService.js"; import { diff --git a/tests/boundary/sqlite/sqliteDatabaseDescriptorCleanup.test.ts b/tests/boundary/sqlite/sqliteDatabaseDescriptorCleanup.test.ts index db5158c277..b596bedaa7 100644 --- a/tests/boundary/sqlite/sqliteDatabaseDescriptorCleanup.test.ts +++ b/tests/boundary/sqlite/sqliteDatabaseDescriptorCleanup.test.ts @@ -7,8 +7,8 @@ import { fileURLToPath } from "node:url"; import { expect, it, onTestFinished, vi } from "vitest"; import { SqliteDatabaseService } from "../../../src/application/sqlite/SqliteDatabaseService.js"; -import { ArtifactFileCleanupFailure } from "../../../src/artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactFileCleanupFailure } from "../../../src/resources/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { registerSqliteCommands } from "../../../src/cli/sqliteCommands.js"; import { createSqliteDatabaseService } from "../../../src/composition/sqlite.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; diff --git a/tests/boundary/sqlite/sqliteDatabaseFailures.test.ts b/tests/boundary/sqlite/sqliteDatabaseFailures.test.ts index c90557fe11..6f803705cd 100644 --- a/tests/boundary/sqlite/sqliteDatabaseFailures.test.ts +++ b/tests/boundary/sqlite/sqliteDatabaseFailures.test.ts @@ -1,4 +1,4 @@ -import { ArtifactReaderFailure } from "../../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { classifyProviderFailure } from "../../../src/providers/classifyProviderFailure.js"; import { expect, it } from "vitest"; import { OwnedCommandFailure } from "../../../src/process/OwnedCommand.js"; diff --git a/tests/boundary/sqlite/sqliteDatabaseSnapshot.test.ts b/tests/boundary/sqlite/sqliteDatabaseSnapshot.test.ts index fc2ab501a8..e9eded8173 100644 --- a/tests/boundary/sqlite/sqliteDatabaseSnapshot.test.ts +++ b/tests/boundary/sqlite/sqliteDatabaseSnapshot.test.ts @@ -12,8 +12,8 @@ import { classifyProviderFailure } from "../../../src/providers/classifyProvider import { DatabaseSync } from "node:sqlite"; import { createHash } from "node:crypto"; import { expect, it, onTestFinished, vi } from "vitest"; -import { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js"; -import type { StableArtifactFileSystem } from "../../../src/artifacts/readStableArtifact.js"; +import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; +import type { StableArtifactFileSystem } from "../../../src/resources/readStableArtifact.js"; import { captureSqliteDatabaseSnapshot } from "../../../src/sqlite/SqliteDatabaseSnapshot.js"; import { inspectSqliteDatabaseSnapshot } from "../../../src/sqlite/SqliteDatabaseInspection.js"; import { sqliteDatabaseDialect } from "../../../src/sqlite/SqliteDatabaseFailures.js"; diff --git a/tests/composition/analysis-sessions/backwardCallerEvidence.test.ts b/tests/composition/analysis-sessions/backwardCallerEvidence.test.ts index 86ffa90992..1262a99d4d 100644 --- a/tests/composition/analysis-sessions/backwardCallerEvidence.test.ts +++ b/tests/composition/analysis-sessions/backwardCallerEvidence.test.ts @@ -1,5 +1,5 @@ -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; -import type { AnalysisProvider } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; +import type { AnalysisProvider } from "../../../src/ports/AnalysisProvider.js"; import { executeComposedWorkflow, createWorkflowEvidence, diff --git a/tests/composition/analysis-sessions/binarySession.test.ts b/tests/composition/analysis-sessions/binarySession.test.ts index a187d18b81..ea5dd1f586 100644 --- a/tests/composition/analysis-sessions/binarySession.test.ts +++ b/tests/composition/analysis-sessions/binarySession.test.ts @@ -3,7 +3,7 @@ import { createAnalysisExecution, type AnalysisClient, type AnalysisProvider, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import type { BinarySession } from "../../../src/application/binary/BinarySession.js"; import { parseBinaryTarget } from "../../../src/application/BinaryTargetResolver.js"; import type { JsonValue } from "../../../src/domain/jsonValue.js"; @@ -13,7 +13,7 @@ import { projectAnalysisError } from "../../../src/domain/analysisErrorProjectio import { HopperStartError } from "../../../src/domain/hopperErrors.js"; import { ProviderAdapterError } from "../../../src/domain/providerAdapterError.js"; import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js"; -import { AnalysisCleanupLease } from "../../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../../src/resources/AnalysisCleanupLease.js"; import { err, ok as resultOk } from "../../../src/domain/result.js"; import { createEvidenceBundle } from "../../../src/domain/evidenceBundle.js"; import { createEvidence } from "../../../src/domain/evidence.js"; diff --git a/tests/composition/analysis-sessions/binarySessionCleanupRetry.test.ts b/tests/composition/analysis-sessions/binarySessionCleanupRetry.test.ts index 9238753d79..466ad708cb 100644 --- a/tests/composition/analysis-sessions/binarySessionCleanupRetry.test.ts +++ b/tests/composition/analysis-sessions/binarySessionCleanupRetry.test.ts @@ -5,11 +5,11 @@ import { expect, it, onTestFinished, vi } from "vitest"; import { AnalysisCleanupLease, AnalysisCleanupLeaseGroup, -} from "../../../src/artifacts/AnalysisCleanupLease.js"; +} from "../../../src/resources/AnalysisCleanupLease.js"; import type { AnalysisClient, AnalysisProvider, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { AnalysisCancelledError } from "../../../src/domain/analysisErrorCore.js"; import { HopperStartError } from "../../../src/domain/hopperErrors.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; diff --git a/tests/composition/analysis-sessions/compositeProvider.test.ts b/tests/composition/analysis-sessions/compositeProvider.test.ts index 02e4bc9d5e..60bb1a436d 100644 --- a/tests/composition/analysis-sessions/compositeProvider.test.ts +++ b/tests/composition/analysis-sessions/compositeProvider.test.ts @@ -12,8 +12,8 @@ import type { AnalysisProvider, CapabilityDescriptor, ProviderIdentity, -} from "../../../src/application/AnalysisProvider.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import type { BinaryTarget } from "../../../src/domain/binaryTargetTypes.js"; import { ok } from "../../../src/domain/result.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/composition/analysis-sessions/providerBinding.test.ts b/tests/composition/analysis-sessions/providerBinding.test.ts index c87cb16ffd..0177df779c 100644 --- a/tests/composition/analysis-sessions/providerBinding.test.ts +++ b/tests/composition/analysis-sessions/providerBinding.test.ts @@ -15,7 +15,7 @@ import { type AnalysisProviderCandidate, type CapabilityDescriptor, type ProviderIdentity, -} from "../../../src/application/AnalysisProvider.js"; +} from "../../../src/ports/AnalysisProvider.js"; import { AnalysisProviderRegistry } from "../../../src/application/binary/AnalysisProviderRegistry.js"; import type { BinarySession } from "../../../src/application/binary/BinarySession.js"; import { composeBinarySession } from "../../../src/application/binary/BinarySessionComposition.js"; diff --git a/tests/composition/callPathGraphOracle.test.ts b/tests/composition/callPathGraphOracle.test.ts index f43bf437d4..b5a58f6db0 100644 --- a/tests/composition/callPathGraphOracle.test.ts +++ b/tests/composition/callPathGraphOracle.test.ts @@ -1,6 +1,6 @@ import { expect, it } from "vitest"; import { z } from "zod"; -import { createAnalysisExecution } from "../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../src/ports/AnalysisProvider.js"; import { traceCallPath } from "../../src/application/CallPathTracing.js"; import { ok } from "../../src/domain/result.js"; diff --git a/tests/composition/callPathParserOperation.test.ts b/tests/composition/callPathParserOperation.test.ts index 893f5956ee..2df32cc838 100644 --- a/tests/composition/callPathParserOperation.test.ts +++ b/tests/composition/callPathParserOperation.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; import { z } from "zod"; -import { createAnalysisExecution } from "../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../src/ports/AnalysisProvider.js"; import { traceCallPath } from "../../src/application/CallPathTracing.js"; import { ok } from "../../src/domain/result.js"; diff --git a/tests/composition/directAnalysisCleanup.test.ts b/tests/composition/directAnalysisCleanup.test.ts index 0104c79ee2..f023e6832f 100644 --- a/tests/composition/directAnalysisCleanup.test.ts +++ b/tests/composition/directAnalysisCleanup.test.ts @@ -57,7 +57,7 @@ import { import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; import { BinarySession } from "../../src/application/binary/BinarySession.js"; import { InvestigationRecords } from "../../src/application/investigation/InvestigationRecords.js"; -import { AnalysisCleanupLease } from "../../src/artifacts/AnalysisCleanupLease.js"; +import { AnalysisCleanupLease } from "../../src/resources/AnalysisCleanupLease.js"; const cleanupError = new ProviderCleanupError( "fixture", diff --git a/tests/composition/directAnalysisLimitations.test.ts b/tests/composition/directAnalysisLimitations.test.ts index 5420fbf37f..12f2dc338f 100644 --- a/tests/composition/directAnalysisLimitations.test.ts +++ b/tests/composition/directAnalysisLimitations.test.ts @@ -2,7 +2,7 @@ import { projectCliAnalysisResult } from "../../src/cli/projectCliAnalysisResult import { expect, it } from "vitest"; import { parseConfig } from "../../src/config/parseConfig.js"; import { runDirectAnalysis } from "../../src/application/DirectAnalysis.js"; -import { createAnalysisExecution } from "../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../src/ports/AnalysisProvider.js"; import { ok } from "../../src/domain/result.js"; import { createBinarySessionTargets, diff --git a/tests/composition/idaProvider.test.ts b/tests/composition/idaProvider.test.ts index 4a38c64315..84dd2ec577 100644 --- a/tests/composition/idaProvider.test.ts +++ b/tests/composition/idaProvider.test.ts @@ -13,7 +13,7 @@ import { } from "../../src/domain/analysisSnapshot.js"; import { createEvidence } from "../../src/domain/evidence.js"; import { createEvidenceBundle } from "../../src/domain/evidenceBundle.js"; -import { createAnalysisExecution } from "../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../src/ports/AnalysisProvider.js"; import { EnhancedTools } from "../../src/application/EnhancedTools.js"; import { IDA_PROVIDER_IDENTITY } from "../../src/ida/IdaProviderMetadata.js"; import { parseBinaryTarget } from "../../src/application/BinaryTargetResolver.js"; diff --git a/tests/composition/reverseEngineeringCommandPort.test.ts b/tests/composition/reverseEngineeringCommandPort.test.ts index d98a310985..cba2d3889a 100644 --- a/tests/composition/reverseEngineeringCommandPort.test.ts +++ b/tests/composition/reverseEngineeringCommandPort.test.ts @@ -5,7 +5,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { ReverseEngineeringService } from "../../src/application/reverse/ReverseEngineeringService.js"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { projectAnalysisError } from "../../src/domain/analysisErrorProjection.js"; import { ok } from "../../src/domain/result.js"; import { createReverseEngineeringCommandPort } from "../../src/composition/reverseEngineering.js"; diff --git a/tests/composition/reverseEngineeringUnknownFailures.test.ts b/tests/composition/reverseEngineeringUnknownFailures.test.ts index eec605dc2a..c7ffea4825 100644 --- a/tests/composition/reverseEngineeringUnknownFailures.test.ts +++ b/tests/composition/reverseEngineeringUnknownFailures.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { ReverseEngineeringService } from "../../src/application/reverse/ReverseEngineeringService.js"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { projectAnalysisError } from "../../src/domain/analysisErrorProjection.js"; import { ok } from "../../src/domain/result.js"; import { OwnedCommandFailure } from "../../src/process/OwnedCommand.js"; diff --git a/tests/composition/sourcePublicationOneShot.test.ts b/tests/composition/sourcePublicationOneShot.test.ts index 100857da08..fd68b597f6 100644 --- a/tests/composition/sourcePublicationOneShot.test.ts +++ b/tests/composition/sourcePublicationOneShot.test.ts @@ -13,7 +13,7 @@ import { runProviderAnalysis, } from "../../src/application/DirectAnalysis.js"; import type { DirectAnalysisDependencies } from "../../src/application/DirectAnalysisDependencies.js"; -import { createAnalysisExecution } from "../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../src/ports/AnalysisProvider.js"; import { createAnalysisExecutionEvidence } from "../../src/domain/analysisObservation.js"; import { createEvidence } from "../../src/domain/evidence.js"; import { parseConfig } from "../../src/config/parseConfig.js"; diff --git a/tests/composition/webCaptureDeliveryRedaction.test.ts b/tests/composition/webCaptureDeliveryRedaction.test.ts index df2edea4ca..adf849ef59 100644 --- a/tests/composition/webCaptureDeliveryRedaction.test.ts +++ b/tests/composition/webCaptureDeliveryRedaction.test.ts @@ -11,7 +11,7 @@ import { import { createEvidence } from "../../src/domain/evidence.js"; import { parseEvidenceBundle } from "../../src/domain/evidenceBundle.js"; import { projectAnalysisError } from "../../src/domain/analysisErrorProjection.js"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { AnalysisTimeoutError } from "../../src/domain/analysisErrorCore.js"; import { err, ok } from "../../src/domain/result.js"; import { historicalHar } from "../fixtures/historicalHar.js"; diff --git a/tests/conformance/contracts/analysisErrorProjection.test.ts b/tests/conformance/contracts/analysisErrorProjection.test.ts index e7d26d8ee3..4097623057 100644 --- a/tests/conformance/contracts/analysisErrorProjection.test.ts +++ b/tests/conformance/contracts/analysisErrorProjection.test.ts @@ -2,10 +2,8 @@ import { describe, expect, it } from "vitest"; import { Ajv2020 } from "ajv/dist/2020.js"; import { ProcessCaptureError } from "../../../src/process/capture/ProcessCaptureError.js"; -import { - analysisErrorJsonSchema, - analysisErrorProjectionSchema, -} from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorJsonSchema } from "../../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../../src/domain/analysisErrorProjectionSchema.js"; import { ArtifactOperationError } from "../../../src/domain/artifactOperationError.js"; import { EvidenceFileError } from "../../../src/domain/evidenceErrors.js"; import { HopperRemoteError } from "../../../src/domain/hopperErrors.js"; diff --git a/tests/conformance/providerCompletion.test.ts b/tests/conformance/providerCompletion.test.ts index 9a702c5ae7..18e1f7e9a0 100644 --- a/tests/conformance/providerCompletion.test.ts +++ b/tests/conformance/providerCompletion.test.ts @@ -29,7 +29,7 @@ import { evmInterfaceExecution, evmInterfaceFixture, } from "../fixtures/evm/interface.js"; -import type { EvmInterfaceExecution } from "../../src/application/evm/EvmInterfacePort.js"; +import type { EvmInterfaceExecution } from "../../src/ports/evm/EvmInterfacePort.js"; it("retains valid web-network observations and validates malformed ones before cancellation", async () => { const report = { diff --git a/tests/evaluation/moduleBoundaries.test.ts b/tests/evaluation/moduleBoundaries.test.ts index deacf4f5bb..9ef89a2897 100644 --- a/tests/evaluation/moduleBoundaries.test.ts +++ b/tests/evaluation/moduleBoundaries.test.ts @@ -1,5 +1,5 @@ import { execFile, spawnSync } from "node:child_process"; -import { mkdir, rename, writeFile } from "node:fs/promises"; +import { mkdir, readFile, rename, writeFile } from "node:fs/promises"; import { dirname, join, resolve } from "node:path"; import { fileURLToPath, pathToFileURL } from "node:url"; import { promisify } from "node:util"; @@ -385,6 +385,22 @@ describe("module import syntax and source discovery", () => { 'import { value } from "../domain/../android/Provider.js";', 'const loaded = import("../%61ndroid/Provider.js?view=one#fragment");', ])("checks the resolved owner in %s", (source) => { + // Only the declared localPath -> HostPlatform import is exempt (see + // LAYER_EXCEPTIONS); the same import from another domain file is not. + expect( + inspectModuleBoundaries( + "src/domain/localPath.ts", + 'import { HOST_PLATFORM } from "../platform/HostPlatform.js";', + process.cwd(), + ), + ).toEqual([]); + expect( + inspectModuleBoundaries( + "src/domain/probe.ts", + 'import { HOST_PLATFORM } from "../platform/HostPlatform.js";', + process.cwd(), + ), + ).toEqual([expect.objectContaining({ boundary: "pure-layer" })]); expect( inspectModuleBoundaries("src/domain/probe.ts", source, process.cwd()), ).toEqual([ @@ -594,3 +610,159 @@ describe.each(["apple", "inventory", "extraction"])( }); }, ); + +describe("layer baseline ratchet", () => { + const baselineFile = "scripts/lib/module-layers.baseline.json"; + + /** A tree with one native -> application import and the given baseline. */ + const layeredTree = async (recorded: number) => { + const root = await createTestTempDirectory("rea-module-layers-"); + await mkdir(join(root, "src", "native"), { recursive: true }); + await mkdir(join(root, "src", "application"), { recursive: true }); + await mkdir(join(root, "scripts", "lib"), { recursive: true }); + await writeFile( + join(root, "src/application/Port.ts"), + "export type P = 1;\n", + ); + await writeFile( + join(root, "src/native/Provider.ts"), + 'import type { P } from "../application/Port.js";\nexport type Q = P;\n', + ); + const upward = recorded > 0 ? { "native -> application": recorded } : {}; + await writeFile( + join(root, baselineFile), + `${JSON.stringify({ upward, cycles: [] }, null, 2)}\n`, + ); + return root; + }; + const run = (root: string, ...flags: string[]) => { + const result = spawnSync(process.execPath, [verifier, ...flags], { + cwd: root, + encoding: "utf8", + }); + if (result.error !== undefined) throw result.error; + return result; + }; + const recorded = async (root: string): Promise => + JSON.parse(await readFile(join(root, baselineFile), "utf8")); + + it("fails on a recorded count above the observed imports", async () => { + const root = await layeredTree(2); + const result = run(root); + expect(result.status).toBe(1); + expect(result.stderr).toContain( + "upward import native -> application: 1, baseline 2", + ); + expect(await recorded(root)).toEqual({ + upward: { "native -> application": 2 }, + cycles: [], + }); + }); + + it("lowers a stale count when asked and then passes", async () => { + const root = await layeredTree(2); + expect(run(root, "--shrink-layer-baseline").status).toBe(0); + expect(await recorded(root)).toEqual({ + upward: { "native -> application": 1 }, + cycles: [], + crossProvider: {}, + entry: {}, + }); + expect(run(root).status).toBe(0); + }); + + it("refuses to record growth when asked to shrink", async () => { + const root = await layeredTree(0); + const result = run(root, "--shrink-layer-baseline"); + expect(result.status).toBe(1); + expect(result.stderr).toContain( + "upward import native -> application: 1 imports, baseline 0", + ); + expect(await recorded(root)).toEqual({ upward: {}, cycles: [] }); + }); + + it("does not lower the baseline while a source file cannot be inspected", async () => { + const root = await layeredTree(1); + // The unparsable file holds the tree's only native -> application import. + await writeFile( + join(root, "src/native/Provider.ts"), + "export type Q = 1;\n", + ); + await writeFile( + join(root, "src/native/Broken.ts"), + 'import type { P } from "../application/Port.js";\nimport {', + ); + const result = run(root, "--shrink-layer-baseline"); + expect(result.status).toBe(1); + expect(result.stderr).toContain("Could not inspect src/native/Broken.ts"); + expect(await recorded(root)).toEqual({ + upward: { "native -> application": 1 }, + cycles: [], + }); + }); + + /** + * A tree with one import of another provider folder, one composition import + * past ghidra's entry files (beside an import of a declared one) and one + * import of a toolkit file past src/resources/index.ts. + */ + const providerTree = async (baseline: object) => { + const root = await createTestTempDirectory("rea-provider-boundaries-"); + const files: Record = { + "src/native/Reader.ts": "export type R = 1;\n", + "src/gpu/Probe.ts": + 'import type { R } from "../native/Reader.js";\nexport type G = R;\n', + "src/ghidra/Doctor.ts": "export type D = 1;\n", + "src/ghidra/GhidraDoctor.ts": 'export type { D } from "./Doctor.js";\n', + "src/composition/ghidra.ts": + 'import type { D } from "../ghidra/Doctor.js";\nimport type { D as E } from "../ghidra/GhidraDoctor.js";\nexport type C = D | E;\n', + "src/resources/Scope.ts": "export type S = 1;\n", + "src/resources/index.ts": 'export type { S } from "./Scope.js";\n', + "src/process/Lease.ts": + 'import type { S } from "../resources/Scope.js";\nexport type L = S;\n', + }; + for (const [path, source] of Object.entries(files)) { + await mkdir(dirname(join(root, path)), { recursive: true }); + await writeFile(join(root, path), source); + } + await mkdir(join(root, "scripts", "lib"), { recursive: true }); + await writeFile( + join(root, baselineFile), + `${JSON.stringify({ upward: {}, cycles: [], ...baseline }, null, 2)}\n`, + ); + return root; + }; + + it("fails on provider boundary imports the baseline does not record", async () => { + const root = await providerTree({}); + const result = run(root, "--shrink-layer-baseline"); + expect(result.status).toBe(1); + for (const finding of [ + "cross-provider import gpu -> native: 1 imports, baseline 0", + "import past the entry file composition -> ghidra: 1 imports, baseline 0", + "import past the entry file process -> resources: 1 imports, baseline 0", + ]) + expect(result.stderr).toContain(finding); + expect(await recorded(root)).toEqual({ upward: {}, cycles: [] }); + }); + + it("lowers stale provider boundary counts when asked and then passes", async () => { + const root = await providerTree({ + crossProvider: { "gpu -> native": 2, "go -> native": 1 }, + entry: { "composition -> ghidra": 3, "process -> resources": 1 }, + }); + const stale = run(root); + expect(stale.status).toBe(1); + expect(stale.stderr).toContain( + "cross-provider import gpu -> native: 1, baseline 2", + ); + expect(run(root, "--shrink-layer-baseline").status).toBe(0); + expect(await recorded(root)).toEqual({ + upward: {}, + cycles: [], + crossProvider: { "gpu -> native": 1 }, + entry: { "composition -> ghidra": 1, "process -> resources": 1 }, + }); + expect(run(root).status).toBe(0); + }); +}); diff --git a/tests/evaluation/moduleLayers.test.ts b/tests/evaluation/moduleLayers.test.ts index e3895d6296..556be7fea5 100644 --- a/tests/evaluation/moduleLayers.test.ts +++ b/tests/evaluation/moduleLayers.test.ts @@ -1,10 +1,15 @@ +import { existsSync } from "node:fs"; import { readdir } from "node:fs/promises"; import { describe, expect, it } from "vitest"; import { + ENTRY_FILES, + PROVIDER_DEPENDENCIES, UNIT_LAYERS, compareLayerBaseline, layerGraphFacts, + lowerLayerBaseline, + providerBoundaryFacts, sourceUnit, } from "../../scripts/lib/module-layers.mjs"; @@ -45,6 +50,8 @@ describe("top-level module layers", () => { undeclared: [], upward: { "native -> application": 2 }, cycles: ["application <-> native"], + crossProvider: {}, + entry: { "application -> native": 1 }, }); }); @@ -64,7 +71,7 @@ describe("top-level module layers", () => { ).toEqual(["isolated"]); }); - it("fails on growth and only reports shrinkage", () => { + it("separates growth from shrinkage", () => { const baseline = { upward: { "native -> application": 2, "gdb -> application": 1 }, cycles: ["application <-> native", "application <-> gdb"], @@ -74,17 +81,144 @@ describe("top-level module layers", () => { undeclared: [], upward: { "native -> application": 3, "rizin -> application": 1 }, cycles: ["application <-> native", "application <-> rizin"], + crossProvider: { "gpu -> native": 2 }, + entry: {}, }, - baseline, + { ...baseline, entry: { "composition -> ghidra": 1 } }, ); expect(grown.failures).toEqual([ "upward import native -> application: 3 imports, baseline 2", "upward import rizin -> application: 1 imports, baseline 0", + "cross-provider import gpu -> native: 2 imports, baseline 0", "mutual import not in baseline: application <-> rizin", ]); expect(grown.lowerable).toEqual([ "upward import gdb -> application: 0, baseline 1", + "import past the entry file composition -> ghidra: 0, baseline 1", "recorded mutual import no longer present: application <-> gdb", ]); }); + + it("lowers a baseline to the observed facts without admitting growth", () => { + expect( + lowerLayerBaseline( + { + undeclared: [], + upward: { + "native -> application": 1, + "gdb -> application": 3, + "rizin -> application": 1, + }, + cycles: ["application <-> native", "application <-> rizin"], + crossProvider: { "gpu -> native": 1, "go -> native": 4 }, + entry: {}, + }, + { + crossProvider: { "gpu -> native": 3 }, + entry: { "composition -> ghidra": 2 }, + upward: { + "native -> application": 2, + "gdb -> application": 2, + "kuna -> application": 1, + }, + cycles: ["application <-> native", "application <-> gdb"], + }, + ), + ).toEqual({ + upward: { "native -> application": 1, "gdb -> application": 2 }, + cycles: ["application <-> native"], + crossProvider: { "gpu -> native": 1 }, + entry: {}, + }); + }); +}); + +describe("provider boundaries", () => { + it("counts cross-provider imports and imports past a provider's entry files", () => { + expect( + providerBoundaryFacts([ + edge("src/gpu/A.ts", "src/native/B.js"), + edge("src/gpu/A.ts", "src/native/NativeMacOSProvider.js"), + edge("src/gpu/A.ts", "src/providers/Core.js"), + edge("src/gpu/A.ts", "src/resources/index.js"), + edge("src/gpu/A.ts", "src/gpu/C.js"), + edge("src/composition/D.ts", "src/ghidra/E.js"), + edge("src/composition/D.ts", "src/ghidra/GhidraDoctor.js"), + edge("src/composition/D.ts", "src/ghidra/index.js"), + edge("src/application/G.ts", "src/ghidra/GhidraProvider.js"), + edge("src/server/F.ts", "src/ghidra/E.js"), + edge("src/providers/Core.ts", "src/ghidra/E.js"), + edge("src/composition/D.test.ts", "src/ghidra/E.js"), + ]), + ).toEqual({ + crossProvider: { "gpu -> native": 2 }, + entry: { "composition -> ghidra": 2, "server -> ghidra": 1 }, + }); + }); + + it("names only existing files as entry files and declared dependencies", () => { + const declared = [ + ...Object.entries(ENTRY_FILES), + ...PROVIDER_DEPENDENCIES.map(({ to, files }) => [to, files] as const), + ]; + const missing = declared.flatMap(([unit, files]) => + files + .map((file) => `src/${unit}/${file}`) + .filter((path) => !existsSync(path)), + ); + expect(missing).toEqual([]); + }); + + it("skips only declared provider dependency files for their pair", () => { + expect( + providerBoundaryFacts([ + edge("src/inspector/A.ts", "src/browser/CdpConnection.js"), + edge("src/inspector/A.ts", "src/browser/protocol/CdpEvents.js"), + edge("src/inspector/A.ts", "src/browser/ElectronFileScope.js"), + edge("src/electron/B.ts", "src/browser/CdpConnection.js"), + ]).crossProvider, + ).toEqual({ "electron -> browser": 1, "inspector -> browser": 1 }); + }); + + it("counts every outside import of a toolkit file past src/resources/index.ts", () => { + expect( + providerBoundaryFacts([ + edge("src/gpu/A.ts", "src/resources/Reader.js"), + edge("src/gpu/A.ts", "src/resources/index.js"), + edge("src/process/B.ts", "src/resources/Scope.js"), + edge("src/application/C.ts", "src/resources/Scope.js"), + edge("src/resources/Scope.ts", "src/resources/Reader.js"), + edge("src/gpu/A.test.ts", "src/resources/Reader.js"), + ]).entry, + ).toEqual({ + "application -> resources": 1, + "gpu -> resources": 1, + "process -> resources": 1, + }); + }); + + it("keeps the shared provider core below every provider folder", () => { + expect(UNIT_LAYERS.providers).toBe("providerCore"); + expect( + layerGraphFacts([ + edge("src/ghidra/A.ts", "src/providers/Core.js"), + edge("src/providers/Core.ts", "src/ghidra/A.js"), + ]).upward, + ).toEqual({ "providers -> ghidra": 1 }); + }); + + it("skips only the exact declared file-to-file exception", () => { + expect( + layerGraphFacts([ + edge("src/domain/localPath.ts", "src/platform/HostPlatform.js"), + ]).upward, + ).toEqual({}); + expect( + layerGraphFacts([ + edge("src/domain/localPath.ts", "src/platform/HostPlatform.js"), + edge("src/domain/other.ts", "src/platform/HostPlatform.js"), + edge("src/domain/localPath.ts", "src/platform/Other.js"), + ]).upward, + ).toEqual({ "domain -> platform": 2 }); + }); }); diff --git a/tests/fixtures/analysisExecution.ts b/tests/fixtures/analysisExecution.ts index 94fe941fa4..404207a0d8 100644 --- a/tests/fixtures/analysisExecution.ts +++ b/tests/fixtures/analysisExecution.ts @@ -1,4 +1,4 @@ -import { createAnalysisExecution } from "../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../src/ports/AnalysisProvider.js"; import { ok } from "../../src/domain/result.js"; const FIXTURE_PROVIDER = { diff --git a/tests/fixtures/artifactInventory.ts b/tests/fixtures/artifactInventory.ts index 709946bebd..2a5aeda5bb 100644 --- a/tests/fixtures/artifactInventory.ts +++ b/tests/fixtures/artifactInventory.ts @@ -1,9 +1,9 @@ import { ArtifactResourceScope, type ArtifactResourceOwner, -} from "../../src/artifacts/ArtifactResourceScope.js"; +} from "../../src/resources/ArtifactResourceScope.js"; import { onTestFinished } from "vitest"; -import { ArtifactReaderFailure } from "../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js"; import { classifyAndHashRootForInventory } from "../../src/artifacts/inventory/classify.js"; import { inventoryArtifact as inventoryArtifactOwned, diff --git a/tests/fixtures/artifactReaderLifecycle.ts b/tests/fixtures/artifactReaderLifecycle.ts index e0fbe66099..e4444d2bf0 100644 --- a/tests/fixtures/artifactReaderLifecycle.ts +++ b/tests/fixtures/artifactReaderLifecycle.ts @@ -8,7 +8,7 @@ import { describe, expect, it, vi } from "vitest"; import type { ArtifactReader, ArtifactEntry, -} from "../../src/artifacts/ArtifactReader.js"; +} from "../../src/resources/ArtifactReader.js"; import { openRegularFile, type StableRegularFileDescriptor, diff --git a/tests/fixtures/artifactResourceScope.ts b/tests/fixtures/artifactResourceScope.ts index bf6c2d84ff..1c24fc94a5 100644 --- a/tests/fixtures/artifactResourceScope.ts +++ b/tests/fixtures/artifactResourceScope.ts @@ -1,5 +1,5 @@ import { onTestFinished } from "vitest"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; /** Each caller owns its scope through test finalization, including retained retries. */ export const createTestArtifactResourceScope = (): ArtifactResourceScope => { diff --git a/tests/fixtures/binarySession.ts b/tests/fixtures/binarySession.ts index 0e8f9dbe2a..b94318fa58 100644 --- a/tests/fixtures/binarySession.ts +++ b/tests/fixtures/binarySession.ts @@ -14,7 +14,7 @@ import type { AnalysisProfileResolution, AnalysisProfileResolutionOptions, AnalysisProvider, -} from "../../src/application/AnalysisProvider.js"; +} from "../../src/ports/AnalysisProvider.js"; import { BinarySession } from "../../src/application/binary/BinarySession.js"; import { SessionProviderRouter } from "../../src/application/binary/SessionProviderRouter.js"; import { AnalysisProviderRegistry } from "../../src/application/binary/AnalysisProviderRegistry.js"; diff --git a/tests/fixtures/composedWorkflowEvidence.ts b/tests/fixtures/composedWorkflowEvidence.ts index 3751729e87..19edd118e4 100644 --- a/tests/fixtures/composedWorkflowEvidence.ts +++ b/tests/fixtures/composedWorkflowEvidence.ts @@ -5,7 +5,7 @@ import { parseConfig } from "../../src/config/parseConfig.js"; import { createAnalysisExecution, type AnalysisProvider, -} from "../../src/application/AnalysisProvider.js"; +} from "../../src/ports/AnalysisProvider.js"; import type { DirectAnalysisDependencies } from "../../src/application/DirectAnalysisDependencies.js"; import { createAnalysisProfile } from "../../src/domain/analysisProfile.js"; import type { Evidence } from "../../src/domain/evidence.js"; diff --git a/tests/fixtures/directAnalysisInterrupt.mjs b/tests/fixtures/directAnalysisInterrupt.mjs index aa5c20c303..5203b25657 100644 --- a/tests/fixtures/directAnalysisInterrupt.mjs +++ b/tests/fixtures/directAnalysisInterrupt.mjs @@ -10,7 +10,7 @@ import { import { BinarySession } from "../../dist/application/binary/BinarySession.js"; import { SessionProviderRouter } from "../../dist/application/binary/SessionProviderRouter.js"; import { AnalysisProviderRegistry } from "../../dist/application/binary/AnalysisProviderRegistry.js"; -import { createAnalysisExecution } from "../../dist/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../dist/ports/AnalysisProvider.js"; import { AnalysisCancelledError } from "../../dist/domain/analysisErrorCore.js"; import { err, ok } from "../../dist/domain/result.js"; diff --git a/tests/fixtures/evm/interface.ts b/tests/fixtures/evm/interface.ts index 0c876c37bf..dc4bdfc926 100644 --- a/tests/fixtures/evm/interface.ts +++ b/tests/fixtures/evm/interface.ts @@ -1,6 +1,6 @@ import { createHash } from "node:crypto"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; -import type { EvmInterfaceExecution } from "../../../src/application/evm/EvmInterfacePort.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; +import type { EvmInterfaceExecution } from "../../../src/ports/evm/EvmInterfacePort.js"; import type { EvmInterface } from "../../../src/domain/evm/evmInterface.js"; /** Source-owned transport seam, independent of real engine verification. */ diff --git a/tests/fixtures/flutterVerifierPreload.mjs b/tests/fixtures/flutterVerifierPreload.mjs index 863c2e0fb4..11eb821afb 100644 --- a/tests/fixtures/flutterVerifierPreload.mjs +++ b/tests/fixtures/flutterVerifierPreload.mjs @@ -15,7 +15,7 @@ const mocks = { "@modelcontextprotocol/client": `import {envelope} from ${JSON.stringify(modelUrl)};export class Client {async connect(){} async close(){} async callTool({name,arguments:input}){return {structuredContent:envelope(name,input)}}}`, "@modelcontextprotocol/client/stdio": `export class StdioClientTransport {async close(){}}`, "../dist/contracts/toolContracts.js": `export const toolContract=()=>({outputSchema:{parse:value=>value}});`, - "../dist/artifacts/ArtifactResourceScope.js": `export class ArtifactResourceScope {async close(){}}`, + "../dist/resources/ArtifactResourceScope.js": `export class ArtifactResourceScope {async close(){}}`, "./lib/mcp-verifier-results.mjs": `export const requireMcpOutput=response=>response.structuredContent;`, "./lib/verifier-file-resources.mjs": `export const hashVerifierFile=async()=>({sha256:'a'.repeat(64),bytes:1});`, }; diff --git a/tests/fixtures/inspectionResources.ts b/tests/fixtures/inspectionResources.ts index e00b8fd5e0..c35da975d3 100644 --- a/tests/fixtures/inspectionResources.ts +++ b/tests/fixtures/inspectionResources.ts @@ -1,6 +1,6 @@ -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; -import { AnalysisCleanupLease } from "../../src/artifacts/AnalysisCleanupLease.js"; -import type { RetainedResourceScope } from "../../src/application/AnalysisProvider.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; +import { AnalysisCleanupLease } from "../../src/resources/AnalysisCleanupLease.js"; +import type { RetainedResourceScope } from "../../src/ports/AnalysisProvider.js"; /** Test-scoped real inspection leases; every retained owner is closed by the fixture. */ export const createInspectionResources = () => { diff --git a/tests/fixtures/javascriptArtifactAnalysis.ts b/tests/fixtures/javascriptArtifactAnalysis.ts index 327554f539..df0e70e6a1 100644 --- a/tests/fixtures/javascriptArtifactAnalysis.ts +++ b/tests/fixtures/javascriptArtifactAnalysis.ts @@ -5,7 +5,7 @@ import { type JavaScriptSemanticGraphProjection, } from "../../src/application/javascript/JavaScriptSemanticGraphBuilder.js"; import { createJavaScriptSourceAnalysis } from "../../src/artifacts/javascript/JavaScriptSourceAnalysis.js"; -import type { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import type { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import type { JavaScriptArtifactFileSet } from "../../src/domain/javascript/javascriptArtifactFiles.js"; import { withArtifactResourceScope } from "./artifactInventory.js"; diff --git a/tests/fixtures/mcpToolCatalog.ts b/tests/fixtures/mcpToolCatalog.ts index f970576be0..d817b99264 100644 --- a/tests/fixtures/mcpToolCatalog.ts +++ b/tests/fixtures/mcpToolCatalog.ts @@ -1,6 +1,6 @@ import { readFileSync } from "node:fs"; import type { ToolAnnotations } from "@modelcontextprotocol/server"; -import type { CapabilityDescriptor } from "../../src/application/AnalysisProvider.js"; +import type { CapabilityDescriptor } from "../../src/ports/AnalysisProvider.js"; import type { ToolKind } from "../../src/contracts/toolContractTypes.js"; import type { ToolEffects } from "../../src/contracts/toolEffects.js"; diff --git a/tests/fixtures/mcpToolError.ts b/tests/fixtures/mcpToolError.ts index d6b45fa920..19e7db6af0 100644 --- a/tests/fixtures/mcpToolError.ts +++ b/tests/fixtures/mcpToolError.ts @@ -2,7 +2,7 @@ import type { CallToolResult } from "@modelcontextprotocol/server"; import { expect } from "vitest"; import { z } from "zod"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; /** Read and validate the complete typed diagnostic in an MCP tool failure. */ export function parseMcpToolError(result: CallToolResult) { diff --git a/tests/fixtures/optionalObservationProviders.ts b/tests/fixtures/optionalObservationProviders.ts index cf772ab7e0..e4bd3b8adc 100644 --- a/tests/fixtures/optionalObservationProviders.ts +++ b/tests/fixtures/optionalObservationProviders.ts @@ -1,5 +1,5 @@ -import type { BrowserObservationPort } from "../../src/application/BrowserObservationPort.js"; -import type { JavaScriptRuntimeObservationPort } from "../../src/application/javascript/JavaScriptRuntimeObservationPort.js"; +import type { BrowserObservationPort } from "../../src/ports/BrowserObservationPort.js"; +import type { JavaScriptRuntimeObservationPort } from "../../src/ports/javascript/JavaScriptRuntimeObservationPort.js"; import { CDP_BROWSER_PROVIDER_IDENTITY } from "../../src/browser/providerIdentities.js"; import { V8_INSPECTOR_PROVIDER_IDENTITY } from "../../src/inspector/providerIdentity.js"; import { createBrowserScenarioProvider } from "../../src/composition/browserScenario.js"; diff --git a/tests/fixtures/outputTreeCommit.ts b/tests/fixtures/outputTreeCommit.ts index e90cbc2164..929a379a88 100644 --- a/tests/fixtures/outputTreeCommit.ts +++ b/tests/fixtures/outputTreeCommit.ts @@ -1,6 +1,6 @@ import { expect, onTestFinished, vi } from "vitest"; -import { SafeOutputTree } from "../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../src/resources/SafeOutputTree.js"; import { waitFor } from "../support/testWait.js"; /** diff --git a/tests/fixtures/referenceReaderFifoProbe.mjs b/tests/fixtures/referenceReaderFifoProbe.mjs index 026661bb7e..5f987caef5 100644 --- a/tests/fixtures/referenceReaderFifoProbe.mjs +++ b/tests/fixtures/referenceReaderFifoProbe.mjs @@ -10,7 +10,7 @@ if (modulePath === undefined || root === undefined) const { readStableFile } = await import(pathToFileURL(modulePath)); const { ArtifactResourceScope } = await import( - new URL("../artifacts/ArtifactResourceScope.js", pathToFileURL(modulePath)) + new URL("../resources/ArtifactResourceScope.js", pathToFileURL(modulePath)) ); const resources = new ArtifactResourceScope(); try { diff --git a/tests/fixtures/wasm/artifact.ts b/tests/fixtures/wasm/artifact.ts index c64aac8632..a528a9b22e 100644 --- a/tests/fixtures/wasm/artifact.ts +++ b/tests/fixtures/wasm/artifact.ts @@ -1,6 +1,6 @@ import { createHash } from "node:crypto"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; -import type { WasmArtifactExecution } from "../../../src/application/wasm/WasmArtifactPort.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; +import type { WasmArtifactExecution } from "../../../src/ports/wasm/WasmArtifactPort.js"; import type { WasmArtifact } from "../../../src/domain/wasm/wasmArtifact.js"; /** Source-owned transport seam; upstream binaries are verified in a separate lane. */ export const wasmArtifactFixture = ( diff --git a/tests/fixtures/webModuleTrace.ts b/tests/fixtures/webModuleTrace.ts index 7fece295d1..10bad6b63a 100644 --- a/tests/fixtures/webModuleTrace.ts +++ b/tests/fixtures/webModuleTrace.ts @@ -2,7 +2,7 @@ import { createHash } from "node:crypto"; import type { WebModuleArtifacts, WebModuleResolutionPort, -} from "../../src/application/WebModulePorts.js"; +} from "../../src/ports/WebModulePorts.js"; import { webScriptExportManifestSchema } from "../../src/domain/webScriptExport.js"; import { ok } from "../../src/domain/result.js"; diff --git a/tests/fixtures/webSourceLocation.ts b/tests/fixtures/webSourceLocation.ts index 15e988ca09..4be87c2015 100644 --- a/tests/fixtures/webSourceLocation.ts +++ b/tests/fixtures/webSourceLocation.ts @@ -2,7 +2,7 @@ import { createHash } from "node:crypto"; import type { WebSourceLocationArtifacts, WebSourceMapPort, -} from "../../src/application/WebSourceLocationPorts.js"; +} from "../../src/ports/WebSourceLocationPorts.js"; import { webModuleArtifactsFixture } from "./webModuleTrace.js"; import { traceSourceMap } from "../../src/javascript/sourceMaps/TraceSourceMap.js"; import { ok } from "../../src/domain/result.js"; diff --git a/tests/process-global/apkSignatureLifecycle.test.ts b/tests/process-global/apkSignatureLifecycle.test.ts index 603d5b8513..16a6e848e2 100644 --- a/tests/process-global/apkSignatureLifecycle.test.ts +++ b/tests/process-global/apkSignatureLifecycle.test.ts @@ -56,7 +56,7 @@ vi.mock("node:fs/promises", async (importOriginal) => { }); import { ApkSignatureProvider } from "../../src/apkSignature/ApkSignatureProvider.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { createCli } from "../../src/cli.js"; import { cliCommandFor } from "../../src/cliCommandNames.js"; import { projectAnalysisError } from "../../src/domain/analysisErrorProjection.js"; diff --git a/tests/process-global/artifactFileSourceLifecycle.test.ts b/tests/process-global/artifactFileSourceLifecycle.test.ts index bd7bce2f96..4f80dfdecd 100644 --- a/tests/process-global/artifactFileSourceLifecycle.test.ts +++ b/tests/process-global/artifactFileSourceLifecycle.test.ts @@ -15,8 +15,8 @@ import { ArtifactReaderFailure, type ArtifactEntry, type ArtifactReader, -} from "../../src/artifacts/ArtifactReader.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +} from "../../src/resources/ArtifactReader.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { GodotPckArtifactReader } from "../../src/artifacts/GodotPckArtifactReader.js"; import { NodeSeaArtifactReader } from "../../src/artifacts/NodeSeaArtifactReader.js"; import { nodeSeaElf } from "../../src/artifacts/nodeSea/NodeSea.fixture.js"; diff --git a/tests/process-global/artifactReadFailurePrecedence.test.ts b/tests/process-global/artifactReadFailurePrecedence.test.ts index 5e3e9ab734..51e9c22461 100644 --- a/tests/process-global/artifactReadFailurePrecedence.test.ts +++ b/tests/process-global/artifactReadFailurePrecedence.test.ts @@ -68,8 +68,8 @@ vi.mock("node:fs/promises", async (importOriginal) => { }); import { AsarArtifactReader } from "../../src/artifacts/AsarArtifactReader.js"; -import { SafeOutputTree } from "../../src/artifacts/SafeOutputTree.js"; -import { ArtifactReaderFailure } from "../../src/artifacts/ArtifactReader.js"; +import { SafeOutputTree } from "../../src/resources/SafeOutputTree.js"; +import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; const trees: SafeOutputTree[] = []; diff --git a/tests/process-global/assetCatalogCancellationReason.test.ts b/tests/process-global/assetCatalogCancellationReason.test.ts index aae43888d2..1f236603a3 100644 --- a/tests/process-global/assetCatalogCancellationReason.test.ts +++ b/tests/process-global/assetCatalogCancellationReason.test.ts @@ -24,7 +24,7 @@ vi.mock("../../src/process/ExecFileOutput.js", async (importOriginal) => { }); import { execFileOutput } from "../../src/process/ExecFileOutput.js"; -import { ArtifactReaderFailure } from "../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js"; import { DirectoryArtifactReader } from "../../src/artifacts/DirectoryArtifactReader.js"; import { analyzeAppleAssetCatalogs } from "../../src/artifacts/apple/AppleAssetCatalogAnalysis.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; diff --git a/tests/process-global/binaryTargetAdmissionCancellation.test.ts b/tests/process-global/binaryTargetAdmissionCancellation.test.ts index e7d01def1d..34e6f5dceb 100644 --- a/tests/process-global/binaryTargetAdmissionCancellation.test.ts +++ b/tests/process-global/binaryTargetAdmissionCancellation.test.ts @@ -55,8 +55,8 @@ import { RegularFileOperationCancelled } from "../../src/filesystem/RegularFile. import { RetainedRegularFileCleanupFailure, retryRegularFileCleanup, -} from "../../src/application/RegularFileRead.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +} from "../../src/process/RegularFileRead.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { createApplicationMcpHarness } from "../fixtures/applicationMcpHarness.js"; import { createTestBinarySession } from "../fixtures/binarySession.js"; import { advertisedMcpToolSchemas } from "../fixtures/advertisedMcpTool.js"; diff --git a/tests/process-global/browserScenarioCleanup.test.ts b/tests/process-global/browserScenarioCleanup.test.ts index 554844df0b..531f25b766 100644 --- a/tests/process-global/browserScenarioCleanup.test.ts +++ b/tests/process-global/browserScenarioCleanup.test.ts @@ -3,7 +3,7 @@ import { Cli } from "incur"; import { resolve } from "node:path"; import { expect, it, vi } from "vitest"; -import type { BrowserScenarioCapturePort } from "../../src/application/BrowserScenarioCapturePort.js"; +import type { BrowserScenarioCapturePort } from "../../src/ports/BrowserScenarioCapturePort.js"; import { createBrowserScenarioEvidence } from "../../src/application/BrowserScenarioEvidence.js"; import type { BrowserScenarioSessionPort } from "../../src/browser/BrowserScenarioSessionPort.js"; import { PlaywrightBrowserScenarioProvider } from "../../src/browser/PlaywrightBrowserScenarioProvider.js"; diff --git a/tests/process-global/bundleComparisonFailures.test.ts b/tests/process-global/bundleComparisonFailures.test.ts index 81d85e34ce..a91995a93e 100644 --- a/tests/process-global/bundleComparisonFailures.test.ts +++ b/tests/process-global/bundleComparisonFailures.test.ts @@ -12,10 +12,10 @@ import { readImmutableEvidenceBundle, writeEvidenceBundle, } from "../../src/application/EvidenceBundleFiles.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { OwnedStagedOutput } from "../../src/filesystem/OwnedStagedOutput.js"; import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js"; -import { RetainedRegularFileCleanupFailure } from "../../src/application/RegularFileRead.js"; +import { RetainedRegularFileCleanupFailure } from "../../src/process/RegularFileRead.js"; import * as bundleComparison from "../../src/domain/bundleComparison.js"; import * as bundleSummary from "../../src/domain/evidenceRecordSummary.js"; import { bundleComparisonResultSchema } from "../../src/domain/bundleComparison.js"; diff --git a/tests/process-global/commandFinalizationCancellation.test.ts b/tests/process-global/commandFinalizationCancellation.test.ts index 2355273249..4b48474309 100644 --- a/tests/process-global/commandFinalizationCancellation.test.ts +++ b/tests/process-global/commandFinalizationCancellation.test.ts @@ -11,7 +11,7 @@ import { registerAnalysisViewCommands } from "../../src/cli/analysisViewCommands import { registerCutterCommands } from "../../src/cli/cutterCommands.js"; import { registerWasmCommands } from "../../src/cli/wasmCommands.js"; import { wasmArtifactModule } from "../../src/composition/wasm.js"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { toolContract } from "../../src/contracts/toolContracts.js"; import { CutterBridgeService } from "../../src/cutter/CutterBridgeService.js"; import { AnalysisOutputError } from "../../src/domain/analysisErrorCore.js"; diff --git a/tests/process-global/derivedOperationFailures.test.ts b/tests/process-global/derivedOperationFailures.test.ts index 70741fad66..51ba2f0c10 100644 --- a/tests/process-global/derivedOperationFailures.test.ts +++ b/tests/process-global/derivedOperationFailures.test.ts @@ -28,7 +28,7 @@ import { managedReconstructionImportResultSchema } from "../../src/domain/manage import { captureProcessScenarioFile } from "../../src/application/process/ProcessCli.js"; import { managedComparisonCommand } from "../fixtures/managedComparisonCommand.js"; -import { RetainedRegularFileCleanupFailure } from "../../src/application/RegularFileRead.js"; +import { RetainedRegularFileCleanupFailure } from "../../src/process/RegularFileRead.js"; import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js"; import { primaryAnalysisError } from "../../src/domain/analysisErrorBase.js"; import { buildManagedPeFixture } from "../../src/dotnet/ManagedPe.fixture.js"; diff --git a/tests/process-global/dmgCancellationReason.test.ts b/tests/process-global/dmgCancellationReason.test.ts index f31caea071..508099ba6a 100644 --- a/tests/process-global/dmgCancellationReason.test.ts +++ b/tests/process-global/dmgCancellationReason.test.ts @@ -33,7 +33,7 @@ vi.mock("../../src/process/ExecFileOutput.js", async (importOriginal) => { }; }); import { NativeDmgArtifactReader } from "../../src/artifacts/NativeDmgArtifactReader.js"; -import { ArtifactReaderFailure } from "../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js"; import { ExecFileOutputCancelledError } from "../../src/process/ExecFileOutput.js"; import { translateArtifactFailure } from "../../src/artifacts/ArtifactOperationFailure.js"; diff --git a/tests/process-global/dylibFileLifetime.test.ts b/tests/process-global/dylibFileLifetime.test.ts index d57fd1c337..bfd599d714 100644 --- a/tests/process-global/dylibFileLifetime.test.ts +++ b/tests/process-global/dylibFileLifetime.test.ts @@ -55,10 +55,10 @@ vi.mock("node:fs/promises", async (importOriginal) => { import { traceDylibResolution } from "../../src/artifacts/apple/DylibResolutionReader.js"; import { machoImage } from "../../src/artifacts/apple/MachoImage.fixture.js"; -import { ArtifactFileCleanupFailure } from "../../src/artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../../src/artifacts/ArtifactReader.js"; +import { ArtifactFileCleanupFailure } from "../../src/resources/ArtifactFileOperation.js"; +import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js"; import { ArtifactProvider } from "../../src/artifacts/ArtifactProvider.js"; -import type { AnalysisClient } from "../../src/application/AnalysisProvider.js"; +import type { AnalysisClient } from "../../src/ports/AnalysisProvider.js"; import { parseBinaryTarget } from "../../src/application/BinaryTargetResolver.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; diff --git a/tests/process-global/firmwareFileLifetime.test.ts b/tests/process-global/firmwareFileLifetime.test.ts index fc04075742..dc98151bd1 100644 --- a/tests/process-global/firmwareFileLifetime.test.ts +++ b/tests/process-global/firmwareFileLifetime.test.ts @@ -121,13 +121,13 @@ vi.mock("../../src/firmware/FirmwareCommand.js", async (importOriginal) => { import { FirmwareFileAccess } from "../../src/firmware/FirmwareFiles.js"; import { publishFirmwareExtraction } from "../../src/firmware/FirmwarePublication.js"; import { normalizeUnblobReport } from "../../src/firmware/FirmwareReports.js"; -import { SafeOutputTree } from "../../src/artifacts/SafeOutputTree.js"; -import { AnalysisCleanupLease } from "../../src/artifacts/AnalysisCleanupLease.js"; -import { ArtifactReaderFailure } from "../../src/artifacts/ArtifactReader.js"; +import { SafeOutputTree } from "../../src/resources/SafeOutputTree.js"; +import { AnalysisCleanupLease } from "../../src/resources/AnalysisCleanupLease.js"; +import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js"; import { FirmwareProvider } from "../../src/firmware/FirmwareProvider.js"; import { firmwareFailureDialect } from "../../src/firmware/FirmwareFailures.js"; import { classifyProviderFailure } from "../../src/providers/classifyProviderFailure.js"; -import { ArtifactFileCleanupFailure } from "../../src/artifacts/ArtifactFileOperation.js"; +import { ArtifactFileCleanupFailure } from "../../src/resources/ArtifactFileOperation.js"; import { AnalysisError } from "../../src/domain/analysisErrorBase.js"; import { AnalysisCancelledError } from "../../src/domain/analysisErrorCore.js"; import { PrivateRuntimeRoot } from "../../src/process/PrivateRuntimeRoot.js"; diff --git a/tests/process-global/firmwarePublicationDeadline.test.ts b/tests/process-global/firmwarePublicationDeadline.test.ts index 0e247f21ed..9cf81b2cf8 100644 --- a/tests/process-global/firmwarePublicationDeadline.test.ts +++ b/tests/process-global/firmwarePublicationDeadline.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { afterEach, expect, it, vi } from "vitest"; import { awaitAcknowledgement } from "../fixtures/lifecycleAcknowledgement.js"; import * as firmwareFiles from "../../src/firmware/FirmwareFiles.js"; -import { SafeOutputTree } from "../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../src/resources/SafeOutputTree.js"; import { PrivateRuntimeRoot } from "../../src/process/PrivateRuntimeRoot.js"; import { DEFAULT_FIRMWARE_ANALYSIS_TIMEOUT_MS } from "../../src/domain/firmware/firmwareAnalysis.js"; import { projectAnalysisError } from "../../src/domain/analysisErrorProjection.js"; diff --git a/tests/process-global/ghidraEndpointLifetime.test.ts b/tests/process-global/ghidraEndpointLifetime.test.ts index cf13ffd30b..1ca0cb0dc5 100644 --- a/tests/process-global/ghidraEndpointLifetime.test.ts +++ b/tests/process-global/ghidraEndpointLifetime.test.ts @@ -71,11 +71,11 @@ vi.mock("node:fs/promises", async (importOriginal) => { }; }); -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { ArtifactFileCleanupFailure, artifactFilePrimaryFacts, -} from "../../src/artifacts/ArtifactFileOperation.js"; +} from "../../src/resources/ArtifactFileOperation.js"; import { observeGhidraEndpoint } from "../../src/ghidra/GhidraTransport.js"; import { GhidraClient } from "../../src/ghidra/GhidraClient.js"; import { diff --git a/tests/process-global/ghidraImportSnapshotLifetime.test.ts b/tests/process-global/ghidraImportSnapshotLifetime.test.ts index 6ea987d69b..fd92f0e4e1 100644 --- a/tests/process-global/ghidraImportSnapshotLifetime.test.ts +++ b/tests/process-global/ghidraImportSnapshotLifetime.test.ts @@ -70,8 +70,8 @@ import { createGhidraTargetSnapshot } from "../../src/ghidra/GhidraTargetSnapsho import { ArtifactFileCleanupFailure, bindArtifactFileCleanup, -} from "../../src/artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +} from "../../src/resources/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { ProviderCleanupError } from "../../src/domain/providerCleanupError.js"; import { GhidraClient } from "../../src/ghidra/GhidraClient.js"; import { GhidraProvider } from "../../src/ghidra/GhidraProvider.js"; @@ -81,7 +81,7 @@ import { parseBinaryTarget } from "../../src/application/BinaryTargetResolver.js import { elf } from "../../src/domain/binaryTarget.fixture.js"; import { silentLogger } from "../../src/logger.js"; import { projectAnalysisError } from "../../src/domain/analysisErrorProjection.js"; -import type { AnalysisClient } from "../../src/application/AnalysisProvider.js"; +import type { AnalysisClient } from "../../src/ports/AnalysisProvider.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; beforeEach(() => { diff --git a/tests/process-global/ghidraProjectReadCancellation.test.ts b/tests/process-global/ghidraProjectReadCancellation.test.ts index 37c07bfcd9..6848e74292 100644 --- a/tests/process-global/ghidraProjectReadCancellation.test.ts +++ b/tests/process-global/ghidraProjectReadCancellation.test.ts @@ -1,19 +1,19 @@ import { mkdir, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import { ArtifactFileCancelled } from "../../src/artifacts/ArtifactFileOperation.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactFileCancelled } from "../../src/resources/ArtifactFileOperation.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { AnalysisCancelledError } from "../../src/domain/analysisErrorCore.js"; import { resolveGhidraProject } from "../../src/ghidra/GhidraProjectSnapshot.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; const fault = vi.hoisted(() => ({ reason: undefined as unknown })); vi.mock( - "../../src/artifacts/ArtifactFileOperation.js", + "../../src/resources/ArtifactFileOperation.js", async (importOriginal) => { const original = await importOriginal< - typeof import("../../src/artifacts/ArtifactFileOperation.js") + typeof import("../../src/resources/ArtifactFileOperation.js") >(); return { ...original, diff --git a/tests/process-global/historicalCaptureSnapshotRedaction.test.ts b/tests/process-global/historicalCaptureSnapshotRedaction.test.ts index fab8140ac0..7e689c9131 100644 --- a/tests/process-global/historicalCaptureSnapshotRedaction.test.ts +++ b/tests/process-global/historicalCaptureSnapshotRedaction.test.ts @@ -37,10 +37,10 @@ import { HAR_CAPTURE_PROVIDER_IDENTITY } from "../../src/browser/history/Capture import { WebNetworkCaptureService } from "../../src/application/WebNetworkCaptureService.js"; import { projectAnalysisError } from "../../src/domain/analysisErrorProjection.js"; import { fileSnapshotPartialObservationSchema } from "../../src/domain/fileSnapshotObservation.js"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; import { historicalHar } from "../fixtures/historicalHar.js"; -import { readStableArtifact } from "../../src/artifacts/readStableArtifact.js"; +import { readStableArtifact } from "../../src/resources/readStableArtifact.js"; import { ArtifactOperationError } from "../../src/domain/artifactOperationError.js"; import { ProviderCleanupError } from "../../src/domain/providerCleanupError.js"; import { analysisErrorWithCleanupFailure } from "../../src/domain/analysisErrorCleanup.js"; diff --git a/tests/process-global/historicalCaptureSourceSnapshots.test.ts b/tests/process-global/historicalCaptureSourceSnapshots.test.ts index 1f1575e6ae..b1da1c00fc 100644 --- a/tests/process-global/historicalCaptureSourceSnapshots.test.ts +++ b/tests/process-global/historicalCaptureSourceSnapshots.test.ts @@ -64,7 +64,7 @@ import { decodeHarCapture } from "../../src/browser/history/HarCapture.js"; import { inspectWebNetworkCaptureInputSchema } from "../../src/domain/webNetworkCapture.js"; import { projectAnalysisError } from "../../src/domain/analysisErrorProjection.js"; import { primaryAnalysisError } from "../../src/domain/analysisErrorBase.js"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; import { historicalHar } from "../fixtures/historicalHar.js"; diff --git a/tests/process-global/idaWorkspaceCleanup.test.ts b/tests/process-global/idaWorkspaceCleanup.test.ts index c6aa21714d..dbdc40b1a4 100644 --- a/tests/process-global/idaWorkspaceCleanup.test.ts +++ b/tests/process-global/idaWorkspaceCleanup.test.ts @@ -3,8 +3,8 @@ import { access, readFile, writeFile, type FileHandle } from "node:fs/promises"; import { join } from "node:path"; import { afterEach, expect, it, vi } from "vitest"; -import { ArtifactFileCleanupFailure } from "../../src/artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../../src/artifacts/ArtifactReader.js"; +import { ArtifactFileCleanupFailure } from "../../src/resources/ArtifactFileOperation.js"; +import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js"; import { parseBinaryTarget } from "../../src/application/BinaryTargetResolver.js"; import { elf } from "../../src/domain/binaryTarget.fixture.js"; import { AnalysisProtocolError } from "../../src/domain/analysisErrorCore.js"; diff --git a/tests/process-global/javascriptAnalysisCancellation.test.ts b/tests/process-global/javascriptAnalysisCancellation.test.ts index c2156514e7..538844fada 100644 --- a/tests/process-global/javascriptAnalysisCancellation.test.ts +++ b/tests/process-global/javascriptAnalysisCancellation.test.ts @@ -11,7 +11,7 @@ import { createTestBinarySession, } from "../fixtures/binarySession.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; -import type { ProgressUpdate } from "../../src/application/ProgressReporter.js"; +import type { ProgressUpdate } from "../../src/ports/ProgressReporter.js"; const progressBoundary = vi.hoisted(() => ({ observe: undefined as ((update: ProgressUpdate) => Promise) | undefined, @@ -19,11 +19,9 @@ const progressBoundary = vi.hoisted(() => ({ // Observe each application boundary deterministically; transport rate limiting // is covered by reporter tests and must not select the cancellation site. -vi.mock("../../src/application/ProgressReporter.js", async (original) => { +vi.mock("../../src/ports/ProgressReporter.js", async (original) => { const actual = - await original< - typeof import("../../src/application/ProgressReporter.js") - >(); + await original(); return { ...actual, createProgressReporter: ( diff --git a/tests/process-global/javascriptArtifactVerification.test.ts b/tests/process-global/javascriptArtifactVerification.test.ts index 94656d8a71..32390482d2 100644 --- a/tests/process-global/javascriptArtifactVerification.test.ts +++ b/tests/process-global/javascriptArtifactVerification.test.ts @@ -3,7 +3,7 @@ import { open, realpath, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, onTestFinished, vi } from "vitest"; import { analyzeJavaScriptApplication } from "../../src/application/javascript/JavaScriptApplicationService.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js"; import { DirectoryArtifactReader } from "../../src/artifacts/DirectoryArtifactReader.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; diff --git a/tests/process-global/javascriptRuntimeObservationCli.test.ts b/tests/process-global/javascriptRuntimeObservationCli.test.ts index 4f5d1e8e0c..50c7976103 100644 --- a/tests/process-global/javascriptRuntimeObservationCli.test.ts +++ b/tests/process-global/javascriptRuntimeObservationCli.test.ts @@ -6,7 +6,7 @@ import { Cli } from "incur"; import { afterEach, describe, expect, test, vi } from "vitest"; import { observeJavaScriptRuntime } from "../../src/application/javascript/JavaScriptRuntimeObservationService.js"; -import type { JavaScriptRuntimeObservationPort } from "../../src/application/javascript/JavaScriptRuntimeObservationPort.js"; +import type { JavaScriptRuntimeObservationPort } from "../../src/ports/javascript/JavaScriptRuntimeObservationPort.js"; import { V8InspectorProvider } from "../../src/inspector/V8InspectorProvider.js"; import { observeJavaScriptRuntimeInputSchema } from "../../src/domain/javascript/javascriptRuntimeObservation.js"; import { startFakeV8Inspector } from "../fixtures/inspector/fakeV8Inspector.js"; diff --git a/tests/process-global/managedBundleReadGuards.test.ts b/tests/process-global/managedBundleReadGuards.test.ts index 0dae058199..eeb98da482 100644 --- a/tests/process-global/managedBundleReadGuards.test.ts +++ b/tests/process-global/managedBundleReadGuards.test.ts @@ -18,7 +18,7 @@ import { createImmutableEvidenceBundle, safeParseImmutableEvidenceBundle, } from "../../src/domain/evidenceBundle.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { inspectAnalysisView } from "../../src/application/analysisView/AnalysisViewService.js"; import { readImmutableEvidenceBundle } from "../../src/application/EvidenceBundleFiles.js"; import { requireAuthenticationHeadroom } from "../../src/application/JsonAuthenticationHeadroom.js"; diff --git a/tests/process-global/mcpDeliveryEnvironment.test.ts b/tests/process-global/mcpDeliveryEnvironment.test.ts index 896c5e1993..ad8b494945 100644 --- a/tests/process-global/mcpDeliveryEnvironment.test.ts +++ b/tests/process-global/mcpDeliveryEnvironment.test.ts @@ -3,7 +3,7 @@ import { STDIO_DEFAULT_MAX_BUFFER_SIZE } from "@modelcontextprotocol/server"; import { afterEach, expect, it, vi } from "vitest"; import { z } from "zod"; -import { createAnalysisExecution } from "../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../src/ports/AnalysisProvider.js"; import { AnalysisInputError } from "../../src/domain/analysisErrorCore.js"; import { jsonObjectSchema } from "../../src/domain/jsonValue.js"; import { ok } from "../../src/domain/result.js"; diff --git a/tests/process-global/oneShotSourceClosure.test.ts b/tests/process-global/oneShotSourceClosure.test.ts index 7bfcba5cfd..d13d0d1396 100644 --- a/tests/process-global/oneShotSourceClosure.test.ts +++ b/tests/process-global/oneShotSourceClosure.test.ts @@ -6,9 +6,9 @@ import { afterEach, expect, it, vi } from "vitest"; import type { UndeliveredSourceClosure } from "../../src/application/AnalysisEvidenceSources.js"; import * as matchingService from "../../src/application/native/NativeFunctionMatchingService.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { registerNativeFunctionMatchingCommands } from "../../src/cli/nativeFunctionMatchingCommands.js"; -import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js"; +import { analysisErrorProjectionSchema } from "../../src/domain/analysisErrorProjectionSchema.js"; import { createEvidence, parseEvidence } from "../../src/domain/evidence.js"; import { createEvidenceBundle, diff --git a/tests/process-global/processSnapshotCleanupMcp.test.ts b/tests/process-global/processSnapshotCleanupMcp.test.ts index ff2d3b7a5b..da818eb0f4 100644 --- a/tests/process-global/processSnapshotCleanupMcp.test.ts +++ b/tests/process-global/processSnapshotCleanupMcp.test.ts @@ -34,7 +34,7 @@ vi.mock("node:fs/promises", async (importOriginal) => { import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; import { createTestBinarySession } from "../fixtures/binarySession.js"; import { parseMcpToolError } from "../fixtures/mcpToolError.js"; -import type { AnalysisClient } from "../../src/application/AnalysisProvider.js"; +import type { AnalysisClient } from "../../src/ports/AnalysisProvider.js"; import { observed } from "../fixtures/analysisExecution.js"; import { createServer } from "../../src/server/createServer.js"; import { silentLogger } from "../../src/logger.js"; diff --git a/tests/process-global/pwntoolsStageRetirement.test.ts b/tests/process-global/pwntoolsStageRetirement.test.ts index abfc9de562..26047fe866 100644 --- a/tests/process-global/pwntoolsStageRetirement.test.ts +++ b/tests/process-global/pwntoolsStageRetirement.test.ts @@ -32,8 +32,8 @@ import { import { prepareProcessOwnershipInspection } from "../../src/process/ProcessOwnershipObservation.js"; import { spawnOwnedProviderProcess } from "../../src/process/ProviderProcess.js"; import { PrivateRuntimeRoot } from "../../src/process/PrivateRuntimeRoot.js"; -import { ArtifactFileCleanupFailure } from "../../src/artifacts/ArtifactFileOperation.js"; -import * as artifacts from "../../src/artifacts/readStableArtifact.js"; +import { ArtifactFileCleanupFailure } from "../../src/resources/ArtifactFileOperation.js"; +import * as artifacts from "../../src/resources/readStableArtifact.js"; import { recordedCrashFixture, recordedCrashFixtureBytes, diff --git a/tests/process-global/referenceSourceCancellation.test.ts b/tests/process-global/referenceSourceCancellation.test.ts index 553cc54d34..7113df50b0 100644 --- a/tests/process-global/referenceSourceCancellation.test.ts +++ b/tests/process-global/referenceSourceCancellation.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { createCli } from "../../src/cli.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; import { holdFirstFileRead } from "../support/holdFirstFileRead.js"; diff --git a/tests/process-global/referenceSourceSymlinkRace.test.ts b/tests/process-global/referenceSourceSymlinkRace.test.ts index 1b3803ccec..3f239ffab2 100644 --- a/tests/process-global/referenceSourceSymlinkRace.test.ts +++ b/tests/process-global/referenceSourceSymlinkRace.test.ts @@ -62,7 +62,7 @@ import { } from "node:fs/promises"; import { join } from "node:path"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { importReferenceSource } from "../../src/application/ReferenceSourceImport.js"; import { readReferenceSource } from "../../src/reference/ReferenceSourceReader.js"; diff --git a/tests/process-global/selectedArtifactSourceLifecycle.test.ts b/tests/process-global/selectedArtifactSourceLifecycle.test.ts index 23f6989900..142bb8c48d 100644 --- a/tests/process-global/selectedArtifactSourceLifecycle.test.ts +++ b/tests/process-global/selectedArtifactSourceLifecycle.test.ts @@ -17,7 +17,7 @@ import * as artifactHash from "../../src/artifacts/ArtifactHash.js"; import { ArtifactReaderFailure, type ArtifactEntry, -} from "../../src/artifacts/ArtifactReader.js"; +} from "../../src/resources/ArtifactReader.js"; import { MachOSliceArtifactReader } from "../../src/artifacts/MachOSliceArtifactReader.js"; import { CPU, diff --git a/tests/process-global/setupConfigurationRollback.test.ts b/tests/process-global/setupConfigurationRollback.test.ts index 27e8b4e245..1cdec09bf0 100644 --- a/tests/process-global/setupConfigurationRollback.test.ts +++ b/tests/process-global/setupConfigurationRollback.test.ts @@ -119,10 +119,10 @@ vi.mock("node:fs/promises", async (importOriginal) => { }; }); -vi.mock("../../src/application/RegularFileRead.js", async (importOriginal) => { +vi.mock("../../src/process/RegularFileRead.js", async (importOriginal) => { const original = await importOriginal< - typeof import("../../src/application/RegularFileRead.js") + typeof import("../../src/process/RegularFileRead.js") >(); return { ...original, @@ -144,9 +144,9 @@ import { configureClientConfiguration, ClientConfigurationCleanupRollbackFailure, } from "../../src/application/SetupClientConfiguration.js"; -import { RegularFileReadFailure } from "../../src/application/RegularFileRead.js"; +import { RegularFileReadFailure } from "../../src/process/RegularFileRead.js"; import { retryClientConfigurationCleanup } from "../../src/application/ClientConfigurationCleanup.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { RegularFileCleanupFailure } from "../../src/filesystem/OwnedRegularFile.js"; import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js"; import type { DoctorHost } from "../../src/application/Doctor.js"; @@ -984,9 +984,9 @@ it("cleanup retry never adopts an opaque cancellation reason as another owner", const { RegularFileOperationCancelled } = await import("../../src/filesystem/RegularFile.js"); const { ArtifactResourceScope } = - await import("../../src/artifacts/ArtifactResourceScope.js"); + await import("../../src/resources/ArtifactResourceScope.js"); const { retryRegularFileCleanupFailures } = - await import("../../src/application/RegularFileRead.js"); + await import("../../src/process/RegularFileRead.js"); const resources = new ArtifactResourceScope(); const outcome = await retryRegularFileCleanupFailures( new RegularFileCleanupFailure({ diff --git a/tests/process-global/shortFileReads.test.ts b/tests/process-global/shortFileReads.test.ts index 3d16a688c3..6ea849a931 100644 --- a/tests/process-global/shortFileReads.test.ts +++ b/tests/process-global/shortFileReads.test.ts @@ -64,7 +64,7 @@ import { CPU, fatImage, } from "../../src/artifacts/apple/MachoImage.fixture.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { readElectronFuseImage } from "../../src/electron/ElectronFuseReader.js"; import { ElectronFuseProvider } from "../../src/electron/ElectronFuseProvider.js"; import { RegularFileChangedError } from "../../src/filesystem/RegularFile.js"; diff --git a/tests/process-global/sourceToBundleReferenceGuards.test.ts b/tests/process-global/sourceToBundleReferenceGuards.test.ts index ca7a45ad5a..bfc0ebc59d 100644 --- a/tests/process-global/sourceToBundleReferenceGuards.test.ts +++ b/tests/process-global/sourceToBundleReferenceGuards.test.ts @@ -9,7 +9,7 @@ import { resolveSourceToBundleReference } from "../../src/application/javascript import { requireAuthenticationHeadroom } from "../../src/application/JsonAuthenticationHeadroom.js"; import * as workflow from "../../src/application/javascript/JavaScriptApplicationWorkflowService.js"; import { historicalSourceGraphSchema } from "../../src/domain/referenceSourceGraph.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { SOURCE_TO_BUNDLE_COMPARISON_EXAMPLE } from "../../src/contracts/javascript/javascriptApplicationWorkflowExamples.js"; import { createServer } from "../../src/server/createServer.js"; import { ToolResultDelivery } from "../../src/server/ToolResultDelivery.js"; diff --git a/tests/process-global/stableArtifactConsumers.test.ts b/tests/process-global/stableArtifactConsumers.test.ts index e3353ba4e8..d2883c7a3d 100644 --- a/tests/process-global/stableArtifactConsumers.test.ts +++ b/tests/process-global/stableArtifactConsumers.test.ts @@ -86,8 +86,8 @@ import { mapArtifactFileFailure, artifactFilePrimaryFacts, withArtifactRegularFile, -} from "../../src/artifacts/ArtifactFileOperation.js"; -import { AnalysisCleanupLease } from "../../src/artifacts/AnalysisCleanupLease.js"; +} from "../../src/resources/ArtifactFileOperation.js"; +import { AnalysisCleanupLease } from "../../src/resources/AnalysisCleanupLease.js"; import { translateArtifactFailure } from "../../src/artifacts/ArtifactOperationFailure.js"; import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js"; import { @@ -96,8 +96,8 @@ import { regularFileCancellation, } from "../../src/filesystem/OwnedRegularFile.js"; import { RegularFileOperationCancelled } from "../../src/filesystem/RegularFile.js"; -import { ArtifactResourceScope } from "../../src/artifacts/ArtifactResourceScope.js"; -import { readStableArtifact } from "../../src/artifacts/readStableArtifact.js"; +import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; +import { readStableArtifact } from "../../src/resources/readStableArtifact.js"; import { ArtifactAnalysisResources } from "../../src/process/ArtifactAnalysisResources.js"; import { readLinuxResourceLimits } from "../../src/process/LinuxResourceLimits.js"; import { LocalWebSourceLocationArtifacts } from "../../src/browser/assets/WebSourceLocationArtifacts.js"; @@ -106,7 +106,7 @@ import { webSourceLocationArgs, webSourceLocationFixture, } from "../fixtures/webSourceLocation.js"; -import { ArtifactReaderFailure } from "../../src/artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js"; import { GoBinaryProvider } from "../../src/go/GoBinaryProvider.js"; import { PythonPycProvider } from "../../src/python/PythonPycProvider.js"; import { inspectPythonPycInputSchema } from "../../src/domain/python/pythonPyc.js"; diff --git a/tests/process-global/windowsRuntimeAdmission.test.ts b/tests/process-global/windowsRuntimeAdmission.test.ts index a9f328a188..56a3edf5be 100644 --- a/tests/process-global/windowsRuntimeAdmission.test.ts +++ b/tests/process-global/windowsRuntimeAdmission.test.ts @@ -1,6 +1,6 @@ import { beforeEach, expect, it, vi } from "vitest"; import { WindowsPrivateRuntime } from "../../src/windows/WindowsPrivateRuntime.js"; -import { PrivateRuntimeRootUnavailableError } from "../../src/process/PrivateRuntimeRootUnavailableError.js"; +import { PrivateRuntimeRootUnavailableError } from "../../src/domain/privateRuntimeRootUnavailableError.js"; const { nativeCall } = vi.hoisted(() => ({ nativeCall: vi.fn() })); vi.mock("../../src/windows/WindowsNativeLoader.js", async (original) => ({ diff --git a/tests/support/artifactClientScope.ts b/tests/support/artifactClientScope.ts index 9277a8f249..3c50d9b681 100644 --- a/tests/support/artifactClientScope.ts +++ b/tests/support/artifactClientScope.ts @@ -1,5 +1,5 @@ import { onTestFinished } from "vitest"; -import type { AnalysisClient } from "../../src/application/AnalysisProvider.js"; +import type { AnalysisClient } from "../../src/ports/AnalysisProvider.js"; import { ArtifactProvider } from "../../src/artifacts/ArtifactProvider.js"; import type { BinaryTarget } from "../../src/domain/binaryTargetTypes.js"; diff --git a/tests/support/cli/apktoolCli.ts b/tests/support/cli/apktoolCli.ts index 2c1b1d9369..78feedd2e7 100644 --- a/tests/support/cli/apktoolCli.ts +++ b/tests/support/cli/apktoolCli.ts @@ -2,7 +2,7 @@ import { Cli } from "incur"; import pino from "pino"; import type { ApktoolResourceAnalysisPort } from "../../../src/application/apktool/ApktoolResourceAnalysisPort.js"; -import { createAnalysisExecution } from "../../../src/application/AnalysisProvider.js"; +import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import { registerApktoolCommands } from "../../../src/cli/apktoolCommands.js"; import { presentOmittableDefaults } from "../../../src/cli/omittableDefaults.js"; import type { ApktoolRequest } from "../../../src/domain/apktool/apktoolResourceAnalysis.js"; diff --git a/tests/support/javascriptApplicationScope.ts b/tests/support/javascriptApplicationScope.ts index 59b8166849..f3b5bcbefc 100644 --- a/tests/support/javascriptApplicationScope.ts +++ b/tests/support/javascriptApplicationScope.ts @@ -5,9 +5,9 @@ import { } from "../../src/application/javascript/JavaScriptApplicationService.js"; import { reconstructJavaScriptArtifact as reconstructOwned } from "../../src/application/javascript/JavaScriptArtifactReconstruction.js"; import { analyzeJavaScriptApplicationInputSchema } from "../../src/domain/javascript/javascriptApplicationAnalysis.js"; -import type { ProgressReporter } from "../../src/application/ProgressReporter.js"; +import type { ProgressReporter } from "../../src/ports/ProgressReporter.js"; import { readJavaScriptArtifactFiles as readOwned } from "../../src/artifacts/javascript/JavaScriptArtifactFiles.js"; -import type { ArtifactReader } from "../../src/artifacts/ArtifactReader.js"; +import type { ArtifactReader } from "../../src/resources/ArtifactReader.js"; import type { ArtifactInventorySnapshot } from "../../src/domain/artifactInventorySnapshot.js"; /** Read a fixture's nested containers with an awaited cleanup owner. */ diff --git a/tests/support/publishedDirectoryCloseFailure.ts b/tests/support/publishedDirectoryCloseFailure.ts index 3da2a4aaa4..4e1c75fe66 100644 --- a/tests/support/publishedDirectoryCloseFailure.ts +++ b/tests/support/publishedDirectoryCloseFailure.ts @@ -2,7 +2,7 @@ import { stat } from "node:fs/promises"; import { dirname } from "node:path"; import { vi } from "vitest"; -import { SafeOutputTree } from "../../src/artifacts/SafeOutputTree.js"; +import { SafeOutputTree } from "../../src/resources/SafeOutputTree.js"; import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js"; /** Fail closing the parent directory after publication until retry is allowed. */