@1aboveio/skills 1.0.17 → 1.0.19

package/README.md

@@ -52,7 +52,7 @@ See https://github.com/1aboveio/ai/blob/main/docs/native-codex.md for prerequisi
 | `core` | `@1aboveio/core-skills` | distill-writing, doc-to-md, editorial-review, house-style, plain-language, polish-cn, reg-parser, terminology, write-doc, write-report |
 | `engineering` | `@1aboveio/engineering-skills` | better-review, e2e-test, engineering, engineering-runtime, ensure-coverage, golden-path, harness-runtime, resolve-issues, resolve-release, rush-issues, rush-release, test-quality |
 | `cicd` | `@1aboveio/cicd-skills` | cloud-build, cloud-debug, cloud-deploy, docker, github-actions, github-flow, google-cloud, mergify, podman |
-| `app-dev` | `@1aboveio/app-dev-skills` | airflow, android-development, app-debug, better-auth, data-catalog, data-quality, ios-foundation, monorepo, nextjs-fullstack, prisma-setup, pyspark, python-backend, shadcn, zod-v4 |
+| `app-dev` | `@1aboveio/app-dev-skills` | airflow, android-development, app-debug, better-auth, data-catalog, data-quality, ios-foundation, maestro, monorepo, nextjs-fullstack, prisma-setup, pyspark, python-backend, shadcn, zod-v4 |
 | `risk-compliance` | `@1aboveio/risk-compliance-skills` | compliance-audit, contract-compare, contract-review, doc-authenticity, fraud-detection, payment-analysis, portfolio-payment-analysis, similar-domain, tld-detection |
 | `content` | `@1aboveio/content-skills` | article-review, article-to-image, flowchart-svg, image-gen, mermaid, wechat-article-writer, wechat-publisher, wechat-search, xai-search |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1aboveio/skills",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "Every 1aboveio skill package in one: install once, then choose which packages Pi loads with npx @1aboveio/skills select.",
   "license": "MIT",
   "repository": {
@@ -28,8 +28,8 @@
   "nativeCodex": {
     "schemaVersion": 1,
     "metadataPath": ".codex-plugin/resources.json",
-    "metadataDigest": "4ae04aa79316f8a7cc9df45582d19e332321316012dac6843be1eb21d2b1a385",
-    "releaseIdentity": "d4a51368dcc414b3136d3b6f51a6aeeeea77429a101eb65f36f7878e00032494"
+    "metadataDigest": "5214fae69e2323b56ca56e3e09a4d6d21dfb408ae7834a560b65cac2efbb51f3",
+    "releaseIdentity": "6f7be7f9699ae9d9480689971e5cb8ea88e5d8f460618fe153a4ca8b7ad4347a"
   },
   "pi": {
     "skills": [
@@ -110,6 +110,7 @@
           "data-catalog",
           "data-quality",
           "ios-foundation",
+          "maestro",
           "monorepo",
           "nextjs-fullstack",
           "prisma-setup",
@@ -260,7 +261,7 @@
         ]
       }
     ],
-    "digest": "ae9b2ca5b33484b68e892b41976bcc054562385ef7dc7db94bf86ab42e369d0d"
+    "digest": "8cfe81576dedf61b5ecafa0141e615cc570630469837e7da251de0c4a40b92cf"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/skills/app-dev/airflow/SKILL.md

@@ -2,7 +2,7 @@
 name: airflow
 description: Airflow DAG architecture and conventions. Use when designing, writing, reviewing, testing, or debugging Airflow DAGs and tasks, including TaskGroups, data intervals, timezone-aware date parameters, CLI validation, environment-based scheduling, and pytest integrity tests.
 user-invocable: true
-release-version: 0.48.1
+release-version: 0.49.1
 ---
 **Updates:** Once/session run `node <skill-base-dir>/release-check.mjs`.
 # Airflow DAG Development Patterns

