Background

Decomposition of #2576 (Cat A processing). Cluster A1 covers the Android surface of the v2026.3.22 sync backlog: 31 files under apps/android/ where fork content diverges from upstream@v2026.3.22 with rebrand applied.

See full triage at hq/upstream/pending-sync-review/2026-04-24-cat-a-triage.md (cluster A1 section) and per-cluster TSV at hq/upstream/pending-sync-review/2026-04-24-cat-a-clusters.tsv.

Disposition summary

Cluster scope (per fork path prefix):

• apps/android/app/src/main/java/org/remoteclaw/{android,app}/** — 25 main src files
• apps/android/app/src/test/java/org/remoteclaw/{android,app}/** — 6 test files

Scope

For each of the 31 files:

1. CHERRY-PICK (29): Apply the upstream change between fork's last sync of this file and v2026.3.22 to the fork's rebranded path with rebrand-content transforms. Per-file inspection may convert to EXCLUDE-DIVERGENT if the upstream change touches a fork-gutted code path.
2. EXCLUDE-DIVERGENT (2): Add row to hq/upstream/disposition.tsv with rationale citing the fork commit (gut/fork-divergent) that intentionally caused divergence.

File list

How to verify

• Per-file: git log -1 --format=%H -- {fork-equivalent-path} shows the cherry-pick (or trailer Cherry-picked-from: {upstream-sha})
• Local Android Gradle build (fork CI does not build Android)
• Local Android instrumentation/unit tests pass
• Bulk: re-run audit against v2026.3.22 after PR merges; A1 cluster residual = 0
• For EXCLUDE-DIVERGENT entries: disposition.tsv row exists with rationale referencing fork divergence commit

Acceptance criteria

• Each of the 31 paths has either a cherry-picked upstream change (with rebrand transform) OR an EXCLUDE-DIVERGENT entry in hq/upstream/disposition.tsv
• Local pnpm check (lint+typecheck) passes
• Local Android Gradle build passes
• No new CI failures
• Bulk verification re-run shows A1 residual = 0

Out of scope

• A2 (macOS, 35 files) — separate issue
• A3 (Shared+iOS, 10 files) — separate issue
• A0 (40 ALREADY-SYNCED, audit false positives) — needs audit-tooling enhancement; not in this issue
• Backslash-dir bug (18 files in apps/android/app/src/main/java/org\ literal-backslash directory) — separate issue

Notes

• Per-file dispositions in the file list above are proposals. Reviewer judgment on each file is required during execution; expect 5–10% reclassification (CHERRY-PICK → EXCLUDE-DIVERGENT) after code-context inspection.
• Two largest CHERRY-PICK files (GatewaySession.kt 259 lines, CameraCaptureManager.kt 107 lines) may warrant their own commits within the cluster PR for review tractability.
• Three of the 31 paths target org/remoteclaw/app/ (not org/remoteclaw/android/) — fork has inconsistent android-package naming. Address in the same PR (either consolidate or document the split).