Reverse engineer anything with agents, from app behavior down to native binaries.
TypeScript agent-skillsai-agentsbinary-analysisclaude-codeclicodexcordisdecompilerdeveloper-toolsdshdsh-pluginghidrahopperllmmcpmodel-context-protocolreareverse-engineeringstatic-analysistouhou
refactor(binary): group session selection and snapshot ownership (#886)
ysopwnabledd114d398019
diff --git a/docs/adr/0001-provider-selection-and-analysis-profiles.md b/docs/adr/0001-provider-selection-and-analysis-profiles.mdindex 562aa632e..9430f1d8e 100644--- a/docs/adr/0001-provider-selection-and-analysis-profiles.md+++ b/docs/adr/0001-provider-selection-and-analysis-profiles.md@@ -29,9 +29,9 @@ same bytes could therefore disagree because of language, compiler, loader,analyzer, or provider-version differences while appearing target-compatible.The decision addressed the earlier representations of-[`CompositeProvider`](../../src/application/CompositeProvider.ts),+[`CompositeProvider`](../../src/application/binary/CompositeProvider.ts),[runtime composition](../../src/application/runtime.ts),-[`BinarySession`](../../src/application/BinarySession.ts),+[`BinarySession`](../../src/application/binary/BinarySession.ts),[`BinaryTarget`](../../src/domain/binaryTarget.ts),[analysis snapshot](../../src/domain/analysisSnapshot.ts), and[session lifecycle inputs](../../src/contracts/sessionLifecycleInputs.ts).diff --git a/docs/capability-migration.md b/docs/capability-migration.mdindex 278cd5e5f..99fbfeb5e 100644--- a/docs/capability-migration.md+++ b/docs/capability-migration.md@@ -225,6 +225,27 @@ explicit downloader and fixed manifest belong to `scripts/fixtures/android/`.JADX CLI/MCP parity requires the fixed APK and existing audited JAR; syntheticprotocol/cancellation success does not establish that engine or an unverified host.+## Binary application ownership++`src/application/binary/` owns the active session, deep-provider registry and+evaluation, operation routing, disjoint provider composition, lazy auxiliary+clients, cancellation and client cleanup. Its records facade and snapshot+cache/files remain bound to the exact target and analysis profile. Investigation+records still have their separate owner in `src/application/investigation/`.++`AnalysisProvider.ts` stays shared because its identity/execution types also serve+nonbinary ports. `BinaryTargetResolver.ts` stays shared because Android, firmware,+managed and artifact workflows use its target parsing. The existing `runtime.ts`+remains the exact temporary production wiring entrypoint while direct-analysis+callers are migrated deliberately; application workflows gain no outward+composition dependency.++The three colocated application tests move with their owner. Composition cases+remain in `tests/composition/analysis-sessions/`; filesystem and SDK cases retain+their boundary lanes. The shared `tests/fixtures/binarySession.ts` factory supports+several capability families. Existing recursive application globs discover the+moved tests; bridge assets and real-verifier entrypoints remain at their owners.+## Firmware layer and verification ownershipFirmware workflows and their existing typed port live indiff --git a/docs/testing.md b/docs/testing.mdindex fc7a7b2bb..6c98eeca1 100644--- a/docs/testing.md+++ b/docs/testing.md@@ -32,6 +32,12 @@ registries but do not cross production filesystem, process, socket, or browser bBoundary tests cross one production boundary. Only acceptance tests assemblethe complete runtime or invoke the compiled product surface.+Binary session, registry, lazy-client and snapshot module cases live under+`src/application/binary/`. Their composition cases stay in+`tests/composition/analysis-sessions/`; snapshot persistence and actual SDK calls+stay in the filesystem and MCP boundary lanes. The shared injected session fixture+serves several capabilities and remains under `tests/fixtures/`.+Focused immutable builders and recording ports shared by one test family livebeside their production owner as `src/**/*.fixture.ts`. They are typecheckedwith the suite and excluded from package builds; broader runtime and providerdiff --git a/src/application/DirectAnalysis.ts b/src/application/DirectAnalysis.tsindex 3d9c82c1c..412f43ff1 100644--- a/src/application/DirectAnalysis.ts+++ b/src/application/DirectAnalysis.ts@@ -20,7 +20,7 @@ import { access } from "node:fs/promises";import {readAnalysisSnapshot,writeAnalysisSnapshot,-} from "./AnalysisSnapshotFiles.js";+} from "./binary/AnalysisSnapshotFiles.js";import { parseBinaryTarget } from "./BinaryTargetResolver.js";import type { BinaryTarget } from "../domain/binaryTarget.js";import {diff --git a/src/application/AbortablePromise.ts b/src/application/binary/AbortablePromise.tssimilarity index 100%rename from src/application/AbortablePromise.tsrename to src/application/binary/AbortablePromise.tsdiff --git a/src/application/AnalysisClientCleanup.ts b/src/application/binary/AnalysisClientCleanup.tssimilarity index 70%rename from src/application/AnalysisClientCleanup.tsrename to src/application/binary/AnalysisClientCleanup.tsindex fedc8cef8..3cd13b215 100644--- a/src/application/AnalysisClientCleanup.ts+++ b/src/application/binary/AnalysisClientCleanup.ts@@ -1,7 +1,7 @@-import { ProviderCleanupError } from "../domain/providerCleanupError.js";-import { err, ok, type Result } from "../domain/result.js";-import type { AnalysisError } from "../domain/analysisErrorBase.js";-import type { AnalysisClient, ExecutionOptions } from "./AnalysisProvider.js";+import { ProviderCleanupError } from "../../domain/providerCleanupError.js";+import { err, ok, type Result } from "../../domain/result.js";+import type { AnalysisError } from "../../domain/analysisErrorBase.js";+import type { AnalysisClient, ExecutionOptions } from "../AnalysisProvider.js";/** Close one provider client and normalize unexpected adapter rejection. */export const closeAnalysisClient = async (diff --git a/src/application/AnalysisProviderEvaluation.ts b/src/application/binary/AnalysisProviderEvaluation.tssimilarity index 89%rename from src/application/AnalysisProviderEvaluation.tsrename to src/application/binary/AnalysisProviderEvaluation.tsindex e648a4fd7..c8cd651b6 100644--- a/src/application/AnalysisProviderEvaluation.ts+++ b/src/application/binary/AnalysisProviderEvaluation.ts@@ -1,12 +1,12 @@import {analysisProfileSchema,type AnalysisProfileCommitment,-} from "../domain/analysisProfile.js";-import type { BinaryTarget } from "../domain/binaryTarget.js";-import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";-import { jsonObjectSchema, type JsonValue } from "../domain/jsonValue.js";-import { err, ok, type Result } from "../domain/result.js";-import type { AnalysisProviderCandidate } from "./AnalysisProvider.js";+} from "../../domain/analysisProfile.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";+import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";+import { jsonObjectSchema, type JsonValue } from "../../domain/jsonValue.js";+import { err, ok, type Result } from "../../domain/result.js";+import type { AnalysisProviderCandidate } from "../AnalysisProvider.js";import type { AnalysisProviderCandidateStatus } from "./AnalysisProviderRegistry.js";import { ABORTED, waitForAbortable } from "./AbortablePromise.js";diff --git a/src/application/AnalysisProviderRegistry.test.ts b/src/application/binary/AnalysisProviderRegistry.test.tssimilarity index 96%rename from src/application/AnalysisProviderRegistry.test.tsrename to src/application/binary/AnalysisProviderRegistry.test.tsindex a079f43c0..acbbae5fc 100644--- a/src/application/AnalysisProviderRegistry.test.ts+++ b/src/application/binary/AnalysisProviderRegistry.test.ts@@ -12,13 +12,13 @@ import {type ProviderAvailability,type ProviderIdentity,type ProviderTargetSupport,-} from "./AnalysisProvider.js";-import { createAnalysisProfile } from "../domain/analysisProfile.js";-import type { BinaryTarget } from "../domain/binaryTarget.js";-import { ProviderAdapterError } from "../domain/providerAdapterError.js";-import { ProviderSelectionError } from "../domain/providerSelectionError.js";-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";-import { err, ok } from "../domain/result.js";+} from "../AnalysisProvider.js";+import { createAnalysisProfile } from "../../domain/analysisProfile.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";+import { ProviderAdapterError } from "../../domain/providerAdapterError.js";+import { ProviderSelectionError } from "../../domain/providerSelectionError.js";+import { projectAnalysisError } from "../../domain/analysisErrorProjection.js";+import { err, ok } from "../../domain/result.js";const DATABASE_TARGET: BinaryTarget = {path: "/tmp/fixture.hop",diff --git a/src/application/AnalysisProviderRegistry.ts b/src/application/binary/AnalysisProviderRegistry.tssimilarity index 96%rename from src/application/AnalysisProviderRegistry.tsrename to src/application/binary/AnalysisProviderRegistry.tsindex d39b201f8..cfc2180c3 100644--- a/src/application/AnalysisProviderRegistry.ts+++ b/src/application/binary/AnalysisProviderRegistry.ts@@ -2,24 +2,24 @@ import {analysisProviderIdSchema,analysisProviderSelectorSchema,type AnalysisProviderSelector,-} from "../contracts/providerSelection.js";-import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js";-import type { BinaryTarget } from "../domain/binaryTarget.js";-import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";+} from "../../contracts/providerSelection.js";+import type { AnalysisProfileCommitment } from "../../domain/analysisProfile.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";+import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";import {ProviderSelectionError,type ProviderSelectionFailureReason,type ProviderSelectionRejection,-} from "../domain/providerSelectionError.js";-import { jsonObjectSchema, type JsonValue } from "../domain/jsonValue.js";-import { err, ok, type Result } from "../domain/result.js";+} from "../../domain/providerSelectionError.js";+import { jsonObjectSchema, type JsonValue } from "../../domain/jsonValue.js";+import { err, ok, type Result } from "../../domain/result.js";import type {AnalysisProviderCandidate,CapabilityDescriptor,ProviderAvailability,ProviderIdentity,ProviderTargetSupport,-} from "./AnalysisProvider.js";+} from "../AnalysisProvider.js";import {evaluateAnalysisProviderCandidate,type AnalysisProviderCandidateEvaluation,diff --git a/src/application/AnalysisSnapshotCache.test.ts b/src/application/binary/AnalysisSnapshotCache.test.tssimilarity index 90%rename from src/application/AnalysisSnapshotCache.test.tsrename to src/application/binary/AnalysisSnapshotCache.test.tsindex 1458b5c98..101880148 100644--- a/src/application/AnalysisSnapshotCache.test.ts+++ b/src/application/binary/AnalysisSnapshotCache.test.ts@@ -1,15 +1,15 @@import { describe, expect, it } from "vitest";-import { createAnalysisProfile } from "../domain/analysisProfile.js";+import { createAnalysisProfile } from "../../domain/analysisProfile.js";import {ANALYSIS_SNAPSHOT_PROFILE,ANALYSIS_SNAPSHOT_PROVIDER,ANALYSIS_SNAPSHOT_TARGET,-} from "../domain/analysisSnapshot.fixture.js";-import { createEvidence } from "../domain/evidence.js";-import { createEvidenceBundle } from "../domain/evidenceBundle.js";-import { ok } from "../domain/result.js";-import { createAnalysisExecution } from "./AnalysisProvider.js";+} from "../../domain/analysisSnapshot.fixture.js";+import { createEvidence } from "../../domain/evidence.js";+import { createEvidenceBundle } from "../../domain/evidenceBundle.js";+import { ok } from "../../domain/result.js";+import { createAnalysisExecution } from "../AnalysisProvider.js";import { AnalysisSnapshotCache } from "./AnalysisSnapshotCache.js";describe("analysis snapshot cache partitioning", () => {diff --git a/src/application/AnalysisSnapshotCache.ts b/src/application/binary/AnalysisSnapshotCache.tssimilarity index 92%rename from src/application/AnalysisSnapshotCache.tsrename to src/application/binary/AnalysisSnapshotCache.tsindex 1588fb905..2cb6f705f 100644--- a/src/application/AnalysisSnapshotCache.ts+++ b/src/application/binary/AnalysisSnapshotCache.ts@@ -1,11 +1,11 @@-import type { BinaryTarget } from "../domain/binaryTarget.js";-import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js";-import type { JsonValue } from "../domain/jsonValue.js";-import type { EvidenceBundle } from "../domain/evidenceBundle.js";-import { EvidenceIntegrityError } from "../domain/evidenceErrors.js";-import { NoBinaryOpenError } from "../domain/configurationErrors.js";-import { type AnalysisError } from "../domain/analysisErrorBase.js";-import { err, ok, type Result } from "../domain/result.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";+import type { AnalysisProfileCommitment } from "../../domain/analysisProfile.js";+import type { JsonValue } from "../../domain/jsonValue.js";+import type { EvidenceBundle } from "../../domain/evidenceBundle.js";+import { EvidenceIntegrityError } from "../../domain/evidenceErrors.js";+import { NoBinaryOpenError } from "../../domain/configurationErrors.js";+import { type AnalysisError } from "../../domain/analysisErrorBase.js";+import { err, ok, type Result } from "../../domain/result.js";import {analysisQueryId,createAnalysisSnapshotEntry,@@ -18,13 +18,13 @@ import {type AnalysisSnapshotEntry,type AnalysisSnapshotBinding,type AnalysisSnapshotTarget,-} from "../domain/analysisSnapshot.js";+} from "../../domain/analysisSnapshot.js";import type {AnalysisExecution,AnalysisOperation,CapabilityDescriptor,-} from "./AnalysisProvider.js";-import { GENERATED_MCP_TOOL_CATALOG } from "../generatedMcpToolCatalog.js";+} from "../AnalysisProvider.js";+import { GENERATED_MCP_TOOL_CATALOG } from "../../generatedMcpToolCatalog.js";const STATEFUL_OPERATIONS: ReadonlySet<AnalysisOperation> = new Set(["health",diff --git a/src/application/AnalysisSnapshotFiles.ts b/src/application/binary/AnalysisSnapshotFiles.tssimilarity index 86%rename from src/application/AnalysisSnapshotFiles.tsrename to src/application/binary/AnalysisSnapshotFiles.tsindex 6907ea005..2841e1dbf 100644--- a/src/application/AnalysisSnapshotFiles.ts+++ b/src/application/binary/AnalysisSnapshotFiles.ts@@ -2,13 +2,13 @@ import {parseAnalysisSnapshot,serializeAnalysisSnapshot,type AnalysisSnapshot,-} from "../domain/analysisSnapshot.js";+} from "../../domain/analysisSnapshot.js";import {EvidenceFileError,EvidenceIntegrityError,-} from "../domain/evidenceErrors.js";-import { err, ok, type Result } from "../domain/result.js";-import { readJsonFile, writeTextFile } from "./JsonFiles.js";+} from "../../domain/evidenceErrors.js";+import { err, ok, type Result } from "../../domain/result.js";+import { readJsonFile, writeTextFile } from "../JsonFiles.js";type SnapshotFailure = EvidenceFileError | EvidenceIntegrityError;diff --git a/src/application/BinarySession.ts b/src/application/binary/BinarySession.tssimilarity index 95%rename from src/application/BinarySession.tsrename to src/application/binary/BinarySession.tsindex 4f168d267..7acc84357 100644--- a/src/application/BinarySession.ts+++ b/src/application/binary/BinarySession.ts@@ -1,31 +1,31 @@import { randomUUID } from "node:crypto";-import type { BinaryTarget } from "../domain/binaryTarget.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";import {analysisProfilesEqual,type AnalysisProfileCommitment,-} from "../domain/analysisProfile.js";-import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";-import { type AnalysisError } from "../domain/analysisErrorBase.js";-import { err, ok, type Result } from "../domain/result.js";-import type { JsonValue } from "../domain/jsonValue.js";-import { createEvidence } from "../domain/evidence.js";+} from "../../domain/analysisProfile.js";+import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";+import { type AnalysisError } from "../../domain/analysisErrorBase.js";+import { err, ok, type Result } from "../../domain/result.js";+import type { JsonValue } from "../../domain/jsonValue.js";+import { createEvidence } from "../../domain/evidence.js";import type {AnalysisClient,AnalysisExecution,ExecutionOptions,AnalysisOperationPort,ProviderIdentity,-} from "./AnalysisProvider.js";-import type { AnalysisOperation } from "./AnalysisProvider.js";-import { OFFICIAL_TOOL_CONTRACTS } from "../contracts/officialToolContracts.js";-import { ENHANCED_TOOL_CONTRACTS } from "../contracts/enhancedToolContracts.js";+} from "../AnalysisProvider.js";+import type { AnalysisOperation } from "../AnalysisProvider.js";+import { OFFICIAL_TOOL_CONTRACTS } from "../../contracts/officialToolContracts.js";+import { ENHANCED_TOOL_CONTRACTS } from "../../contracts/enhancedToolContracts.js";import type { BinarySessionPort } from "./BinarySessionPort.js";import {SessionProviderRouter,type SessionProviderRoute,} from "./SessionProviderRouter.js";-import { InvestigationRecords } from "./investigation/InvestigationRecords.js";+import { InvestigationRecords } from "../investigation/InvestigationRecords.js";import { BinarySessionRecords } from "./BinarySessionRecords.js";import { binarySessionStatus } from "./BinarySessionStatus.js";import {diff --git a/src/application/BinarySessionComposition.ts b/src/application/binary/BinarySessionComposition.tssimilarity index 82%rename from src/application/BinarySessionComposition.tsrename to src/application/binary/BinarySessionComposition.tsindex 60df888a2..42425d467 100644--- a/src/application/BinarySessionComposition.ts+++ b/src/application/binary/BinarySessionComposition.ts@@ -1,5 +1,5 @@-import { InvestigationRecords } from "./investigation/InvestigationRecords.js";-import type { AnalysisProvider } from "./AnalysisProvider.js";+import { InvestigationRecords } from "../investigation/InvestigationRecords.js";+import type { AnalysisProvider } from "../AnalysisProvider.js";import { AnalysisProviderRegistry } from "./AnalysisProviderRegistry.js";import { BinarySession } from "./BinarySession.js";import { SessionProviderRouter } from "./SessionProviderRouter.js";diff --git a/src/application/BinarySessionExecution.ts b/src/application/binary/BinarySessionExecution.tssimilarity index 87%rename from src/application/BinarySessionExecution.tsrename to src/application/binary/BinarySessionExecution.tsindex 410bf0223..ccca9eb05 100644--- a/src/application/BinarySessionExecution.ts+++ b/src/application/binary/BinarySessionExecution.ts@@ -1,18 +1,18 @@-import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js";-import type { BinaryTarget } from "../domain/binaryTarget.js";-import { AnalysisCapabilityUnavailableError } from "../domain/analysisErrorCore.js";-import { NoBinaryOpenError } from "../domain/configurationErrors.js";-import { ProviderAdapterError } from "../domain/providerAdapterError.js";-import { type AnalysisError } from "../domain/analysisErrorBase.js";-import type { JsonValue } from "../domain/jsonValue.js";-import type { EvidenceSubjectTarget } from "../domain/evidence.js";-import { err, ok, type Result } from "../domain/result.js";+import type { AnalysisProfileCommitment } from "../../domain/analysisProfile.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";+import { AnalysisCapabilityUnavailableError } from "../../domain/analysisErrorCore.js";+import { NoBinaryOpenError } from "../../domain/configurationErrors.js";+import { ProviderAdapterError } from "../../domain/providerAdapterError.js";+import { type AnalysisError } from "../../domain/analysisErrorBase.js";+import type { JsonValue } from "../../domain/jsonValue.js";+import type { EvidenceSubjectTarget } from "../../domain/evidence.js";+import { err, ok, type Result } from "../../domain/result.js";import type {AnalysisClient,AnalysisExecution,AnalysisOperation,CapabilityDescriptor,-} from "./AnalysisProvider.js";+} from "../AnalysisProvider.js";import { isSnapshotCacheable } from "./AnalysisSnapshotCache.js";import type { SessionProviderRoute } from "./SessionProviderRouter.js";diff --git a/src/application/BinarySessionOpen.ts b/src/application/binary/BinarySessionOpen.tssimilarity index 83%rename from src/application/BinarySessionOpen.tsrename to src/application/binary/BinarySessionOpen.tsindex 45d3a281d..e0d425ee9 100644--- a/src/application/BinarySessionOpen.ts+++ b/src/application/binary/BinarySessionOpen.ts@@ -1,17 +1,17 @@-import type { ExecutableFormatHint } from "../domain/dosCom.js";-import type { AnalysisProviderSelector } from "../contracts/providerSelection.js";-import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js";+import type { ExecutableFormatHint } from "../../domain/dosCom.js";+import type { AnalysisProviderSelector } from "../../contracts/providerSelection.js";+import type { AnalysisProfileCommitment } from "../../domain/analysisProfile.js";import {snapshotMatchesBinding,snapshotMatchesTarget,snapshotTarget,-} from "../domain/analysisSnapshot.js";-import type { AnalysisSnapshot } from "../domain/analysisSnapshot.js";-import { parseBinaryTarget } from "./BinaryTargetResolver.js";-import { type BinaryTarget } from "../domain/binaryTarget.js";-import { EvidenceIntegrityError } from "../domain/evidenceErrors.js";-import { type AnalysisError } from "../domain/analysisErrorBase.js";-import { err, type Result } from "../domain/result.js";+} from "../../domain/analysisSnapshot.js";+import type { AnalysisSnapshot } from "../../domain/analysisSnapshot.js";+import { parseBinaryTarget } from "../BinaryTargetResolver.js";+import { type BinaryTarget } from "../../domain/binaryTarget.js";+import { EvidenceIntegrityError } from "../../domain/evidenceErrors.js";+import { type AnalysisError } from "../../domain/analysisErrorBase.js";+import { err, type Result } from "../../domain/result.js";import type { SessionProviderRoute } from "./SessionProviderRouter.js";import { SessionProviderRouter } from "./SessionProviderRouter.js";diff --git a/src/application/BinarySessionPort.ts b/src/application/binary/BinarySessionPort.tssimilarity index 66%rename from src/application/BinarySessionPort.tsrename to src/application/binary/BinarySessionPort.tsindex b223da7cf..a8bd37a04 100644--- a/src/application/BinarySessionPort.ts+++ b/src/application/binary/BinarySessionPort.ts@@ -1,19 +1,19 @@-import type { InvestigationRecordPort } from "./investigation/InvestigationRecordPort.js";-import type { ExecutableFormatHint } from "../domain/dosCom.js";-import type { BinaryTarget } from "../domain/binaryTarget.js";-import type { JsonValue } from "../domain/jsonValue.js";-import type { AnalysisSnapshot } from "../domain/analysisSnapshot.js";-import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js";-import type { AnalysisProviderSelector } from "../contracts/providerSelection.js";-import type { AnalysisError } from "../domain/analysisErrorBase.js";-import type { Result } from "../domain/result.js";+import type { InvestigationRecordPort } from "../investigation/InvestigationRecordPort.js";+import type { ExecutableFormatHint } from "../../domain/dosCom.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";+import type { JsonValue } from "../../domain/jsonValue.js";+import type { AnalysisSnapshot } from "../../domain/analysisSnapshot.js";+import type { AnalysisProfileCommitment } from "../../domain/analysisProfile.js";+import type { AnalysisProviderSelector } from "../../contracts/providerSelection.js";+import type { AnalysisError } from "../../domain/analysisErrorBase.js";+import type { Result } from "../../domain/result.js";import type {AnalysisOperation,AnalysisOperationPort,ExecutionOptions,ProviderIdentity,-} from "./AnalysisProvider.js";+} from "../AnalysisProvider.js";/** Target lifecycle used by CLI and MCP without exposing a concrete provider. */export interface BinarySessionPortdiff --git a/src/application/BinarySessionRecords.ts b/src/application/binary/BinarySessionRecords.tssimilarity index 88%rename from src/application/BinarySessionRecords.tsrename to src/application/binary/BinarySessionRecords.tsindex f8ade2509..3ec801bda 100644--- a/src/application/BinarySessionRecords.ts+++ b/src/application/binary/BinarySessionRecords.ts@@ -1,25 +1,25 @@-import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js";-import type { AnalysisSnapshot } from "../domain/analysisSnapshot.js";-import type { BinaryTarget } from "../domain/binaryTarget.js";-import type { Evidence } from "../domain/evidence.js";-import type { EvidenceBundle } from "../domain/evidenceBundle.js";-import { evidenceBundleForTarget } from "../domain/evidenceBundle.js";-import { EvidenceIntegrityError } from "../domain/evidenceErrors.js";-import { type AnalysisError } from "../domain/analysisErrorBase.js";-import { type UnknownRegistryError } from "../domain/unknownRegistryError.js";+import type { AnalysisProfileCommitment } from "../../domain/analysisProfile.js";+import type { AnalysisSnapshot } from "../../domain/analysisSnapshot.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";+import type { Evidence } from "../../domain/evidence.js";+import type { EvidenceBundle } from "../../domain/evidenceBundle.js";+import { evidenceBundleForTarget } from "../../domain/evidenceBundle.js";+import { EvidenceIntegrityError } from "../../domain/evidenceErrors.js";+import { type AnalysisError } from "../../domain/analysisErrorBase.js";+import { type UnknownRegistryError } from "../../domain/unknownRegistryError.js";import type {RecordUnknownInput,ResidualUnknown,UnknownStatus,UpdateUnknownInput,-} from "../domain/residualUnknown.js";-import { err, ok, type Result } from "../domain/result.js";+} from "../../domain/residualUnknown.js";+import { err, ok, type Result } from "../../domain/result.js";import type {AnalysisExecution,AnalysisOperation,-} from "./AnalysisProvider.js";+} from "../AnalysisProvider.js";import { AnalysisSnapshotCache } from "./AnalysisSnapshotCache.js";-import { InvestigationRecords } from "./investigation/InvestigationRecords.js";+import { InvestigationRecords } from "../investigation/InvestigationRecords.js";export interface ActiveAnalysisBinding {readonly target: BinaryTarget;@@ -146,7 +146,7 @@ export abstract class BinarySessionRecords {profile: AnalysisProfileCommitment,operation: AnalysisOperation,parameters: Readonly<- Record<string, import("../domain/jsonValue.js").JsonValue>+ Record<string, import("../../domain/jsonValue.js").JsonValue>>,): AnalysisExecution | undefined {return this.#snapshot.lookup(target, profile, operation, parameters);diff --git a/src/application/BinarySessionStatus.ts b/src/application/binary/BinarySessionStatus.tssimilarity index 97%rename from src/application/BinarySessionStatus.tsrename to src/application/binary/BinarySessionStatus.tsindex 8e4c45daa..bbffb8311 100644--- a/src/application/BinarySessionStatus.ts+++ b/src/application/binary/BinarySessionStatus.ts@@ -1,10 +1,10 @@-import type { BinaryTarget } from "../domain/binaryTarget.js";-import type { JsonValue } from "../domain/jsonValue.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";+import type { JsonValue } from "../../domain/jsonValue.js";import type {CapabilityDescriptor,ProviderRequestActivitySnapshot,ProviderRuntimeLineageSnapshot,-} from "./AnalysisProvider.js";+} from "../AnalysisProvider.js";import type {SessionProviderRoute,SessionProviderRouter,diff --git a/src/application/CompositeProvider.ts b/src/application/binary/CompositeProvider.tssimilarity index 94%rename from src/application/CompositeProvider.tsrename to src/application/binary/CompositeProvider.tsindex 75c5992f3..4fd6e7923 100644--- a/src/application/CompositeProvider.ts+++ b/src/application/binary/CompositeProvider.ts@@ -1,7 +1,7 @@-import { AnalysisCapabilityUnavailableError } from "../domain/analysisErrorCore.js";-import { err, ok } from "../domain/result.js";-import type { BinaryTarget } from "../domain/binaryTarget.js";-import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js";+import { AnalysisCapabilityUnavailableError } from "../../domain/analysisErrorCore.js";+import { err, ok } from "../../domain/result.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";+import type { AnalysisProfileCommitment } from "../../domain/analysisProfile.js";import type {AnalysisClient,AnalysisClientContext,@@ -9,7 +9,7 @@ import type {AnalysisProvider,CapabilityDescriptor,ProviderIdentity,-} from "./AnalysisProvider.js";+} from "../AnalysisProvider.js";import { closeAnalysisClient } from "./AnalysisClientCleanup.js";/** Synthetic compatibility identity for a deterministic provider set. */diff --git a/src/application/LazyAnalysisProvider.test.ts b/src/application/binary/LazyAnalysisProvider.test.tssimilarity index 90%rename from src/application/LazyAnalysisProvider.test.tsrename to src/application/binary/LazyAnalysisProvider.test.tsindex 0808ac1b0..97540d10f 100644--- a/src/application/LazyAnalysisProvider.test.ts+++ b/src/application/binary/LazyAnalysisProvider.test.ts@@ -1,10 +1,13 @@import { expect, it } from "vitest";-import { parseBinaryTarget } from "./BinaryTargetResolver.js";-import type { AnalysisProvider, ProviderIdentity } from "./AnalysisProvider.js";+import { parseBinaryTarget } from "../BinaryTargetResolver.js";+import type {+ AnalysisProvider,+ ProviderIdentity,+} from "../AnalysisProvider.js";import { LazyAnalysisProvider } from "./LazyAnalysisProvider.js";-import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";-import { err } from "../domain/result.js";+import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";+import { err } from "../../domain/result.js";const identity: ProviderIdentity = {id: "test-provider",diff --git a/src/application/LazyAnalysisProvider.ts b/src/application/binary/LazyAnalysisProvider.tssimilarity index 90%rename from src/application/LazyAnalysisProvider.tsrename to src/application/binary/LazyAnalysisProvider.tsindex ec2a5a457..f66d9694c 100644--- a/src/application/LazyAnalysisProvider.ts+++ b/src/application/binary/LazyAnalysisProvider.ts@@ -1,9 +1,9 @@-import type { AnalysisProfileCommitment } from "../domain/analysisProfile.js";-import type { BinaryTarget } from "../domain/binaryTarget.js";-import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";-import { AnalysisError } from "../domain/analysisErrorBase.js";-import { ProviderAdapterError } from "../domain/providerAdapterError.js";-import { err } from "../domain/result.js";+import type { AnalysisProfileCommitment } from "../../domain/analysisProfile.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";+import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";+import { AnalysisError } from "../../domain/analysisErrorBase.js";+import { ProviderAdapterError } from "../../domain/providerAdapterError.js";+import { err } from "../../domain/result.js";import { ABORTED, waitForAbortable } from "./AbortablePromise.js";import type {AnalysisClient,@@ -13,7 +13,7 @@ import type {ProviderIdentity,ProviderRequestActivitySnapshot,ProviderRuntimeLineageSnapshot,-} from "./AnalysisProvider.js";+} from "../AnalysisProvider.js";type LoadAnalysisProvider = () => Promise<AnalysisProvider>;diff --git a/src/application/SessionProviderRouter.ts b/src/application/binary/SessionProviderRouter.tssimilarity index 95%rename from src/application/SessionProviderRouter.tsrename to src/application/binary/SessionProviderRouter.tsindex 936bb5438..abb369482 100644--- a/src/application/SessionProviderRouter.ts+++ b/src/application/binary/SessionProviderRouter.ts@@ -1,18 +1,18 @@-import type { AnalysisProviderSelector } from "../contracts/providerSelection.js";+import type { AnalysisProviderSelector } from "../../contracts/providerSelection.js";import {analysisProfileSchema,type AnalysisProfileCommitment,-} from "../domain/analysisProfile.js";-import type { BinaryTarget } from "../domain/binaryTarget.js";+} from "../../domain/analysisProfile.js";+import type { BinaryTarget } from "../../domain/binaryTarget.js";import {AnalysisCancelledError,AnalysisCapabilityUnavailableError,-} from "../domain/analysisErrorCore.js";-import { ProviderAdapterError } from "../domain/providerAdapterError.js";-import { ProviderSelectionError } from "../domain/providerSelectionError.js";-import { type AnalysisError } from "../domain/analysisErrorBase.js";-import { jsonObjectSchema, type JsonValue } from "../domain/jsonValue.js";-import { err, ok, type Result } from "../domain/result.js";+} from "../../domain/analysisErrorCore.js";+import { ProviderAdapterError } from "../../domain/providerAdapterError.js";+import { ProviderSelectionError } from "../../domain/providerSelectionError.js";+import { type AnalysisError } from "../../domain/analysisErrorBase.js";+import { jsonObjectSchema, type JsonValue } from "../../domain/jsonValue.js";+import { err, ok, type Result } from "../../domain/result.js";import type {AnalysisClient,AnalysisClientContext,@@ -22,7 +22,7 @@ import type {AnalysisProvider,CapabilityDescriptor,ProviderIdentity,-} from "./AnalysisProvider.js";+} from "../AnalysisProvider.js";import {AnalysisProviderRegistry,type AnalysisProviderBinding,diff --git a/src/application/runtime.ts b/src/application/runtime.tsindex 82e081b4f..07026076a 100644--- a/src/application/runtime.ts+++ b/src/application/runtime.ts@@ -1,15 +1,15 @@import type { AppConfig } from "../config.js";-import type { BinarySession } from "./BinarySession.js";+import type { BinarySession } from "./binary/BinarySession.js";import { HopperProvider } from "../hopper/HopperProvider.js";import { GhidraProvider } from "../ghidra/GhidraProvider.js";import { IdaProvider } from "../ida/IdaProvider.js";import { silentLogger, type Logger } from "../logger.js";import { auxiliaryAnalysisProviderDeclarations } from "../composition/auxiliaryAnalysisProviders.js";-import { AnalysisProviderRegistry } from "./AnalysisProviderRegistry.js";-import { composeBinarySession } from "./BinarySessionComposition.js";-import { LazyAnalysisProvider } from "./LazyAnalysisProvider.js";+import { AnalysisProviderRegistry } from "./binary/AnalysisProviderRegistry.js";+import { composeBinarySession } from "./binary/BinarySessionComposition.js";+import { LazyAnalysisProvider } from "./binary/LazyAnalysisProvider.js";import { ManagedStaticProvider } from "../dotnet/ManagedStaticProvider.js";-import { SessionProviderRouter } from "./SessionProviderRouter.js";+import { SessionProviderRouter } from "./binary/SessionProviderRouter.js";/*** Compose the target-switching runtime shared directly by CLI and MCP adapters.diff --git a/src/composition/auxiliaryAnalysisProviders.ts b/src/composition/auxiliaryAnalysisProviders.tsindex 7086817c9..9f3f8e84b 100644--- a/src/composition/auxiliaryAnalysisProviders.ts+++ b/src/composition/auxiliaryAnalysisProviders.ts@@ -1,4 +1,4 @@-import type { LazyAnalysisProvider } from "../application/LazyAnalysisProvider.js";+import type { LazyAnalysisProvider } from "../application/binary/LazyAnalysisProvider.js";import {ARTIFACT_PROVIDER_IDENTITY,artifactCapabilities,diff --git a/src/main/shutdown.ts b/src/main/shutdown.tsindex eb6cc229d..07767431e 100644--- a/src/main/shutdown.ts+++ b/src/main/shutdown.ts@@ -1,6 +1,6 @@import type { StdioServerHandle } from "@modelcontextprotocol/server/stdio";-import type { BinarySession } from "../application/BinarySession.js";+import type { BinarySession } from "../application/binary/BinarySession.js";import type { Logger } from "../logger.js";import type { RuntimeDependencies } from "./types.js";import { MCP_SHUTDOWN_FAILED } from "./messages.js";diff --git a/src/main/startup.ts b/src/main/startup.tsindex e05915fb3..f6e0985ac 100644--- a/src/main/startup.ts+++ b/src/main/startup.ts@@ -1,4 +1,4 @@-import type { BinarySession } from "../application/BinarySession.js";+import type { BinarySession } from "../application/binary/BinarySession.js";import type { AppConfig } from "../config.js";import type { Logger } from "../logger.js";import { projectAnalysisError } from "../domain/analysisErrorProjection.js";diff --git a/src/main/transport.ts b/src/main/transport.tsindex dcaa683e1..e1f821e56 100644--- a/src/main/transport.ts+++ b/src/main/transport.ts@@ -1,6 +1,6 @@import type { StdioServerHandle } from "@modelcontextprotocol/server/stdio";-import type { BinarySession } from "../application/BinarySession.js";+import type { BinarySession } from "../application/binary/BinarySession.js";import type { Logger } from "../logger.js";import { createServer } from "../server/createServer.js";import type { RuntimeDependencies } from "./types.js";diff --git a/src/server/createServer.ts b/src/server/createServer.tsindex 4b5155d6b..fa54425a5 100644--- a/src/server/createServer.ts+++ b/src/server/createServer.ts@@ -2,7 +2,7 @@ import { McpServer } from "@modelcontextprotocol/server";import { isAbsolute } from "node:path";import type { AnalysisOperationPort } from "../application/AnalysisProvider.js";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import type { BrowserObservationPort } from "../application/BrowserObservationPort.js";import type { BrowserScenarioCapturePort } from "../application/BrowserScenarioCapturePort.js";import type { ElectronActiveObservationPort } from "../application/ElectronActiveObservationPort.js";diff --git a/src/server/promptCompletion.ts b/src/server/promptCompletion.tsindex e56383cc0..b02c5a35b 100644--- a/src/server/promptCompletion.ts+++ b/src/server/promptCompletion.ts@@ -3,7 +3,7 @@ import { z } from "zod";import { uniqueSorted } from "../domain/canonicalOrdering.js";import type { AnalysisOperationPort } from "../application/AnalysisProvider.js";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import type { PromptCompletionKind } from "../contracts/promptContracts.js";import { artifactInventoryResultSchema } from "../domain/artifactGraph.js";import { artifactInspectionResultSchema } from "../domain/artifactInspection.js";diff --git a/src/server/recordDerivedEvidence.ts b/src/server/recordDerivedEvidence.tsindex 9f7b3fdde..81b4645cb 100644--- a/src/server/recordDerivedEvidence.ts+++ b/src/server/recordDerivedEvidence.ts@@ -1,4 +1,4 @@-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import type { AnalysisError } from "../domain/analysisErrorBase.js";import type { Evidence } from "../domain/evidence.js";import type { RecordUnknownInput } from "../domain/residualUnknown.js";diff --git a/src/server/registerArtifactComparisonTool.ts b/src/server/registerArtifactComparisonTool.tsindex 402c401e1..f42cca0e0 100644--- a/src/server/registerArtifactComparisonTool.ts+++ b/src/server/registerArtifactComparisonTool.ts@@ -1,6 +1,6 @@import type { McpServer } from "@modelcontextprotocol/server";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import { toolContract } from "../contracts/toolContracts.js";import { compareArtifacts } from "../domain/artifactComparison.js";import { createEvidence, parseEvidence } from "../domain/evidence.js";diff --git a/src/server/registerBundleComparisonTool.ts b/src/server/registerBundleComparisonTool.tsindex 1c2f40754..7ec2662f8 100644--- a/src/server/registerBundleComparisonTool.ts+++ b/src/server/registerBundleComparisonTool.ts@@ -1,6 +1,6 @@import type { McpServer } from "@modelcontextprotocol/server";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import { readEvidenceBundle } from "../application/EvidenceBundleFiles.js";import { toolContract } from "../contracts/toolContracts.js";import { compareBundles } from "../domain/bundleComparison.js";diff --git a/src/server/registerCloseLifecycleTool.ts b/src/server/registerCloseLifecycleTool.tsindex 49c16a02c..19f66e786 100644--- a/src/server/registerCloseLifecycleTool.ts+++ b/src/server/registerCloseLifecycleTool.ts@@ -1,4 +1,4 @@-import { writeAnalysisSnapshot } from "../application/AnalysisSnapshotFiles.js";+import { writeAnalysisSnapshot } from "../application/binary/AnalysisSnapshotFiles.js";import { ok } from "../domain/result.js";import {reportLifecycleEnd,diff --git a/src/server/registerFunctionComparisonTool.ts b/src/server/registerFunctionComparisonTool.tsindex 72b67f33f..84a450684 100644--- a/src/server/registerFunctionComparisonTool.ts+++ b/src/server/registerFunctionComparisonTool.ts@@ -1,6 +1,6 @@import type { McpServer } from "@modelcontextprotocol/server";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import { toolContract } from "../contracts/toolContracts.js";import {createEvidence,diff --git a/src/server/registerInvestigationTools.ts b/src/server/registerInvestigationTools.tsindex 659527e3c..2e2dee834 100644--- a/src/server/registerInvestigationTools.ts+++ b/src/server/registerInvestigationTools.ts@@ -1,6 +1,6 @@import type { McpServer } from "@modelcontextprotocol/server";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import { toolContract } from "../contracts/toolContracts.js";import { buildCallPath } from "../domain/callPath.js";import { findChangedBehavior } from "../domain/changedBehavior.js";diff --git a/src/server/registerInvestigationTools/helpers.ts b/src/server/registerInvestigationTools/helpers.tsindex 211b5bfeb..705cc3211 100644--- a/src/server/registerInvestigationTools/helpers.ts+++ b/src/server/registerInvestigationTools/helpers.ts@@ -1,4 +1,4 @@-import type { BinarySessionPort } from "../../application/BinarySession.js";+import type { BinarySessionPort } from "../../application/binary/BinarySession.js";import type { Evidence } from "../../domain/evidence.js";import { EvidenceIntegrityError } from "../../domain/evidenceErrors.js";import { type AnalysisError } from "../../domain/analysisErrorBase.js";diff --git a/src/server/registerManagedTools.ts b/src/server/registerManagedTools.tsindex a9fdc2bfe..1d7a8a84f 100644--- a/src/server/registerManagedTools.ts+++ b/src/server/registerManagedTools.ts@@ -2,7 +2,7 @@ import type { EvidenceWriter } from "../application/investigation/InvestigationRimport type { McpServer } from "@modelcontextprotocol/server";import type { AnalysisOperationPort } from "../application/AnalysisProvider.js";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import { MANAGED_TOOL_CONTRACTS } from "../contracts/managedToolContracts.js";import type { BinaryTarget } from "../domain/binaryTarget.js";import { AnalysisInputError } from "../domain/analysisErrorCore.js";diff --git a/src/server/registerManagedWorkflowTools/types.ts b/src/server/registerManagedWorkflowTools/types.tsindex 9943e33e1..987037aab 100644--- a/src/server/registerManagedWorkflowTools/types.ts+++ b/src/server/registerManagedWorkflowTools/types.ts@@ -2,7 +2,7 @@ import type {EvidenceWriter,EvidenceUnknownWriter,} from "../../application/investigation/InvestigationRecordPort.js";-import type { BinarySessionPort } from "../../application/BinarySession.js";+import type { BinarySessionPort } from "../../application/binary/BinarySession.js";import type { Logger } from "../../logger.js";/** Shared services for registering managed-code workflow tools. */diff --git a/src/server/registerProcessComparisonTool.ts b/src/server/registerProcessComparisonTool.tsindex 6cbce0e8e..868528322 100644--- a/src/server/registerProcessComparisonTool.ts+++ b/src/server/registerProcessComparisonTool.ts@@ -1,6 +1,6 @@import type { McpServer } from "@modelcontextprotocol/server";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import { toolContract } from "../contracts/toolContracts.js";import { EvidenceIntegrityError } from "../domain/evidenceErrors.js";import {diff --git a/src/server/registerPrompts.ts b/src/server/registerPrompts.tsindex fc2c5a80b..f31f51efc 100644--- a/src/server/registerPrompts.ts+++ b/src/server/registerPrompts.ts@@ -6,7 +6,7 @@ import {import { z } from "zod";import type { AnalysisOperationPort } from "../application/AnalysisProvider.js";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import {PROMPT_CONTRACTS,renderGuidedPrompt,diff --git a/src/server/registerSessionRecordTools.ts b/src/server/registerSessionRecordTools.tsindex 12bab5028..b7508cd25 100644--- a/src/server/registerSessionRecordTools.ts+++ b/src/server/registerSessionRecordTools.ts@@ -1,6 +1,6 @@import type { McpServer } from "@modelcontextprotocol/server";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import {readEvidenceBundle,writeEvidenceBundle,diff --git a/src/server/registerSessionStatusTool.ts b/src/server/registerSessionStatusTool.tsindex bfcd975de..a7ce3cf55 100644--- a/src/server/registerSessionStatusTool.ts+++ b/src/server/registerSessionStatusTool.ts@@ -1,6 +1,6 @@import type { McpServer } from "@modelcontextprotocol/server";-import type { BinarySessionPort } from "../application/BinarySession.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import { buildCapabilityInventory } from "../application/CapabilityInventory.js";import { toolContract } from "../contracts/toolContracts.js";import type { ClientFeatureAvailability } from "../contracts/toolOutputSchemaPrimitives.js";diff --git a/src/server/registerSessionTools.ts b/src/server/registerSessionTools.tsindex e7e8de23c..fd601bfcf 100644--- a/src/server/registerSessionTools.ts+++ b/src/server/registerSessionTools.ts@@ -5,8 +5,8 @@ import {getNavigationContext,inspectAddressContext,} from "../application/AnalysisContextQueries.js";-import { readAnalysisSnapshot } from "../application/AnalysisSnapshotFiles.js";-import type { BinarySessionPort } from "../application/BinarySession.js";+import { readAnalysisSnapshot } from "../application/binary/AnalysisSnapshotFiles.js";+import type { BinarySessionPort } from "../application/binary/BinarySession.js";import { createProcessCaptureEvidence } from "../application/ProcessEvidence.js";import { captureProcessScenario } from "../application/ProcessHarness.js";import { toolContract } from "../contracts/toolContracts.js";diff --git a/tests/acceptance/applications/applicationEvidenceMcp.test.ts b/tests/acceptance/applications/applicationEvidenceMcp.test.tsindex 8034b0c6b..ce3859a40 100644--- a/tests/acceptance/applications/applicationEvidenceMcp.test.ts+++ b/tests/acceptance/applications/applicationEvidenceMcp.test.ts@@ -2,7 +2,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import { describe, expect, it } from "vitest";import { createTestBinarySession } from "../../fixtures/binarySession.js";-import type { BinarySession } from "../../../src/application/BinarySession.js";+import type { BinarySession } from "../../../src/application/binary/BinarySession.js";import { createServer } from "../../../src/server/createServer.js";import {JAVASCRIPT_FEATURE_TRACE_FULL_EVIDENCE_EXAMPLE,diff --git a/tests/boundary/filesystem/analysisSnapshot.test.ts b/tests/boundary/filesystem/analysisSnapshot.test.tsindex 3cbf12cc0..5d0907394 100644--- a/tests/boundary/filesystem/analysisSnapshot.test.ts+++ b/tests/boundary/filesystem/analysisSnapshot.test.ts@@ -9,7 +9,7 @@ import { createAnalysisExecution } from "../../../src/application/AnalysisProvidimport {readAnalysisSnapshot,writeAnalysisSnapshot,-} from "../../../src/application/AnalysisSnapshotFiles.js";+} from "../../../src/application/binary/AnalysisSnapshotFiles.js";import {createAnalysisSnapshotEntry,parseAnalysisSnapshot,diff --git a/tests/boundary/filesystem/directAnalysisPermissions.test.ts b/tests/boundary/filesystem/directAnalysisPermissions.test.tsindex 0a7298097..7078d7603 100644--- a/tests/boundary/filesystem/directAnalysisPermissions.test.ts+++ b/tests/boundary/filesystem/directAnalysisPermissions.test.ts@@ -5,7 +5,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";-import { writeAnalysisSnapshot } from "../../../src/application/AnalysisSnapshotFiles.js";+import { writeAnalysisSnapshot } from "../../../src/application/binary/AnalysisSnapshotFiles.js";import { runDirectAnalysis } from "../../../src/application/DirectAnalysis.js";import type { AnalysisSnapshot } from "../../../src/domain/analysisSnapshot.js";import {diff --git a/tests/boundary/mcp/ghidraMcpHarness.ts b/tests/boundary/mcp/ghidraMcpHarness.tsindex 81eaefc32..0aa25c188 100644--- a/tests/boundary/mcp/ghidraMcpHarness.ts+++ b/tests/boundary/mcp/ghidraMcpHarness.ts@@ -1,8 +1,8 @@import { Client, InMemoryTransport } from "@modelcontextprotocol/client";-import { composeBinarySession } from "../../../src/application/BinarySessionComposition.js";-import type { BinarySession } from "../../../src/application/BinarySession.js";-import { AnalysisProviderRegistry } from "../../../src/application/AnalysisProviderRegistry.js";-import { SessionProviderRouter } from "../../../src/application/SessionProviderRouter.js";+import { composeBinarySession } from "../../../src/application/binary/BinarySessionComposition.js";+import type { BinarySession } from "../../../src/application/binary/BinarySession.js";+import { AnalysisProviderRegistry } from "../../../src/application/binary/AnalysisProviderRegistry.js";+import { SessionProviderRouter } from "../../../src/application/binary/SessionProviderRouter.js";import { parseConfig } from "../../../src/config.js";import type { JsonValue } from "../../../src/domain/jsonValue.js";import { ok } from "../../../src/domain/result.js";diff --git a/tests/boundary/mcp/investigationAnalysisMcp.test.ts b/tests/boundary/mcp/investigationAnalysisMcp.test.tsindex 7d5a60eaa..330ef0dc3 100644--- a/tests/boundary/mcp/investigationAnalysisMcp.test.ts+++ b/tests/boundary/mcp/investigationAnalysisMcp.test.ts@@ -3,7 +3,7 @@ import { expect, it } from "vitest";import { z } from "zod";import { createTestBinarySession } from "../../fixtures/binarySession.js";-import type { BinarySession } from "../../../src/application/BinarySession.js";+import type { BinarySession } from "../../../src/application/binary/BinarySession.js";import { FUNCTION_COMPARISON_EXAMPLE } from "../../../src/contracts/functionComparisonExample.js";import { INVESTIGATION_EXAMPLES } from "../../../src/contracts/investigationExamples.js";import {diff --git a/tests/boundary/mcp/managedMcp.test.ts b/tests/boundary/mcp/managedMcp.test.tsindex 1ac1a5e16..c41d54546 100644--- a/tests/boundary/mcp/managedMcp.test.ts+++ b/tests/boundary/mcp/managedMcp.test.ts@@ -8,11 +8,11 @@ import { z } from "zod";import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";-import { AnalysisProviderRegistry } from "../../../src/application/AnalysisProviderRegistry.js";-import { composeBinarySession } from "../../../src/application/BinarySessionComposition.js";-import type { BinarySession } from "../../../src/application/BinarySession.js";+import { AnalysisProviderRegistry } from "../../../src/application/binary/AnalysisProviderRegistry.js";+import { composeBinarySession } from "../../../src/application/binary/BinarySessionComposition.js";+import type { BinarySession } from "../../../src/application/binary/BinarySession.js";import type { BinaryTarget } from "../../../src/domain/binaryTarget.js";-import { SessionProviderRouter } from "../../../src/application/SessionProviderRouter.js";+import { SessionProviderRouter } from "../../../src/application/binary/SessionProviderRouter.js";import { MANAGED_NATIVE_VERIFICATION_EXAMPLE } from "../../../src/contracts/managedWorkflowExamples.js";import { ManagedStaticProvider } from "../../../src/dotnet/ManagedStaticProvider.js";import { createServer } from "../../../src/server/createServer.js";diff --git a/tests/boundary/mcp/optionalProviderIsolation.test.ts b/tests/boundary/mcp/optionalProviderIsolation.test.tsindex 6b93f5245..f6f7a3a1e 100644--- a/tests/boundary/mcp/optionalProviderIsolation.test.ts+++ b/tests/boundary/mcp/optionalProviderIsolation.test.ts@@ -4,7 +4,7 @@ import { McpServer } from "@modelcontextprotocol/server";import { afterEach, expect } from "vitest";import { z } from "zod";-import type { BinarySessionPort } from "../../../src/application/BinarySessionPort.js";+import type { BinarySessionPort } from "../../../src/application/binary/BinarySessionPort.js";import {loadOptionalObservationProviders,type OptionalObservationFactories,diff --git a/tests/boundary/mcp/promptMcp.test.ts b/tests/boundary/mcp/promptMcp.test.tsindex 11b9677e6..4a1003a6b 100644--- a/tests/boundary/mcp/promptMcp.test.ts+++ b/tests/boundary/mcp/promptMcp.test.ts@@ -9,7 +9,7 @@ import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";import type { AnalysisClient } from "../../../src/application/AnalysisProvider.js";import { createTestBinarySession } from "../../fixtures/binarySession.js";-import type { BinarySession } from "../../../src/application/BinarySession.js";+import type { BinarySession } from "../../../src/application/binary/BinarySession.js";import { PROMPT_CONTRACTS } from "../../../src/contracts/promptContracts.js";import { createEvidence } from "../../../src/domain/evidence.js";import { createServer } from "../../../src/server/createServer.js";diff --git a/tests/boundary/mcp/providerSelectionMcp.test.ts b/tests/boundary/mcp/providerSelectionMcp.test.tsindex eff0352e3..af80423b8 100644--- a/tests/boundary/mcp/providerSelectionMcp.test.ts+++ b/tests/boundary/mcp/providerSelectionMcp.test.ts@@ -14,9 +14,9 @@ import {type CapabilityDescriptor,type ProviderIdentity,} from "../../../src/application/AnalysisProvider.js";-import { AnalysisProviderRegistry } from "../../../src/application/AnalysisProviderRegistry.js";-import { composeBinarySession } from "../../../src/application/BinarySessionComposition.js";-import { SessionProviderRouter } from "../../../src/application/SessionProviderRouter.js";+import { AnalysisProviderRegistry } from "../../../src/application/binary/AnalysisProviderRegistry.js";+import { composeBinarySession } from "../../../src/application/binary/BinarySessionComposition.js";+import { SessionProviderRouter } from "../../../src/application/binary/SessionProviderRouter.js";import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js";import { ok } from "../../../src/domain/result.js";import { silentLogger } from "../../../src/logger.js";diff --git a/tests/boundary/providers/auxiliaryDeclarations.test.ts b/tests/boundary/providers/auxiliaryDeclarations.test.tsindex ea2cbdf70..84a8f5e40 100644--- a/tests/boundary/providers/auxiliaryDeclarations.test.ts+++ b/tests/boundary/providers/auxiliaryDeclarations.test.ts@@ -1,7 +1,7 @@import { expect, it } from "vitest";import { auxiliaryAnalysisProviderDeclarations } from "../../../src/composition/auxiliaryAnalysisProviders.js";-import { LazyAnalysisProvider } from "../../../src/application/LazyAnalysisProvider.js";+import { LazyAnalysisProvider } from "../../../src/application/binary/LazyAnalysisProvider.js";import { parseBinaryTarget } from "../../../src/application/BinaryTargetResolver.js";import { GENERATED_AUXILIARY_PROVIDERS } from "../../../src/generatedMcpToolCatalog.js";diff --git a/tests/composition/analysis-sessions/binarySession.test.ts b/tests/composition/analysis-sessions/binarySession.test.tsindex 0f6c47e53..da99e17e8 100644--- a/tests/composition/analysis-sessions/binarySession.test.ts+++ b/tests/composition/analysis-sessions/binarySession.test.ts@@ -2,7 +2,7 @@ import type {AnalysisClient,AnalysisProvider,} from "../../../src/application/AnalysisProvider.js";-import type { BinarySession } from "../../../src/application/BinarySession.js";+import type { BinarySession } from "../../../src/application/binary/BinarySession.js";import type { JsonValue } from "../../../src/domain/jsonValue.js";import type { RecordUnknownInput } from "../../../src/domain/residualUnknown.js";import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js";diff --git a/tests/composition/analysis-sessions/compositeProvider.test.ts b/tests/composition/analysis-sessions/compositeProvider.test.tsindex 1ffff03ef..010a4eb84 100644--- a/tests/composition/analysis-sessions/compositeProvider.test.ts+++ b/tests/composition/analysis-sessions/compositeProvider.test.ts@@ -3,7 +3,7 @@ import { join } from "node:path";import { describe, expect, it } from "vitest";import { createTestBinarySession } from "../../fixtures/binarySession.js";-import { CompositeProvider } from "../../../src/application/CompositeProvider.js";+import { CompositeProvider } from "../../../src/application/binary/CompositeProvider.js";import type {AnalysisOperation,AnalysisProvider,diff --git a/tests/composition/analysis-sessions/investigationRecords.test.ts b/tests/composition/analysis-sessions/investigationRecords.test.tsindex 8cff526c2..423002066 100644--- a/tests/composition/analysis-sessions/investigationRecords.test.ts+++ b/tests/composition/analysis-sessions/investigationRecords.test.ts@@ -1,7 +1,7 @@import { expect, it, onTestFinished } from "vitest";-import { BinarySession } from "../../../src/application/BinarySession.js";-import { SessionProviderRouter } from "../../../src/application/SessionProviderRouter.js";+import { BinarySession } from "../../../src/application/binary/BinarySession.js";+import { SessionProviderRouter } from "../../../src/application/binary/SessionProviderRouter.js";import { InvestigationRecords } from "../../../src/application/investigation/InvestigationRecords.js";import { createEvidence } from "../../../src/domain/evidence.js";import { recordUnknownInputSchema } from "../../../src/domain/residualUnknown.js";diff --git a/tests/composition/analysis-sessions/providerBinding.test.ts b/tests/composition/analysis-sessions/providerBinding.test.tsindex e677f1609..7434a8399 100644--- a/tests/composition/analysis-sessions/providerBinding.test.ts+++ b/tests/composition/analysis-sessions/providerBinding.test.ts@@ -15,10 +15,10 @@ import {type CapabilityDescriptor,type ProviderIdentity,} from "../../../src/application/AnalysisProvider.js";-import { AnalysisProviderRegistry } from "../../../src/application/AnalysisProviderRegistry.js";-import type { BinarySession } from "../../../src/application/BinarySession.js";-import { composeBinarySession } from "../../../src/application/BinarySessionComposition.js";-import { SessionProviderRouter } from "../../../src/application/SessionProviderRouter.js";+import { AnalysisProviderRegistry } from "../../../src/application/binary/AnalysisProviderRegistry.js";+import type { BinarySession } from "../../../src/application/binary/BinarySession.js";+import { composeBinarySession } from "../../../src/application/binary/BinarySessionComposition.js";+import { SessionProviderRouter } from "../../../src/application/binary/SessionProviderRouter.js";import { createAnalysisProfile } from "../../../src/domain/analysisProfile.js";import { AnalysisCancelledError } from "../../../src/domain/analysisErrorCore.js";import { ProviderAdapterError } from "../../../src/domain/providerAdapterError.js";diff --git a/tests/fixtures/binarySession.ts b/tests/fixtures/binarySession.tsindex 1e6ee2a5b..30fc0db58 100644--- a/tests/fixtures/binarySession.ts+++ b/tests/fixtures/binarySession.ts@@ -14,8 +14,8 @@ import type {AnalysisProfileResolutionOptions,AnalysisProvider,} from "../../src/application/AnalysisProvider.js";-import { BinarySession } from "../../src/application/BinarySession.js";-import { SessionProviderRouter } from "../../src/application/SessionProviderRouter.js";+import { BinarySession } from "../../src/application/binary/BinarySession.js";+import { SessionProviderRouter } from "../../src/application/binary/SessionProviderRouter.js";import { err, ok as resultOk } from "../../src/domain/result.js";import { observed } from "./analysisExecution.js";