package/skills/app-dev/android-development/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: android-development
-description: "Prove and debug Expo / React Native apps on an owned Android emulator. Use for Android startup/rendering failures, Metro or ADB problems, UiAutomator/harness failures, APK builds, SDK/NDK/JDK workspace setup, native journey validation, and choosing Kotlin/Compose versus React Native for Android flows. Reproduce failed Android CI checkpoints off CI before fixing and redispatching. Standalone invocation offers Project or Session; init persists repo conventions. NOT for workflow YAML, CI speed or runners (github-actions), browser tests (e2e-test), iOS (ios-foundation), plain Jest tests, or signing/store release."
-release-version: 0.48.1
+description: "Prove and debug Expo / React Native apps on an owned Android emulator. Use for Android startup/rendering failures, Metro or ADB problems, native harness failures, APK builds, SDK/NDK/JDK workspace setup, native journey validation, and choosing Kotlin/Compose versus React Native for Android flows. Reproduce failed Android CI checkpoints off CI before fixing and redispatching. Standalone invocation offers Project or Session; init persists repo conventions. Maestro journey authoring, UI-driver migration and flow diagnosis belong to maestro. NOT for workflow YAML, CI speed or runners (github-actions), browser tests (e2e-test), iOS (ios-foundation), plain Jest tests, or signing/store release."
+release-version: 0.49.1
 ---
 **Updates:** Once/session run `node <skill-base-dir>/release-check.mjs`.
 # Android development
@@ -60,15 +60,17 @@ The contract, other languages and the Maestro/Detox mapping are in
 
 ## UI journey tool
 
-The skill references Maestro; it does not bundle or install it. Offer Maestro for new
-single-device journeys when the repo has no journey tool. Keep an existing sufficient
-harness; adding Maestro needs a concrete benefit and repo authorization, not just an
-installed CLI. Maestro uses the same work loop and validation ladder. Run it on the
-session's own emulator (`maestro --device <serial>`) and convert its output with
-[maestro_failure.py](scripts/maestro_failure.py), which writes the record above. Read
-[UI journeys](references/ui-journeys.md) before selecting or running Maestro flows, for
-starting state, permissions, device ownership, execution evidence and the cases that
-stay custom.
+Before selecting, authoring, running, debugging or migrating Maestro journeys, read and
+apply `{maestro baseDir}/SKILL.md`. That skill owns complete UI flows, the split between
+UI/backend/native proof, exclusive UI-driver execution and Maestro evidence conversion.
+It is a required companion; report it missing rather than improvising or installing it.
+
+Keep Android workspace, emulator/ADB, build/install, Metro and cleanup ownership here.
+Pass the existing owned device and identity contract to Maestro; it does not create a
+second runtime. Offer Maestro for new journeys without a tool, but an existing harness
+migration still needs task/repo authorization. Preserve this validation ladder and all
+assigned native assertions. The [journey routing note](references/ui-journeys.md) keeps
+the old reference location discoverable without duplicating Maestro's procedure.
 
 ## Validation ladder
 
