From 28713f9b4dcb882f0e811653890fde70cb5fdadb Mon Sep 17 00:00:00 2001 From: ysopwnable <161784452+N0zoM1z0@users.noreply.github.com> Date: Wed, 7 Oct 2026 19:22:04 +0800 Subject: [PATCH] refactor(managed): group capability workflows and verification (#926) --- docs/capability-migration.md | 24 ++++++++++++++ docs/testing.md | 10 ++++++ package.json | 2 +- .../managed/pe.d.mts} | 0 .../managed/pe.mjs} | 0 scripts/generate-completion-ledger.mjs | 2 +- scripts/generate-mcp-tool-catalog.mjs | 2 +- scripts/lib/catalog-core.mjs | 11 ++++--- scripts/verify-package-managed.mjs | 2 +- .../managed/completion-report.mjs} | 2 +- .../managed/config.mjs} | 0 .../managed/conformance.mjs} | 33 ++++++++++--------- .../managed/manifest-parser.mjs} | 0 .../managed/manifest.mjs} | 16 ++++----- .../managed/oracles.mjs} | 12 +++---- .../managed/support.mjs} | 6 ++-- src/application/AnalysisProvider.ts | 2 +- src/application/DirectAnalysis.ts | 2 +- .../JavaScriptApplicationEvidenceGraph.ts | 2 +- .../ManagedApplicationGraphService.ts | 14 ++++---- .../ManagedMemberComparisonService.ts | 20 +++++------ .../ManagedNativeVerificationService.ts | 14 ++++---- .../ManagedReconstructionService.test.ts | 8 ++--- .../ManagedReconstructionService.ts | 14 ++++---- src/cli/managedCommands.ts | 6 ++-- src/cli/managedProjectGraphCommand.ts | 2 +- src/contracts/contractSnapshot.test.ts | 4 +-- .../{ => managed}/managedToolContracts.ts | 8 ++--- .../{ => managed}/managedWorkflowExamples.ts | 6 ++-- .../managedWorkflowToolContracts.ts | 12 +++---- src/contracts/toolContracts.test.ts | 4 +-- src/contracts/toolContracts.ts | 4 +-- src/contracts/toolOutputSchemaGroups.ts | 10 +++--- src/contracts/workflowInputContracts.test.ts | 4 +-- .../{ => managed}/managedApplicationGraph.ts | 10 +++--- .../managedApplicationGraphCoverage.ts | 2 +- .../managedApplicationGraphNodeCoverage.ts | 0 .../managedApplicationGraphNodes.ts | 2 +- src/domain/{ => managed}/managedArtifact.ts | 2 +- .../{ => managed}/managedMemberComparison.ts | 8 ++--- .../managedMemberComparisonCoverage.ts | 0 .../managedMemberComparisonItems.ts | 0 .../managedMemberComparisonMatch.ts | 4 +-- .../managedNativeVerification.ts | 4 +-- .../managedNativeVerificationMatch.ts | 8 ++--- .../managedNativeVerificationSchemas.ts | 8 ++--- .../managedReconstruction.test.ts | 2 +- .../{ => managed}/managedReconstruction.ts | 8 ++--- src/dotnet/ManagedArtifactInspector.ts | 2 +- src/dotnet/ManagedMemberInspector.ts | 2 +- src/dotnet/ManagedMemberInspectorCore.ts | 2 +- src/dotnet/ManagedMetadataInventory.ts | 2 +- src/dotnet/ManagedMetadataInventoryRows.ts | 2 +- src/dotnet/ManagedNativeBoundaryHelpers.ts | 2 +- src/dotnet/ManagedNativeBoundaryInspector.ts | 2 +- src/dotnet/ManagedPeReader.ts | 2 +- src/dotnet/ManagedReaderFailure.ts | 2 +- src/dotnet/ManagedStaticProvider.ts | 4 +-- src/dotnet/ManagedStaticProviderMetadata.ts | 2 +- src/server/registerManagedTools.ts | 4 +-- .../compareManagedMembers.ts | 4 +-- .../registerManagedWorkflowTools/contract.ts | 2 +- .../importManagedReconstruction.ts | 2 +- .../projectManagedApplicationGraph.ts | 2 +- .../verifyManagedNativeBoundaries.ts | 4 +-- ....01-lists-the-complete-target-open.test.ts | 2 +- tests/boundary/mcp/managedMcp.test.ts | 2 +- .../managed/managedMemberComparison.test.ts | 6 ++-- ...anagedMemberComparisonFromMetadata.test.ts | 2 +- ...nagedMemberComparisonPartialBodies.test.ts | 2 +- .../managed/managedStaticProvider.test.ts | 2 +- .../managedApplicationGraph.test.ts | 8 ++--- .../managed/managedConformanceFixture.test.ts | 2 +- .../managed/managedNativeVerification.test.ts | 8 ++--- turbo.json | 2 ++ 75 files changed, 217 insertions(+), 177 deletions(-) rename scripts/{lib/managed-pe-fixture.d.mts => fixtures/managed/pe.d.mts} (100%) rename scripts/{lib/managed-pe-fixture.mjs => fixtures/managed/pe.mjs} (100%) rename scripts/{lib/managed-completion-report.mjs => verify/managed/completion-report.mjs} (98%) rename scripts/{lib/managed-conformance-config.mjs => verify/managed/config.mjs} (100%) rename scripts/{verify-managed-conformance.mjs => verify/managed/conformance.mjs} (90%) rename scripts/{lib/managed-conformance-manifest-parser.mjs => verify/managed/manifest-parser.mjs} (100%) rename scripts/{lib/managed-conformance-manifest.mjs => verify/managed/manifest.mjs} (93%) rename scripts/{lib/managed-conformance-oracles.mjs => verify/managed/oracles.mjs} (94%) rename scripts/{lib/managed-conformance-support.mjs => verify/managed/support.mjs} (85%) rename src/application/{ => managed}/ManagedApplicationGraphService.ts (86%) rename src/application/{ => managed}/ManagedMemberComparisonService.ts (89%) rename src/application/{ => managed}/ManagedNativeVerificationService.ts (80%) rename src/application/{ => managed}/ManagedReconstructionService.test.ts (93%) rename src/application/{ => managed}/ManagedReconstructionService.ts (86%) rename src/contracts/{ => managed}/managedToolContracts.ts (93%) rename src/contracts/{ => managed}/managedWorkflowExamples.ts (97%) rename src/contracts/{ => managed}/managedWorkflowToolContracts.ts (94%) rename src/domain/{ => managed}/managedApplicationGraph.ts (96%) rename src/domain/{ => managed}/managedApplicationGraphCoverage.ts (95%) rename src/domain/{ => managed}/managedApplicationGraphNodeCoverage.ts (100%) rename src/domain/{ => managed}/managedApplicationGraphNodes.ts (99%) rename src/domain/{ => managed}/managedArtifact.ts (99%) rename src/domain/{ => managed}/managedMemberComparison.ts (97%) rename src/domain/{ => managed}/managedMemberComparisonCoverage.ts (100%) rename src/domain/{ => managed}/managedMemberComparisonItems.ts (100%) rename src/domain/{ => managed}/managedMemberComparisonMatch.ts (98%) rename src/domain/{ => managed}/managedNativeVerification.ts (96%) rename src/domain/{ => managed}/managedNativeVerificationMatch.ts (98%) rename src/domain/{ => managed}/managedNativeVerificationSchemas.ts (96%) rename src/domain/{ => managed}/managedReconstruction.test.ts (98%) rename src/domain/{ => managed}/managedReconstruction.ts (97%) diff --git a/docs/capability-migration.md b/docs/capability-migration.md index 568cf4411c..5761279c1c 100644 --- a/docs/capability-migration.md +++ b/docs/capability-migration.md @@ -295,6 +295,30 @@ lifecycles. Runtime ports retain their distinct Inspector, passive Electron and active Electron effects; shipped Electron hooks remain at their existing provider boundary. +## Managed capability ownership + +`src/domain/managed/` owns managed artifact and member semantics, reconstruction +import, native-boundary verification and application graph projection. +`src/application/managed/` owns their shared Evidence workflows, and +`src/contracts/managed/` owns their named contracts and examples. Producer +metadata/IL parsing stays in `src/dotnet/`; target resolution, Evidence, ordering +and investigation records retain their shared owners. Path-based member +comparison preserves its actual target/byte-digest admission and existing parser +helper. + +`scripts/verify/managed/` groups the portable conformance entrypoint and its +support, manifest, oracle and completion-report helpers. Its PE byte fixture +builder and declaration live in `scripts/fixtures/managed/`, shared with the +installed-package lane and existing managed conformance tests. `verify:managed` +keeps its command name and optional caller-cwd manifest resolution. Compiled +catalog and generator imports follow the owners; document-check cache inputs +include the relocated runtime verifier and fixture files. + +Portable byte fixtures, optional operator-local manifests, actual ILSpy oracles +and real Ghidra NativeAOT checks retain their distinct proof levels and +prerequisites. The existing NativeAOT fixture/engine lane keeps its owner. This +move preserves implementations, Evidence identities and generated commitments. + ## Binary application ownership `src/application/binary/` owns the active session, deep-provider registry and diff --git a/docs/testing.md b/docs/testing.md index f90ff820fc..ab880da0d4 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -61,6 +61,16 @@ needed, exercise the actual target through browser, Electron, or process capture. Real model trials are manual; Vitest covers deterministic evaluator logic. +`verify:managed` runs the portable PE byte-fixture conformance entrypoint under +`scripts/verify/managed/`, with its byte builder under +`scripts/fixtures/managed/`. It checks static classification, members, +reconstruction, native-boundary relationships and application graphs without +executing fixture PE files. Operator-local manifests and actual ILSpy oracles +remain optional, separately reported checks; the real Ghidra NativeAOT lane has +its own toolchain prerequisites. See [the managed guide](managed-code-analysis.md) +for those configurations. Generated completion-ledger checks use the same owning +entrypoint and include its verifier/fixture files in their cache inputs. + ## End-to-end, integration and golden evidence Full E2E tests invoke the production command dispatcher and real providers, diff --git a/package.json b/package.json index 9cc536ed75..86de894b22 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "verify:javascript-runtime": "npm run build:cached && node scripts/verify/javascript/runtime-observation.mjs", "verify:javascript:digests": "npm run build:cached && node scripts/verify/javascript/digests.mjs", "verify:application-workflows": "npm run build:cached && node scripts/verify/javascript/application-workflows.mjs", - "verify:managed": "npm run build:cached && node scripts/verify-managed-conformance.mjs", + "verify:managed": "npm run build:cached && node scripts/verify/managed/conformance.mjs", "verify:firmware": "npm run build:cached && node scripts/verify/firmware/analysis.mjs", "fixtures:firmware": "node scripts/fixtures/firmware/generate.mjs", "verify:android": "npm run build:cached && node scripts/verify/android/analysis.mjs", diff --git a/scripts/lib/managed-pe-fixture.d.mts b/scripts/fixtures/managed/pe.d.mts similarity index 100% rename from scripts/lib/managed-pe-fixture.d.mts rename to scripts/fixtures/managed/pe.d.mts diff --git a/scripts/lib/managed-pe-fixture.mjs b/scripts/fixtures/managed/pe.mjs similarity index 100% rename from scripts/lib/managed-pe-fixture.mjs rename to scripts/fixtures/managed/pe.mjs diff --git a/scripts/generate-completion-ledger.mjs b/scripts/generate-completion-ledger.mjs index 6242313cce..fa3bf6b4a0 100644 --- a/scripts/generate-completion-ledger.mjs +++ b/scripts/generate-completion-ledger.mjs @@ -22,7 +22,7 @@ delete verifierEnvironment.REA_ILSPY_CMD_PATH; const { stdout } = await exec( process.execPath, - [join(root, "scripts/verify-managed-conformance.mjs")], + [join(root, "scripts/verify/managed/conformance.mjs")], { cwd: root, env: verifierEnvironment, diff --git a/scripts/generate-mcp-tool-catalog.mjs b/scripts/generate-mcp-tool-catalog.mjs index d66d9b4ce0..7d44af653a 100644 --- a/scripts/generate-mcp-tool-catalog.mjs +++ b/scripts/generate-mcp-tool-catalog.mjs @@ -6,7 +6,7 @@ import { Ajv2020 } from "ajv/dist/2020.js"; import { McpServer } from "@modelcontextprotocol/server"; import { TOOL_CONTRACTS } from "../dist/contracts/toolContracts.js"; -import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "../dist/contracts/managedWorkflowToolContracts.js"; +import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "../dist/contracts/managed/managedWorkflowToolContracts.js"; import { auxiliaryAnalysisProviderDeclarations } from "../dist/composition/auxiliaryAnalysisProviders.js"; import { toolRegistrationOptions } from "../dist/server/toolRegistrationOptions.js"; import { ensureGeneratedFile } from "./lib/generated-file.mjs"; diff --git a/scripts/lib/catalog-core.mjs b/scripts/lib/catalog-core.mjs index a1559d4c8d..5c1ae369cc 100644 --- a/scripts/lib/catalog-core.mjs +++ b/scripts/lib/catalog-core.mjs @@ -42,12 +42,13 @@ const SOURCE_PATHS = { sessionContracts: "dist/contracts/sessionToolContracts.js", nativeContracts: "dist/contracts/nativeToolContracts.js", artifactContracts: "dist/contracts/artifactToolContracts.js", - managedContracts: "dist/contracts/managedToolContracts.js", + managedContracts: "dist/contracts/managed/managedToolContracts.js", firmwareContracts: "dist/contracts/firmware/firmwareToolContracts.js", firmwareProvider: "dist/firmware/FirmwareRelease.js", androidContracts: "dist/contracts/android/androidToolContracts.js", androidProvider: "dist/android/JadxRelease.js", - managedWorkflowContracts: "dist/contracts/managedWorkflowToolContracts.js", + managedWorkflowContracts: + "dist/contracts/managed/managedWorkflowToolContracts.js", browserContracts: "dist/contracts/browserToolContracts.js", browserScenarioContracts: "dist/contracts/browserScenarioToolContracts.js", electronContracts: "dist/contracts/javascript/electronToolContracts.js", @@ -88,9 +89,9 @@ const SOURCE_PATHS = { "dist/domain/javascript/javascriptRuntimeObservation.js", webBundleAnalysis: "dist/domain/webBundleAnalysis.js", webCaptureDiff: "dist/domain/webCaptureDiff.js", - managedArtifact: "dist/domain/managedArtifact.js", - managedComparison: "dist/domain/managedMemberComparison.js", - managedNativeVerification: "dist/domain/managedNativeVerification.js", + managedArtifact: "dist/domain/managed/managedArtifact.js", + managedComparison: "dist/domain/managed/managedMemberComparison.js", + managedNativeVerification: "dist/domain/managed/managedNativeVerification.js", webMcpDiscovery: "dist/domain/webMcpDiscovery.js", webScreenshot: "dist/domain/webScreenshot.js", javascriptApplicationGraph: diff --git a/scripts/verify-package-managed.mjs b/scripts/verify-package-managed.mjs index 3f1d1c5c54..16ef569937 100644 --- a/scripts/verify-package-managed.mjs +++ b/scripts/verify-package-managed.mjs @@ -2,7 +2,7 @@ import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { createEvidence } from "../dist/domain/evidence.js"; -import { buildManagedPeFixture } from "./lib/managed-pe-fixture.mjs"; +import { buildManagedPeFixture } from "./fixtures/managed/pe.mjs"; import { functionDossier, json, run } from "./lib/verify-package-core.mjs"; const buildManagedFixtures = async (workspace) => { diff --git a/scripts/lib/managed-completion-report.mjs b/scripts/verify/managed/completion-report.mjs similarity index 98% rename from scripts/lib/managed-completion-report.mjs rename to scripts/verify/managed/completion-report.mjs index 01124d6046..9cd900f589 100644 --- a/scripts/lib/managed-completion-report.mjs +++ b/scripts/verify/managed/completion-report.mjs @@ -1,4 +1,4 @@ -import { createEvidence } from "../../dist/domain/evidence.js"; +import { createEvidence } from "../../../dist/domain/evidence.js"; const COMPLETION_PROVIDER = { id: "rea-managed-conformance", diff --git a/scripts/lib/managed-conformance-config.mjs b/scripts/verify/managed/config.mjs similarity index 100% rename from scripts/lib/managed-conformance-config.mjs rename to scripts/verify/managed/config.mjs diff --git a/scripts/verify-managed-conformance.mjs b/scripts/verify/managed/conformance.mjs similarity index 90% rename from scripts/verify-managed-conformance.mjs rename to scripts/verify/managed/conformance.mjs index e499c6d249..c274fff409 100644 --- a/scripts/verify-managed-conformance.mjs +++ b/scripts/verify/managed/conformance.mjs @@ -3,21 +3,21 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; import assert from "node:assert/strict"; -import { inspectManagedArtifactBytes } from "../dist/dotnet/ManagedArtifactInspector.js"; -import { inspectManagedMembersBytes } from "../dist/dotnet/ManagedMemberInspector.js"; -import { inspectManagedNativeBoundariesBytes } from "../dist/dotnet/ManagedNativeBoundaryInspector.js"; -import { compareManagedMemberPaths } from "../dist/application/ManagedMemberComparisonService.js"; -import { verifyManagedNativeBoundariesEvidence } from "../dist/application/ManagedNativeVerificationService.js"; -import { importManagedReconstructionEvidence } from "../dist/application/ManagedReconstructionService.js"; -import { projectManagedApplicationGraphEvidence } from "../dist/application/ManagedApplicationGraphService.js"; -import { traceApplicationFeatureEvidence } from "../dist/application/javascript/JavaScriptApplicationWorkflowService.js"; -import { MANAGED_STATIC_PROVIDER } from "../dist/application/InvestigationProviders.js"; -import { createEvidence } from "../dist/domain/evidence.js"; +import { inspectManagedArtifactBytes } from "../../../dist/dotnet/ManagedArtifactInspector.js"; +import { inspectManagedMembersBytes } from "../../../dist/dotnet/ManagedMemberInspector.js"; +import { inspectManagedNativeBoundariesBytes } from "../../../dist/dotnet/ManagedNativeBoundaryInspector.js"; +import { compareManagedMemberPaths } from "../../../dist/application/managed/ManagedMemberComparisonService.js"; +import { verifyManagedNativeBoundariesEvidence } from "../../../dist/application/managed/ManagedNativeVerificationService.js"; +import { importManagedReconstructionEvidence } from "../../../dist/application/managed/ManagedReconstructionService.js"; +import { projectManagedApplicationGraphEvidence } from "../../../dist/application/managed/ManagedApplicationGraphService.js"; +import { traceApplicationFeatureEvidence } from "../../../dist/application/javascript/JavaScriptApplicationWorkflowService.js"; +import { MANAGED_STATIC_PROVIDER } from "../../../dist/application/InvestigationProviders.js"; +import { createEvidence } from "../../../dist/domain/evidence.js"; import { alternateMvid, buildNativePeFixture, -} from "./lib/managed-pe-fixture.mjs"; -import { createManagedConformanceSupport } from "./lib/managed-conformance-support.mjs"; +} from "../../fixtures/managed/pe.mjs"; +import { createManagedConformanceSupport } from "./support.mjs"; import { comparisonLimits, defaultIlBody, @@ -25,9 +25,12 @@ import { inspectionLimits, memberLimits, nativeBoundaryLimits, -} from "./lib/managed-conformance-config.mjs"; -import { createManagedCompletionReport } from "./lib/managed-completion-report.mjs"; -import { completeVerifierRun, createVerifierRun } from "./lib/verifier-run.mjs"; +} from "./config.mjs"; +import { createManagedCompletionReport } from "./completion-report.mjs"; +import { + completeVerifierRun, + createVerifierRun, +} from "../../lib/verifier-run.mjs"; const verifierRun = createVerifierRun(); const workspace = await mkdtemp(join(tmpdir(), "rea-managed-conformance-")); diff --git a/scripts/lib/managed-conformance-manifest-parser.mjs b/scripts/verify/managed/manifest-parser.mjs similarity index 100% rename from scripts/lib/managed-conformance-manifest-parser.mjs rename to scripts/verify/managed/manifest-parser.mjs diff --git a/scripts/lib/managed-conformance-manifest.mjs b/scripts/verify/managed/manifest.mjs similarity index 93% rename from scripts/lib/managed-conformance-manifest.mjs rename to scripts/verify/managed/manifest.mjs index ff24863ab2..ecf3f7e34f 100644 --- a/scripts/lib/managed-conformance-manifest.mjs +++ b/scripts/verify/managed/manifest.mjs @@ -1,18 +1,18 @@ import { basename, dirname, isAbsolute, resolve } from "node:path"; import { readFile } from "node:fs/promises"; -import { parseBinaryTarget } from "../../dist/application/BinaryTargetResolver.js"; -import { inspectManagedArtifactBytes } from "../../dist/dotnet/ManagedArtifactInspector.js"; -import { inspectManagedMembersBytes } from "../../dist/dotnet/ManagedMemberInspector.js"; -import { projectManagedApplicationGraphEvidence } from "../../dist/application/ManagedApplicationGraphService.js"; -import { traceApplicationFeatureEvidence } from "../../dist/application/javascript/JavaScriptApplicationWorkflowService.js"; -import { createEvidence } from "../../dist/domain/evidence.js"; -import { MANAGED_STATIC_PROVIDER } from "../../dist/application/InvestigationProviders.js"; +import { parseBinaryTarget } from "../../../dist/application/BinaryTargetResolver.js"; +import { inspectManagedArtifactBytes } from "../../../dist/dotnet/ManagedArtifactInspector.js"; +import { inspectManagedMembersBytes } from "../../../dist/dotnet/ManagedMemberInspector.js"; +import { projectManagedApplicationGraphEvidence } from "../../../dist/application/managed/ManagedApplicationGraphService.js"; +import { traceApplicationFeatureEvidence } from "../../../dist/application/javascript/JavaScriptApplicationWorkflowService.js"; +import { createEvidence } from "../../../dist/domain/evidence.js"; +import { MANAGED_STATIC_PROVIDER } from "../../../dist/application/InvestigationProviders.js"; import { ensure, methodTokenRow, parseManagedAppManifest, -} from "./managed-conformance-manifest-parser.mjs"; +} from "./manifest-parser.mjs"; export const createManagedManifestVerifier = (context) => ({ verifyManagedAppManifest: (rawManifest, manifestPath) => diff --git a/scripts/lib/managed-conformance-oracles.mjs b/scripts/verify/managed/oracles.mjs similarity index 94% rename from scripts/lib/managed-conformance-oracles.mjs rename to scripts/verify/managed/oracles.mjs index 7181ccbe1e..e2b83b78f6 100644 --- a/scripts/lib/managed-conformance-oracles.mjs +++ b/scripts/verify/managed/oracles.mjs @@ -5,12 +5,12 @@ import { basename, isAbsolute, join, resolve } from "node:path"; import assert from "node:assert/strict"; import { promisify } from "node:util"; -import { inspectManagedArtifactBytes } from "../../dist/dotnet/ManagedArtifactInspector.js"; -import { inspectManagedMembersBytes } from "../../dist/dotnet/ManagedMemberInspector.js"; -import { importManagedReconstructionEvidence } from "../../dist/application/ManagedReconstructionService.js"; -import { createEvidence } from "../../dist/domain/evidence.js"; -import { MANAGED_STATIC_PROVIDER } from "../../dist/application/InvestigationProviders.js"; -import { createManagedManifestVerifier } from "./managed-conformance-manifest.mjs"; +import { inspectManagedArtifactBytes } from "../../../dist/dotnet/ManagedArtifactInspector.js"; +import { inspectManagedMembersBytes } from "../../../dist/dotnet/ManagedMemberInspector.js"; +import { importManagedReconstructionEvidence } from "../../../dist/application/managed/ManagedReconstructionService.js"; +import { createEvidence } from "../../../dist/domain/evidence.js"; +import { MANAGED_STATIC_PROVIDER } from "../../../dist/application/InvestigationProviders.js"; +import { createManagedManifestVerifier } from "./manifest.mjs"; const execFileAsync = promisify(execFile); diff --git a/scripts/lib/managed-conformance-support.mjs b/scripts/verify/managed/support.mjs similarity index 85% rename from scripts/lib/managed-conformance-support.mjs rename to scripts/verify/managed/support.mjs index be0d5ea9df..18a200e338 100644 --- a/scripts/lib/managed-conformance-support.mjs +++ b/scripts/verify/managed/support.mjs @@ -2,9 +2,9 @@ import { createHash } from "node:crypto"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; -import { parseBinaryTarget } from "../../dist/application/BinaryTargetResolver.js"; -import { buildManagedPeFixture } from "./managed-pe-fixture.mjs"; -import { createManagedConformanceOracleSupport } from "./managed-conformance-oracles.mjs"; +import { parseBinaryTarget } from "../../../dist/application/BinaryTargetResolver.js"; +import { buildManagedPeFixture } from "../../fixtures/managed/pe.mjs"; +import { createManagedConformanceOracleSupport } from "./oracles.mjs"; export const createManagedConformanceSupport = (context) => { const fixtureBytes = async (name, bytes) => { diff --git a/src/application/AnalysisProvider.ts b/src/application/AnalysisProvider.ts index d1ba09e0c9..0983a3a301 100644 --- a/src/application/AnalysisProvider.ts +++ b/src/application/AnalysisProvider.ts @@ -3,7 +3,7 @@ import type { OfficialToolName } from "../contracts/officialToolContracts.js"; import type { EnhancedToolName } from "../contracts/enhancedInputs.js"; import type { NativeToolName } from "../contracts/nativeToolContracts.js"; import type { ArtifactAnalysisOperation } from "../contracts/artifactToolContracts.js"; -import type { ManagedToolName } from "../contracts/managedToolContracts.js"; +import type { ManagedToolName } from "../contracts/managed/managedToolContracts.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js"; import type { JsonValue } from "../domain/jsonValue.js"; diff --git a/src/application/DirectAnalysis.ts b/src/application/DirectAnalysis.ts index 412f43ff14..5875047bb4 100644 --- a/src/application/DirectAnalysis.ts +++ b/src/application/DirectAnalysis.ts @@ -12,7 +12,7 @@ import type { ArtifactAnalysisOperation } from "../contracts/artifactToolContrac import { isManagedToolName, type ManagedToolName, -} from "../contracts/managedToolContracts.js"; +} from "../contracts/managed/managedToolContracts.js"; import { EvidenceIntegrityError } from "../domain/evidenceErrors.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { type AnalysisError } from "../domain/analysisErrorBase.js"; diff --git a/src/application/javascript/JavaScriptApplicationEvidenceGraph.ts b/src/application/javascript/JavaScriptApplicationEvidenceGraph.ts index 622e5f0283..8d9106359a 100644 --- a/src/application/javascript/JavaScriptApplicationEvidenceGraph.ts +++ b/src/application/javascript/JavaScriptApplicationEvidenceGraph.ts @@ -12,7 +12,7 @@ import { import type { JavaScriptApplicationGraph } from "../../domain/javascript/javascriptApplicationGraph.js"; import type { JavaScriptSemanticGraph } from "../../domain/javascript/javascriptSemanticGraph.js"; import { javascriptRuntimeReconciliationResultSchema } from "../../domain/javascript/javascriptRuntimeReconciliationSchemas.js"; -import { managedApplicationGraphResultSchema } from "../../domain/managedApplicationGraph.js"; +import { managedApplicationGraphResultSchema } from "../../domain/managed/managedApplicationGraph.js"; /** Supported immutable source for an application-level graph workflow. */ export interface ApplicationGraphEvidenceSource { diff --git a/src/application/ManagedApplicationGraphService.ts b/src/application/managed/ManagedApplicationGraphService.ts similarity index 86% rename from src/application/ManagedApplicationGraphService.ts rename to src/application/managed/ManagedApplicationGraphService.ts index 9bd42fe6a2..5c27f648f3 100644 --- a/src/application/ManagedApplicationGraphService.ts +++ b/src/application/managed/ManagedApplicationGraphService.ts @@ -3,19 +3,19 @@ import { z } from "zod"; import { AnalysisInputError, AnalysisProtocolError, -} from "../domain/analysisErrorCore.js"; -import { type AnalysisError } from "../domain/analysisErrorBase.js"; -import { createEvidence, type Evidence } from "../domain/evidence.js"; -import { jsonValueSchema } from "../domain/jsonValue.js"; +} from "../../domain/analysisErrorCore.js"; +import { type AnalysisError } from "../../domain/analysisErrorBase.js"; +import { createEvidence, type Evidence } from "../../domain/evidence.js"; +import { jsonValueSchema } from "../../domain/jsonValue.js"; import { managedApplicationGraphResultSchema, projectManagedApplicationGraph, projectManagedApplicationGraphInputSchema, type ManagedApplicationGraphResult, type ProjectManagedApplicationGraphInput, -} from "../domain/managedApplicationGraph.js"; -import { err, ok, type Result } from "../domain/result.js"; -import { MANAGED_WORKFLOW_PROVIDER } from "./InvestigationProviders.js"; +} from "../../domain/managed/managedApplicationGraph.js"; +import { err, ok, type Result } from "../../domain/result.js"; +import { MANAGED_WORKFLOW_PROVIDER } from "../InvestigationProviders.js"; const OPERATION = "project_managed_application_graph" as const; diff --git a/src/application/ManagedMemberComparisonService.ts b/src/application/managed/ManagedMemberComparisonService.ts similarity index 89% rename from src/application/ManagedMemberComparisonService.ts rename to src/application/managed/ManagedMemberComparisonService.ts index 47426a9097..e27846f14d 100644 --- a/src/application/ManagedMemberComparisonService.ts +++ b/src/application/managed/ManagedMemberComparisonService.ts @@ -8,22 +8,22 @@ import { managedMemberComparisonResultSchema, parseManagedMemberEvidence, type CompareManagedMembersInput, -} from "../domain/managedMemberComparison.js"; +} from "../../domain/managed/managedMemberComparison.js"; import { AnalysisInputError, AnalysisProtocolError, -} from "../domain/analysisErrorCore.js"; -import { EvidenceIntegrityError } from "../domain/evidenceErrors.js"; -import { type AnalysisError } from "../domain/analysisErrorBase.js"; -import { createEvidence, type Evidence } from "../domain/evidence.js"; -import { jsonValueSchema } from "../domain/jsonValue.js"; -import { parseBinaryTarget } from "./BinaryTargetResolver.js"; -import { err, ok, type Result } from "../domain/result.js"; -import { inspectManagedMembersBytes } from "../dotnet/ManagedMemberInspector.js"; +} from "../../domain/analysisErrorCore.js"; +import { EvidenceIntegrityError } from "../../domain/evidenceErrors.js"; +import { type AnalysisError } from "../../domain/analysisErrorBase.js"; +import { createEvidence, type Evidence } from "../../domain/evidence.js"; +import { jsonValueSchema } from "../../domain/jsonValue.js"; +import { parseBinaryTarget } from "../BinaryTargetResolver.js"; +import { err, ok, type Result } from "../../domain/result.js"; +import { inspectManagedMembersBytes } from "../../dotnet/ManagedMemberInspector.js"; import { MANAGED_STATIC_PROVIDER, MANAGED_WORKFLOW_PROVIDER, -} from "./InvestigationProviders.js"; +} from "../InvestigationProviders.js"; /** Compare managed members from input parsed by a trusted adapter. */ export const compareManagedMembersEvidenceValidated = ( diff --git a/src/application/ManagedNativeVerificationService.ts b/src/application/managed/ManagedNativeVerificationService.ts similarity index 80% rename from src/application/ManagedNativeVerificationService.ts rename to src/application/managed/ManagedNativeVerificationService.ts index 63ddc799cb..6835701ae9 100644 --- a/src/application/ManagedNativeVerificationService.ts +++ b/src/application/managed/ManagedNativeVerificationService.ts @@ -3,18 +3,18 @@ import { z } from "zod"; import { AnalysisInputError, AnalysisProtocolError, -} from "../domain/analysisErrorCore.js"; -import { type AnalysisError } from "../domain/analysisErrorBase.js"; -import { createEvidence, type Evidence } from "../domain/evidence.js"; -import { jsonValueSchema } from "../domain/jsonValue.js"; +} from "../../domain/analysisErrorCore.js"; +import { type AnalysisError } from "../../domain/analysisErrorBase.js"; +import { createEvidence, type Evidence } from "../../domain/evidence.js"; +import { jsonValueSchema } from "../../domain/jsonValue.js"; import { managedNativeVerificationInputSchema, verifyManagedNativeBoundaries, type ManagedNativeVerificationInput, type ManagedNativeVerificationResult, -} from "../domain/managedNativeVerification.js"; -import { err, ok, type Result } from "../domain/result.js"; -import { MANAGED_WORKFLOW_PROVIDER } from "./InvestigationProviders.js"; +} from "../../domain/managed/managedNativeVerification.js"; +import { err, ok, type Result } from "../../domain/result.js"; +import { MANAGED_WORKFLOW_PROVIDER } from "../InvestigationProviders.js"; const OPERATION = "verify_managed_native_boundaries" as const; diff --git a/src/application/ManagedReconstructionService.test.ts b/src/application/managed/ManagedReconstructionService.test.ts similarity index 93% rename from src/application/ManagedReconstructionService.test.ts rename to src/application/managed/ManagedReconstructionService.test.ts index d4afa734d2..c980e1c6f3 100644 --- a/src/application/ManagedReconstructionService.test.ts +++ b/src/application/managed/ManagedReconstructionService.test.ts @@ -2,13 +2,13 @@ import { createHash } from "node:crypto"; import { describe, expect, it } from "vitest"; -import { MANAGED_RECONSTRUCTION_IMPORT_EXAMPLE } from "../contracts/managedWorkflowExamples.js"; +import { MANAGED_RECONSTRUCTION_IMPORT_EXAMPLE } from "../../contracts/managed/managedWorkflowExamples.js"; import { importManagedReconstruction, managedReconstructionImportInputSchema, -} from "../domain/managedReconstruction.js"; -import { managedMemberInspectionSchema } from "../domain/managedArtifact.js"; -import { createEvidence } from "../domain/evidence.js"; +} from "../../domain/managed/managedReconstruction.js"; +import { managedMemberInspectionSchema } from "../../domain/managed/managedArtifact.js"; +import { createEvidence } from "../../domain/evidence.js"; import { importManagedReconstructionEvidence } from "./ManagedReconstructionService.js"; const exampleInput = () => diff --git a/src/application/ManagedReconstructionService.ts b/src/application/managed/ManagedReconstructionService.ts similarity index 86% rename from src/application/ManagedReconstructionService.ts rename to src/application/managed/ManagedReconstructionService.ts index e285271970..86c38f7f73 100644 --- a/src/application/ManagedReconstructionService.ts +++ b/src/application/managed/ManagedReconstructionService.ts @@ -3,18 +3,18 @@ import { z } from "zod"; import { AnalysisInputError, AnalysisProtocolError, -} from "../domain/analysisErrorCore.js"; -import { type AnalysisError } from "../domain/analysisErrorBase.js"; -import { createEvidence, type Evidence } from "../domain/evidence.js"; -import { jsonValueSchema } from "../domain/jsonValue.js"; +} from "../../domain/analysisErrorCore.js"; +import { type AnalysisError } from "../../domain/analysisErrorBase.js"; +import { createEvidence, type Evidence } from "../../domain/evidence.js"; +import { jsonValueSchema } from "../../domain/jsonValue.js"; import { importManagedReconstruction, managedReconstructionImportInputSchema, type ManagedReconstructionImportInput, type ManagedReconstructionImportResult, -} from "../domain/managedReconstruction.js"; -import { err, ok, type Result } from "../domain/result.js"; -import { MANAGED_WORKFLOW_PROVIDER } from "./InvestigationProviders.js"; +} from "../../domain/managed/managedReconstruction.js"; +import { err, ok, type Result } from "../../domain/result.js"; +import { MANAGED_WORKFLOW_PROVIDER } from "../InvestigationProviders.js"; const OPERATION = "import_managed_reconstruction" as const; diff --git a/src/cli/managedCommands.ts b/src/cli/managedCommands.ts index f1c65b107a..b3c167efdd 100644 --- a/src/cli/managedCommands.ts +++ b/src/cli/managedCommands.ts @@ -1,8 +1,8 @@ import { z } from "incur"; -import { compareManagedMemberPaths } from "../application/ManagedMemberComparisonService.js"; -import { verifyManagedNativeBoundariesEvidence } from "../application/ManagedNativeVerificationService.js"; -import { importManagedReconstructionEvidence } from "../application/ManagedReconstructionService.js"; +import { compareManagedMemberPaths } from "../application/managed/ManagedMemberComparisonService.js"; +import { verifyManagedNativeBoundariesEvidence } from "../application/managed/ManagedNativeVerificationService.js"; +import { importManagedReconstructionEvidence } from "../application/managed/ManagedReconstructionService.js"; import { runProviderAnalysis } from "../application/DirectAnalysis.js"; import { parseCliJsonInput } from "../cliJsonInput.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; diff --git a/src/cli/managedProjectGraphCommand.ts b/src/cli/managedProjectGraphCommand.ts index d41d99d99d..b1104de7ad 100644 --- a/src/cli/managedProjectGraphCommand.ts +++ b/src/cli/managedProjectGraphCommand.ts @@ -1,6 +1,6 @@ import { z } from "incur"; -import { projectManagedApplicationGraphEvidence } from "../application/ManagedApplicationGraphService.js"; +import { projectManagedApplicationGraphEvidence } from "../application/managed/ManagedApplicationGraphService.js"; import { CLI_COMMANDS } from "../cliCommandNames.js"; import { parseCliJsonInput } from "../cliJsonInput.js"; import { logCliCommand } from "../cliLogging.js"; diff --git a/src/contracts/contractSnapshot.test.ts b/src/contracts/contractSnapshot.test.ts index f0bbe69a60..3a606a0529 100644 --- a/src/contracts/contractSnapshot.test.ts +++ b/src/contracts/contractSnapshot.test.ts @@ -8,8 +8,8 @@ import { NATIVE_TOOL_CONTRACTS } from "./nativeToolContracts.js"; import { ARTIFACT_TOOL_CONTRACTS } from "./artifactToolContracts.js"; import { FIRMWARE_TOOL_CONTRACTS } from "./firmware/firmwareToolContracts.js"; import { ANDROID_TOOL_CONTRACTS } from "./android/androidToolContracts.js"; -import { MANAGED_TOOL_CONTRACTS } from "./managedToolContracts.js"; -import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "./managedWorkflowToolContracts.js"; +import { MANAGED_TOOL_CONTRACTS } from "./managed/managedToolContracts.js"; +import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "./managed/managedWorkflowToolContracts.js"; import { BROWSER_TOOL_CONTRACTS } from "./browserToolContracts.js"; import { BROWSER_SCENARIO_TOOL_CONTRACTS } from "./browserScenarioToolContracts.js"; import { ELECTRON_TOOL_CONTRACTS } from "./javascript/electronToolContracts.js"; diff --git a/src/contracts/managedToolContracts.ts b/src/contracts/managed/managedToolContracts.ts similarity index 93% rename from src/contracts/managedToolContracts.ts rename to src/contracts/managed/managedToolContracts.ts index 5f2c4ab968..dc57023227 100644 --- a/src/contracts/managedToolContracts.ts +++ b/src/contracts/managed/managedToolContracts.ts @@ -1,9 +1,9 @@ import { z } from "zod"; -import type { ToolContract } from "./toolContracts.js"; -import { managedOutputSchemas } from "./toolOutputSchemas.js"; -import { toolContractMetadata } from "./toolEffects.js"; -import { requireOutputSchema } from "./toolOutputSchemaPrimitives.js"; +import type { ToolContract } from "../toolContracts.js"; +import { managedOutputSchemas } from "../toolOutputSchemas.js"; +import { toolContractMetadata } from "../toolEffects.js"; +import { requireOutputSchema } from "../toolOutputSchemaPrimitives.js"; /** Exact caller boundary for execution-free PE/CLI triage and identity. */ const managedTargetInputSchema = z.object({ diff --git a/src/contracts/managedWorkflowExamples.ts b/src/contracts/managed/managedWorkflowExamples.ts similarity index 97% rename from src/contracts/managedWorkflowExamples.ts rename to src/contracts/managed/managedWorkflowExamples.ts index e6acdc5eb0..6340b2c2c5 100644 --- a/src/contracts/managedWorkflowExamples.ts +++ b/src/contracts/managed/managedWorkflowExamples.ts @@ -1,9 +1,9 @@ -import { createEvidence } from "../domain/evidence.js"; +import { createEvidence } from "../../domain/evidence.js"; import type { ManagedMemberInspection, ManagedNativeBoundaryInspection, -} from "../domain/managedArtifact.js"; -import type { InspectMacho } from "../domain/nativeInspection.js"; +} from "../../domain/managed/managedArtifact.js"; +import type { InspectMacho } from "../../domain/nativeInspection.js"; const MANAGED_STATIC_EXAMPLE_PROVIDER = { id: "rea-dotnet-static", diff --git a/src/contracts/managedWorkflowToolContracts.ts b/src/contracts/managed/managedWorkflowToolContracts.ts similarity index 94% rename from src/contracts/managedWorkflowToolContracts.ts rename to src/contracts/managed/managedWorkflowToolContracts.ts index 26e1886fdd..f1f8d40927 100644 --- a/src/contracts/managedWorkflowToolContracts.ts +++ b/src/contracts/managed/managedWorkflowToolContracts.ts @@ -1,17 +1,17 @@ import { z } from "zod"; -import { evidenceSchema } from "../domain/evidence.js"; +import { evidenceSchema } from "../../domain/evidence.js"; -import { managedReconstructionImportInputSchema } from "../domain/managedReconstruction.js"; -import type { ToolContract } from "./toolContracts.js"; -import { managedWorkflowOutputSchemas } from "./toolOutputSchemas.js"; +import { managedReconstructionImportInputSchema } from "../../domain/managed/managedReconstruction.js"; +import type { ToolContract } from "../toolContracts.js"; +import { managedWorkflowOutputSchemas } from "../toolOutputSchemas.js"; import { MANAGED_MEMBER_COMPARISON_EXAMPLE, MANAGED_NATIVE_VERIFICATION_EXAMPLE, MANAGED_APPLICATION_GRAPH_EXAMPLE, MANAGED_RECONSTRUCTION_IMPORT_EXAMPLE, } from "./managedWorkflowExamples.js"; -import { toolContractMetadata } from "./toolEffects.js"; -import { requireOutputSchema } from "./toolOutputSchemaPrimitives.js"; +import { toolContractMetadata } from "../toolEffects.js"; +import { requireOutputSchema } from "../toolOutputSchemaPrimitives.js"; /** Inputs for comparing two managed observations carried inline. */ export const compareManagedMembersReferenceInputSchema = z diff --git a/src/contracts/toolContracts.test.ts b/src/contracts/toolContracts.test.ts index b73588cb04..1649b96ecb 100644 --- a/src/contracts/toolContracts.test.ts +++ b/src/contracts/toolContracts.test.ts @@ -5,10 +5,10 @@ import { OFFICIAL_TOOL_CONTRACTS } from "./officialToolContracts.js"; import { SESSION_TOOL_CONTRACTS } from "./sessionToolContracts.js"; import { TOOL_CONTRACTS } from "./toolContracts.js"; import { ARTIFACT_TOOL_CONTRACTS } from "./artifactToolContracts.js"; -import { MANAGED_TOOL_CONTRACTS } from "./managedToolContracts.js"; +import { MANAGED_TOOL_CONTRACTS } from "./managed/managedToolContracts.js"; import { FIRMWARE_TOOL_CONTRACTS } from "./firmware/firmwareToolContracts.js"; import { ANDROID_TOOL_CONTRACTS } from "./android/androidToolContracts.js"; -import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "./managedWorkflowToolContracts.js"; +import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "./managed/managedWorkflowToolContracts.js"; import { NATIVE_TOOL_CONTRACTS } from "./nativeToolContracts.js"; import { BROWSER_PROVIDER_TOOL_CONTRACTS } from "./browserProviderToolContracts.js"; import { ELECTRON_TOOL_CONTRACTS } from "./javascript/electronToolContracts.js"; diff --git a/src/contracts/toolContracts.ts b/src/contracts/toolContracts.ts index 3966c2f567..6fa54b72ff 100644 --- a/src/contracts/toolContracts.ts +++ b/src/contracts/toolContracts.ts @@ -1,9 +1,9 @@ import { NATIVE_TOOL_CONTRACTS } from "./nativeToolContracts.js"; import { ARTIFACT_TOOL_CONTRACTS } from "./artifactToolContracts.js"; -import { MANAGED_TOOL_CONTRACTS } from "./managedToolContracts.js"; +import { MANAGED_TOOL_CONTRACTS } from "./managed/managedToolContracts.js"; import { FIRMWARE_TOOL_CONTRACTS } from "./firmware/firmwareToolContracts.js"; import { ANDROID_TOOL_CONTRACTS } from "./android/androidToolContracts.js"; -import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "./managedWorkflowToolContracts.js"; +import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "./managed/managedWorkflowToolContracts.js"; import { BROWSER_PROVIDER_TOOL_CONTRACTS } from "./browserProviderToolContracts.js"; import { ELECTRON_TOOL_CONTRACTS } from "./javascript/electronToolContracts.js"; import { JAVASCRIPT_RUNTIME_OBSERVATION_TOOL_CONTRACTS } from "./javascript/javascriptRuntimeObservationToolContracts.js"; diff --git a/src/contracts/toolOutputSchemaGroups.ts b/src/contracts/toolOutputSchemaGroups.ts index 2a8665591f..c4ef6b7707 100644 --- a/src/contracts/toolOutputSchemaGroups.ts +++ b/src/contracts/toolOutputSchemaGroups.ts @@ -37,11 +37,11 @@ import { managedArtifactInspectionSchema, managedMemberInspectionSchema, managedNativeBoundaryInspectionSchema, -} from "../domain/managedArtifact.js"; -import { managedMemberComparisonResultSchema } from "../domain/managedMemberComparison.js"; -import { managedNativeVerificationResultSchema } from "../domain/managedNativeVerification.js"; -import { managedReconstructionImportResultSchema } from "../domain/managedReconstruction.js"; -import { managedApplicationGraphResultSchema } from "../domain/managedApplicationGraph.js"; +} from "../domain/managed/managedArtifact.js"; +import { managedMemberComparisonResultSchema } from "../domain/managed/managedMemberComparison.js"; +import { managedNativeVerificationResultSchema } from "../domain/managed/managedNativeVerification.js"; +import { managedReconstructionImportResultSchema } from "../domain/managed/managedReconstruction.js"; +import { managedApplicationGraphResultSchema } from "../domain/managed/managedApplicationGraph.js"; import { artifactComparisonResultSchema } from "../domain/artifactComparison.js"; import { functionComparisonResultSchema } from "../domain/functionComparison.js"; import { bundleComparisonResultSchema } from "../domain/bundleComparison.js"; diff --git a/src/contracts/workflowInputContracts.test.ts b/src/contracts/workflowInputContracts.test.ts index 291d3dded2..a82481e5d3 100644 --- a/src/contracts/workflowInputContracts.test.ts +++ b/src/contracts/workflowInputContracts.test.ts @@ -7,12 +7,12 @@ import { MANAGED_APPLICATION_GRAPH_EXAMPLE, MANAGED_MEMBER_COMPARISON_EXAMPLE, MANAGED_NATIVE_VERIFICATION_EXAMPLE, -} from "./managedWorkflowExamples.js"; +} from "./managed/managedWorkflowExamples.js"; import { compareManagedMembersReferenceInputSchema, managedApplicationGraphReferenceInputSchema, managedNativeVerificationReferenceInputSchema, -} from "./managedWorkflowToolContracts.js"; +} from "./managed/managedWorkflowToolContracts.js"; describe("workflow input contracts", () => { it("rejects application Evidence ID references and duplicate inline records", () => { diff --git a/src/domain/managedApplicationGraph.ts b/src/domain/managed/managedApplicationGraph.ts similarity index 96% rename from src/domain/managedApplicationGraph.ts rename to src/domain/managed/managedApplicationGraph.ts index 63be9cf230..8158e205cf 100644 --- a/src/domain/managedApplicationGraph.ts +++ b/src/domain/managed/managedApplicationGraph.ts @@ -3,13 +3,13 @@ import { createHash } from "node:crypto"; import canonicalize from "canonicalize"; import { z } from "zod"; -import { evidenceSchema, parseEvidence, type Evidence } from "./evidence.js"; +import { evidenceSchema, parseEvidence, type Evidence } from "../evidence.js"; import { createJavaScriptApplicationGraph, javascriptApplicationGraphSchema, type ApplicationEdge, type ApplicationNode, -} from "./javascript/javascriptApplicationGraph.js"; +} from "../javascript/javascriptApplicationGraph.js"; import { managedArtifactInspectionSchema, managedMemberInspectionSchema, @@ -18,7 +18,7 @@ import { type ManagedMemberInspection, type ManagedNativeBoundaryInspection, } from "./managedArtifact.js"; -import type { JsonValue } from "./jsonValue.js"; +import type { JsonValue } from "../jsonValue.js"; import { assessManagedGraphOmissions, managedGraphEvidenceCoverage, @@ -30,8 +30,8 @@ import { addBoundaryNodes, addMemberNodes, } from "./managedApplicationGraphNodes.js"; -import { digestSchema } from "./../domain/digests.js"; -import { prefixedDigestSchema } from "./../domain/digests.js"; +import { digestSchema } from "../digests.js"; +import { prefixedDigestSchema } from "../digests.js"; const evidenceIdSchema = prefixedDigestSchema("ev"); const textSchema = z.string().min(1); diff --git a/src/domain/managedApplicationGraphCoverage.ts b/src/domain/managed/managedApplicationGraphCoverage.ts similarity index 95% rename from src/domain/managedApplicationGraphCoverage.ts rename to src/domain/managed/managedApplicationGraphCoverage.ts index cd60391b2e..612d389bcc 100644 --- a/src/domain/managedApplicationGraphCoverage.ts +++ b/src/domain/managed/managedApplicationGraphCoverage.ts @@ -1,4 +1,4 @@ -import type { ApplicationGraphEvidence } from "./javascript/javascriptApplicationGraph.js"; +import type { ApplicationGraphEvidence } from "../javascript/javascriptApplicationGraph.js"; import type { ManagedArtifactInspection, ManagedMemberInspection, diff --git a/src/domain/managedApplicationGraphNodeCoverage.ts b/src/domain/managed/managedApplicationGraphNodeCoverage.ts similarity index 100% rename from src/domain/managedApplicationGraphNodeCoverage.ts rename to src/domain/managed/managedApplicationGraphNodeCoverage.ts diff --git a/src/domain/managedApplicationGraphNodes.ts b/src/domain/managed/managedApplicationGraphNodes.ts similarity index 99% rename from src/domain/managedApplicationGraphNodes.ts rename to src/domain/managed/managedApplicationGraphNodes.ts index 33062d0050..3704055d24 100644 --- a/src/domain/managedApplicationGraphNodes.ts +++ b/src/domain/managed/managedApplicationGraphNodes.ts @@ -4,7 +4,7 @@ import { createJavaScriptApplicationNode, type ApplicationGraphEvidence, type ApplicationNode, -} from "./javascript/javascriptApplicationGraph.js"; +} from "../javascript/javascriptApplicationGraph.js"; import { managedSourceCoverage } from "./managedApplicationGraphCoverage.js"; import { type ManagedMemberInspection, diff --git a/src/domain/managedArtifact.ts b/src/domain/managed/managedArtifact.ts similarity index 99% rename from src/domain/managedArtifact.ts rename to src/domain/managed/managedArtifact.ts index 916283adf0..23d11d8ccd 100644 --- a/src/domain/managedArtifact.ts +++ b/src/domain/managed/managedArtifact.ts @@ -1,5 +1,5 @@ import { z } from "zod"; -import { digestSchema } from "./../domain/digests.js"; +import { digestSchema } from "../digests.js"; const tokenSchema = z.string().regex(/^0x[0-9a-f]{8}$/u); const offsetSchema = z.number().int().min(0); diff --git a/src/domain/managedMemberComparison.ts b/src/domain/managed/managedMemberComparison.ts similarity index 97% rename from src/domain/managedMemberComparison.ts rename to src/domain/managed/managedMemberComparison.ts index 31e14dd45a..3858ac8b64 100644 --- a/src/domain/managedMemberComparison.ts +++ b/src/domain/managed/managedMemberComparison.ts @@ -1,7 +1,7 @@ import { z } from "zod"; -import { emptyArraySchema } from "./emptyArraySchema.js"; -import { evidenceSchema } from "./evidence.js"; +import { emptyArraySchema } from "../emptyArraySchema.js"; +import { evidenceSchema } from "../evidence.js"; import { cliMetadataGuidSchema, type ManagedMemberInspection, @@ -18,8 +18,8 @@ import { buildMethodItems, } from "./managedMemberComparisonItems.js"; import { keyMembers, sha256 } from "./managedMemberComparisonMatch.js"; -import { digestSchema } from "./../domain/digests.js"; -import { prefixedDigestSchema } from "./../domain/digests.js"; +import { digestSchema } from "../digests.js"; +import { prefixedDigestSchema } from "../digests.js"; const evidenceIdSchema = prefixedDigestSchema("ev"); const tokenSchema = z.string().regex(/^0x[0-9a-f]{8}$/u); diff --git a/src/domain/managedMemberComparisonCoverage.ts b/src/domain/managed/managedMemberComparisonCoverage.ts similarity index 100% rename from src/domain/managedMemberComparisonCoverage.ts rename to src/domain/managed/managedMemberComparisonCoverage.ts diff --git a/src/domain/managedMemberComparisonItems.ts b/src/domain/managed/managedMemberComparisonItems.ts similarity index 100% rename from src/domain/managedMemberComparisonItems.ts rename to src/domain/managed/managedMemberComparisonItems.ts diff --git a/src/domain/managedMemberComparisonMatch.ts b/src/domain/managed/managedMemberComparisonMatch.ts similarity index 98% rename from src/domain/managedMemberComparisonMatch.ts rename to src/domain/managed/managedMemberComparisonMatch.ts index 9a809a71b1..0e3cb314f4 100644 --- a/src/domain/managedMemberComparisonMatch.ts +++ b/src/domain/managed/managedMemberComparisonMatch.ts @@ -2,7 +2,7 @@ import { createHash } from "node:crypto"; import canonicalize from "canonicalize"; -import { parseEvidence } from "./evidence.js"; +import { parseEvidence } from "../evidence.js"; import { managedMemberInspectionSchema, type ManagedMemberInspection, @@ -11,7 +11,7 @@ import type { ManagedMemberComparisonResult, ManagedMemberComparisonSide, } from "./managedMemberComparison.js"; -import type { JsonValue } from "./jsonValue.js"; +import type { JsonValue } from "../jsonValue.js"; export const sha256 = (value: JsonValue): string => { const serialized = canonicalize(value); diff --git a/src/domain/managedNativeVerification.ts b/src/domain/managed/managedNativeVerification.ts similarity index 96% rename from src/domain/managedNativeVerification.ts rename to src/domain/managed/managedNativeVerification.ts index 2b77f107c4..2263fd4120 100644 --- a/src/domain/managedNativeVerification.ts +++ b/src/domain/managed/managedNativeVerification.ts @@ -2,12 +2,12 @@ import { createHash } from "node:crypto"; import canonicalize from "canonicalize"; -import { parseEvidence } from "./evidence.js"; +import { parseEvidence } from "../evidence.js"; import { managedNativeBoundaryInspectionSchema, type ManagedNativeBoundaryInspection, } from "./managedArtifact.js"; -import type { JsonValue } from "./jsonValue.js"; +import type { JsonValue } from "../jsonValue.js"; import { managedNativeVerificationResultSchema, type ManagedNativeVerificationInput, diff --git a/src/domain/managedNativeVerificationMatch.ts b/src/domain/managed/managedNativeVerificationMatch.ts similarity index 98% rename from src/domain/managedNativeVerificationMatch.ts rename to src/domain/managed/managedNativeVerificationMatch.ts index 433881ff8b..20c2dd14b9 100644 --- a/src/domain/managedNativeVerificationMatch.ts +++ b/src/domain/managed/managedNativeVerificationMatch.ts @@ -3,11 +3,11 @@ import { basename } from "node:path"; import canonicalize from "canonicalize"; -import { parseEvidence } from "./evidence.js"; -import { functionDossierSchema } from "./hopperValues.js"; -import { inspectMachoSchema } from "./nativeInspection.js"; +import { parseEvidence } from "../evidence.js"; +import { functionDossierSchema } from "../hopperValues.js"; +import { inspectMachoSchema } from "../nativeInspection.js"; import type { ManagedNativeBoundaryInspection } from "./managedArtifact.js"; -import type { JsonValue } from "./jsonValue.js"; +import type { JsonValue } from "../jsonValue.js"; import { pinvokeVerificationSchema, type ManagedNativeVerificationInput, diff --git a/src/domain/managedNativeVerificationSchemas.ts b/src/domain/managed/managedNativeVerificationSchemas.ts similarity index 96% rename from src/domain/managedNativeVerificationSchemas.ts rename to src/domain/managed/managedNativeVerificationSchemas.ts index 3bf680182d..03590b3894 100644 --- a/src/domain/managedNativeVerificationSchemas.ts +++ b/src/domain/managed/managedNativeVerificationSchemas.ts @@ -1,10 +1,10 @@ import { z } from "zod"; -import { emptyArraySchema } from "./emptyArraySchema.js"; -import { evidenceSchema } from "./evidence.js"; +import { emptyArraySchema } from "../emptyArraySchema.js"; +import { evidenceSchema } from "../evidence.js"; import { cliMetadataGuidSchema } from "./managedArtifact.js"; -import { digestSchema } from "./../domain/digests.js"; -import { prefixedDigestSchema } from "./../domain/digests.js"; +import { digestSchema } from "../digests.js"; +import { prefixedDigestSchema } from "../digests.js"; const evidenceIdSchema = prefixedDigestSchema("ev"); const tokenSchema = z.string().regex(/^0x[0-9a-f]{8}$/u); diff --git a/src/domain/managedReconstruction.test.ts b/src/domain/managed/managedReconstruction.test.ts similarity index 98% rename from src/domain/managedReconstruction.test.ts rename to src/domain/managed/managedReconstruction.test.ts index e0d15337c6..a1b5837ba2 100644 --- a/src/domain/managedReconstruction.test.ts +++ b/src/domain/managed/managedReconstruction.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "vitest"; -import { createEvidence } from "./evidence.js"; +import { createEvidence } from "../evidence.js"; import { managedReconstructionImportInputSchema } from "./managedReconstruction.js"; describe("managed reconstruction import input", () => { diff --git a/src/domain/managedReconstruction.ts b/src/domain/managed/managedReconstruction.ts similarity index 97% rename from src/domain/managedReconstruction.ts rename to src/domain/managed/managedReconstruction.ts index d064f65b34..dc8863aced 100644 --- a/src/domain/managedReconstruction.ts +++ b/src/domain/managed/managedReconstruction.ts @@ -3,15 +3,15 @@ import { createHash } from "node:crypto"; import canonicalize from "canonicalize"; import { z } from "zod"; -import { evidenceSchema, parseEvidence } from "./evidence.js"; +import { evidenceSchema, parseEvidence } from "../evidence.js"; import { cliMetadataGuidSchema, managedMemberInspectionSchema, type ManagedMemberInspection, } from "./managedArtifact.js"; -import type { JsonValue } from "./jsonValue.js"; -import { digestSchema } from "./../domain/digests.js"; -import { prefixedDigestSchema } from "./../domain/digests.js"; +import type { JsonValue } from "../jsonValue.js"; +import { digestSchema } from "../digests.js"; +import { prefixedDigestSchema } from "../digests.js"; const evidenceIdSchema = prefixedDigestSchema("ev"); const tokenSchema = z.string().regex(/^0x[0-9a-f]{8}$/u); diff --git a/src/dotnet/ManagedArtifactInspector.ts b/src/dotnet/ManagedArtifactInspector.ts index 4f9fd75288..a5caecba98 100644 --- a/src/dotnet/ManagedArtifactInspector.ts +++ b/src/dotnet/ManagedArtifactInspector.ts @@ -3,7 +3,7 @@ import { managedArtifactInspectionSchema, type ManagedArtifactInspection, type ManagedParseIssue, -} from "../domain/managedArtifact.js"; +} from "../domain/managed/managedArtifact.js"; import { readManagedPeLayout, type ManagedCliHeader, diff --git a/src/dotnet/ManagedMemberInspector.ts b/src/dotnet/ManagedMemberInspector.ts index 16f2f5c5d9..8e3b6ef3d8 100644 --- a/src/dotnet/ManagedMemberInspector.ts +++ b/src/dotnet/ManagedMemberInspector.ts @@ -3,7 +3,7 @@ import { managedMemberInspectionSchema, type ManagedMemberInspection, type ManagedParseIssue, -} from "../domain/managedArtifact.js"; +} from "../domain/managed/managedArtifact.js"; import { readManagedPeLayout, type ManagedPeLayout, diff --git a/src/dotnet/ManagedMemberInspectorCore.ts b/src/dotnet/ManagedMemberInspectorCore.ts index 218761fbc8..227a93cc92 100644 --- a/src/dotnet/ManagedMemberInspectorCore.ts +++ b/src/dotnet/ManagedMemberInspectorCore.ts @@ -2,7 +2,7 @@ import { managedFailure, ManagedReaderFailure, } from "./ManagedReaderFailure.js"; -import type { ManagedMemberInspection } from "../domain/managedArtifact.js"; +import type { ManagedMemberInspection } from "../domain/managed/managedArtifact.js"; import { type ManagedMetadataLayout, type MetadataTableLayout, diff --git a/src/dotnet/ManagedMetadataInventory.ts b/src/dotnet/ManagedMetadataInventory.ts index ed0d88d9d5..f0eadaaa09 100644 --- a/src/dotnet/ManagedMetadataInventory.ts +++ b/src/dotnet/ManagedMetadataInventory.ts @@ -1,7 +1,7 @@ import type { ManagedArtifactInspection, ManagedParseIssue, -} from "../domain/managedArtifact.js"; +} from "../domain/managed/managedArtifact.js"; import { METADATA_TABLE_NAMES, type ManagedMetadataLayout, diff --git a/src/dotnet/ManagedMetadataInventoryRows.ts b/src/dotnet/ManagedMetadataInventoryRows.ts index 15c800ca88..836c9a376b 100644 --- a/src/dotnet/ManagedMetadataInventoryRows.ts +++ b/src/dotnet/ManagedMetadataInventoryRows.ts @@ -1,7 +1,7 @@ import type { ManagedArtifactInspection, ManagedParseIssue, -} from "../domain/managedArtifact.js"; +} from "../domain/managed/managedArtifact.js"; import { metadataRowOffset, type ManagedMetadataLayout, diff --git a/src/dotnet/ManagedNativeBoundaryHelpers.ts b/src/dotnet/ManagedNativeBoundaryHelpers.ts index 1e9908f426..5ef2e3bbb7 100644 --- a/src/dotnet/ManagedNativeBoundaryHelpers.ts +++ b/src/dotnet/ManagedNativeBoundaryHelpers.ts @@ -3,7 +3,7 @@ import { managedNativeBoundaryInspectionSchema, type ManagedNativeBoundaryInspection, type ManagedParseIssue, -} from "../domain/managedArtifact.js"; +} from "../domain/managed/managedArtifact.js"; import { type ManagedMetadataLayout } from "./ManagedMetadataLayout.js"; import { metadataRowCursor, diff --git a/src/dotnet/ManagedNativeBoundaryInspector.ts b/src/dotnet/ManagedNativeBoundaryInspector.ts index b9d519ee7d..a0e58f3c05 100644 --- a/src/dotnet/ManagedNativeBoundaryInspector.ts +++ b/src/dotnet/ManagedNativeBoundaryInspector.ts @@ -3,7 +3,7 @@ import { managedNativeBoundaryInspectionSchema, type ManagedNativeBoundaryInspection, type ManagedParseIssue, -} from "../domain/managedArtifact.js"; +} from "../domain/managed/managedArtifact.js"; import { readManagedMetadataInventory, type ManagedResourceDirectory, diff --git a/src/dotnet/ManagedPeReader.ts b/src/dotnet/ManagedPeReader.ts index 84e3ce5b66..2f2f7fdba0 100644 --- a/src/dotnet/ManagedPeReader.ts +++ b/src/dotnet/ManagedPeReader.ts @@ -1,4 +1,4 @@ -import type { ManagedParseIssue } from "../domain/managedArtifact.js"; +import type { ManagedParseIssue } from "../domain/managed/managedArtifact.js"; import { managedFailure, ManagedReaderFailure, diff --git a/src/dotnet/ManagedReaderFailure.ts b/src/dotnet/ManagedReaderFailure.ts index 98a28b18b0..734b72ea90 100644 --- a/src/dotnet/ManagedReaderFailure.ts +++ b/src/dotnet/ManagedReaderFailure.ts @@ -1,4 +1,4 @@ -import type { ManagedParseIssue } from "../domain/managedArtifact.js"; +import type { ManagedParseIssue } from "../domain/managed/managedArtifact.js"; /** Bounded format failure retained as caller-visible managed coverage. */ export class ManagedReaderFailure extends Error { diff --git a/src/dotnet/ManagedStaticProvider.ts b/src/dotnet/ManagedStaticProvider.ts index a61345960d..a5019006a3 100644 --- a/src/dotnet/ManagedStaticProvider.ts +++ b/src/dotnet/ManagedStaticProvider.ts @@ -21,7 +21,7 @@ import { managedMemberInputSchema, managedNativeBoundaryInputSchema, type ManagedToolName, -} from "../contracts/managedToolContracts.js"; +} from "../contracts/managed/managedToolContracts.js"; import type { BinaryTarget } from "../domain/binaryTarget.js"; import { AnalysisCancelledError, @@ -35,7 +35,7 @@ import type { ManagedArtifactInspection, ManagedMemberInspection, ManagedNativeBoundaryInspection, -} from "../domain/managedArtifact.js"; +} from "../domain/managed/managedArtifact.js"; import { err, ok } from "../domain/result.js"; import { inspectManagedArtifactBytes } from "./ManagedArtifactInspector.js"; import { inspectManagedMembersBytes } from "./ManagedMemberInspector.js"; diff --git a/src/dotnet/ManagedStaticProviderMetadata.ts b/src/dotnet/ManagedStaticProviderMetadata.ts index 09d5e970db..4495cdd59b 100644 --- a/src/dotnet/ManagedStaticProviderMetadata.ts +++ b/src/dotnet/ManagedStaticProviderMetadata.ts @@ -6,7 +6,7 @@ import { MANAGED_STATIC_PROVIDER } from "../application/InvestigationProviders.j import { MANAGED_TOOL_CONTRACTS, type ManagedToolName, -} from "../contracts/managedToolContracts.js"; +} from "../contracts/managed/managedToolContracts.js"; /** Identity of execution-free managed metadata observations. */ export const MANAGED_STATIC_PROVIDER_IDENTITY: ProviderIdentity = Object.freeze( diff --git a/src/server/registerManagedTools.ts b/src/server/registerManagedTools.ts index 1d7a8a84f5..66d5d54c85 100644 --- a/src/server/registerManagedTools.ts +++ b/src/server/registerManagedTools.ts @@ -3,14 +3,14 @@ import type { McpServer } from "@modelcontextprotocol/server"; import type { AnalysisOperationPort } from "../application/AnalysisProvider.js"; import type { BinarySessionPort } from "../application/binary/BinarySession.js"; -import { MANAGED_TOOL_CONTRACTS } from "../contracts/managedToolContracts.js"; +import { MANAGED_TOOL_CONTRACTS } from "../contracts/managed/managedToolContracts.js"; import type { BinaryTarget } from "../domain/binaryTarget.js"; import { AnalysisInputError } from "../domain/analysisErrorCore.js"; import { err } from "../domain/result.js"; import type { Logger } from "../logger.js"; import { registerEvidenceTools } from "./registerEvidenceTools.js"; import { runManagedProviderExecution } from "../application/DirectAnalysis.js"; -import { isManagedToolName } from "../contracts/managedToolContracts.js"; +import { isManagedToolName } from "../contracts/managed/managedToolContracts.js"; /** Register execution-free managed PE/CLI inspection. */ export const registerManagedTools = ( diff --git a/src/server/registerManagedWorkflowTools/compareManagedMembers.ts b/src/server/registerManagedWorkflowTools/compareManagedMembers.ts index 8e4522cf28..c744551037 100644 --- a/src/server/registerManagedWorkflowTools/compareManagedMembers.ts +++ b/src/server/registerManagedWorkflowTools/compareManagedMembers.ts @@ -1,8 +1,8 @@ import { recordSessionEvidenceSources } from "../sessionEvidence.js"; import type { McpServer } from "@modelcontextprotocol/server"; -import { compareManagedMembersEvidenceValidated } from "../../application/ManagedMemberComparisonService.js"; -import { managedMemberComparisonResultSchema } from "../../domain/managedMemberComparison.js"; +import { compareManagedMembersEvidenceValidated } from "../../application/managed/ManagedMemberComparisonService.js"; +import { managedMemberComparisonResultSchema } from "../../domain/managed/managedMemberComparison.js"; import { logToolExecution } from "../toolLogging.js"; import { toolRegistrationOptions } from "../toolRegistrationOptions.js"; import { toCallToolResult } from "../toolResult.js"; diff --git a/src/server/registerManagedWorkflowTools/contract.ts b/src/server/registerManagedWorkflowTools/contract.ts index 413c7cab40..a82ecbe538 100644 --- a/src/server/registerManagedWorkflowTools/contract.ts +++ b/src/server/registerManagedWorkflowTools/contract.ts @@ -1,4 +1,4 @@ -import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "../../contracts/managedWorkflowToolContracts.js"; +import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "../../contracts/managed/managedWorkflowToolContracts.js"; /** Locate one managed workflow tool contract by exact name. */ export function managedWorkflowContract( diff --git a/src/server/registerManagedWorkflowTools/importManagedReconstruction.ts b/src/server/registerManagedWorkflowTools/importManagedReconstruction.ts index 63d2414f31..d9ddecb6bd 100644 --- a/src/server/registerManagedWorkflowTools/importManagedReconstruction.ts +++ b/src/server/registerManagedWorkflowTools/importManagedReconstruction.ts @@ -1,6 +1,6 @@ import type { McpServer } from "@modelcontextprotocol/server"; -import { importManagedReconstructionEvidenceValidated } from "../../application/ManagedReconstructionService.js"; +import { importManagedReconstructionEvidenceValidated } from "../../application/managed/ManagedReconstructionService.js"; import { logToolExecution } from "../toolLogging.js"; import { toolRegistrationOptions } from "../toolRegistrationOptions.js"; import { toCallToolResult } from "../toolResult.js"; diff --git a/src/server/registerManagedWorkflowTools/projectManagedApplicationGraph.ts b/src/server/registerManagedWorkflowTools/projectManagedApplicationGraph.ts index 5caa969cb0..2e7ccc5fd6 100644 --- a/src/server/registerManagedWorkflowTools/projectManagedApplicationGraph.ts +++ b/src/server/registerManagedWorkflowTools/projectManagedApplicationGraph.ts @@ -1,7 +1,7 @@ import { recordSessionEvidenceSources } from "../sessionEvidence.js"; import type { McpServer } from "@modelcontextprotocol/server"; -import { projectManagedApplicationGraphEvidence } from "../../application/ManagedApplicationGraphService.js"; +import { projectManagedApplicationGraphEvidence } from "../../application/managed/ManagedApplicationGraphService.js"; import { logToolExecution } from "../toolLogging.js"; import { toolRegistrationOptions } from "../toolRegistrationOptions.js"; import { toCallToolResult } from "../toolResult.js"; diff --git a/src/server/registerManagedWorkflowTools/verifyManagedNativeBoundaries.ts b/src/server/registerManagedWorkflowTools/verifyManagedNativeBoundaries.ts index a5e0b70037..3bdffe8c1b 100644 --- a/src/server/registerManagedWorkflowTools/verifyManagedNativeBoundaries.ts +++ b/src/server/registerManagedWorkflowTools/verifyManagedNativeBoundaries.ts @@ -1,8 +1,8 @@ import { recordSessionEvidenceSources } from "../sessionEvidence.js"; import type { McpServer } from "@modelcontextprotocol/server"; -import { verifyManagedNativeBoundariesEvidence } from "../../application/ManagedNativeVerificationService.js"; -import { managedNativeVerificationResultSchema } from "../../domain/managedNativeVerification.js"; +import { verifyManagedNativeBoundariesEvidence } from "../../application/managed/ManagedNativeVerificationService.js"; +import { managedNativeVerificationResultSchema } from "../../domain/managed/managedNativeVerification.js"; import { logToolExecution } from "../toolLogging.js"; import { toolRegistrationOptions } from "../toolRegistrationOptions.js"; import { toCallToolResult } from "../toolResult.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 a5d5aac0f3..fa7bfe1e53 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 @@ -3,7 +3,7 @@ import { afterEach, describe, expect, it } from "vitest"; import { PROCEDURES, inventory, jsonResult } from "./enhancedToolsHarness.js"; import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js"; -import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "../../../src/contracts/managedWorkflowToolContracts.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"; import { TOOL_CONTRACTS } from "../../../src/contracts/toolContracts.js"; diff --git a/tests/boundary/mcp/managedMcp.test.ts b/tests/boundary/mcp/managedMcp.test.ts index c41d54546c..4ededb36de 100644 --- a/tests/boundary/mcp/managedMcp.test.ts +++ b/tests/boundary/mcp/managedMcp.test.ts @@ -13,7 +13,7 @@ import { composeBinarySession } from "../../../src/application/binary/BinarySess import type { BinarySession } from "../../../src/application/binary/BinarySession.js"; import type { BinaryTarget } from "../../../src/domain/binaryTarget.js"; import { SessionProviderRouter } from "../../../src/application/binary/SessionProviderRouter.js"; -import { MANAGED_NATIVE_VERIFICATION_EXAMPLE } from "../../../src/contracts/managedWorkflowExamples.js"; +import { MANAGED_NATIVE_VERIFICATION_EXAMPLE } from "../../../src/contracts/managed/managedWorkflowExamples.js"; import { ManagedStaticProvider } from "../../../src/dotnet/ManagedStaticProvider.js"; import { createServer } from "../../../src/server/createServer.js"; import { buildManagedPeFixture } from "../../../src/dotnet/ManagedPe.fixture.js"; diff --git a/tests/boundary/providers/managed/managedMemberComparison.test.ts b/tests/boundary/providers/managed/managedMemberComparison.test.ts index e1ba950777..a33b7592fb 100644 --- a/tests/boundary/providers/managed/managedMemberComparison.test.ts +++ b/tests/boundary/providers/managed/managedMemberComparison.test.ts @@ -8,12 +8,12 @@ import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js import { compareManagedMembersEvidenceValidated, compareManagedMemberPaths, -} from "../../../../src/application/ManagedMemberComparisonService.js"; +} from "../../../../src/application/managed/ManagedMemberComparisonService.js"; import { parseBinaryTarget } from "../../../../src/application/BinaryTargetResolver.js"; -import { managedMemberComparisonResultSchema } from "../../../../src/domain/managedMemberComparison.js"; +import { managedMemberComparisonResultSchema } from "../../../../src/domain/managed/managedMemberComparison.js"; import { createEvidence } from "../../../../src/domain/evidence.js"; import { jsonValueSchema } from "../../../../src/domain/jsonValue.js"; -import { compareManagedMembersInputSchema } from "../../../../src/domain/managedMemberComparison.js"; +import { compareManagedMembersInputSchema } from "../../../../src/domain/managed/managedMemberComparison.js"; import { inspectManagedMembersBytes } from "../../../../src/dotnet/ManagedMemberInspector.js"; import { managedPeFixtureTarget } from "../../../../src/dotnet/ManagedPe.fixture.js"; import { buildManagedPeFixture } from "../../../../src/dotnet/ManagedPe.fixture.js"; diff --git a/tests/boundary/providers/managed/managedMemberComparisonFromMetadata.test.ts b/tests/boundary/providers/managed/managedMemberComparisonFromMetadata.test.ts index 792d5abd62..6a2cde9d02 100644 --- a/tests/boundary/providers/managed/managedMemberComparisonFromMetadata.test.ts +++ b/tests/boundary/providers/managed/managedMemberComparisonFromMetadata.test.ts @@ -5,7 +5,7 @@ import { describe, expect, it } from "vitest"; import { compareManagedMembers, managedMemberComparisonResultSchema, -} from "../../../../src/domain/managedMemberComparison.js"; +} from "../../../../src/domain/managed/managedMemberComparison.js"; import { inspectManagedMembersBytes } from "../../../../src/dotnet/ManagedMemberInspector.js"; import { buildManagedPeFixture, diff --git a/tests/boundary/providers/managed/managedMemberComparisonPartialBodies.test.ts b/tests/boundary/providers/managed/managedMemberComparisonPartialBodies.test.ts index 0bba44e66c..bd5df15057 100644 --- a/tests/boundary/providers/managed/managedMemberComparisonPartialBodies.test.ts +++ b/tests/boundary/providers/managed/managedMemberComparisonPartialBodies.test.ts @@ -2,7 +2,7 @@ import { createHash } from "node:crypto"; import { describe, expect, it } from "vitest"; -import { compareManagedMembers } from "../../../../src/domain/managedMemberComparison.js"; +import { compareManagedMembers } from "../../../../src/domain/managed/managedMemberComparison.js"; import { inspectManagedMembersBytes } from "../../../../src/dotnet/ManagedMemberInspector.js"; import { buildManagedPeFixture, diff --git a/tests/boundary/providers/managed/managedStaticProvider.test.ts b/tests/boundary/providers/managed/managedStaticProvider.test.ts index 08be5d8f86..0f2466d049 100644 --- a/tests/boundary/providers/managed/managedStaticProvider.test.ts +++ b/tests/boundary/providers/managed/managedStaticProvider.test.ts @@ -11,7 +11,7 @@ import { managedArtifactInspectionSchema, managedMemberInspectionSchema, managedNativeBoundaryInspectionSchema, -} from "../../../../src/domain/managedArtifact.js"; +} from "../../../../src/domain/managed/managedArtifact.js"; import { ManagedStaticProvider } from "../../../../src/dotnet/ManagedStaticProvider.js"; import { buildManagedPeFixture } from "../../../../src/dotnet/ManagedPe.fixture.js"; diff --git a/tests/composition/analysis-sessions/managedApplicationGraph.test.ts b/tests/composition/analysis-sessions/managedApplicationGraph.test.ts index 0607fea214..9930b97954 100644 --- a/tests/composition/analysis-sessions/managedApplicationGraph.test.ts +++ b/tests/composition/analysis-sessions/managedApplicationGraph.test.ts @@ -1,13 +1,13 @@ import { describe, expect, it } from "vitest"; -import { projectManagedApplicationGraphEvidence } from "../../../src/application/ManagedApplicationGraphService.js"; -import { managedApplicationGraphReferenceInputSchema } from "../../../src/contracts/managedWorkflowToolContracts.js"; -import { MANAGED_APPLICATION_GRAPH_EXAMPLE } from "../../../src/contracts/managedWorkflowExamples.js"; +import { projectManagedApplicationGraphEvidence } from "../../../src/application/managed/ManagedApplicationGraphService.js"; +import { managedApplicationGraphReferenceInputSchema } from "../../../src/contracts/managed/managedWorkflowToolContracts.js"; +import { MANAGED_APPLICATION_GRAPH_EXAMPLE } from "../../../src/contracts/managed/managedWorkflowExamples.js"; import { traceApplicationFeatureEvidence } from "../../../src/application/javascript/JavaScriptApplicationWorkflowService.js"; import { MANAGED_STATIC_PROVIDER } from "../../../src/application/InvestigationProviders.js"; import { createEvidence, parseEvidence } from "../../../src/domain/evidence.js"; import { parseJavaScriptApplicationGraph } from "../../../src/domain/javascript/javascriptApplicationGraph.js"; -import { managedApplicationGraphResultSchema } from "../../../src/domain/managedApplicationGraph.js"; +import { managedApplicationGraphResultSchema } from "../../../src/domain/managed/managedApplicationGraph.js"; import { inspectManagedArtifactBytes } from "../../../src/dotnet/ManagedArtifactInspector.js"; import { inspectManagedMembersBytes } from "../../../src/dotnet/ManagedMemberInspector.js"; import { inspectManagedNativeBoundariesBytes } from "../../../src/dotnet/ManagedNativeBoundaryInspector.js"; diff --git a/tests/conformance/providers/managed/managedConformanceFixture.test.ts b/tests/conformance/providers/managed/managedConformanceFixture.test.ts index 33d5bd2fd5..4899a3decf 100644 --- a/tests/conformance/providers/managed/managedConformanceFixture.test.ts +++ b/tests/conformance/providers/managed/managedConformanceFixture.test.ts @@ -5,7 +5,7 @@ import { afterEach, describe, expect, it } from "vitest"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; -import { buildManagedPeFixture } from "../../../../scripts/lib/managed-pe-fixture.mjs"; +import { buildManagedPeFixture } from "../../../../scripts/fixtures/managed/pe.mjs"; import { parseBinaryTarget } from "../../../../src/application/BinaryTargetResolver.js"; const workspaces: string[] = []; diff --git a/tests/conformance/providers/managed/managedNativeVerification.test.ts b/tests/conformance/providers/managed/managedNativeVerification.test.ts index 1183401513..0e04138c75 100644 --- a/tests/conformance/providers/managed/managedNativeVerification.test.ts +++ b/tests/conformance/providers/managed/managedNativeVerification.test.ts @@ -1,14 +1,14 @@ import { describe, expect, it } from "vitest"; -import { verifyManagedNativeBoundariesEvidence } from "../../../../src/application/ManagedNativeVerificationService.js"; -import { MANAGED_NATIVE_VERIFICATION_EXAMPLE } from "../../../../src/contracts/managedWorkflowExamples.js"; +import { verifyManagedNativeBoundariesEvidence } from "../../../../src/application/managed/ManagedNativeVerificationService.js"; +import { MANAGED_NATIVE_VERIFICATION_EXAMPLE } from "../../../../src/contracts/managed/managedWorkflowExamples.js"; import { createEvidence } from "../../../../src/domain/evidence.js"; import { managedNativeVerificationInputSchema, managedNativeVerificationResultSchema, verifyManagedNativeBoundaries, -} from "../../../../src/domain/managedNativeVerification.js"; -import { managedNativeBoundaryInspectionSchema } from "../../../../src/domain/managedArtifact.js"; +} from "../../../../src/domain/managed/managedNativeVerification.js"; +import { managedNativeBoundaryInspectionSchema } from "../../../../src/domain/managed/managedArtifact.js"; import { inspectMachoSchema } from "../../../../src/domain/nativeInspection.js"; const exampleInput = () => diff --git a/turbo.json b/turbo.json index d43d731d97..086d4db29e 100644 --- a/turbo.json +++ b/turbo.json @@ -109,6 +109,8 @@ "scripts/generate-*.mjs", "scripts/check-doc-facts.mjs", "scripts/lib/*.mjs", + "scripts/verify/managed/*.mjs", + "scripts/fixtures/managed/*.mjs", "src/generated*.ts", "src/contracts/**/*.ts", "docs/**",