feat(container): add first-party Android MCP module

.changeset/mcp-android-integration.md

@@ -0,0 +1,14 @@
+---
+"@prover-coder-ai/docker-git": minor
+---
+
+Add Android MCP integration alongside the existing Playwright MCP support (issue #436).
+
+Projects can now opt into a nested Android emulator sidecar driven by the
+first-party Rust `android-connection` MCP server, mirroring how Playwright MCP works. Enable it
+with the new `--mcp-android` / `--no-mcp-android` create flags, the `mcp-android`
+subcommand, the interactive create-flow prompt, or the `enableMcpAndroid` field
+on the web/API create-project request. When enabled, the generated
+`docker-compose.yml` adds a gated `docker-android` emulator service (KVM,
+ADB port forwarding, headless CI mode) and the agent MCP config writers register
+the Android server so it coexists with Playwright.

README.md

@@ -71,6 +71,7 @@ bun run  docker-git clone https://github.com/ProverCoderAI/docker-git/issues/122
 
 - `--force` пересоздаёт окружение и удаляет volumes проекта.
 - `--mcp-playwright` включает Playwright MCP и Chromium sidecar для браузерной автоматизации.
+- `--mcp-android` включает first-party Android MCP (`android-connection`) и вложенный sidecar с Android-эмулятором (`docker-android`) для мобильной автоматизации.
 
 Автоматический запуск агента:
 

packages/api/src/api/contracts.ts

@@ -476,6 +476,7 @@ export type CreateProjectRequest = {
   readonly dockerNetworkMode?: string | undefined
   readonly dockerSharedNetworkName?: string | undefined
   readonly enableMcpPlaywright?: boolean | undefined
+  readonly enableMcpAndroid?: boolean | undefined
   readonly outDir?: string | undefined
   readonly gitTokenLabel?: string | undefined
   readonly skipGithubAuth?: boolean | undefined

packages/api/src/api/schema.ts

@@ -43,6 +43,7 @@ export const CreateProjectRequestSchema = Schema.Struct({
   dockerNetworkMode: OptionalString,
   dockerSharedNetworkName: OptionalString,
   enableMcpPlaywright: OptionalBoolean,
+  enableMcpAndroid: OptionalBoolean,
   outDir: OptionalString,
   gitTokenLabel: OptionalString,
   skipGithubAuth: OptionalBoolean,

packages/api/src/services/projects.ts

@@ -471,6 +471,7 @@ const toCreateRawOptions = (request: CreateProjectRequest): RawOptions => ({
     ? {}
     : { dockerSharedNetworkName: request.dockerSharedNetworkName }),
   ...(request.enableMcpPlaywright === undefined ? {} : { enableMcpPlaywright: request.enableMcpPlaywright }),
+  ...(request.enableMcpAndroid === undefined ? {} : { enableMcpAndroid: request.enableMcpAndroid }),
   ...(request.outDir === undefined ? {} : { outDir: request.outDir }),
   ...(request.gitTokenLabel === undefined ? {} : { gitTokenLabel: request.gitTokenLabel }),
   ...(request.skipGithubAuth === undefined ? {} : { skipGithubAuth: request.skipGithubAuth }),

packages/app/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @prover-coder-ai/docker-git
 
+## 1.3.14
+
+### Patch Changes
+
+- chore: automated version bump
+
+- Updated dependencies []:
+  - @prover-coder-ai/docker-git-session-sync@1.0.70
+
 ## 1.3.13
 
 ### Patch Changes

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prover-coder-ai/docker-git",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "description": "docker-git Bun and Gridland CLI plus browser frontend",
   "main": "dist/src/docker-git/main.js",
   "bin": {

packages/app/src/docker-git/api-client-create.ts

@@ -41,6 +41,7 @@ export const buildCreateProjectRequest = (
     dockerNetworkMode: config.dockerNetworkMode,
     dockerSharedNetworkName: config.dockerSharedNetworkName,
     enableMcpPlaywright: config.enableMcpPlaywright,
+    enableMcpAndroid: config.enableMcpAndroid ?? false,
     outDir: command.outDir,
     gitTokenLabel: config.gitTokenLabel,
     skipGithubAuth: config.skipGithubAuth,

packages/app/src/docker-git/cli/parser-apply.ts

@@ -40,6 +40,7 @@ export const parseApply = (
       playwrightCpuLimit,
       playwrightRamLimit,
       gpu,
-      enableMcpPlaywright: raw.enableMcpPlaywright
+      enableMcpPlaywright: raw.enableMcpPlaywright,
+      enableMcpAndroid: raw.enableMcpAndroid
     }
   })

packages/app/src/docker-git/cli/parser-mcp-android.ts

@@ -0,0 +1,24 @@
+import { Either } from "effect"
+
+import { type McpAndroidUpCommand, type ParseError } from "../frontend-lib/core/domain.js"
+
+import { parseProjectDirWithOptions } from "./parser-shared.js"
+
+// CHANGE: parse "mcp-android" command for existing docker-git projects
+// WHY: allow enabling Android MCP in an already created container/project dir
+// QUOTE(ТЗ): "Подключить mcp-android так же как работает MCP PLAYRIGHT"
+// REF: issue-436
+// SOURCE: n/a
+// FORMAT THEOREM: forall argv: parseMcpAndroid(argv) = cmd -> deterministic(cmd)
+// PURITY: CORE
+// EFFECT: Effect<McpAndroidUpCommand, ParseError, never>
+// INVARIANT: projectDir is never empty
+// COMPLEXITY: O(n) where n = |argv|
+export const parseMcpAndroid = (
+  args: ReadonlyArray<string>
+): Either.Either<McpAndroidUpCommand, ParseError> =>
+  Either.map(parseProjectDirWithOptions(args), ({ projectDir, raw }) => ({
+    _tag: "McpAndroidUp",
+    projectDir,
+    runUp: raw.up ?? true
+  }))

packages/app/src/docker-git/cli/parser-options.ts

@@ -110,6 +110,8 @@ const booleanFlagUpdaters: Readonly<Record<string, (raw: RawOptions) => RawOptio
   "--force-env": (raw) => ({ ...raw, forceEnv: true }),
   "--mcp-playwright": (raw) => ({ ...raw, enableMcpPlaywright: true }),
   "--no-mcp-playwright": (raw) => ({ ...raw, enableMcpPlaywright: false }),
+  "--mcp-android": (raw) => ({ ...raw, enableMcpAndroid: true }),
+  "--no-mcp-android": (raw) => ({ ...raw, enableMcpAndroid: false }),
   "--wipe": (raw) => ({ ...raw, wipe: true }),
   "--no-wipe": (raw) => ({ ...raw, wipe: false }),
   "--web": (raw) => ({ ...raw, authWeb: true }),

packages/app/src/docker-git/cli/parser.ts

@@ -7,6 +7,7 @@ import { parseAttach } from "./parser-attach.js"
 import { parseAuth } from "./parser-auth.js"
 import { parseClone } from "./parser-clone.js"
 import { buildCreateCommand } from "./parser-create.js"
+import { parseMcpAndroid } from "./parser-mcp-android.js"
 import { parseMcpPlaywright } from "./parser-mcp-playwright.js"
 import { parseOpen } from "./parser-open.js"
 import { parseRawOptions } from "./parser-options.js"
@@ -93,6 +94,7 @@ export const parseArgs = (args: ReadonlyArray<string>): Either.Either<Command, P
       Match.when("sessions", () => parseSessions(rest)),
       Match.when("scrap", () => parseScrap(rest)),
       Match.when("mcp-playwright", () => parseMcpPlaywright(rest)),
+      Match.when("mcp-android", () => parseMcpAndroid(rest)),
       Match.when("help", () => Either.right(helpCommand)),
       Match.when("ps", () => Either.right(statusCommand)),
       Match.when("status", () => Either.right(statusCommand)),

packages/app/src/docker-git/cli/usage.ts

@@ -7,6 +7,7 @@ docker-git clone <url> [options]
 docker-git open [<selector>] [options]
 docker-git apply [<url>] [options]
 docker-git mcp-playwright [<url>] [options]
+docker-git mcp-android [<url>] [options]
 docker-git attach [<project-dir>] [options]
 docker-git panes [<url>] [options]
 docker-git scrap <action> [<url>] [options]
@@ -27,6 +28,7 @@ Commands:
   open                Open an existing docker-git project by selector, URL, or path
   apply               Apply docker-git config to an existing project/container (current dir by default)
   mcp-playwright      Enable Playwright MCP + nested Chromium browser for an existing project dir
+  mcp-android         Enable Android MCP (android-connection) + nested Android emulator for an existing project dir
   attach, tmux        Attach to an existing docker-git project workspace with tmux
   panes, terms        List tmux panes for a docker-git project
   scrap               Export/import project scrap (session snapshot + rebuildable deps)
@@ -78,6 +80,7 @@ Options:
   --up | --no-up            Run docker compose up after init (default: --up)
   --ssh | --no-ssh          Auto-open SSH after create/clone (default: clone=--ssh, create=--no-ssh)
   --mcp-playwright | --no-mcp-playwright  Enable Rust browser MCP + noVNC/CDP session (default: --no-mcp-playwright)
+  --mcp-android | --no-mcp-android  Enable Android MCP (android-connection) + nested Android emulator sidecar (default: --no-mcp-android)
   --auto[=claude|codex|gemini|grok]  Auto-execute an agent; without value picks by auth, random if multiple are available
   -d, --daemon             browser: run the browser frontend server in the background after build
   --active                  apply-all: apply only to currently running containers (skip stopped ones)

packages/app/src/docker-git/frontend-lib/core/command-builders-template.ts

@@ -20,6 +20,7 @@ export type BuildTemplateConfigInput = {
   readonly geminiAuthLabel: string | undefined
   readonly grokAuthLabel: string | undefined
   readonly enableMcpPlaywright: boolean
+  readonly enableMcpAndroid: boolean
   readonly agentMode: AgentMode | undefined
   readonly agentAuto: boolean
   /**
@@ -96,6 +97,7 @@ export const buildTemplateConfig = (input: BuildTemplateConfigInput): CreateComm
   dockerNetworkMode: input.dockerNetworkMode,
   dockerSharedNetworkName: input.dockerSharedNetworkName,
   enableMcpPlaywright: input.enableMcpPlaywright,
+  enableMcpAndroid: input.enableMcpAndroid,
   bunVersion: defaultTemplateConfig.bunVersion,
   agentMode: input.agentMode,
   agentAuto: input.agentAuto,

packages/app/src/docker-git/frontend-lib/core/command-builders.ts

@@ -201,6 +201,7 @@ type CreateBehavior = {
   readonly force: boolean
   readonly forceEnv: boolean
   readonly enableMcpPlaywright: boolean
+  readonly enableMcpAndroid: boolean
 }
 
 const resolveCreateBehavior = (raw: RawOptions): CreateBehavior => ({
@@ -209,7 +210,8 @@ const resolveCreateBehavior = (raw: RawOptions): CreateBehavior => ({
   skipGithubAuth: raw.skipGithubAuth ?? false,
   force: raw.force ?? false,
   forceEnv: raw.forceEnv ?? false,
-  enableMcpPlaywright: raw.enableMcpPlaywright ?? false
+  enableMcpPlaywright: raw.enableMcpPlaywright ?? false,
+  enableMcpAndroid: raw.enableMcpAndroid ?? false
 })
 
 type TokenLabelConfig = {
@@ -277,6 +279,7 @@ export const buildCreateCommand = (
         ...tokenLabels,
         skipGithubAuth: behavior.skipGithubAuth,
         enableMcpPlaywright: behavior.enableMcpPlaywright,
+        enableMcpAndroid: behavior.enableMcpAndroid,
         agentMode,
         agentAuto: isAgentAuto,
         clonedOnHostname: raw.clonedOnHostname

packages/app/src/docker-git/frontend-lib/core/command-options.ts

@@ -34,6 +34,7 @@ export interface RawOptions {
   readonly dockerNetworkMode?: string
   readonly dockerSharedNetworkName?: string
   readonly enableMcpPlaywright?: boolean
+  readonly enableMcpAndroid?: boolean
   readonly archivePath?: string
   readonly scrapMode?: string
   readonly wipe?: boolean

packages/app/src/docker-git/frontend-lib/core/domain.ts

@@ -114,6 +114,7 @@ export interface TemplateConfig {
   readonly dockerNetworkMode: DockerNetworkMode
   readonly dockerSharedNetworkName: string
   readonly enableMcpPlaywright: boolean
+  readonly enableMcpAndroid?: boolean | undefined
   readonly bunVersion: string
   readonly agentMode?: AgentMode | undefined
   readonly agentAuto?: boolean | undefined
@@ -204,6 +205,12 @@ export interface McpPlaywrightUpCommand {
   readonly runUp: boolean
 }
 
+export interface McpAndroidUpCommand {
+  readonly _tag: "McpAndroidUp"
+  readonly projectDir: string
+  readonly runUp: boolean
+}
+
 export interface ApplyCommand {
   readonly _tag: "Apply"
   readonly projectDir: string
@@ -219,6 +226,7 @@ export interface ApplyCommand {
   readonly playwrightRamLimit?: string | undefined
   readonly gpu?: GpuMode | undefined
   readonly enableMcpPlaywright?: boolean | undefined
+  readonly enableMcpAndroid?: boolean | undefined
 }
 
 // CHANGE: add apply-all command to apply docker-git config to every known project; support --active flag
@@ -262,6 +270,7 @@ export type Command =
   | SessionsCommand
   | ScrapCommand
   | McpPlaywrightUpCommand
+  | McpAndroidUpCommand
   | ApplyCommand
   | ApplyAllCommand
   | HelpCommand

packages/app/src/docker-git/frontend-lib/core/template-defaults.ts

@@ -30,6 +30,7 @@ type DefaultTemplateConfig = Pick<
   | "dockerNetworkMode"
   | "dockerSharedNetworkName"
   | "enableMcpPlaywright"
+  | "enableMcpAndroid"
   | "bunVersion"
 >
 
@@ -75,6 +76,7 @@ export const defaultTemplateConfig = {
   dockerNetworkMode: defaultDockerNetworkMode,
   dockerSharedNetworkName: defaultDockerSharedNetworkName,
   enableMcpPlaywright: false,
+  enableMcpAndroid: false,
   bunVersion: "1.3.11"
 } satisfies DefaultTemplateConfig
 /* jscpd:ignore-end */

packages/app/src/docker-git/menu-create-command-parse.ts

@@ -113,6 +113,7 @@ const unsupportedCreatePrefixes = new Set([
   "gists",
   "help",
   "kill-all",
+  "mcp-android",
   "mcp-playwright",
   "menu",
   "open",
@@ -164,6 +165,9 @@ const runUpCreateInput = (raw: RawCreateOptions, command: CreateCommand): Partia
 const playwrightCreateInput = (raw: RawCreateOptions, command: CreateCommand): Partial<CreateInputs> =>
   raw.enableMcpPlaywright === undefined ? {} : { enableMcpPlaywright: command.config.enableMcpPlaywright }
 
+const androidCreateInput = (raw: RawCreateOptions, command: CreateCommand): Partial<CreateInputs> =>
+  raw.enableMcpAndroid === undefined ? {} : { enableMcpAndroid: command.config.enableMcpAndroid ?? false }
+
 const forceCreateInput = (raw: RawCreateOptions, command: CreateCommand): Partial<CreateInputs> =>
   raw.force === undefined ? {} : { force: command.force }
 
@@ -183,6 +187,7 @@ const createInputsFromCommand = (
   ...gpuCreateInput(raw, command),
   ...runUpCreateInput(raw, command),
   ...playwrightCreateInput(raw, command),
+  ...androidCreateInput(raw, command),
   ...forceCreateInput(raw, command),
   ...forceEnvCreateInput(raw, command)
 })

packages/app/src/docker-git/menu-create-draft.ts

@@ -12,6 +12,7 @@ export const createProjectDraftFromInputs = (
   readonly gpu: GpuMode
   readonly up: boolean
   readonly enableMcpPlaywright: boolean
+  readonly enableMcpAndroid: boolean
   readonly force: boolean
   readonly forceEnv: boolean
 } => ({
@@ -23,6 +24,7 @@ export const createProjectDraftFromInputs = (
   gpu: input.gpu,
   up: input.runUp,
   enableMcpPlaywright: input.enableMcpPlaywright,
+  enableMcpAndroid: input.enableMcpAndroid,
   force: input.force,
   forceEnv: input.forceEnv
 })

packages/app/src/docker-git/menu-create-inputs.ts

@@ -247,6 +247,7 @@ export const resolveCreateInputs = (
     gpu: values.gpu ?? defaultTemplateConfig.gpu,
     runUp: values.runUp !== false,
     enableMcpPlaywright: values.enableMcpPlaywright === true,
+    enableMcpAndroid: values.enableMcpAndroid === true,
     force: values.force === true,
     forceEnv: values.forceEnv === true
   }

packages/app/src/docker-git/menu-create-labels.ts

@@ -23,6 +23,10 @@ export const renderCreateStepLabel = (step: CreateStep, defaults: CreateInputs):
           renderExplicitBooleanChoice(defaults.enableMcpPlaywright)
         }]`
     ),
+    Match.when(
+      "mcpAndroid",
+      () => `Enable Android MCP (nested Android emulator)? [${renderExplicitBooleanChoice(defaults.enableMcpAndroid)}]`
+    ),
     Match.when(
       "force",
       () => `Force recreate (overwrite files + wipe volumes)? [${renderExplicitBooleanChoice(defaults.force)}]`
@@ -57,6 +61,12 @@ export const renderCreateStepLabelWithBufferPreview = (
         ? renderCreateStepLabel(step, defaults)
         : `Enable Playwright MCP (nested Chromium browser)? [${renderExplicitBooleanChoice(enableMcpPlaywright)}]`
     }),
+    Match.when("mcpAndroid", () => {
+      const enableMcpAndroid = parseExplicitBooleanChoice(buffer)
+      return enableMcpAndroid === null
+        ? renderCreateStepLabel(step, defaults)
+        : `Enable Android MCP (nested Android emulator)? [${renderExplicitBooleanChoice(enableMcpAndroid)}]`
+    }),
     Match.when("force", () => {
       const force = parseExplicitBooleanChoice(buffer)
       return force === null

packages/app/src/docker-git/menu-create-navigation.ts

@@ -224,6 +224,7 @@ export const resolveCreateSettingsChoiceBuffer = (
     Match.when("gpu", () => gpuChoiceBuffer(direction)),
     Match.when("runUp", () => booleanChoiceBuffer(direction)),
     Match.when("mcpPlaywright", () => booleanChoiceBuffer(direction)),
+    Match.when("mcpAndroid", () => booleanChoiceBuffer(direction)),
     Match.when("force", () => booleanChoiceBuffer(direction)),
     Match.exhaustive
   )

packages/app/src/docker-git/menu-create-step-apply.ts

@@ -41,12 +41,13 @@ const applyGpuStep = (
 
 const applyBooleanStep = (
   input: ApplyCreateStepInput,
-  key: "runUp" | "enableMcpPlaywright" | "force"
+  key: "runUp" | "enableMcpPlaywright" | "enableMcpAndroid" | "force"
 ): Either.Either<Partial<Mutable<CreateInputs>>, ParseError> => {
   const isValue = isYesDefault(input.buffer, input.currentDefaults[key])
   return Match.value(key).pipe(
     Match.when("runUp", () => Either.right({ runUp: isValue })),
     Match.when("enableMcpPlaywright", () => Either.right({ enableMcpPlaywright: isValue })),
+    Match.when("enableMcpAndroid", () => Either.right({ enableMcpAndroid: isValue })),
     Match.when("force", () => Either.right({ force: isValue })),
     Match.exhaustive
   )
@@ -64,6 +65,7 @@ const applyCreateStep = (
     Match.when("gpu", () => applyGpuStep(input)),
     Match.when("runUp", () => applyBooleanStep(input, "runUp")),
     Match.when("mcpPlaywright", () => applyBooleanStep(input, "enableMcpPlaywright")),
+    Match.when("mcpAndroid", () => applyBooleanStep(input, "enableMcpAndroid")),
     Match.when("force", () => applyBooleanStep(input, "force")),
     Match.exhaustive
   )

packages/app/src/docker-git/menu-create-steps.ts

@@ -19,6 +19,7 @@ const isCreateStepSatisfied = (
     Match.when("gpu", () => hasOwn(values, "gpu")),
     Match.when("runUp", () => hasOwn(values, "runUp")),
     Match.when("mcpPlaywright", () => hasOwn(values, "enableMcpPlaywright")),
+    Match.when("mcpAndroid", () => hasOwn(values, "enableMcpAndroid")),
     Match.when("force", () => hasOwn(values, "force")),
     Match.exhaustive
   )