Skip to content

Android driver: adb-tools.ts, the leaf part for env, commands and device folders #1264

Closed

Description

@V3RON

Part of #1259.

Scope

After this PR, adb-tools.ts is a part of the Android driver (ADR 0063 §4). It owns no state, and does the scoped environment the driver's adb and emulator calls get today, running a command that throws DriverCrashError on a non-zero exit, a device's AVD folder and driver-data check, scanning adb devices, a bounded adb shell read, the emulator's version, and the driver's wait. AndroidDriver builds it in its constructor, passes it the options it needs, and delegates to it. Behaviour, messages, timeouts and files on disk do not change. Only the calls that use #env today get it: sdkmanager runs with no env, destroyLegacy builds its own, and the physical handler uses baseEnv (F9). This part breaks today's loops between method groups, which all run through #dataFor, #avdFolder or #env.

In short

About 97 lines of code move out of the 3,573-line driver into a file an agent reads whole. Nothing a user or a caller sees changes. A part is a file that owns its own state and takes its collaborators in an options object; it never imports index.ts.

flowchart LR
  R["index.ts: AndroidDriver"] --> P["adb-tools.ts (new part)"]
  R --> O[parts moved earlier]
  P --> O
Loading

What a user would notice if this goes wrong: a command runs with the wrong ANDROID_AVD_HOME or adb port, and a device is not found.

Technical spec

Facts

Commit 059a270. Line numbers are on that commit; earlier tasks of #1259 move code, so the implementer finds each name by search.

# Fact Source
F1 every name this task moves, at its line on 059a270 (the exact assignment of every name of the file, made from its syntax tree) ADB_DEVICES_TIMEOUT_MS at src/drivers/android/index.ts:120; SEED_AVD_NAME at src/drivers/android/index.ts:160; #env at src/drivers/android/index.ts:1028; #scanAdbSerials at src/drivers/android/index.ts:1988; #adbShellOrUndefined at src/drivers/android/index.ts:2099; #emulatorVersion at src/drivers/android/index.ts:2624; #avdFolder at src/drivers/android/index.ts:2648; #runOrThrow at src/drivers/android/index.ts:3008; #dataFor at src/drivers/android/index.ts:3028; #delay at src/drivers/android/index.ts:3084; deviceIdOf at src/drivers/android/index.ts:3317; serialFor at src/drivers/android/index.ts:3321
F2 a part in this folder takes an options object and is built by the driver src/drivers/android/adb-registrar.ts:22-25, src/drivers/android/index.ts:675
F3 such a part has its own test file that builds it directly src/drivers/android/adb-registrar.test.ts:9
F4 the folder's testing.ts is imported by index.test.ts, and the test file's shared helpers sit outside any describe src/drivers/android/index.test.ts:46, src/drivers/android/index.test.ts:5117-5410, src/drivers/android/index.test.ts:7306-8212
F5 Fallow fails CI on an import loop between files (circular-dependencies, default error) and on any dead-code finding node_modules/fallow/schema.json RulesConfig at pnpm-lock.yaml:2180; docs/internal/agent-rules/toolchain.md:51-53
F6 test-lint flags an added sibling import in a test unless a why: sits above the first describe .agents/scripts/test-lint.mjs:141-148
F7 the module manual is 141 lines, and manuals may have at most 150 src/drivers/android/AGENTS.md:1-141, src/docs-manuals.test.ts:9
F8 the root tests that prove the root still reaches this part src/drivers/android/index.test.ts:421 "boots concurrent devices on different even ports and skips ports adb shows taken"; src/drivers/android/index.test.ts:7177 "destroys a plain Android device after its ownership check"
F9 sdkmanager runs with no env; destroyLegacy builds its own env; the physical handler gets baseEnv src/drivers/android/index.ts:2317-2322, src/drivers/android/index.ts:892, src/drivers/android/index.ts:667-673

Modules touched

Searches: grep -rn of each F1 name under src/ (hits only in src/drivers/android/index.ts, src/drivers/android/index.test.ts and, for the exports index.ts keeps, their importers); ls src/drivers/android/adb-tools.ts (absent on 059a270).

