From 8e8921d40c63b40ab7e1598f672063dd304d93f0 Mon Sep 17 00:00:00 2001 From: ysopwnable <161784452+N0zoM1z0@users.noreply.github.com> Date: Wed, 7 Oct 2026 14:09:57 +0800 Subject: [PATCH] refactor(android): group layered source and verification (#873) --- docs/capability-migration.md | 17 +++++++++++++++++ docs/testing.md | 8 ++++++++ package.json | 4 ++-- .../apidemos.json} | 0 .../android/fetch.mjs} | 10 ++++++---- scripts/lib/catalog-core.mjs | 2 +- .../android/analysis.mjs} | 14 +++++++------- .../android/cli-cancellation.mjs} | 2 +- src/android/AndroidTargetSnapshot.ts | 2 +- src/android/JadxAnalysis.ts | 4 ++-- src/android/JadxConfiguration.ts | 2 +- src/android/JadxProtocol.ts | 2 +- src/android/JadxProvider.ts | 4 ++-- src/android/JadxSession.ts | 2 +- .../{ => android}/AndroidAnalysisPort.ts | 10 +++++----- .../{ => android}/AndroidAnalysisService.ts | 16 ++++++++-------- .../{ => android}/AndroidApplicationService.ts | 12 ++++++------ src/cli/androidCommands.ts | 4 ++-- src/cli/applicationCommands.ts | 4 ++-- src/composition/android.ts | 2 +- .../{ => android}/androidToolContracts.ts | 8 ++++---- src/contracts/applicationToolContracts.ts | 2 +- src/contracts/contractSnapshot.test.ts | 2 +- src/contracts/toolContracts.test.ts | 2 +- src/contracts/toolContracts.ts | 2 +- src/domain/{ => android}/androidAnalysis.ts | 0 src/domain/{ => android}/androidApplication.ts | 8 ++++---- src/server/createServer.ts | 4 ++-- src/server/registerAndroidTools.ts | 4 ++-- .../projectMobileApplicationGraph.ts | 2 +- tests/boundary/android/jadxIntegration.test.ts | 4 ++-- tests/boundary/android/jadxProtocol.test.ts | 2 +- tests/boundary/mcp/androidAnalysisMcp.test.ts | 2 +- .../application.test.ts} | 4 ++-- tests/fixtures/android/jadx.ts | 2 +- 35 files changed, 98 insertions(+), 71 deletions(-) rename scripts/fixtures/{android-apidemos.json => android/apidemos.json} (100%) rename scripts/{fetch-android-fixtures.mjs => fixtures/android/fetch.mjs} (87%) rename scripts/{verify-real-android.mjs => verify/android/analysis.mjs} (93%) rename scripts/{lib/android-cli-cancellation.mjs => verify/android/cli-cancellation.mjs} (98%) rename src/application/{ => android}/AndroidAnalysisPort.ts (52%) rename src/application/{ => android}/AndroidAnalysisService.ts (76%) rename src/application/{ => android}/AndroidApplicationService.ts (65%) rename src/contracts/{ => android}/androidToolContracts.ts (93%) rename src/domain/{ => android}/androidAnalysis.ts (100%) rename src/domain/{ => android}/androidApplication.ts (96%) rename tests/composition/{analysis-sessions/androidApplication.test.ts => android/application.test.ts} (97%) diff --git a/docs/capability-migration.md b/docs/capability-migration.md index 5287ccbab..00205397b 100644 --- a/docs/capability-migration.md +++ b/docs/capability-migration.md @@ -207,3 +207,20 @@ All observation registrars resolve contracts by name. An isolated compiled-proce test reverses presentation arrays and performs actual MCP SDK calls to verify advertised schemas and handler meaning. Reordering metadata must not select a different operation, schema, provider or deep-provider priority. + +## Android layer and verification ownership + +Android workflows and their existing typed port live in `src/application/android/`, +pure APK/inventory semantics in `src/domain/android/`, and the named inspection +contracts in `src/contracts/android/`. The headless JADX producer remains in +`src/android/`; `src/composition/android.ts` supplies its fresh factory to both +caller adapters. Public names, result meaning and JVM/queue/cleanup limits are +unchanged. Inventory-only application projection remains execution-free. + +The real lane and signal-cleanup helper belong to `scripts/verify/android/`; its +explicit downloader and fixed manifest belong to `scripts/fixtures/android/`. +`verify:android` and `fixtures:android` keep their command names and repository-root +`_reference/apk-integration/` fixture default. Synthetic producer fixtures stay in +`tests/fixtures/android/`, with matching boundary and composition ownership. Real +JADX CLI/MCP parity requires the fixed APK and existing audited JAR; synthetic +protocol/cancellation success does not establish that engine or an unverified host. diff --git a/docs/testing.md b/docs/testing.md index 70f2634d2..2f919b1fb 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -193,6 +193,14 @@ See [Android analysis](android-analysis.md) for boundaries and resource budgets. Authenticated IPA inventory projection is documented in [Apple application analysis](apple-application-analysis.md). +The lane and owned-process cancellation helper live in `scripts/verify/android/`. +The explicit downloader and fixed manifest live in `scripts/fixtures/android/`; +their default remains repository-root `_reference/apk-integration/`. Producer +fixtures live in `tests/fixtures/android/`, boundary cases in +`tests/boundary/android/`, and inventory projection composition cases in +`tests/composition/android/`. Real engine success and synthetic protocol success +are separate proof levels. + Synthetic producer regressions run independently: ```sh diff --git a/package.json b/package.json index 979aaa38f..6330c6bb4 100644 --- a/package.json +++ b/package.json @@ -142,8 +142,8 @@ "verify:managed": "npm run build:cached && node scripts/verify-managed-conformance.mjs", "verify:firmware": "npm run build:cached && node scripts/verify-real-firmware.mjs", "fixtures:firmware": "node scripts/generate-firmware-fixtures.mjs", - "verify:android": "npm run build:cached && node scripts/verify-real-android.mjs", - "fixtures:android": "node scripts/fetch-android-fixtures.mjs", + "verify:android": "npm run build:cached && node scripts/verify/android/analysis.mjs", + "fixtures:android": "node scripts/fixtures/android/fetch.mjs", "verify:agent": "npm run build:cached && node scripts/verify-agent-experience.mjs", "verify:hopper:linux": "npm run verify:fixtures && npm run build:cached && node scripts/verify-real-hopper-linux.mjs", "verify:setup:linux": "npm run build:cached && node scripts/verify-linux-setup-e2e.mjs", diff --git a/scripts/fixtures/android-apidemos.json b/scripts/fixtures/android/apidemos.json similarity index 100% rename from scripts/fixtures/android-apidemos.json rename to scripts/fixtures/android/apidemos.json diff --git a/scripts/fetch-android-fixtures.mjs b/scripts/fixtures/android/fetch.mjs similarity index 87% rename from scripts/fetch-android-fixtures.mjs rename to scripts/fixtures/android/fetch.mjs index 0e6329b37..ba650aa19 100644 --- a/scripts/fetch-android-fixtures.mjs +++ b/scripts/fixtures/android/fetch.mjs @@ -3,15 +3,17 @@ import { createReadStream } from "node:fs"; import { link, mkdir, open, rm } from "node:fs/promises"; import { resolve, join } from "node:path"; import { fileURLToPath } from "node:url"; -import { JADX_RELEASE } from "../src/android/JadxRelease.ts"; -import fixture from "./fixtures/android-apidemos.json" with { type: "json" }; +import { JADX_RELEASE } from "../../../src/android/JadxRelease.ts"; +import fixture from "./apidemos.json" with { type: "json" }; const args = process.argv.slice(2); if (args.length > 1) - throw new Error("Usage: node scripts/fetch-android-fixtures.mjs [DIRECTORY]"); + throw new Error("Usage: npm run fixtures:android -- [DIRECTORY]"); const directory = resolve( args[0] ?? - fileURLToPath(new URL("../_reference/apk-integration/", import.meta.url)), + fileURLToPath( + new URL("../../../_reference/apk-integration/", import.meta.url), + ), ); await mkdir(directory, { recursive: true }); const hashFile = async (path) => { diff --git a/scripts/lib/catalog-core.mjs b/scripts/lib/catalog-core.mjs index 2ef9a72a3..470441005 100644 --- a/scripts/lib/catalog-core.mjs +++ b/scripts/lib/catalog-core.mjs @@ -45,7 +45,7 @@ const SOURCE_PATHS = { managedContracts: "dist/contracts/managedToolContracts.js", firmwareContracts: "dist/contracts/firmwareToolContracts.js", firmwareProvider: "dist/firmware/FirmwareRelease.js", - androidContracts: "dist/contracts/androidToolContracts.js", + androidContracts: "dist/contracts/android/androidToolContracts.js", androidProvider: "dist/android/JadxRelease.js", managedWorkflowContracts: "dist/contracts/managedWorkflowToolContracts.js", browserContracts: "dist/contracts/browserToolContracts.js", diff --git a/scripts/verify-real-android.mjs b/scripts/verify/android/analysis.mjs similarity index 93% rename from scripts/verify-real-android.mjs rename to scripts/verify/android/analysis.mjs index 5f088e962..3f9c6a399 100644 --- a/scripts/verify-real-android.mjs +++ b/scripts/verify/android/analysis.mjs @@ -6,18 +6,18 @@ import { fileURLToPath } from "node:url"; import { promisify } from "node:util"; import { Client } from "@modelcontextprotocol/client"; import { StdioClientTransport } from "@modelcontextprotocol/client/stdio"; -import { parseEvidence } from "../dist/domain/evidence.js"; -import { hashAndroidFile } from "../dist/android/AndroidTargetSnapshot.js"; -import { JADX_RELEASE } from "../dist/android/JadxRelease.js"; -import fixture from "./fixtures/android-apidemos.json" with { type: "json" }; -import { verifyAndroidCliCancellation } from "./lib/android-cli-cancellation.mjs"; +import { parseEvidence } from "../../../dist/domain/evidence.js"; +import { hashAndroidFile } from "../../../dist/android/AndroidTargetSnapshot.js"; +import { JADX_RELEASE } from "../../../dist/android/JadxRelease.js"; +import fixture from "../../fixtures/android/apidemos.json" with { type: "json" }; +import { verifyAndroidCliCancellation } from "./cli-cancellation.mjs"; -const repository = resolve(dirname(fileURLToPath(import.meta.url)), ".."); +const repository = resolve(dirname(fileURLToPath(import.meta.url)), "../../.."); const apk = process.env.REA_ANDROID_TEST_APK; const jar = process.env.REA_JADX_MCP_JAR; if (apk === undefined || jar === undefined) throw new Error( - "verify:android requires REA_ANDROID_TEST_APK and REA_JADX_MCP_JAR. Run node scripts/fetch-android-fixtures.mjs and select the downloaded files; see docs/android-analysis.md.", + "verify:android requires REA_ANDROID_TEST_APK and REA_JADX_MCP_JAR. Run npm run fixtures:android and select the downloaded files; see docs/android-analysis.md.", ); await access(apk); await access(jar); diff --git a/scripts/lib/android-cli-cancellation.mjs b/scripts/verify/android/cli-cancellation.mjs similarity index 98% rename from scripts/lib/android-cli-cancellation.mjs rename to scripts/verify/android/cli-cancellation.mjs index 2666a556d..a5e282888 100644 --- a/scripts/lib/android-cli-cancellation.mjs +++ b/scripts/verify/android/cli-cancellation.mjs @@ -3,7 +3,7 @@ import { spawn } from "node:child_process"; import { cleanupOwnedProcessGroup, readProcessRunId, -} from "../../dist/process/ProcessOwnership.js"; +} from "../../../dist/process/ProcessOwnership.js"; /** Exercise a real CLI signal while the owned Java engine is still running. */ export const verifyAndroidCliCancellation = async ({ diff --git a/src/android/AndroidTargetSnapshot.ts b/src/android/AndroidTargetSnapshot.ts index b5bcc3dc1..ce7b3b826 100644 --- a/src/android/AndroidTargetSnapshot.ts +++ b/src/android/AndroidTargetSnapshot.ts @@ -3,7 +3,7 @@ import { chmod, copyFile } from "node:fs/promises"; import { createHash } from "node:crypto"; import { join } from "node:path"; import { AnalysisInputError } from "../domain/analysisErrorCore.js"; -import type { AndroidOperation } from "../domain/androidAnalysis.js"; +import type { AndroidOperation } from "../domain/android/androidAnalysis.js"; /** Stream a local file digest without retaining the APK or JAR in memory. */ export const hashAndroidFile = async (path: string): Promise => { diff --git a/src/android/JadxAnalysis.ts b/src/android/JadxAnalysis.ts index 419dfc660..94e3cfa6e 100644 --- a/src/android/JadxAnalysis.ts +++ b/src/android/JadxAnalysis.ts @@ -1,6 +1,6 @@ import type { z } from "zod"; -import type { AndroidRequest } from "../domain/androidAnalysis.js"; -import { androidResultSchemas } from "../domain/androidAnalysis.js"; +import type { AndroidRequest } from "../domain/android/androidAnalysis.js"; +import { androidResultSchemas } from "../domain/android/androidAnalysis.js"; import { AnalysisCapabilityUnavailableError, AnalysisInputError, diff --git a/src/android/JadxConfiguration.ts b/src/android/JadxConfiguration.ts index c585769a5..45a24b09c 100644 --- a/src/android/JadxConfiguration.ts +++ b/src/android/JadxConfiguration.ts @@ -2,7 +2,7 @@ import { access, realpath, stat } from "node:fs/promises"; import { constants } from "node:fs"; import { isAbsolute, join } from "node:path"; import { AnalysisCapabilityUnavailableError } from "../domain/analysisErrorCore.js"; -import type { AndroidOperation } from "../domain/androidAnalysis.js"; +import type { AndroidOperation } from "../domain/android/androidAnalysis.js"; import { JADX_JAR_CONFIGURATION_REMEDIATION } from "./JadxRelease.js"; /** Caller-supplied tools, resolved only when an Android operation is selected. */ diff --git a/src/android/JadxProtocol.ts b/src/android/JadxProtocol.ts index bb92c1561..38b0d1db6 100644 --- a/src/android/JadxProtocol.ts +++ b/src/android/JadxProtocol.ts @@ -1,7 +1,7 @@ import { z } from "zod"; import { AnalysisOutputError } from "../domain/analysisErrorCore.js"; import { jsonValueSchema } from "../domain/jsonValue.js"; -import type { AndroidOperation } from "../domain/androidAnalysis.js"; +import type { AndroidOperation } from "../domain/android/androidAnalysis.js"; const count = z.number().int().nonnegative(); export const jadxLoadSchema = z.object({ diff --git a/src/android/JadxProvider.ts b/src/android/JadxProvider.ts index f008437d1..7975c6cd4 100644 --- a/src/android/JadxProvider.ts +++ b/src/android/JadxProvider.ts @@ -1,5 +1,5 @@ import { z } from "zod"; -import type { AndroidAnalysisPort } from "../application/AndroidAnalysisPort.js"; +import type { AndroidAnalysisPort } from "../application/android/AndroidAnalysisPort.js"; import type { ExecutionOptions } from "../application/AnalysisProvider.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { @@ -10,7 +10,7 @@ import { } from "../domain/analysisErrorCore.js"; import { ProviderAdapterError } from "../domain/providerAdapterError.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; -import type { AndroidRequest } from "../domain/androidAnalysis.js"; +import type { AndroidRequest } from "../domain/android/androidAnalysis.js"; import type { BinaryTarget } from "../domain/binaryTarget.js"; import { err, ok } from "../domain/result.js"; import { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js"; diff --git a/src/android/JadxSession.ts b/src/android/JadxSession.ts index 27ecf28d1..8e81d6dd8 100644 --- a/src/android/JadxSession.ts +++ b/src/android/JadxSession.ts @@ -3,7 +3,7 @@ import { createAnalysisExecution, type AnalysisExecution, } from "../application/AnalysisProvider.js"; -import type { AndroidRequest } from "../domain/androidAnalysis.js"; +import type { AndroidRequest } from "../domain/android/androidAnalysis.js"; import { AnalysisCapabilityUnavailableError, AnalysisOutputError, diff --git a/src/application/AndroidAnalysisPort.ts b/src/application/android/AndroidAnalysisPort.ts similarity index 52% rename from src/application/AndroidAnalysisPort.ts rename to src/application/android/AndroidAnalysisPort.ts index 09dd85795..3a2f56f23 100644 --- a/src/application/AndroidAnalysisPort.ts +++ b/src/application/android/AndroidAnalysisPort.ts @@ -1,11 +1,11 @@ import type { AnalysisExecution, ExecutionOptions, -} from "./AnalysisProvider.js"; -import type { AndroidRequest } from "../domain/androidAnalysis.js"; -import type { BinaryTarget } from "../domain/binaryTarget.js"; -import type { AnalysisError } from "../domain/analysisErrorBase.js"; -import type { Result } from "../domain/result.js"; +} from "../AnalysisProvider.js"; +import type { AndroidRequest } from "../../domain/android/androidAnalysis.js"; +import type { BinaryTarget } from "../../domain/binaryTarget.js"; +import type { AnalysisError } from "../../domain/analysisErrorBase.js"; +import type { Result } from "../../domain/result.js"; /** Static Android inspection boundary; implementation details belong to the provider. */ export interface AndroidAnalysisPort { diff --git a/src/application/AndroidAnalysisService.ts b/src/application/android/AndroidAnalysisService.ts similarity index 76% rename from src/application/AndroidAnalysisService.ts rename to src/application/android/AndroidAnalysisService.ts index 8502ce18d..fe8c8f650 100644 --- a/src/application/AndroidAnalysisService.ts +++ b/src/application/android/AndroidAnalysisService.ts @@ -1,18 +1,18 @@ import type { AndroidAnalysisPort } from "./AndroidAnalysisPort.js"; -import type { ExecutionOptions } from "./AnalysisProvider.js"; -import { parseBinaryTarget } from "./BinaryTargetResolver.js"; +import type { ExecutionOptions } from "../AnalysisProvider.js"; +import { parseBinaryTarget } from "../BinaryTargetResolver.js"; import { androidRequestSchema, type AndroidOperation, -} from "../domain/androidAnalysis.js"; +} from "../../domain/android/androidAnalysis.js"; import { AnalysisCancelledError, AnalysisInputError, -} from "../domain/analysisErrorCore.js"; -import type { AnalysisError } from "../domain/analysisErrorBase.js"; -import { createEvidence, type Evidence } from "../domain/evidence.js"; -import { jsonObjectSchema } from "../domain/jsonValue.js"; -import { err, ok, type Result } from "../domain/result.js"; +} from "../../domain/analysisErrorCore.js"; +import type { AnalysisError } from "../../domain/analysisErrorBase.js"; +import { createEvidence, type Evidence } from "../../domain/evidence.js"; +import { jsonObjectSchema } from "../../domain/jsonValue.js"; +import { err, ok, type Result } from "../../domain/result.js"; /** Shared CLI/MCP admission, execution and Evidence composition for Android. */ export class AndroidAnalysisService { diff --git a/src/application/AndroidApplicationService.ts b/src/application/android/AndroidApplicationService.ts similarity index 65% rename from src/application/AndroidApplicationService.ts rename to src/application/android/AndroidApplicationService.ts index 0d21c73ce..0798e055e 100644 --- a/src/application/AndroidApplicationService.ts +++ b/src/application/android/AndroidApplicationService.ts @@ -1,12 +1,12 @@ -import type { AnalysisError } from "../domain/analysisErrorBase.js"; -import type { Evidence } from "../domain/evidence.js"; +import type { AnalysisError } from "../../domain/analysisErrorBase.js"; +import type { Evidence } from "../../domain/evidence.js"; import { androidApplicationProjectionInputSchema, projectAndroidApplication, -} from "../domain/androidApplication.js"; -import type { Result } from "../domain/result.js"; -import { ANDROID_APPLICATION_PROVIDER } from "./InvestigationProviders.js"; -import { projectInventoryEvidence } from "./InventoryProjectionEvidence.js"; +} from "../../domain/android/androidApplication.js"; +import type { Result } from "../../domain/result.js"; +import { ANDROID_APPLICATION_PROVIDER } from "../InvestigationProviders.js"; +import { projectInventoryEvidence } from "../InventoryProjectionEvidence.js"; const OPERATION = "project_android_application_graph" as const; diff --git a/src/cli/androidCommands.ts b/src/cli/androidCommands.ts index 75408786f..c4b85971c 100644 --- a/src/cli/androidCommands.ts +++ b/src/cli/androidCommands.ts @@ -1,10 +1,10 @@ import { z } from "incur"; -import { AndroidAnalysisService } from "../application/AndroidAnalysisService.js"; +import { AndroidAnalysisService } from "../application/android/AndroidAnalysisService.js"; import { createAndroidAnalysisProvider } from "../composition/android.js"; import { CLI_COMMANDS } from "../cliCommandNames.js"; import { logCliCommand } from "../cliLogging.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; -import type { AndroidOperation } from "../domain/androidAnalysis.js"; +import type { AndroidOperation } from "../domain/android/androidAnalysis.js"; import type { Logger } from "../logger.js"; import type { CliInstance } from "./types.js"; import { withCommandCancellation } from "./commandCancellation.js"; diff --git a/src/cli/applicationCommands.ts b/src/cli/applicationCommands.ts index e78f686c0..c186d2c0c 100644 --- a/src/cli/applicationCommands.ts +++ b/src/cli/applicationCommands.ts @@ -1,7 +1,7 @@ import { reconstructionCoverageEvaluationInputSchema } from "../domain/reconstructionCoverageInput.js"; import { Cli, z } from "incur"; -import { projectAndroidApplicationEvidence } from "../application/AndroidApplicationService.js"; +import { projectAndroidApplicationEvidence } from "../application/android/AndroidApplicationService.js"; import { projectAppleApplicationEvidence } from "../application/AppleApplicationService.js"; import { compareApplicationVersionsEvidenceValidated, @@ -18,7 +18,7 @@ import { logCliCommand } from "../cliLogging.js"; import { AnalysisInputError } from "../domain/analysisErrorCore.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { type AnalysisError } from "../domain/analysisErrorBase.js"; -import { androidApplicationProjectionInputSchema } from "../domain/androidApplication.js"; +import { androidApplicationProjectionInputSchema } from "../domain/android/androidApplication.js"; import { appleApplicationProjectionInputSchema } from "../domain/appleApplication.js"; import { jsonValueSchema, type JsonValue } from "../domain/jsonValue.js"; import type { Logger } from "../logger.js"; diff --git a/src/composition/android.ts b/src/composition/android.ts index c9d504be5..6ffd82fb6 100644 --- a/src/composition/android.ts +++ b/src/composition/android.ts @@ -1,4 +1,4 @@ -import type { AndroidAnalysisPort } from "../application/AndroidAnalysisPort.js"; +import type { AndroidAnalysisPort } from "../application/android/AndroidAnalysisPort.js"; import type { JadxLauncher } from "../android/JadxMcpTransport.js"; import { JadxProvider } from "../android/JadxProvider.js"; diff --git a/src/contracts/androidToolContracts.ts b/src/contracts/android/androidToolContracts.ts similarity index 93% rename from src/contracts/androidToolContracts.ts rename to src/contracts/android/androidToolContracts.ts index 6d0df12ba..983944b57 100644 --- a/src/contracts/androidToolContracts.ts +++ b/src/contracts/android/androidToolContracts.ts @@ -1,10 +1,10 @@ import { androidInputSchemas, androidResultSchemas, -} from "../domain/androidAnalysis.js"; -import type { ToolContract } from "./toolContractTypes.js"; -import { evidenceResultOf } from "./toolOutputSchemaPrimitives.js"; -import { toolContractMetadata } from "./toolEffects.js"; +} from "../../domain/android/androidAnalysis.js"; +import type { ToolContract } from "../toolContractTypes.js"; +import { evidenceResultOf } from "../toolOutputSchemaPrimitives.js"; +import { toolContractMetadata } from "../toolEffects.js"; /** Static APK operations backed by a separately supplied headless engine. */ export const ANDROID_TOOL_CONTRACTS = [ diff --git a/src/contracts/applicationToolContracts.ts b/src/contracts/applicationToolContracts.ts index 4f107bcd9..7e8c38156 100644 --- a/src/contracts/applicationToolContracts.ts +++ b/src/contracts/applicationToolContracts.ts @@ -19,7 +19,7 @@ import { import { androidApplicationProjectionInputSchema, androidApplicationProjectionResultSchema, -} from "../domain/androidApplication.js"; +} from "../domain/android/androidApplication.js"; import { appleApplicationProjectionInputSchema, appleApplicationProjectionResultSchema, diff --git a/src/contracts/contractSnapshot.test.ts b/src/contracts/contractSnapshot.test.ts index 7024c75fb..9811c71d0 100644 --- a/src/contracts/contractSnapshot.test.ts +++ b/src/contracts/contractSnapshot.test.ts @@ -7,7 +7,7 @@ import { SESSION_TOOL_CONTRACTS } from "./sessionToolContracts.js"; import { NATIVE_TOOL_CONTRACTS } from "./nativeToolContracts.js"; import { ARTIFACT_TOOL_CONTRACTS } from "./artifactToolContracts.js"; import { FIRMWARE_TOOL_CONTRACTS } from "./firmwareToolContracts.js"; -import { ANDROID_TOOL_CONTRACTS } from "./androidToolContracts.js"; +import { ANDROID_TOOL_CONTRACTS } from "./android/androidToolContracts.js"; import { MANAGED_TOOL_CONTRACTS } from "./managedToolContracts.js"; import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "./managedWorkflowToolContracts.js"; import { BROWSER_TOOL_CONTRACTS } from "./browserToolContracts.js"; diff --git a/src/contracts/toolContracts.test.ts b/src/contracts/toolContracts.test.ts index 6372c7017..05b3f10d3 100644 --- a/src/contracts/toolContracts.test.ts +++ b/src/contracts/toolContracts.test.ts @@ -7,7 +7,7 @@ import { TOOL_CONTRACTS } from "./toolContracts.js"; import { ARTIFACT_TOOL_CONTRACTS } from "./artifactToolContracts.js"; import { MANAGED_TOOL_CONTRACTS } from "./managedToolContracts.js"; import { FIRMWARE_TOOL_CONTRACTS } from "./firmwareToolContracts.js"; -import { ANDROID_TOOL_CONTRACTS } from "./androidToolContracts.js"; +import { ANDROID_TOOL_CONTRACTS } from "./android/androidToolContracts.js"; import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "./managedWorkflowToolContracts.js"; import { NATIVE_TOOL_CONTRACTS } from "./nativeToolContracts.js"; import { BROWSER_PROVIDER_TOOL_CONTRACTS } from "./browserProviderToolContracts.js"; diff --git a/src/contracts/toolContracts.ts b/src/contracts/toolContracts.ts index 0c855a8a9..b3a2170e9 100644 --- a/src/contracts/toolContracts.ts +++ b/src/contracts/toolContracts.ts @@ -2,7 +2,7 @@ import { NATIVE_TOOL_CONTRACTS } from "./nativeToolContracts.js"; import { ARTIFACT_TOOL_CONTRACTS } from "./artifactToolContracts.js"; import { MANAGED_TOOL_CONTRACTS } from "./managedToolContracts.js"; import { FIRMWARE_TOOL_CONTRACTS } from "./firmwareToolContracts.js"; -import { ANDROID_TOOL_CONTRACTS } from "./androidToolContracts.js"; +import { ANDROID_TOOL_CONTRACTS } from "./android/androidToolContracts.js"; import { MANAGED_WORKFLOW_TOOL_CONTRACTS } from "./managedWorkflowToolContracts.js"; import { BROWSER_PROVIDER_TOOL_CONTRACTS } from "./browserProviderToolContracts.js"; import { ELECTRON_TOOL_CONTRACTS } from "./electronToolContracts.js"; diff --git a/src/domain/androidAnalysis.ts b/src/domain/android/androidAnalysis.ts similarity index 100% rename from src/domain/androidAnalysis.ts rename to src/domain/android/androidAnalysis.ts diff --git a/src/domain/androidApplication.ts b/src/domain/android/androidApplication.ts similarity index 96% rename from src/domain/androidApplication.ts rename to src/domain/android/androidApplication.ts index 8fe7fca6b..0a48a8a98 100644 --- a/src/domain/androidApplication.ts +++ b/src/domain/android/androidApplication.ts @@ -3,10 +3,10 @@ import { createHash } from "node:crypto"; import canonicalize from "canonicalize"; import { z } from "zod"; -import { parseArtifactInventoryEvidence } from "./artifactInventoryEvidence.js"; -import { evidenceSchema } from "./evidence.js"; -import { digestSchema } from "./../domain/digests.js"; -import { prefixedDigestSchema } from "./../domain/digests.js"; +import { parseArtifactInventoryEvidence } from "../artifactInventoryEvidence.js"; +import { evidenceSchema } from "../evidence.js"; +import { digestSchema } from "../digests.js"; +import { prefixedDigestSchema } from "../digests.js"; const evidenceIdSchema = prefixedDigestSchema("ev"); const pathSchema = z.string().min(1); diff --git a/src/server/createServer.ts b/src/server/createServer.ts index aa7def006..89a9a0098 100644 --- a/src/server/createServer.ts +++ b/src/server/createServer.ts @@ -29,8 +29,8 @@ import { FirmwareAnalysisService } from "../application/FirmwareAnalysisService. import type { FirmwareAnalysisPort } from "../application/FirmwareAnalysisPort.js"; import { createFirmwareAnalysisProvider } from "../composition/firmware.js"; import { registerAndroidTools } from "./registerAndroidTools.js"; -import { AndroidAnalysisService } from "../application/AndroidAnalysisService.js"; -import type { AndroidAnalysisPort } from "../application/AndroidAnalysisPort.js"; +import { AndroidAnalysisService } from "../application/android/AndroidAnalysisService.js"; +import type { AndroidAnalysisPort } from "../application/android/AndroidAnalysisPort.js"; import { createAndroidAnalysisProvider } from "../composition/android.js"; import { registerManagedWorkflowTools } from "./registerManagedWorkflowTools.js"; import { registerNativeTools } from "./registerNativeTools.js"; diff --git a/src/server/registerAndroidTools.ts b/src/server/registerAndroidTools.ts index 0fa29545d..b58cf2517 100644 --- a/src/server/registerAndroidTools.ts +++ b/src/server/registerAndroidTools.ts @@ -1,9 +1,9 @@ import type { EvidenceWriter } from "../application/investigation/InvestigationRecordPort.js"; import type { McpServer, ServerContext } from "@modelcontextprotocol/server"; -import { AndroidAnalysisService } from "../application/AndroidAnalysisService.js"; +import { AndroidAnalysisService } from "../application/android/AndroidAnalysisService.js"; import { toolContract } from "../contracts/toolContracts.js"; import type { ToolContract } from "../contracts/toolContractTypes.js"; -import type { AndroidOperation } from "../domain/androidAnalysis.js"; +import type { AndroidOperation } from "../domain/android/androidAnalysis.js"; import type { Logger } from "../logger.js"; import { logToolExecution } from "./toolLogging.js"; import { toolRegistrationOptions } from "./toolRegistrationOptions.js"; diff --git a/src/server/registerApplicationTools/projectMobileApplicationGraph.ts b/src/server/registerApplicationTools/projectMobileApplicationGraph.ts index 33430496b..573eee331 100644 --- a/src/server/registerApplicationTools/projectMobileApplicationGraph.ts +++ b/src/server/registerApplicationTools/projectMobileApplicationGraph.ts @@ -1,6 +1,6 @@ import type { McpServer } from "@modelcontextprotocol/server"; -import { projectAndroidApplicationEvidence } from "../../application/AndroidApplicationService.js"; +import { projectAndroidApplicationEvidence } from "../../application/android/AndroidApplicationService.js"; import { projectAppleApplicationEvidence } from "../../application/AppleApplicationService.js"; import { APPLICATION_TOOL_CONTRACTS, diff --git a/tests/boundary/android/jadxIntegration.test.ts b/tests/boundary/android/jadxIntegration.test.ts index 78df3d72c..f2e4aaa71 100644 --- a/tests/boundary/android/jadxIntegration.test.ts +++ b/tests/boundary/android/jadxIntegration.test.ts @@ -1,9 +1,9 @@ import { expect, it as test } from "vitest"; import { access, readFile, writeFile } from "node:fs/promises"; import { parseBinaryTarget } from "../../../src/application/BinaryTargetResolver.js"; -import { AndroidAnalysisService } from "../../../src/application/AndroidAnalysisService.js"; +import { AndroidAnalysisService } from "../../../src/application/android/AndroidAnalysisService.js"; import { JadxProvider } from "../../../src/android/JadxProvider.js"; -import { androidResultSchemas } from "../../../src/domain/androidAnalysis.js"; +import { androidResultSchemas } from "../../../src/domain/android/androidAnalysis.js"; import { createJadxProtocolFixture as setup, verifyJadxFixtureCleanup as verifyCleanup, diff --git a/tests/boundary/android/jadxProtocol.test.ts b/tests/boundary/android/jadxProtocol.test.ts index 82e0a11d2..49a3daf17 100644 --- a/tests/boundary/android/jadxProtocol.test.ts +++ b/tests/boundary/android/jadxProtocol.test.ts @@ -4,7 +4,7 @@ import { parseJadxJson, normalizeJadxText, } from "../../../src/android/JadxProtocol.js"; -import { androidInputSchemas } from "../../../src/domain/androidAnalysis.js"; +import { androidInputSchemas } from "../../../src/domain/android/androidAnalysis.js"; it("validates provider text envelopes and rejects unsupported content rather than dropping it", () => { expect( diff --git a/tests/boundary/mcp/androidAnalysisMcp.test.ts b/tests/boundary/mcp/androidAnalysisMcp.test.ts index 1746af6d4..3058a9546 100644 --- a/tests/boundary/mcp/androidAnalysisMcp.test.ts +++ b/tests/boundary/mcp/androidAnalysisMcp.test.ts @@ -1,7 +1,7 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { expect, it as test, onTestFinished } from "vitest"; import { access } from "node:fs/promises"; -import { ANDROID_TOOL_CONTRACTS } from "../../../src/contracts/androidToolContracts.js"; +import { ANDROID_TOOL_CONTRACTS } from "../../../src/contracts/android/androidToolContracts.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { createServer } from "../../../src/server/createServer.js"; import { createTestBinarySession } from "../../fixtures/binarySession.js"; diff --git a/tests/composition/analysis-sessions/androidApplication.test.ts b/tests/composition/android/application.test.ts similarity index 97% rename from tests/composition/analysis-sessions/androidApplication.test.ts rename to tests/composition/android/application.test.ts index e3707ddd2..d0d57be6b 100644 --- a/tests/composition/analysis-sessions/androidApplication.test.ts +++ b/tests/composition/android/application.test.ts @@ -15,9 +15,9 @@ import { requireSuccessfulProjection, } from "../../support/applicationSessionFixture.js"; -import { projectAndroidApplicationEvidence } from "../../../src/application/AndroidApplicationService.js"; +import { projectAndroidApplicationEvidence } from "../../../src/application/android/AndroidApplicationService.js"; import { runProviderAnalysis } from "../../../src/application/DirectAnalysis.js"; -import { androidApplicationProjectionResultSchema } from "../../../src/domain/androidApplication.js"; +import { androidApplicationProjectionResultSchema } from "../../../src/domain/android/androidApplication.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; describe("Android application projection", () => { diff --git a/tests/fixtures/android/jadx.ts b/tests/fixtures/android/jadx.ts index e1662f4e4..a9924666a 100644 --- a/tests/fixtures/android/jadx.ts +++ b/tests/fixtures/android/jadx.ts @@ -2,7 +2,7 @@ import { access, rm, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { fileURLToPath } from "node:url"; import { expect, onTestFinished } from "vitest"; -import { AndroidAnalysisService } from "../../../src/application/AndroidAnalysisService.js"; +import { AndroidAnalysisService } from "../../../src/application/android/AndroidAnalysisService.js"; import { createAndroidAnalysisProvider } from "../../../src/composition/android.js"; import { ProviderProcessSupervisor,