refactor(artifacts): move inventory and extraction into provider owners (#1032)

src/application/javascript/JavaScriptArtifactGraphBuilder.ts

@@ -1,4 +1,4 @@
-import type { ArtifactInventorySnapshot } from "../ArtifactInventory.js";
+import type { ArtifactInventorySnapshot } from "../../artifacts/inventory/ArtifactInventory.js";
 import {
   createJavaScriptApplicationGraph,
   type JavaScriptApplicationGraph,

src/application/javascript/JavaScriptArtifactGraphContext.ts

@@ -1,4 +1,4 @@
-import type { ArtifactInventorySnapshot } from "../ArtifactInventory.js";
+import type { ArtifactInventorySnapshot } from "../../artifacts/inventory/ArtifactInventory.js";
 import {
   completeApplicationCoverage,
   partialApplicationCoverage,

src/application/javascript/JavaScriptArtifactGraphStructure.ts

@@ -1,4 +1,4 @@
-import type { ArtifactInventorySnapshot } from "../ArtifactInventory.js";
+import type { ArtifactInventorySnapshot } from "../../artifacts/inventory/ArtifactInventory.js";
 import type { ApplicationNode } from "../../domain/javascript/javascriptApplicationGraph.js";
 import { completeApplicationCoverage } from "../../domain/javascript/javascriptApplicationEvidenceSchemas.js";
 import type { JavaScriptArtifactAnalysis } from "./JavaScriptArtifactAnalysisTypes.js";

src/application/javascript/JavaScriptArtifactReconstruction.ts

@@ -12,7 +12,7 @@ import {
   javascriptArtifactReconstructionInputSchema,
   type JavaScriptArtifactReconstructionInput,
 } from "./JavaScriptArtifactReconstructionInput.js";
-import { scanCanonicalArtifactInventory } from "../ArtifactInventory.js";
+import { scanCanonicalArtifactInventory } from "../../artifacts/inventory/ArtifactInventory.js";
 import { summarizeElectronBoundaries } from "./ElectronBoundaryAnalysis.js";
 import { buildJavaScriptSemanticGraph } from "./JavaScriptSemanticGraphBuilder.js";
 import type { ProgressReporter } from "../ProgressReporter.js";

src/artifacts/ArtifactProvider.ts

@@ -9,8 +9,8 @@ import {
 } from "../application/AnalysisProvider.js";
 import { inspectBundleKeyedArchive } from "./apple/KeyedArchiveReader.js";
 import { basename, dirname } from "node:path";
-import { inventoryArtifact } from "../application/ArtifactInventory.js";
-import { extractArtifact } from "../application/ArtifactExtraction.js";
+import { inventoryArtifact } from "./inventory/ArtifactInventory.js";
+import { extractArtifact } from "./extraction/ArtifactExtraction.js";
 import { analyzeInterfaceBuilderBundle } from "./apple/InterfaceBuilderAnalysis.js";
 import { analyzeAppleAssetCatalogs } from "./apple/AppleAssetCatalogAnalysis.js";
 import {
@@ -33,7 +33,7 @@ import {
 } from "./ArtifactProviderMetadata.js";
 import { createEvidence } from "../domain/evidence.js";
 import { createArtifactInspection } from "../domain/artifactInspection.js";
-import { resolveArtifactIntegrityPolicy } from "../application/ArtifactInventory/policy.js";
+import { resolveArtifactIntegrityPolicy } from "./inventory/policy.js";
 
 /** Read-only inventory and exclusively owned extraction provider. */
 export class ArtifactProvider implements AnalysisProvider {

src/artifacts/extraction/ArtifactExtraction.ts

@@ -1,29 +1,29 @@
 import { lstat, realpath } from "node:fs/promises";
 
-import { canonicalDigest } from "../domain/comparisonSemantics.js";
-import { AsarArtifactReader } from "../artifacts/AsarArtifactReader.js";
+import { canonicalDigest } from "../../domain/comparisonSemantics.js";
+import { AsarArtifactReader } from "../AsarArtifactReader.js";
 import {
   ArtifactPathRegistry,
   normalizeArtifactPath,
-} from "../artifacts/ArtifactPaths.js";
+} from "../ArtifactPaths.js";
 import {
   ArtifactReaderFailure,
   type ArtifactEntry,
   type ArtifactReader,
-} from "../artifacts/ArtifactReader.js";
-import { DirectoryArtifactReader } from "../artifacts/DirectoryArtifactReader.js";
-import { SafeOutputTree } from "../artifacts/SafeOutputTree.js";
-import { ZipArtifactReader } from "../artifacts/ZipArtifactReader.js";
-import { MachOSliceArtifactReader } from "../artifacts/MachOSliceArtifactReader.js";
+} from "../ArtifactReader.js";
+import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js";
+import { SafeOutputTree } from "../SafeOutputTree.js";
+import { ZipArtifactReader } from "../ZipArtifactReader.js";
+import { MachOSliceArtifactReader } from "../MachOSliceArtifactReader.js";
 import {
   artifactExtractionResultSchema,
   type ArtifactExtractionResult,
   type ArtifactGraphManifest,
   type ArtifactNode,
   type ArtifactOccurrence,
-} from "../domain/artifactGraph.js";
-import type { BinaryTarget } from "../domain/binaryTarget.js";
-import { scanArtifactInventory } from "./ArtifactInventory.js";
+} from "../../domain/artifactGraph.js";
+import type { BinaryTarget } from "../../domain/binaryTarget.js";
+import { scanArtifactInventory } from "../inventory/ArtifactInventory.js";
 
 /** Local extraction input with the output root chosen by the adapter. */
 export interface ArtifactExtractionInput {

src/artifacts/inventory/ArtifactGraphConstruction.ts

@@ -1,13 +1,13 @@
-import { canonicalDigest } from "../domain/comparisonSemantics.js";
-import type { ArtifactEntry } from "../artifacts/ArtifactReader.js";
+import { canonicalDigest } from "../../domain/comparisonSemantics.js";
+import type { ArtifactEntry } from "../ArtifactReader.js";
 import type {
   ArtifactCommand,
   ArtifactEdge,
   ArtifactNode,
   ArtifactOccurrence,
-} from "../domain/artifactGraph.js";
-import { zipPackageFormatForPath } from "../domain/zipPackageFormat.js";
-import { mzWindowsHeaderOffset, parseDosMzHeader } from "../domain/dosMz.js";
+} from "../../domain/artifactGraph.js";
+import { zipPackageFormatForPath } from "../../domain/zipPackageFormat.js";
+import { mzWindowsHeaderOffset, parseDosMzHeader } from "../../domain/dosMz.js";
 
 /** Mutable internal occurrence used until root-bound IDs are known. */
 export interface MutableOccurrence {

src/artifacts/inventory/ArtifactInventory.ts

@@ -3,22 +3,22 @@ import { realpath } from "node:fs/promises";
 import {
   artifactInventoryResultSchema,
   type ArtifactInventoryResult,
-} from "../domain/artifactGraph.js";
-import { abortIfNeeded } from "../artifacts/ArtifactHash.js";
-import { scanCanonicalArtifactInventory } from "./ArtifactInventory/scanCanonical.js";
+} from "../../domain/artifactGraph.js";
+import { abortIfNeeded } from "../ArtifactHash.js";
+import { scanCanonicalArtifactInventory } from "./scanCanonical.js";
 import type {
   ArtifactIntegrityPolicy,
   ArtifactInventoryOptions,
   ArtifactInventorySnapshot,
-} from "./ArtifactInventory/types.js";
+} from "./types.js";
 
-export { scanCanonicalArtifactInventory } from "./ArtifactInventory/scanCanonical.js";
+export { scanCanonicalArtifactInventory } from "./scanCanonical.js";
 
 export type {
   ArtifactIntegrityPolicy,
   ArtifactInventoryOptions,
   ArtifactInventorySnapshot,
-} from "./ArtifactInventory/types.js";
+} from "./types.js";
 
 /** Inventory one local artifact and return every graph collection inline. */
 export const inventoryArtifact = async (

src/artifacts/inventory/classify.ts

@@ -1,7 +1,7 @@
 import { open } from "node:fs/promises";
 
-import { classifyArtifactContent } from "../ArtifactGraphConstruction.js";
-import { ARTIFACT_CLASSIFICATION_PREFIX_BYTES } from "../../artifacts/ArtifactHash.js";
+import { classifyArtifactContent } from "./ArtifactGraphConstruction.js";
+import { ARTIFACT_CLASSIFICATION_PREFIX_BYTES } from "../ArtifactHash.js";
 import type { ArtifactNode } from "../../domain/artifactGraph.js";
 import {
   hasZipSignature,

src/artifacts/inventory/reader.ts

@@ -1,9 +1,9 @@
-import { AsarArtifactReader } from "../../artifacts/AsarArtifactReader.js";
-import type { ArtifactReader } from "../../artifacts/ArtifactReader.js";
-import { DirectoryArtifactReader } from "../../artifacts/DirectoryArtifactReader.js";
-import { MachOSliceArtifactReader } from "../../artifacts/MachOSliceArtifactReader.js";
-import { NativeDmgArtifactReader } from "../../artifacts/NativeDmgArtifactReader.js";
-import { ZipArtifactReader } from "../../artifacts/ZipArtifactReader.js";
+import { AsarArtifactReader } from "../AsarArtifactReader.js";
+import type { ArtifactReader } from "../ArtifactReader.js";
+import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js";
+import { MachOSliceArtifactReader } from "../MachOSliceArtifactReader.js";
+import { NativeDmgArtifactReader } from "../NativeDmgArtifactReader.js";
+import { ZipArtifactReader } from "../ZipArtifactReader.js";
 import type { ArtifactNode } from "../../domain/artifactGraph.js";
 
 export const createReader = async (

src/artifacts/inventory/scanCanonical.ts

@@ -5,7 +5,7 @@ import type { Stats } from "node:fs";
 import {
   ArtifactReaderFailure,
   type ArtifactReader,
-} from "../../artifacts/ArtifactReader.js";
+} from "../ArtifactReader.js";
 import {
   artifactInventoryResultSchema,
   type ArtifactInventoryResult,
@@ -20,10 +20,10 @@ import {
   rekeyOccurrences,
   rootOccurrenceFor,
   type MutableOccurrence,
-} from "../ArtifactGraphConstruction.js";
+} from "./ArtifactGraphConstruction.js";
 import { canonicalDigest } from "../../domain/comparisonSemantics.js";
 import { classifyRoot } from "./classify.js";
-import { hashReadable, type HashResult } from "../../artifacts/ArtifactHash.js";
+import { hashReadable, type HashResult } from "../ArtifactHash.js";
 import { createReader, inventoryLimitations } from "./reader.js";
 import {
   scanReader,

src/artifacts/inventory/scanReader.ts

@@ -3,13 +3,13 @@ import { isAbsolute } from "node:path";
 import {
   ArtifactPathRegistry,
   normalizeArtifactPath,
-} from "../../artifacts/ArtifactPaths.js";
+} from "../ArtifactPaths.js";
 import {
   ArtifactReaderFailure,
   type ArtifactEntry,
   type ArtifactReader,
-} from "../../artifacts/ArtifactReader.js";
-import { AsarArtifactReader } from "../../artifacts/AsarArtifactReader.js";
+} from "../ArtifactReader.js";
+import { AsarArtifactReader } from "../AsarArtifactReader.js";
 import type { ArtifactNode } from "../../domain/artifactGraph.js";
 import {
   classifyArtifactContent,
@@ -17,12 +17,12 @@ import {
   createOccurrence,
   nearestParent,
   type MutableOccurrence,
-} from "../ArtifactGraphConstruction.js";
+} from "./ArtifactGraphConstruction.js";
 import {
   STRICT_INTEGRITY_POLICY,
   type ArtifactIntegrityPolicy,
 } from "./types.js";
-import { hashReadable } from "../../artifacts/ArtifactHash.js";
+import { hashReadable } from "../ArtifactHash.js";
 
 export interface PendingIntegrityContradiction {
   readonly logicalPath: string;

src/cli/artifactCommands.ts

@@ -1,7 +1,7 @@
 import { z } from "incur";
 
 import { runProviderAnalysis } from "../composition/directAnalysis.js";
-import { createArtifactExtractionDestination } from "../application/ArtifactExtractionDestination.js";
+import { createArtifactExtractionDestination } from "../application/artifacts/ArtifactExtractionDestination.js";
 import { logCliCommand } from "../cliLogging.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import type { Logger } from "../logger.js";

src/server/registerEvidenceTools.ts

@@ -14,7 +14,7 @@ import { mcpProgressReporter } from "./mcpProgress.js";
 import { logToolExecution } from "./toolLogging.js";
 import { toolRegistrationOptions } from "./toolRegistrationOptions.js";
 import { toCallToolResult } from "./toolResult.js";
-import { createArtifactExtractionDestination } from "../application/ArtifactExtractionDestination.js";
+import { createArtifactExtractionDestination } from "../application/artifacts/ArtifactExtractionDestination.js";
 
 interface EvidenceToolRegistration {
   readonly logger: Logger;