Merge origin/main into feat/native-call-observation

Follow #973's native ownership: the call-observation schemas move to
src/domain/native/, and the contract now lives in src/contracts/native/.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

.github/workflows/ci.yml

@@ -312,6 +312,8 @@ jobs:
         run: npm run verify:apple-dispatch && npm run verify:interface-builder
       - name: Native plist CLI selection regressions
         run: npm run test:focused -- tests/boundary/cli/nativePlistCli.test.ts tests/boundary/cli/nativePlistPrototypeKeyCli.test.ts tests/boundary/cli/nativePlistSelectionFailureCli.test.ts
+      - name: Native Swift demangling CLI and MCP regressions
+        run: npm run test:focused -- tests/boundary/cli/nativeDemangleCli.test.ts tests/boundary/mcp/nativeDemangleMcp.test.ts
 
   reconstruction-readiness:
     name: Reconstruction readiness

docs/capability-migration.md

@@ -404,3 +404,24 @@ analysis state. MCP startup constructs its connection session through the same
 binary factory. Source and compiled fixtures use these entrypoints. The former
 application runtime path is removed, and the source guard no longer admits its
 outward provider/composition imports.
+
+## Native analyst capability ownership
+
+`src/domain/native/` owns portable native inspection, instruction/data types,
+load-image facts, API boundaries, annotations, metadata recovery, UI observation
+semantics and value/investigation graphs. `src/application/native/` owns shared
+API projection, call routes, dispatch inspection and UI/value tracing. Its tests
+keep the existing service lane. `src/contracts/native/` owns the named native
+adapter contracts; shared official/enhanced aggregates remain at their owners.
+
+Producer interpretation, external commands and host UI lifecycle remain in
+`src/native/`, Hopper, Ghidra and IDA. The shared function dossier still lives in
+`domain/hopperValues.ts`: its historical name does not make its meaning exclusive
+to Hopper. This move retains existing typed ports, exact result schemas,
+observed/derived/unknown distinctions, profiles and Evidence links.
+
+Source and compiled verifier imports follow the new owners. Host UI and real
+native-value verifier locations are retained until their own proof lanes migrate;
+interactive macOS UI success and real dependency tracing require their respective
+host/engine workflows. Portable source fixtures and injected call-route tests
+establish their narrower boundaries, without expanding provider/platform support.

docs/testing.md

@@ -95,6 +95,14 @@ in `src/artifacts/apple/`. The npm entrypoints are unchanged. Format-specific
 Swift/XIB/asset sources and goldens retain their locations; real Apple workflows
 resolve them from the verifier file URL and run in the macOS CI lane.
 
+Portable native semantics and their tests live in `src/domain/native/`; shared
+analyst workflows and service-lane tests live in `src/application/native/`.
+Named native contracts live in `src/contracts/native/`. Provider protocol and
+host UI tests retain their adapter/boundary lanes, and real verifier command
+names remain unchanged.
+The existing Apple CI job also runs the host Swift-demangling CLI/MCP regression
+suites, including option-like symbols, carriage returns and multiline rejection.
+
 MCP SDK transport tests with recording providers remain integration tests.
 They are useful for schema drift and failure projection but do not prove that
 Hopper, Ghidra or another substituted engine works. `verify:package` proves

scripts/lib/catalog-core.mjs