flowchart LR
  R["index.ts (changed)"] --> P["adb-tools.ts (new)"]
  P --> E["earlier parts, data.ts"]
Loading
  • src/drivers/android/adb-tools.ts: new; the part. It imports only data.ts, files that exist on 059a270 and the parts of earlier tasks; anything else reaches it as an option or a callback.
  • src/drivers/android/index.ts: builds the part, delegates, and loses the F1 names.
  • src/drivers/android/index.test.ts: unchanged, except helpers moved to testing.ts.
  • no new test file.
  • src/drivers/android/data.ts: takes a type two parts share, when this task moves one.
  • src/drivers/android/testing.ts: takes any helper two test files now use.
  • src/drivers/android/AGENTS.md: adds the one Files row for the parts, Parts of AndroidDriver (ADR 0063), naming adb-tools.ts and a few words; later part tasks add to that row and add no row of their own (F7).
  • src/source-hygiene.test.ts: the two Android entries of the shrink-only list take their new lengths; an entry whose file is now within its limit is removed.

Contract and event changes

none: the task moves code inside the Android driver; no file under src/contract/ and no event changes (search: git grep -n "drivers/android" src/contract gives 0 hits).

Other code on the same state

The state this part owns: no state. Searches: grep -n of each owned name in src/drivers/android/index.ts and under src/ outside the Android folder (0 hits outside). After this task the root and later tasks (#1265, #1266, #1267, #1268, #1269, #1270, #1273, #1271, #1272) reach that state only through this part's interface; none keeps a copy.

Failure modes

none: the task crosses no new boundary and writes no new state. Every call to adb, emulator, avdmanager or sdkmanager it moves keeps its arguments, environment and time limit (F1).

Rules in play

  • ADR 0063 §1, "A part never calls the root": the part takes collaborators and callbacks in its options and imports no index.ts (F5 fails a loop).
  • ADR 0063 §2, tests sit with the part: a test moves only when everything it asserts is made by this part; a test across parts stays in the root's tests. A part test file has one why: above its first describe naming "a part of a decomposed module" (F6).
  • ADR 0063 §3: a listed file that is now within its limit leaves the shrink-only list in this PR.
  • Architecture rule 14, "nothing outside the directory imports a file inside it": only files in src/drivers/android/ import the part.
  • Architecture rule 17, "A comment starts with why:": a moved comment that is not a why:, or that no longer holds, is deleted.
  • Documentation rule 7 and src/docs-manuals.test.ts: the manual stays within 150 lines (F7).

Tests

No test of src/drivers/android/index.test.ts asserts only this part's code: each drives it through a verb that spans parts, so they stay where they are (ADR 0063 §2). The seam is src/drivers/android/index.test.ts (F8).

  • The driver runs adb and emulator commands through adb-tools.ts, and the whole-driver tests see the same environment, failures and devices as before; cases: "boots concurrent devices on different even ports and skips ports adb shows taken"; "destroys a plain Android device after its ownership check".

Done when

  • pnpm exec vitest run --project unit src/drivers/android passes, and its number of tests is the base's plus the tests this task adds.
  • src/drivers/android/adb-tools.ts exists, and only files in src/drivers/android/ import it: dependency-cruiser's past-index rule (.dependency-cruiser.mjs:36-37), run by pnpm check, fails any import of it from outside the folder.
  • src/drivers/android/index.ts defines none of the F1 names, except each Driver method (and other AndroidDriver member the core or the daemon calls), which stays and delegates; the root's field that holds the part takes a name that is not an F1 name; an F1 constant the root still uses is imported from the part.
  • In src/source-hygiene.test.ts, each Android entry equals its file's new line count, or is gone when the file is within its limit.
  • pnpm check passes.

Out of scope

Depends on

Written by an agent.

Activity

  1. added
    task:draftScope written; technical spec or its spec check missing.
    on Nov 4, 2026
  2. added
    task:readySpec checked. An agent may implement it once its Depends on allow.
    and removed
    task:draftScope written; technical spec or its spec check missing.
    on Nov 4, 2026
  3. self-assigned this
    on Nov 4, 2026
  4. added a commit that references this issue on Nov 4, 2026
    59233df
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

task:readySpec checked. An agent may implement it once its Depends on allow.

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions