Background

Decomposition of #2576 (Cat A processing). Cluster A2 covers the macOS surface of the v2026.3.22 sync backlog: 35 files under apps/macos/ 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 A2 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/macos/Sources/RemoteClaw/** — 31 app source files (largest sub-cluster)
• apps/macos/Sources/RemoteClawDiscovery/** — 1 file
• apps/macos/Sources/RemoteClawMacCLI/** — 1 file
• apps/macos/Tests/RemoteClawIPCTests/** — 2 test files

Scope

For each of the 35 files:

1. CHERRY-PICK (31): 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 (4): All four EXCLUDE-DIVERGENT entries in this cluster (ContextUsageBar.swift, SessionMenuLabelView.swift, SessionsSettings.swift, UsageMenuLabelView.swift) trace to fork commit gut(session): remove vestigial contextTokens config and display denominator #2277 gut(session): remove vestigial contextTokens config and display denominator. Add disposition.tsv rows with that rationale.

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 Xcode build (fork CI does not build macOS)
• Local Swift Package Tests pass: swift test in each touched module
• Bulk: re-run audit against v2026.3.22 after PR merges; A2 cluster residual = 0
• For EXCLUDE-DIVERGENT entries: disposition.tsv row exists citing fork commit gut(session): remove vestigial contextTokens config and display denominator #2277

Acceptance criteria

• Each of the 35 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 Xcode build passes for RemoteClaw.app target
• Local swift test passes for RemoteClawKit targets affected
• No new CI failures
• Bulk verification re-run shows A2 residual = 0

Out of scope

• A1 (Android, 31 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

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.
• Three largest CHERRY-PICK files (NodePairingApprovalPrompter.swift 141 lines, VoiceWakeRuntime.swift 89 lines, PeekabooBridgeHostCoordinator.swift 72 lines) may warrant their own commits within the cluster PR for review tractability.
• The 4 EXCLUDE-DIVERGENT entries can land in a single small commit adding rows to disposition.tsv (in the audit repo), then the remaining 31 cherry-picks can land as the larger code commit.