@@ -151,6 +153,6 @@ higher levels still pending rather than claiming acceptance.
 | Builds, provisioning, device execution, cleanup and setup proof | [setup.md](references/setup.md); use [device-run.sh](scripts/device-run.sh) only without an existing resource owner |
 | Feature/fix validation and handoff | [feature-work.md](references/feature-work.md) |
 | Device failure record and evidence capture | [diagnosis.md](references/diagnosis.md#record-the-failed-device-case) |
-| UI journey tool (Maestro) and its evidence converter | [UI journeys](references/ui-journeys.md) |
+| Maestro journeys, UI-driver migration and evidence conversion | `{maestro baseDir}/SKILL.md` |
 | Failure reproduction and correction | [diagnosis.md](references/diagnosis.md), then the relevant [gotcha](references/gotchas.md) |
 | CI integration | [ci.md](references/ci.md), [template](assets/android-ci-job.yml), and `github-actions` |

package/skills/app-dev/android-development/references/diagnosis.md

@@ -137,12 +137,10 @@ and prints `NATIVE_FAILURE`. Its `original_stage_exit=<n> cleanup_exit=<n>` line
 status are unchanged, and a record the journey already wrote is left untouched.
 
 A repo that already runs Maestro or Detox maps its failing artifacts to this record instead
-of adding the helper: Maestro's failing-step screenshot, view hierarchy and logcat plus its
-`commands.json` step, and Detox's `failing` artifact preset output. For Maestro, run
-[maestro_failure.py](../scripts/maestro_failure.py) over the flow folder or the session folder
-it sits in; it writes the record and prints the line, and [UI journeys](ui-journeys.md#evidence)
-has the evidence layout. A record is written even when the source is the framework's artifact
-set, and the printed line still has the four fields.
+of adding the helper. For Maestro, read `{maestro baseDir}/references/evidence.md` and use
+its converter and non-competing capture path. The old local converter entry point forwards
+to that companion. Detox uses its `failing` artifact preset output. Preserve the same
+record fields and printed line rather than adding another failure format.
 
 ## Bound work and distinguish progress from waiting
 

package/skills/app-dev/android-development/references/gotchas.md

@@ -20,7 +20,7 @@ the product.
 | Backend tool, CI only | a Backend-backed step gets a 5xx in CI only; the log names a missing program (`Browser was not found at the configured executablePath`) |
 | adb transport, mid-journey | `connection terminated: read failed` in the adb trace after boot, then lost `adb reverse`: usually guest RAM |
 | UiAutomator server | `RemoteDisconnected` while the adb transport stays up: the on-device server was relaunched |
-| Maestro driver | driver readiness fails while a setup uiautomator2 process is still alive: see [device ownership](ui-journeys.md#device-ownership) |
+| Maestro driver | driver readiness fails while another UI client holds registration: read `{maestro baseDir}/references/diagnosis.md` |
 | Journey harness | a wait right after a navigation times out while the destination is on screen |
 | Journey harness, short screen | a wait for a label times out only on a short or landscape screen, which shows the content above it |
 | Journey adapter | an offscreen target stays hidden while scrolls move away from it |
@@ -147,14 +147,8 @@ matches, [confirm the suspected cause](#confirm-a-suspected-cause) before changi
 
 ### A scroll adapter moves away from the target
 
-- **Signal:** a custom comparison adapter times out on an offscreen target even though it
-  sends scroll gestures; a fake UI that exposes all targets can still pass.
-- **Cause:** Maestro's requested scroll direction describes the content to reach, not the
-  finger movement. Mapping `DOWN` to a downward finger swipe reverses the intended scroll.
-- **Fix:** for `DOWN` toward later content, swipe the finger up; for `UP` toward earlier
-  content, swipe the finger down. In the adapter test, keep the target offscreen until the
-  correct gesture moves it into view. Wrong-direction gestures must not reveal it merely
-  because a gesture count was reached. Check both directions where the adapter supports them.
+For the Maestro/custom-adapter direction mismatch and its offscreen regression case,
+read `{maestro baseDir}/references/diagnosis.md`. Maestro-specific diagnosis has one owner.
 
 ### A navigation check passes on the previous screen
 

package/skills/app-dev/android-development/references/init.md

@@ -31,7 +31,7 @@ to a newly created Android section; report unresolved commands instead of guessi
 | --- | --- |
 | `CONTRIBUTING.md` | The `## Android development` section, wrapped in `<!-- conventions:android:start -->` / `<!-- conventions:android:end -->`, with `references/android-conventions.md` as its body. |
 | `AGENTS.md` | An `Android task entry` skill-loading block between `conventions:android-task-entry` markers, plus a pointer to the selected `CONTRIBUTING.md` when missing. Check these independently: a contributor-guide link alone is not a skill loader. |
-| `<dir>/device-run.sh`, `<dir>/failure_capture.py` | Only with `--install-scripts`: the generic layer copied with a version header. |
+| `<dir>/device-run.sh`, `<dir>/failure_capture.py`, `<dir>/failure_record.py` | Only with `--install-scripts`: capture/runner scripts and their record dependency copied with version headers. |
 
 Each file is created only when it is absent. The helper never edits `CLAUDE.md`, never writes into
 a parent project, a home directory or global agent configuration, and never reaches outside the
@@ -113,7 +113,10 @@ Existing guidance wins over the template:
 ## Skill scripts: reference or copy
 
 `device-run.sh` and `failure_capture.py` are referenced from the installed skill by
-default: nothing is copied, and the run reads them from the skill directory. Copy them
+default: nothing is copied, and the run reads them from the skill directory, with the
+record module supplied by the required `maestro` companion. Explicit copies also include
+that dependency as `failure_record.py` beside `failure_capture.py`, so they run without
+installed skills. Copy them
 into the repo only on an explicit request, with `--install-scripts` (default target
 `scripts/android/`) or `--install-scripts <dir>` for another relative directory inside
 the project.

package/skills/app-dev/android-development/references/setup.md

@@ -230,7 +230,8 @@ when the journey failed, the `NATIVE_FAILURE` line and its `failure.json`.
 
 Expect every selected scenario's result (`PASS` marker or the journey tool's report),
 required screenshots, and backend and Metro logs when the selected variant uses those
-services. For Maestro's result and screenshot rules, read [UI journeys](ui-journeys.md#evidence).
+services. For Maestro's result, screenshot and non-competing capture rules, read
+`{maestro baseDir}/references/evidence.md` before executing its journey.
 Preserve the failed checkpoint's evidence before cleanup. A release build with embedded
 assets does not require Metro by default.
 

package/skills/app-dev/android-development/references/ui-journeys.md

@@ -1,130 +1,15 @@
-# UI journey tool: Maestro
+# Mobile UI journey routing
 
-Maestro writes a single-device UI flow as YAML and records per-step failure evidence. The
-skill references it; it does not bundle or install it, and adding it is the repo's decision.
+Maestro instructions moved to the required companion skill. Before selecting, authoring,
+running, debugging or migrating Maestro flows, read `{maestro baseDir}/SKILL.md` and its
+task-specific references. Resolve that path from the installed skill, not the working
+directory. Report a missing companion; discovery does not authorize installation.
 
-## When to use it
+`maestro` owns UI/backend/native test splitting, flow structure, state and permissions,
+exclusive UI-driver execution, diagnosis and the Maestro failure converter. This skill
+still owns Android runtime setup, workspace/device identity, the validation ladder and
+cleanup. Reuse its existing owner and required gates; a UI-driver change is not another
+emulator or fixture lifecycle.
 
-| Situation | Recommendation |
-| --- | --- |
-| Repo has no UI journey tool | Offer Maestro for new single-device journeys. It replaces hand-written adb/UiAutomator launch, poll, capture and assertion code. |
-| Repo has a working harness | Reuse it when sufficient. Add Maestro only for a concrete benefit with repo authorization; an installed CLI alone is not a reason to add or migrate journeys. |
-| Coordinated multi-device case | Keep the custom harness. Maestro sharding runs independent flows, and a shard cannot depend on another. |
-
-Maestro changes the UI journey driver, not the [work loop or validation ladder](../SKILL.md#work-loop).
-Use focused flows at the applicable L0/L1 check, candidate-APK journeys at L2, and assigned
-acceptance journeys at L3. Source tests and required backend/native checks keep their roles.
-
-## Starting state and permissions
-
-Declare each flow's intended starting app state and permissions in its YAML or owned
-fixture setup, and check included subflows and hooks for resets:
-
-- For a warm-runtime check, keep the running app or use `launchApp: {stopApp: false}`
-  to foreground it. Plain `launchApp` stops and relaunches the app by default, so it
-  cannot preserve the process whose state the check needs.
-- For restart, upgrade or fresh-install checks, use the checkpoint's required setup.
-  `clearState: true` and `clearState` clear Android app data; they do not install the
-  candidate APK or prove a fresh installation or upgrade. Clear only authorized disposable
-  state. If a reset removes debug endpoint preferences, restore them through the existing
-  owner and verify the app's actual code source before continuing.
-- Set permissions for permission-sensitive journeys. `launchApp` allows all permissions
-  by default; use the required denied or unset state to exercise denial or prompts.
-  An auto-granted run does not prove the permission-request journey.
-
-## Device ownership
-
-Run against the emulator the session owns and name it with `maestro --device <serial>`.
-Use the status handling under [Evidence](#evidence) inside the existing journey owner.
-
-Each session installs and starts Maestro's driver packages (`dev.mobile.maestro`,
-`dev.mobile.maestro.test`) through `am instrument`. That cost lands on the session's first
-flow, not on every step, so run every flow of the case in one session instead of one session
-per flow.
-
-Keep mutating checks exclusive on that device, including existing harness and Maestro
-runs. Reuse the existing runtime owner; Maestro is not a second emulator, backend or
-cleanup owner.
-
-If setup started a `setupUiAutomator` uiautomator2 process, have its owner verify ownership,
-stop it and wait for it to exit before starting Maestro; a live setup driver can block
-Maestro driver readiness. Restart that setup driver only after Maestro has fully exited,
-if it is still needed. Never stop a peer's process; coordinate with its owner instead.
-
-When comparing a custom journey adapter with Maestro, check scroll direction and prove
-offscreen targets with the [scroll-direction gotcha](gotchas.md#a-scroll-adapter-moves-away-from-the-target).
-
-## Evidence
-
-Record the selected flows, executed assertions, run exit status, app/source identity and
-cleanup outcome. Accept the harness's `PASS` markers or Maestro's per-flow results/JUnit
-report as scenario results; a zero exit with no selected flows is not a pass. For JUnit,
-use `--format junit --output <owned-report-path>`; the report is separate from
-`--test-output-dir`. Capture successful checkpoints with `takeScreenshot` when the
-assignment requires visual evidence; normal passing flows have no automatic screenshots.
-
-`--test-output-dir` receives one session folder holding one self-contained folder per flow:
-`manifest.json`, `commands.json` (one entry per executed step), the failing step's
-`screenshots/` image and `screen-hierarchy/` JSON, and `logs/device-logcat.txt`. Convert that
-into the [device failure record](diagnosis.md#record-the-failed-device-case) instead of
-adding the journey helper:
-
-Give each case/attempt a new owned `LOG_DIR`, shared with its existing launcher so its
-partial-record fallback looks in the same directory. Retain earlier attempts separately;
-reusing a runtime does not mean reusing a failure-record destination. Confirm the pinned
-Maestro supports these flags and output layout before using the example.
-
-Run this body as the existing owner's journey command. Guard both commands so `set -e`
-cannot skip conversion or cleanup after a failure. The owner retains its bounded cleanup
-after the journey exits; this is not a new launcher or an acceptance checker.
-
-```bash
-maestro_status=0
-maestro --device "$ANDROID_SERIAL" test --test-output-dir "$LOG_DIR/maestro" \
-  --format junit --output "$LOG_DIR/report.xml" ./maestro-flows || maestro_status=$?
-conversion_status=0
-python3 <skill-base-dir>/scripts/maestro_failure.py --maestro-dir "$LOG_DIR/maestro" \
-  --evidence-dir "$LOG_DIR" --case "$DEVICE_CASE" || conversion_status=$?
-printf 'maestro_exit=%s conversion_exit=%s\n' "$maestro_status" "$conversion_status"
-if [ "$maestro_status" -ne 0 ]; then
-  exit "$maestro_status"
-fi
-exit "$conversion_status"
-```
-
-Convert this invocation's finalized output before teardown. If startup or driver failure
-left no usable failed-step output, retain raw CLI logs and the original status and use
-the existing owner's partial-record fallback before cleanup. Conversion errors are
-evidence-processing failures, not replacements for the original test failure.
-
-It takes the session folder or one flow folder, writes `failure.json` into `--evidence-dir`
-(the flow folder by default) and prints the one `NATIVE_FAILURE` line for the first failed
-step. A passing flow writes nothing, and an existing record is never replaced. The artifact
-fields name the Maestro files (`screenshots/…`, `screen-hierarchy/…`, `logs/…`) rather than
-copying them into the adb names, so the failing frame and its hierarchy stay paired.
-
-Converter exit zero means processing completed, not that tests passed: a recorded failure
-also returns zero, and empty or incomplete step output may produce no record. Establish
-success from the executed assertions and per-flow results above, never from the converter
-or absence of `NATIVE_FAILURE`.
-
-## Agents
-
-`maestro mcp` gives an agent `list_devices`, `inspect_screen`, `take_screenshot` and `run`.
-Explore the screen and draft a repeatable YAML flow with it. Proof comes from executing
-the flow against the identified candidate with assertions that establish the claimed
-behavior and retained results. Committing YAML or finding selectors in MCP does not prove
-the journey passed.
-
-## Limits
-
-- Coordinated multi-device cases, exact data or payment proofs, and process-death checks stay
-  on custom harness code.
-- Authentication codes still come from the harness's disposable database, passed into a flow
-  with `maestro test -e` or resolved by its `runScript`; do not add a second fixture path.
-
-## Sources
-
-- [Launch state and permissions](https://docs.maestro.dev/reference/commands-available/launchapp)
-- [Android state clearing](https://docs.maestro.dev/reference/commands-available/clearstate)
-- [Reports and artifacts](https://docs.maestro.dev/maestro-flows/workspace-management/test-reports-and-artifacts)
+The old `scripts/maestro_failure.py` entry point forwards to the companion for callers
+already using it. New commands use `{maestro baseDir}/scripts/maestro_failure.py`.

package/skills/app-dev/android-development/scripts/failure_capture.py

@@ -21,6 +21,10 @@ adapters described in ``references/diagnosis.md``:
 
     case, step, error, screenshot, uiDump, logcatTail, evidenceDir, cleanupErrors
 
+The record model, its constants and the ``failure.json`` read and write live in the
+sibling ``maestro`` skill (``scripts/failure_record.py``) and are re-exported here, so
+the Maestro converter writes the same record without this module or a device.
+
 ``screenshot``, ``uiDump`` and ``logcatTail`` are file names relative to
 ``evidenceDir`` and are ``null`` when that capture failed; the reason goes to
 ``cleanupErrors`` and never replaces the original ``error``. A record is written
@@ -39,32 +43,35 @@ always propagates unchanged.
 from __future__ import annotations
 
 import contextlib
-import json
 import os
 import subprocess
 import sys
 import tempfile
-from dataclasses import dataclass, field
 
-RECORD_NAME = "failure.json"
-NATIVE_FAILURE_PREFIX = "NATIVE_FAILURE "
+# Explicit project copies carry the record module beside this file. Installed skills
+# use the declared Maestro sibling dependency; neither route depends on the caller's cwd.
+_SCRIPTS = os.path.dirname(os.path.abspath(__file__))
+_RECORD_SCRIPTS = _SCRIPTS if os.path.isfile(os.path.join(_SCRIPTS, "failure_record.py")) else (
+    os.path.normpath(os.path.join(_SCRIPTS, "..", "..", "maestro", "scripts"))
+)
+if _RECORD_SCRIPTS not in sys.path:
+    sys.path.insert(0, _RECORD_SCRIPTS)
+
+from failure_record import (  # noqa: E402
+    NATIVE_FAILURE_KEYS,
+    NATIVE_FAILURE_PREFIX,
+    RECORD_KEYS,
+    RECORD_NAME,
+    Failure,
+    read_record,
+    write_record,
+)
+
 SCREENSHOT_NAME = "screenshot.png"
 UI_DUMP_NAME = "ui-dump.xml"
 LOGCAT_NAME = "logcat-tail.txt"
 UI_DUMP_REMOTE = "/sdcard/failure-capture.xml"
 
-RECORD_KEYS = (
-    "case",
-    "step",
-    "error",
-    "screenshot",
-    "uiDump",
-    "logcatTail",
-    "evidenceDir",
-    "cleanupErrors",
-)
-NATIVE_FAILURE_KEYS = ("case", "step", "error", "evidenceDir")
-
 
 class CaptureError(RuntimeError):
     """A bounded capture command failed, timed out or returned no usable output."""
@@ -152,74 +159,6 @@ class AdbClient:
         _write_bytes(destination, payload)
 
 
-@dataclass
-class Failure:
-    """One failed device case; also the payload of `failure.json`."""
-
-    case: str = None
-    step: str = None
-    error: str = ""
-    screenshot: str = None
-    uiDump: str = None
-    logcatTail: str = None
-    evidenceDir: str = None
-    cleanupErrors: list = field(default_factory=list)
-
-    def as_dict(self):
-        return {key: getattr(self, key) for key in RECORD_KEYS}
-
-    def native_failure_line(self):
-        compact = {key: getattr(self, key) for key in NATIVE_FAILURE_KEYS}
-        return NATIVE_FAILURE_PREFIX + json.dumps(compact, separators=(",", ":"))
-
-    @classmethod
-    def from_dict(cls, payload):
-        values = {key: payload[key] for key in RECORD_KEYS if key in payload}
-        errors = values.get("cleanupErrors")
-        values["cleanupErrors"] = list(errors) if isinstance(errors, list) else []
-        return cls(**values)
-
-
-def read_record(evidence_dir):
-    """The record already in `evidence_dir`, or None when there is no usable one."""
-    path = os.path.join(evidence_dir, RECORD_NAME)
-    try:
-        with open(path, "r", encoding="utf-8") as stream:
-            payload = json.load(stream)
-    except (OSError, ValueError):
-        return None
-    if not isinstance(payload, dict) or "error" not in payload:
-        return None
-    return Failure.from_dict(payload)
-
-
-def write_record(failure, evidence_dir):
-    """Store `failure` unless a record already exists; return the record on disk.
-
-    A valid earlier record wins, so a cleanup error or a second failing step cannot
-    replace the first failure. An unreadable file is not a record and is replaced,
-    with the replacement noted on the returned record's `cleanupErrors`.
-    """
-    os.makedirs(evidence_dir, exist_ok=True)
-    existing = read_record(evidence_dir)
-    if existing is not None:
-        return existing
-    path = os.path.join(evidence_dir, RECORD_NAME)
-    if os.path.exists(path):
-        failure.cleanupErrors.append("%s: replaced an unreadable record" % RECORD_NAME)
-    payload = json.dumps(failure.as_dict(), indent=2) + "\n"
-    handle, temporary = tempfile.mkstemp(dir=evidence_dir, prefix=".failure-", suffix=".json")
-    try:
-        with os.fdopen(handle, "w", encoding="utf-8") as stream:
-            stream.write(payload)
-        os.replace(temporary, path)
-    except BaseException:
-        if os.path.exists(temporary):
-            os.unlink(temporary)
-        raise
-    return failure
-
-
 class FailureRecorder:
     """Capture the first failing step of one device case.
 

package/skills/app-dev/android-development/scripts/init.mjs

@@ -22,6 +22,7 @@ const defaultScriptsDir = 'scripts/android'
 const installableScripts = [
   { name: 'device-run.sh', mode: 0o755 },
   { name: 'failure_capture.py', mode: 0o644 },
+  { name: 'failure_record.py', source: '../../maestro/scripts/failure_record.py', mode: 0o644 },
 ]
 const scriptHeaderPattern = /^# android-development skill (\S+) sha256:([0-9a-f]{64}) (\S+)$/
 
@@ -516,7 +517,7 @@ function scriptPlan(root, requested) {
   return installableScripts.map(script => {
     const file = path.join(root, target, script.name)
     assertScriptDirectory(root, file)
-    const source = scriptSource(script.name)
+    const source = scriptSource(script.source ?? script.name)
     const next = withHeader(source, scriptHeader(script.name, version, source))
     const entry = readGuidance(resolveTarget(root, path.posix.join(target, script.name)))
     const base = { ...entry, mode: script.mode, script: script.name }