diff --git a/scripts/lib/module-layers.baseline.json b/scripts/lib/module-layers.baseline.json index 5c3837cb40..708a8964fb 100644 --- a/scripts/lib/module-layers.baseline.json +++ b/scripts/lib/module-layers.baseline.json @@ -7,10 +7,7 @@ "cli <-> cliOutput.ts", "main <-> server" ], - "crossProvider": { - "gpu -> artifacts": 1, - "model -> artifacts": 1 - }, + "crossProvider": {}, "entry": { "application -> desktop": 28 } diff --git a/src/gpu/GpuCodeObjectsProvider.ts b/src/gpu/GpuCodeObjectsProvider.ts index d7ea05fee8..38db322a97 100644 --- a/src/gpu/GpuCodeObjectsProvider.ts +++ b/src/gpu/GpuCodeObjectsProvider.ts @@ -7,6 +7,7 @@ import { artifactFilePrimaryFacts, artifactFileCancellationCause, artifactFileCompletion, + selectedFileTargetError, } from "../resources/index.js"; import { GPU_CODE_OBJECTS_PROVIDER_IDENTITY } from "./GpuCodeObjectsProviderIdentity.js"; import { lstat, type FileHandle } from "node:fs/promises"; @@ -45,7 +46,6 @@ import { } from "./GpuSource.js"; import { GpuInventory } from "./GpuInventory.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import { selectedFileTargetError } from "../artifacts/RegularFileErrorProjection.js"; import { isSelectedRegularFileError, sameRegularFileState, diff --git a/src/model/ModelArtifactProvider.ts b/src/model/ModelArtifactProvider.ts index 8ab8327f9d..caaafb6976 100644 --- a/src/model/ModelArtifactProvider.ts +++ b/src/model/ModelArtifactProvider.ts @@ -7,6 +7,7 @@ import { artifactFilePrimaryFacts, artifactFileCancellationCause, artifactFileCompletion, + selectedFileTargetError, } from "../resources/index.js"; import { MODEL_ARTIFACT_PROVIDER_IDENTITY } from "./ModelArtifactProviderIdentity.js"; import { lstat, type FileHandle } from "node:fs/promises"; @@ -49,7 +50,6 @@ import { jsonValueByteLength } from "../domain/jsonValueByteLength.js"; import { ParseFailureError } from "../domain/parseFailure.js"; import { parseFailureAnalysisError } from "../domain/parseFailureAnalysisError.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import { selectedFileTargetError } from "../artifacts/RegularFileErrorProjection.js"; import { isSelectedRegularFileError, sameRegularFileState, diff --git a/src/artifacts/RegularFileErrorProjection.ts b/src/resources/RegularFileErrorProjection.ts similarity index 89% rename from src/artifacts/RegularFileErrorProjection.ts rename to src/resources/RegularFileErrorProjection.ts index 66b3b08c69..faf9386ca0 100644 --- a/src/artifacts/RegularFileErrorProjection.ts +++ b/src/resources/RegularFileErrorProjection.ts @@ -1,6 +1,6 @@ import { BinaryTargetError } from "../domain/configurationErrors.js"; import { RejectedRegularFileSymlink } from "../filesystem/RegularFile.js"; -import { regularFileSymlinkRecovery } from "../resources/index.js"; +import { regularFileSymlinkRecovery } from "./StableArtifactFailure.js"; /** Project a selected-file admission failure without reinterpreting its path. */ export const selectedFileTargetError = ( diff --git a/src/resources/index.ts b/src/resources/index.ts index 3c1d0af75a..de8b49b52b 100644 --- a/src/resources/index.ts +++ b/src/resources/index.ts @@ -96,6 +96,7 @@ export { stableArtifactInputRecovery, } from "./StableArtifactFailure.js"; export type { RequestField } from "./StableArtifactFailure.js"; +export { selectedFileTargetError } from "./RegularFileErrorProjection.js"; export { completedStableArtifactObservation } from "./StableArtifactObservation.js"; export { fileAccessFailureReason,