@@ -40,7 +40,7 @@ const SOURCE_PATHS = {
   officialContracts: "dist/contracts/officialToolContracts.js",
   enhancedContracts: "dist/contracts/enhancedToolContracts.js",
   sessionContracts: "dist/contracts/sessionToolContracts.js",
-  nativeContracts: "dist/contracts/nativeToolContracts.js",
+  nativeContracts: "dist/contracts/native/nativeToolContracts.js",
   artifactContracts: "dist/contracts/artifactToolContracts.js",
   managedContracts: "dist/contracts/managed/managedToolContracts.js",
   firmwareContracts: "dist/contracts/firmware/firmwareToolContracts.js",

scripts/lib/native-value-e2e.mjs

@@ -7,7 +7,7 @@ import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
 
 import { parseEvidence } from "../../dist/domain/evidence.js";
 import { analysisProfileSchema } from "../../dist/domain/analysisProfile.js";
-import { nativeValueTraceSchema } from "../../dist/domain/nativeValueTrace.js";
+import { nativeValueTraceSchema } from "../../dist/domain/native/nativeValueTrace.js";
 
 const defaultEntrypoint = fileURLToPath(new URL("../rea.mjs", import.meta.url));
 const environment = () => ({

scripts/verify-real-ghidra-nativeaot.mjs

@@ -17,8 +17,8 @@ import { promisify } from "node:util";
 import { Client } from "@modelcontextprotocol/client";
 import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
 import { parseEvidence } from "../dist/domain/evidence.js";
-import { nativeDataTypeSchema } from "../dist/domain/nativeDataType.js";
-import { nativeLoadImageSchema } from "../dist/domain/nativeLoadImage.js";
+import { nativeDataTypeSchema } from "../dist/domain/native/nativeDataType.js";
+import { nativeLoadImageSchema } from "../dist/domain/native/nativeLoadImage.js";
 
 const mode = process.argv[2] ?? "symbols";
 if (

src/application/AnalysisProvider.ts

@@ -1,7 +1,7 @@
 import type { BinaryTarget } from "../domain/binaryTarget.js";
 import type { OfficialToolName } from "../contracts/officialToolContracts.js";
 import type { EnhancedToolName } from "../contracts/enhancedInputs.js";
-import type { NativeToolName } from "../contracts/nativeToolContracts.js";
+import type { NativeToolName } from "../contracts/native/nativeToolContracts.js";
 import type { ArtifactAnalysisOperation } from "../contracts/artifactToolContracts.js";
 import type { ManagedToolName } from "../contracts/managed/managedToolContracts.js";
 import type { AnalysisError } from "../domain/analysisErrorBase.js";

src/application/DirectAnalysis.ts

@@ -8,7 +8,7 @@ import type { BinarySession } from "./binary/BinarySession.js";
 import { silentLogger, type Logger } from "../logger.js";
 import { createEvidence } from "../domain/evidence.js";
 import type { Evidence } from "../domain/evidence.js";
-import type { NativeToolName } from "../contracts/nativeToolContracts.js";
+import type { NativeToolName } from "../contracts/native/nativeToolContracts.js";
 import type { ArtifactAnalysisOperation } from "../contracts/artifactToolContracts.js";
 import {
   isManagedToolName,

src/application/EnhancedTools.ts

@@ -27,9 +27,9 @@ import {
   discoverObjcClasses,
   discoverObjcProtocols,
 } from "../domain/symbolAnalysis.js";
-import { inspectNativeDispatch } from "./NativeDispatchMetadataInspection.js";
-import { traceNativeValues } from "./NativeValueTrace.js";
-import { traceNativeUiAction } from "./NativeUiActionTrace.js";
+import { inspectNativeDispatch } from "./native/NativeDispatchMetadataInspection.js";
+import { traceNativeValues } from "./native/NativeValueTrace.js";
+import { traceNativeUiAction } from "./native/NativeUiActionTrace.js";
 import { jsonValueSchema, type JsonValue } from "../domain/jsonValue.js";
 
 import {
@@ -39,7 +39,7 @@ import {
 } from "./EnhancedToolTypes.js";
 import { traceCallPath } from "./CallPathTracing.js";
 import { traceLiteralFeature } from "./EnhancedLiteralTracing.js";
-import { projectNativeApiInspection } from "./NativeApiInspection.js";
+import { projectNativeApiInspection } from "./native/NativeApiInspection.js";
 export type { ValidatedEnhancedCall } from "./EnhancedToolTypes.js";
 
 /**

src/application/native/EnhancedNativeInvestigation.test.ts

@@ -7,19 +7,19 @@ import {
   createAnalysisExecution,
   type AnalysisExecution,
   type AnalysisOperation,
-} from "./AnalysisProvider.js";
-import type { AnalysisError } from "../domain/analysisErrorBase.js";
+} from "../AnalysisProvider.js";
+import type { AnalysisError } from "../../domain/analysisErrorBase.js";
 import {
   AnalysisCancelledError,
   AnalysisCapabilityUnavailableError,
-} from "../domain/analysisErrorCore.js";
-import { EnhancedTools } from "./EnhancedTools.js";
+} from "../../domain/analysisErrorCore.js";
+import { EnhancedTools } from "../EnhancedTools.js";
 import {
   nativeInvestigationGraphSchema,
   nativeInvestigationTraceSchema,
-} from "../domain/nativeInvestigationGraph.js";
-import { err, ok } from "../domain/result.js";
-import type { Result } from "../domain/result.js";
+} from "../../domain/native/nativeInvestigationGraph.js";
+import { err, ok } from "../../domain/result.js";
+import type { Result } from "../../domain/result.js";
 
 const target = "a".repeat(64);
 const provider = { id: "fixture", name: "Fixture", version: "1" };

src/application/native/NativeApiInspection.test.ts

@@ -1,8 +1,8 @@
 import { describe, expect, it } from "vitest";
 
-import { functionDossierSchema } from "../domain/hopperValues.js";
-import { ghidraFunctionDossier } from "../domain/ghidraValues.fixture.js";
-import { nativeApiBoundarySchema } from "../domain/nativeApiBoundary.js";
+import { functionDossierSchema } from "../../domain/hopperValues.js";
+import { ghidraFunctionDossier } from "../../domain/ghidraValues.fixture.js";
+import { nativeApiBoundarySchema } from "../../domain/native/nativeApiBoundary.js";
 import { projectNativeApiInspection } from "./NativeApiInspection.js";
 
 describe("native API switch uncertainty", () => {

src/application/native/NativeApiInspection.ts

@@ -1,9 +1,9 @@
-import type { FunctionDossier } from "../domain/hopperValues.js";
+import type { FunctionDossier } from "../../domain/hopperValues.js";
 import {
   nativeApiInspectionResultSchema,
   type NativeApiBoundary,
   type NativeApiInspectionResult,
-} from "../domain/nativeApiBoundary.js";
+} from "../../domain/native/nativeApiBoundary.js";
 
 const unavailableBoundary = (): NativeApiBoundary => ({
   available: false,

src/application/native/NativeCallRoutes.test.ts

@@ -1,10 +1,10 @@
 import { describe, expect, it } from "vitest";
 import { readNativeCallRoutes } from "./NativeCallRoutes.js";
-import { createAnalysisExecution } from "./AnalysisProvider.js";
-import { ghidraReferenceEdge } from "../domain/ghidraValues.fixture.js";
-import { jsonValueSchema } from "../domain/jsonValue.js";
-import { err, ok } from "../domain/result.js";
-import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";
+import { createAnalysisExecution } from "../AnalysisProvider.js";
+import { ghidraReferenceEdge } from "../../domain/ghidraValues.fixture.js";
+import { jsonValueSchema } from "../../domain/jsonValue.js";
+import { err, ok } from "../../domain/result.js";
+import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";
 
 const provider = { id: "fixture", name: "Fixture", version: "1" };
 describe("typed native call routes", () => {

src/application/native/NativeCallRoutes.ts

@@ -1,11 +1,11 @@
 import { z } from "zod";
-import type { AnalysisOperationPort } from "./AnalysisProvider.js";
+import type { AnalysisOperationPort } from "../AnalysisProvider.js";
 import {
   parseRelatedAddresses,
   referenceKindSchema,
-} from "../domain/hopperValues.js";
-import { err, ok } from "../domain/result.js";
-import { AnalysisOutputError } from "../domain/analysisErrorCore.js";
+} from "../../domain/hopperValues.js";
+import { err, ok } from "../../domain/result.js";
+import { AnalysisOutputError } from "../../domain/analysisErrorCore.js";
 
 const referencesSchema = z.object({
   reference_kinds_available: z.boolean().optional(),

src/application/native/NativeDispatchMetadataInspection.ts

@@ -2,12 +2,12 @@ import { z } from "zod";
 import {
   nativeDispatchMetadataResultSchema,
   inspectNativeDispatchMetadata,
-} from "../domain/objcSwiftMetadata.js";
-import { AnalysisOutputError } from "../domain/analysisErrorCore.js";
-import { jsonValueSchema } from "../domain/jsonValue.js";
-import { err, ok } from "../domain/result.js";
-import type { AnalysisOperationPort } from "./AnalysisProvider.js";
-import type { EnhancedResult } from "./EnhancedToolTypes.js";
+} from "../../domain/native/objcSwiftMetadata.js";
+import { AnalysisOutputError } from "../../domain/analysisErrorCore.js";
+import { jsonValueSchema } from "../../domain/jsonValue.js";
+import { err, ok } from "../../domain/result.js";
+import type { AnalysisOperationPort } from "../AnalysisProvider.js";
+import type { EnhancedResult } from "../EnhancedToolTypes.js";
 /** Prefer validated binary metadata, otherwise preserve the bound provider's symbol-only coverage. */
 export const inspectNativeDispatch = async (
   analysis: AnalysisOperationPort,

src/application/native/NativeUiActionTrace.ts

@@ -1,22 +1,22 @@
 import { z } from "zod";
 
-import type { AnalysisOperationPort } from "./AnalysisProvider.js";
-import type { EnhancedResult } from "./EnhancedToolTypes.js";
-import type { enhancedInputSchemas } from "../contracts/enhancedInputs.js";
-import { interfaceBuilderAnalysisSchema } from "../domain/apple/interfaceBuilderGraph.js";
+import type { AnalysisOperationPort } from "../AnalysisProvider.js";
+import type { EnhancedResult } from "../EnhancedToolTypes.js";
+import type { enhancedInputSchemas } from "../../contracts/enhancedInputs.js";
+import { interfaceBuilderAnalysisSchema } from "../../domain/apple/interfaceBuilderGraph.js";
 import {
   nativeInvestigationGraphSchema,
   nativeInvestigationTraceSchema,
   traceNativeInvestigationGraph,
   joinInterfaceBuilderDispatch,
-} from "../domain/nativeInvestigationGraph.js";
-import { nativeDispatchMetadataResultSchema } from "../domain/objcSwiftMetadata.js";
+} from "../../domain/native/nativeInvestigationGraph.js";
+import { nativeDispatchMetadataResultSchema } from "../../domain/native/objcSwiftMetadata.js";
 import { inspectNativeDispatch } from "./NativeDispatchMetadataInspection.js";
-import { jsonValueSchema } from "../domain/jsonValue.js";
+import { jsonValueSchema } from "../../domain/jsonValue.js";
 import { readNativeCallRoutes } from "./NativeCallRoutes.js";
-import { err, ok } from "../domain/result.js";
-import { AnalysisOutputError } from "../domain/analysisErrorCore.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
+import { err, ok } from "../../domain/result.js";
+import { AnalysisOutputError } from "../../domain/analysisErrorCore.js";
+import { projectAnalysisError } from "../../domain/analysisErrorProjection.js";
 
 type Input = z.output<typeof enhancedInputSchemas.trace_native_ui_action>;
 /** Build a UI-to-code trace from the active app and selected native provider. */

src/application/native/NativeValueTrace.test.ts

@@ -3,12 +3,12 @@ import { traceNativeValues } from "./NativeValueTrace.js";
 import {
   createAnalysisExecution,
   type AnalysisOperationPort,
-} from "./AnalysisProvider.js";
-import { ghidraFunctionDossier } from "../domain/ghidraValues.fixture.js";
-import { functionDossierSchema } from "../domain/hopperValues.js";
-import { jsonValueSchema } from "../domain/jsonValue.js";
-import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";
-import { ok, err } from "../domain/result.js";
+} from "../AnalysisProvider.js";
+import { ghidraFunctionDossier } from "../../domain/ghidraValues.fixture.js";
+import { functionDossierSchema } from "../../domain/hopperValues.js";
+import { jsonValueSchema } from "../../domain/jsonValue.js";
+import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";
+import { ok, err } from "../../domain/result.js";
 
 const subject = {
   path: "/fixture",

src/application/native/NativeValueTrace.ts

@@ -1,17 +1,17 @@
-import { functionDossierSchema } from "../domain/hopperValues.js";
-import { nativeCallTargetsSchema } from "../domain/nativeInstruction.js";
+import { functionDossierSchema } from "../../domain/hopperValues.js";
+import { nativeCallTargetsSchema } from "../../domain/native/nativeInstruction.js";
 import {
   nativeValueTraceInputSchema,
   nativeValueTraceSchema,
-} from "../domain/nativeValueTrace.js";
-import { createEvidence } from "../domain/evidence.js";
+} from "../../domain/native/nativeValueTrace.js";
+import { createEvidence } from "../../domain/evidence.js";
 import {
   AnalysisCancelledError,
   AnalysisOutputError,
-} from "../domain/analysisErrorCore.js";
-import { err, ok } from "../domain/result.js";
-import type { AnalysisOperationPort } from "./AnalysisProvider.js";
-import type { EnhancedResult } from "./EnhancedToolTypes.js";
+} from "../../domain/analysisErrorCore.js";
+import { err, ok } from "../../domain/result.js";
+import type { AnalysisOperationPort } from "../AnalysisProvider.js";
+import type { EnhancedResult } from "../EnhancedToolTypes.js";
 
 /** Compose bounded high-p-code def-use graphs across exactly referenced call destinations. */
 export const traceNativeValues = async (

src/cli/nativeCallCommands.ts

@@ -8,7 +8,7 @@ import { AnalysisInputError } from "../domain/analysisErrorCore.js";
 import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import { projectInputIssues } from "../domain/inputIssueProjection.js";
 import { jsonValueSchema } from "../domain/jsonValue.js";
-import { nativeCallObservationInputSchema } from "../domain/nativeCallObservation.js";
+import { nativeCallObservationInputSchema } from "../domain/native/nativeCallObservation.js";
 import type { Logger } from "../logger.js";
 import type { CliInstance } from "./types.js";
 

src/cli/utilityCommands.ts

@@ -13,7 +13,7 @@ import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import { PRODUCT_IDENTITY } from "../identity.js";
 import { logCliCommand } from "../cliLogging.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
-import { swiftSymbolsSchema } from "../contracts/nativeToolContracts.js";
+import { swiftSymbolsSchema } from "../contracts/native/nativeToolContracts.js";
 import type { Logger } from "../logger.js";
 import { isReferenceSourceImportCliFailure } from "./referenceSourceImportStatus.js";
 import type { CliInstance } from "./types.js";

src/contracts/contractSnapshot.test.ts

@@ -4,7 +4,7 @@ import { z } from "zod";
 import { ENHANCED_TOOL_CONTRACTS } from "./enhancedToolContracts.js";
 import { OFFICIAL_TOOL_CONTRACTS } from "./officialToolContracts.js";
 import { SESSION_TOOL_CONTRACTS } from "./sessionToolContracts.js";
-import { NATIVE_TOOL_CONTRACTS } from "./nativeToolContracts.js";
+import { NATIVE_TOOL_CONTRACTS } from "./native/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";

src/contracts/enhancedInputs.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { nativeValueTraceInputSchema } from "../domain/nativeValueTrace.js";
+import { nativeValueTraceInputSchema } from "../domain/native/nativeValueTrace.js";
 const traceLiteralInputSchema = z.strictObject({
   query: z.string().min(1),
   case_sensitive: z.boolean().default(false),

src/contracts/managed/managedWorkflowExamples.ts

@@ -3,7 +3,7 @@ import type {
   ManagedMemberInspection,
   ManagedNativeBoundaryInspection,
 } from "../../domain/managed/managedArtifact.js";
-import type { InspectMacho } from "../../domain/nativeInspection.js";
+import type { InspectMacho } from "../../domain/native/nativeInspection.js";
 
 const MANAGED_STATIC_EXAMPLE_PROVIDER = {
   id: "rea-dotnet-static",

src/contracts/native/nativeToolContracts.ts

@@ -1,15 +1,15 @@
 import { z } from "zod";
-import { nativeCallObservationInputSchema } from "../domain/nativeCallObservation.js";
+import { nativeCallObservationInputSchema } from "../../domain/native/nativeCallObservation.js";
 import {
   nativeUiObservationInputSchema,
   nativeUiScenarioInputSchema,
-} from "../domain/nativeUiObservation.js";
+} from "../../domain/native/nativeUiObservation.js";
 
-import type { ToolContract } from "./toolContracts.js";
-import { nativeOutputSchemas } from "./toolOutputSchemas.js";
-import { jsonValueSchema } from "../domain/jsonValue.js";
-import { toolContractMetadata } from "./toolEffects.js";
-import { requireOutputSchema } from "./toolOutputSchemaPrimitives.js";
+import type { ToolContract } from "../toolContracts.js";
+import { nativeOutputSchemas } from "../toolOutputSchemas.js";
+import { jsonValueSchema } from "../../domain/jsonValue.js";
+import { toolContractMetadata } from "../toolEffects.js";
+import { requireOutputSchema } from "../toolOutputSchemaPrimitives.js";
 
 const examples: Readonly<Record<string, Readonly<Record<string, unknown>>>> = {
   inspect_macho: {},

src/contracts/officialToolContracts.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { nativeFunctionAnnotationsInputSchema } from "../domain/nativeFunctionAnnotations.js";
+import { nativeFunctionAnnotationsInputSchema } from "../domain/native/nativeFunctionAnnotations.js";
 
 import {
   officialOutputSchemas,
@@ -14,8 +14,8 @@ import {
 } from "./toolContractHelpers.js";
 import type { ToolContract } from "./toolContractTypes.js";
 import { toolContractMetadata } from "./toolEffects.js";
-import { nativeDataTypeInputSchema } from "../domain/nativeDataType.js";
-import { nativeInstructionInputSchema } from "../domain/nativeInstruction.js";
+import { nativeDataTypeInputSchema } from "../domain/native/nativeDataType.js";
+import { nativeInstructionInputSchema } from "../domain/native/nativeInstruction.js";
 import { functionInstructionInputSchema } from "./functionInstructionContract.js";
 import { HOPPER_MEMORY_TOOL_DEFINITIONS } from "./hopperMemoryContracts.js";
 import { analysisSearchInput } from "./analysisSearchContract.js";

src/contracts/toolContracts.test.ts

@@ -9,7 +9,7 @@ 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 "./managed/managedWorkflowToolContracts.js";
-import { NATIVE_TOOL_CONTRACTS } from "./nativeToolContracts.js";
+import { NATIVE_TOOL_CONTRACTS } from "./native/nativeToolContracts.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";

src/contracts/toolContracts.ts

@@ -1,4 +1,4 @@
-import { NATIVE_TOOL_CONTRACTS } from "./nativeToolContracts.js";
+import { NATIVE_TOOL_CONTRACTS } from "./native/nativeToolContracts.js";
 import { ARTIFACT_TOOL_CONTRACTS } from "./artifactToolContracts.js";
 import { MANAGED_TOOL_CONTRACTS } from "./managed/managedToolContracts.js";
 import { FIRMWARE_TOOL_CONTRACTS } from "./firmware/firmwareToolContracts.js";

src/contracts/toolOutputSchemaGroups.ts

@@ -1,14 +1,14 @@
 import { z } from "zod";
-import { nativeFunctionAnnotationsSchema } from "../domain/nativeFunctionAnnotations.js";
-import { nativeLoadImageSchema } from "../domain/nativeLoadImage.js";
-import { nativeUiResultSchema } from "../domain/nativeUiObservation.js";
-import { nativeCallObservationResultSchema } from "../domain/nativeCallObservation.js";
-import { nativeValueTraceSchema } from "../domain/nativeValueTrace.js";
-import { nativeDataTypeSchema } from "../domain/nativeDataType.js";
+import { nativeFunctionAnnotationsSchema } from "../domain/native/nativeFunctionAnnotations.js";
+import { nativeLoadImageSchema } from "../domain/native/nativeLoadImage.js";
+import { nativeUiResultSchema } from "../domain/native/nativeUiObservation.js";
+import { nativeValueTraceSchema } from "../domain/native/nativeValueTrace.js";
+import { nativeDataTypeSchema } from "../domain/native/nativeDataType.js";
+import { nativeCallObservationResultSchema } from "../domain/native/nativeCallObservation.js";
 import {
   nativeInstructionSchema,
   nativeCallTargetsSchema,
-} from "../domain/nativeInstruction.js";
+} from "../domain/native/nativeInstruction.js";
 import { jsonValueSchema } from "../domain/jsonValue.js";
 import { residualUnknownSchema } from "../domain/residualUnknown.js";
 import { evidenceBundleSchema } from "../domain/evidenceBundle.js";
@@ -21,14 +21,14 @@ import {
   functionInstructionWindowSchema,
   referenceKindSchema,
 } from "../domain/hopperValues.js";
-import { nativeApiInspectionResultSchema } from "../domain/nativeApiBoundary.js";
+import { nativeApiInspectionResultSchema } from "../domain/native/nativeApiBoundary.js";
 import {
   demangleSwiftSchema,
   inspectMachoSchema,
   inspectPlistSchema,
   inspectSignatureSchema,
   listArchitecturesSchema,
-} from "../domain/nativeInspection.js";
+} from "../domain/native/nativeInspection.js";
 import { artifactExtractionResultSchema } from "../domain/artifactGraph.js";
 import { artifactInspectionResultSchema } from "../domain/artifactInspection.js";
 import { interfaceBuilderAnalysisSchema } from "../domain/apple/interfaceBuilderGraph.js";
@@ -51,8 +51,8 @@ import { callPathResultSchema } from "../domain/callPath.js";
 import { staticRuntimeCorrelationResultSchema } from "../domain/staticRuntimeCorrelation.js";
 import { reconstructionVerificationResultSchema } from "../domain/reconstructionVerification.js";
 import { analysisErrorProjectionSchema } from "./errorSchemas.js";
-import { nativeDispatchMetadataResultSchema } from "../domain/objcSwiftMetadata.js";
-import { nativeInvestigationTraceSchema } from "../domain/nativeInvestigationGraph.js";
+import { nativeDispatchMetadataResultSchema } from "../domain/native/objcSwiftMetadata.js";
+import { nativeInvestigationTraceSchema } from "../domain/native/nativeInvestigationGraph.js";
 import {
   addressList,
   addressedValue,

src/domain/apple/interfaceBuilderGraph.ts

@@ -10,7 +10,7 @@ import {
   nativeInvestigationGraphSchema,
   nativeInvestigationNodeSchema,
   nativeInvestigationTraceLimitsSchema,
-} from "../nativeInvestigationGraph.js";
+} from "../native/nativeInvestigationGraph.js";
 
 export { parseInterfaceBuilderRecords } from "./interfaceBuilderKeyedArchive.js";
 

src/domain/hopperValues.ts

@@ -3,8 +3,8 @@ import { z } from "zod";
 import type { JsonValue } from "./jsonValue.js";
 
 import { err, ok, type Result } from "./result.js";
-import { nativeApiBoundarySchema } from "./nativeApiBoundary.js";
-import { nativeValueFlowSchema } from "./nativeValueFlow.js";
+import { nativeApiBoundarySchema } from "./native/nativeApiBoundary.js";
+import { nativeValueFlowSchema } from "./native/nativeValueFlow.js";
 import { AnalysisOutputError } from "./analysisErrorCore.js";
 import { HopperProtocolError } from "./hopperErrors.js";
 

src/domain/managed/managedNativeVerificationMatch.ts

@@ -5,7 +5,7 @@ import canonicalize from "canonicalize";
 
 import { parseEvidence } from "../evidence.js";
 import { functionDossierSchema } from "../hopperValues.js";
-import { inspectMachoSchema } from "../nativeInspection.js";
+import { inspectMachoSchema } from "../native/nativeInspection.js";
 import type { ManagedNativeBoundaryInspection } from "./managedArtifact.js";
 import type { JsonValue } from "../jsonValue.js";
 import {

src/domain/native/nativeFunctionAnnotations.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { functionDossierSchema } from "./hopperValues.js";
+import { functionDossierSchema } from "../hopperValues.js";
 
 /** One explicit function's analyst-authored metadata changes. */
 export const nativeFunctionAnnotationsInputSchema = z

src/domain/native/nativeInspection.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { jsonValueSchema } from "./jsonValue.js";
+import { jsonValueSchema } from "../jsonValue.js";
 
 const hexAddress = z.string().regex(/^0x[a-fA-F0-9]+$/u);
 const coverage = <Schema extends z.ZodType>(item: Schema) =>

src/domain/native/nativeInvestigationGraph.test.ts

@@ -8,7 +8,7 @@ import {
 import {
   buildInterfaceBuilderAnalysis,
   interfaceBuilderLimitsSchema,
-} from "./apple/interfaceBuilderGraph.js";
+} from "../apple/interfaceBuilderGraph.js";
 
 const evidence = [
   {

src/domain/native/nativeInvestigationGraph.ts

@@ -5,7 +5,7 @@ import {
   nativeMetadataLocationSchema,
   type ObjcSwiftMetadata,
 } from "./objcSwiftMetadata.js";
-import { jsonValueSchema } from "./jsonValue.js";
+import { jsonValueSchema } from "../jsonValue.js";
 
 /** Entity kinds shared by decoded Interface Builder archives and native code. */
 export const nativeInvestigationNodeKindSchema = z.enum([

src/domain/native/nativeLoadImage.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { nativeMetadataRecoverySummarySchema } from "./nativeMetadataRecovery.js";
-import { jsonValueSchema } from "./jsonValue.js";
+import { jsonValueSchema } from "../jsonValue.js";
 
 const integer = z.number().int().min(0).max(Number.MAX_SAFE_INTEGER);
 const digest = z.string().regex(/^[a-f0-9]{64}$/u);

src/domain/native/nativeMetadataRecovery.test.ts

@@ -3,7 +3,7 @@ import {
   nativeMetadataRecoverySchema,
   nativeMetadataRecoverySummarySchema,
 } from "./nativeMetadataRecovery.js";
-import { jsonValueSchema } from "./jsonValue.js";
+import { jsonValueSchema } from "../jsonValue.js";
 
 const metadata = {
   format: "dotnet-nativeaot",

src/domain/native/nativeUiObservation.ts

@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
 
 import { z } from "zod";
 
-import { decodeCanonicalBase64 } from "./webScreenshot.js";
+import { decodeCanonicalBase64 } from "../webScreenshot.js";
 
 const scope = {
   pid: z.number().int().positive(),

src/ghidra/GhidraAnnotations.test.ts

@@ -1,6 +1,6 @@
 import { functionDossierSchema } from "../domain/hopperValues.js";
 import { describe, expect, it } from "vitest";
-import { nativeFunctionAnnotationsInputSchema } from "../domain/nativeFunctionAnnotations.js";
+import { nativeFunctionAnnotationsInputSchema } from "../domain/native/nativeFunctionAnnotations.js";
 import { ghidraFunctionDossier } from "../domain/ghidraValues.fixture.js";
 import {
   parseGhidraFunctionInput,

src/ghidra/GhidraDosComLoadImage.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { attestGhidraDosComLoadImage } from "./GhidraLoadImageValues.js";
 import { fixtureDosComLoadImage } from "./GhidraLoadImage.fixture.js";
-import type { NativeLoadImageObservation } from "../domain/nativeLoadImage.js";
+import type { NativeLoadImageObservation } from "../domain/native/nativeLoadImage.js";
 
 const mutations: ReadonlyArray<
   readonly [string, (o: NativeLoadImageObservation) => void]

src/ghidra/GhidraFunctionValues.ts

@@ -2,12 +2,12 @@ import { z } from "zod";
 import {
   nativeFunctionAnnotationsInputSchema,
   nativeFunctionAnnotationsSchema,
-} from "../domain/nativeFunctionAnnotations.js";
-import { nativeDataTypeSchema } from "../domain/nativeDataType.js";
+} from "../domain/native/nativeFunctionAnnotations.js";
+import { nativeDataTypeSchema } from "../domain/native/nativeDataType.js";
 import {
   nativeInstructionSchema,
   nativeCallTargetsSchema,
-} from "../domain/nativeInstruction.js";
+} from "../domain/native/nativeInstruction.js";
 
 import {
   AnalysisInputError,
@@ -24,8 +24,8 @@ import {
   jsonValueSchema,
   type JsonValue,
 } from "../domain/jsonValue.js";
-import { nativeApiBoundarySchema } from "../domain/nativeApiBoundary.js";
-import { nativeValueFlowSchema } from "../domain/nativeValueFlow.js";
+import { nativeApiBoundarySchema } from "../domain/native/nativeApiBoundary.js";
+import { nativeValueFlowSchema } from "../domain/native/nativeValueFlow.js";
 import { err, ok, type Result } from "../domain/result.js";
 import {
   ghidraIdentifierSchema,

src/ghidra/GhidraInventoryValues.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { nativeLoadImageObservationSchema } from "../domain/nativeLoadImage.js";
+import { nativeLoadImageObservationSchema } from "../domain/native/nativeLoadImage.js";
 
 import {
   AnalysisInputError,

src/ghidra/GhidraLoadImage.fixture.ts

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import { dosMz } from "../domain/binaryTarget.fixture.js";
-import type { NativeLoadImageObservation } from "../domain/nativeLoadImage.js";
+import type { NativeLoadImageObservation } from "../domain/native/nativeLoadImage.js";
 
 const hash = (bytes: Buffer): string =>
   createHash("sha256").update(bytes).digest("hex");

src/ghidra/GhidraLoadImageAttest.ts

@@ -5,7 +5,7 @@ import { jsonValueSchema, type JsonValue } from "../domain/jsonValue.js";
 import {
   nativeLoadImageObservationSchema,
   nativeLoadImageSchema,
-} from "../domain/nativeLoadImage.js";
+} from "../domain/native/nativeLoadImage.js";
 import { ProviderAdapterError } from "../domain/providerAdapterError.js";
 import { err, ok, type Result } from "../domain/result.js";
 import {

src/ghidra/GhidraLoadImageValues.test.ts

@@ -2,8 +2,8 @@ import { describe, expect, it } from "vitest";
 import { createHash } from "node:crypto";
 import { attestGhidraDosLoadImage } from "./GhidraLoadImageValues.js";
 import { fixtureDosLoadImage } from "./GhidraLoadImage.fixture.js";
-import { nativeLoadImageObservationSchema } from "../domain/nativeLoadImage.js";
-import type { NativeLoadImageObservation } from "../domain/nativeLoadImage.js";
+import { nativeLoadImageObservationSchema } from "../domain/native/nativeLoadImage.js";
+import type { NativeLoadImageObservation } from "../domain/native/nativeLoadImage.js";
 
 const damage: ReadonlyArray<
   readonly [string, (observation: NativeLoadImageObservation) => void]

src/ghidra/GhidraLoadImageValues.ts

@@ -4,7 +4,7 @@ import {
   type NativeLoadImage,
   type NativeLoadImageCheck,
   type NativeLoadImageObservation,
-} from "../domain/nativeLoadImage.js";
+} from "../domain/native/nativeLoadImage.js";
 import { parseDosMzHeader, type DosMzHeader } from "../domain/dosMz.js";
 import type { JsonValue } from "../domain/jsonValue.js";
 import { validateDosComLength } from "../domain/dosCom.js";

src/native/AppleDispatchCoverage.ts

@@ -1,4 +1,4 @@
-import type { ObjcSwiftMetadata } from "../domain/objcSwiftMetadata.js";
+import type { ObjcSwiftMetadata } from "../domain/native/objcSwiftMetadata.js";
 import type { PointerFixups } from "./AppleMachoFixups.js";
 
 const describeFixups = (fixups: PointerFixups): string => {

src/native/AppleDispatchMetadata.ts

@@ -5,7 +5,7 @@ import {
   objcSwiftMetadataSchema,
   nativeDispatchMetadataResultSchema,
   type ObjcSwiftMetadata,
-} from "../domain/objcSwiftMetadata.js";
+} from "../domain/native/objcSwiftMetadata.js";
 import type { BinaryTarget } from "../domain/binaryTarget.js";
 import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";
 import { EvidenceIntegrityError } from "../domain/evidenceErrors.js";

src/native/AppleObjcCategories.ts

@@ -1,4 +1,4 @@
-import type { ObjcSwiftMetadata } from "../domain/objcSwiftMetadata.js";
+import type { ObjcSwiftMetadata } from "../domain/native/objcSwiftMetadata.js";
 import type { Section } from "./AppleMachoSelection.js";
 import type { ObjcDispatchReaders } from "./AppleObjcDispatchFacets.js";
 import { readObjcPropertiesOf } from "./AppleObjcProperties.js";

src/native/AppleObjcDispatchFacets.ts

@@ -1,4 +1,4 @@
-import type { ObjcSwiftMetadata } from "../domain/objcSwiftMetadata.js";
+import type { ObjcSwiftMetadata } from "../domain/native/objcSwiftMetadata.js";
 import type { Segment, Section } from "./AppleMachoSelection.js";
 import { boundClassName, decodeObjcCategories } from "./AppleObjcCategories.js";
 import { readObjcPropertiesOf } from "./AppleObjcProperties.js";

src/native/AppleObjcProperties.ts

@@ -1,6 +1,6 @@
 import type { z } from "zod";
 
-import type { objcPropertySchema } from "../domain/objcSwiftMetadata.js";
+import type { objcPropertySchema } from "../domain/native/objcSwiftMetadata.js";
 
 type ObjcProperty = z.infer<typeof objcPropertySchema>;
 

src/native/AppleObjcProtocols.ts

@@ -1,4 +1,4 @@
-import type { ObjcSwiftMetadata } from "../domain/objcSwiftMetadata.js";
+import type { ObjcSwiftMetadata } from "../domain/native/objcSwiftMetadata.js";
 import type { SwiftMetadataReaders } from "./AppleSwiftVtables.js";
 
 /** Read protocol lists and absolute protocol method declarations with cycle-safe identities. */

src/native/AppleSwiftDispatchFacets.ts

@@ -1,4 +1,4 @@
-import type { ObjcSwiftMetadata } from "../domain/objcSwiftMetadata.js";
+import type { ObjcSwiftMetadata } from "../domain/native/objcSwiftMetadata.js";
 import type { Segment, Section } from "./AppleMachoSelection.js";
 
 /** Resolved file-backed metadata location from the Mach-O layout. */

src/native/AppleSwiftVtables.ts

@@ -2,7 +2,7 @@ import type {
   ObjcSwiftMetadata,
   NativeMetadataEvidence,
   NativeMetadataLocation,
-} from "../domain/objcSwiftMetadata.js";
+} from "../domain/native/objcSwiftMetadata.js";
 
 /** Byte readers shared with the validated Mach-O metadata boundary. */
 export interface SwiftMetadataReaders {

src/native/LldbCallTracer.ts

@@ -15,7 +15,7 @@ import {
   nativeCallEventSchema,
   nativeCodeLocationSchema,
   type NativeCallObservationInput,
-} from "../domain/nativeCallObservation.js";
+} from "../domain/native/nativeCallObservation.js";
 import { ProviderAdapterError } from "../domain/providerAdapterError.js";
 import { err, ok, type Result } from "../domain/result.js";
 import { safeParseJson } from "../domain/safeJson.js";

src/native/NativeCallObservation.ts

@@ -15,7 +15,7 @@ import {
   nativeCallObservationResultSchema,
   type NativeCallObservationInput,
   type NativeCallObservationResult,
-} from "../domain/nativeCallObservation.js";
+} from "../domain/native/nativeCallObservation.js";
 import { err, ok, type Result } from "../domain/result.js";
 import type { NativeCallTrace, NativeCallTracer } from "./LldbCallTracer.js";
 

src/native/NativeMacOSProvider.ts

@@ -23,7 +23,7 @@ import {
 import {
   NATIVE_TOOL_CONTRACTS,
   type NativeToolName,
-} from "../contracts/nativeToolContracts.js";
+} from "../contracts/native/nativeToolContracts.js";
 import type { BinaryTarget } from "../domain/binaryTarget.js";
 import type { EvidenceLocation } from "../domain/evidence.js";
 import {
@@ -46,7 +46,7 @@ import {
   inspectSignatureSchema,
   listArchitecturesSchema,
   type NativeCommandInvocation,
-} from "../domain/nativeInspection.js";
+} from "../domain/native/nativeInspection.js";
 import { err, ok, type Result } from "../domain/result.js";
 import {
   NativeCommandFailure,

src/native/NativeMacOSProviderMetadata.ts

@@ -2,7 +2,7 @@ import type {
   CapabilityDescriptor,
   ProviderIdentity,
 } from "../application/AnalysisProvider.js";
-import { NATIVE_TOOL_CONTRACTS } from "../contracts/nativeToolContracts.js";
+import { NATIVE_TOOL_CONTRACTS } from "../contracts/native/nativeToolContracts.js";
 
 /** Public identity committed by macOS-native inspection observations. */
 export const NATIVE_MACOS_PROVIDER_IDENTITY: ProviderIdentity = Object.freeze({

src/native/NativeMachoInspection.ts

@@ -4,7 +4,7 @@ import type { AnalysisError } from "../domain/analysisErrorBase.js";
 import {
   inspectMachoSchema,
   type NativeCommandInvocation,
-} from "../domain/nativeInspection.js";
+} from "../domain/native/nativeInspection.js";
 import { jsonValueSchema, type JsonValue } from "../domain/jsonValue.js";
 import { err, ok, type Result } from "../domain/result.js";
 import type { NativeCommandCapture } from "./CommandRunner.js";

src/native/NativeUiObservation.ts

@@ -6,7 +6,7 @@ import {
   nativeUiScenarioInputSchema,
   nativeUiSnapshotSchema,
   nativeUiResultSchema,
-} from "../domain/nativeUiObservation.js";
+} from "../domain/native/nativeUiObservation.js";
 import {
   AnalysisCancelledError,
   AnalysisCapabilityUnavailableError,

src/native/parsers/codesign.ts

@@ -1,7 +1,7 @@
 import {
   inspectSignatureSchema,
   type InspectSignature,
-} from "../../domain/nativeInspection.js";
+} from "../../domain/native/nativeInspection.js";
 
 /**
  * Parse bounded `codesign -d --verbose=4` diagnostics, which Apple emits on

src/server/registerNativeTools.ts

@@ -2,7 +2,7 @@ import type { EvidenceWriter } from "../application/investigation/InvestigationR
 import type { McpServer } from "@modelcontextprotocol/server";
 
 import type { AnalysisOperationPort } from "../application/AnalysisProvider.js";
-import { NATIVE_TOOL_CONTRACTS } from "../contracts/nativeToolContracts.js";
+import { NATIVE_TOOL_CONTRACTS } from "../contracts/native/nativeToolContracts.js";
 import type { BinaryTarget } from "../domain/binaryTarget.js";
 import type { Logger } from "../logger.js";
 import { registerEvidenceTools } from "./registerEvidenceTools.js";

tests/boundary/mcp/nativeCallObservationMcp.test.ts

@@ -5,7 +5,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
 import { expect, it } from "vitest";
 import { z } from "zod";
 
-import { nativeCallObservationResultSchema } from "../../../src/domain/nativeCallObservation.js";
+import { nativeCallObservationResultSchema } from "../../../src/domain/native/nativeCallObservation.js";
 import { ok } from "../../../src/domain/result.js";
 import type { NativeCallTracer } from "../../../src/native/LldbCallTracer.js";
 import { NativeMacOSProvider } from "../../../src/native/NativeMacOSProvider.js";

tests/boundary/providers/native/nativeCallObservation.test.ts

@@ -11,7 +11,7 @@ import {
 } from "../../../../src/domain/analysisErrorCore.js";
 import type { AnalysisError } from "../../../../src/domain/analysisErrorBase.js";
 import { EvidenceIntegrityError } from "../../../../src/domain/evidenceErrors.js";
-import { nativeCallObservationResultSchema } from "../../../../src/domain/nativeCallObservation.js";
+import { nativeCallObservationResultSchema } from "../../../../src/domain/native/nativeCallObservation.js";
 import { err, ok, type Result } from "../../../../src/domain/result.js";
 import type {
   NativeCallTrace,

tests/boundary/providers/native/nativeSelectedArchitecture.test.ts

@@ -1,5 +1,5 @@
 import { expect, it } from "vitest";
-import { inspectMachoSchema } from "../../../../src/domain/nativeInspection.js";
+import { inspectMachoSchema } from "../../../../src/domain/native/nativeInspection.js";
 import { err } from "../../../../src/domain/result.js";
 import { NativeCommandFailure } from "../../../../src/native/CommandRunner.js";
 import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js";

tests/conformance/providers/managed/managedNativeVerification.test.ts

@@ -9,7 +9,7 @@ import {
   verifyManagedNativeBoundaries,
 } from "../../../../src/domain/managed/managedNativeVerification.js";
 import { managedNativeBoundaryInspectionSchema } from "../../../../src/domain/managed/managedArtifact.js";
-import { inspectMachoSchema } from "../../../../src/domain/nativeInspection.js";
+import { inspectMachoSchema } from "../../../../src/domain/native/nativeInspection.js";
 
 const exampleInput = () =>
   managedNativeVerificationInputSchema.parse(