Date: 2026-05-08 Last updated: 2026-05-23 Range: original..upstream/master Total commits: 199

1. This manifest remains the canonical upstream classification for original..upstream/master.
2. PR #18 merged to master as commit 258125992, carrying the previously separated work lanes:
   • W2-001 / W2-002 semantic repairs (a09adfc63, 386eca6fe, 1a9ef3d68)

• W2-003 lifetime cleanup (5340472b0)
• bounded W3-P poll hardening (21275249c, c81e6da9f, 3e78ebcd8, plus a supporting local seam in td/telegram/MessageContent.*)
• separate fingerprint/tooling work in td/mtproto/BrowserProfile.cpp, test/analysis/extract_client_hello_fixtures.py, reviewed fixture refreshes, and docs/Plans/FINGERPRINT_HARDENING_MASTER_PLAN_2026-05-24.md

3. The lane and class columns below remain the historical Pass A intake record for the upstream backlog. The merged execution outcome does not rewrite that initial classification.
4. W4-G remains deferred for any new intake, but its current repository-resident adaptation baseline and verified test state are frozen in docs/Plans/UPSTREAM_WAVE_4_PREFLIGHT_2026-05-14.md; the W4 manifest rows now use that annex as their evidence anchor instead of leaving the verified state only in local code and test surfaces.
5. W5-AI remains deferred for implementation, but rows 5, 10, 63, 70 through 83, 88, 89, 94 through 101, 194, 195, and 199 now use docs/Plans/UPSTREAM_WAVE_5_PREFLIGHT_2026-05-14.md as their shared evidence anchor for local baseline, divergence, risk, and TDD planning state.
6. Wave 5 pass-B decisions and bounded adaptations are now recorded in docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.6; this manifest keeps pass-A row classification stable and uses that section as the canonical pass-B decision anchor.
7. Wave 6 pass-B decisions and bounded hardening adaptations are now recorded in docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.9; pass-A row classes remain unchanged and the section is the canonical anchor for valuable-versus-deferred W6 rationale.
8. W6-M now has a frozen activation preflight anchor in docs/Plans/UPSTREAM_WAVE_6_PREFLIGHT_2026-05-19.md. Manifest rows 84 through 87 retain pass-A classes and use that annex as archival blast-radius, risk matrix, and RED inventory context for provenance review.
9. Wave 1 pass-B decisions are now recorded in docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.11; rows 1, 2, 8, 9, 17, 40, 56, 81, 184, and 199 retain historical W1-T pass-A labels while using that section as the canonical decision anchor. Rows 81 and 199 also retain their Wave 5 cross-lane anchor in Section 0.3.6.
10. Wave 3 pass-B decisions are now recorded in docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.3.a; rows 51, 52, 66, 67, 159, 162, and 187 retain historical W3-P pass-A labels while using that section as the canonical adapted-versus-not-adapted decision anchor.
11. Wave 8 pass-B decisions are now recorded in docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.8.a; rows 104, 134, 176, 180, and 193 retain historical W8-X pass-A labels while using that section as the canonical adapted-versus-not-adapted decision anchor.
12. A repository audit on 2026-05-23 confirmed that W3-P, W4-G, W5-AI, W6-M, W7-D, and W8-X all have repository-resident implementations or local-equivalent bounded adaptations in the current tree, but it did not sustain the older "no remaining wave-level backlog" conclusion.
13. W9-R (audit reconciliation) is closed in the gating plan Section 0.3.12; status/matrix/manifest wording now consistently distinguish bounded local-equivalent closure from upstream-exact parity.
14. W10-V (executable validation uplift) is closed in the gating plan Section 0.3.13 on targeted seam-level runtime harness evidence (run_all_tests build plus focused CTest passes for text-composition, guest-query, and managed-bot token/access-settings dispatch seams). This does not claim full actor-level end-to-end owner-path coverage and does not rewrite historical Pass A lane counts below.
15. W11-AI2 remains intentionally open-deferred by policy decision in the gating plan Section 0.3.14. Activation is allowed only under explicit owner/product approval with per-commit deep review and RED-first runtime owner-path coverage.

• W1-T: 10
• W2-C: 4
• W2B: 9
• W3-P: 70
• W4-G: 8
• W5-AI: 22
• W6-M: 4
• W7-D: 3
• W8-X: 69

• deep-review: 4
• research-input: 4
• already-incorporated: 2
• ignore: 1
• defer: 188

This section records pass-B outcomes for the bounded Wave 5 slice while preserving pass-A row classes above.

Valuable and adapted:

1. 990b821c8 (Add td_api::internalLinkTypeTextCompositionStyle.)

• Decision: valuable.
• Local adaptation summary: keep typed addstyle link surface and enforce one shared slug contract by delegating LinkManager slug validation to TranslationManager::is_valid_text_composition_style_slug(...).
• Evidence anchor: docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.6 and RED->GREEN contract coverage in test/text_composition_style_name_integration.cpp.

2. c96e67c38 + 58d72a0e8 + a26ccb8c5 (updateAiComposeTones lifecycle)

• Decision: valuable as inseparable triple.
• Local adaptation summary: preserve bot guard, reload trigger, and guaranteed promise completion semantics.
• Evidence anchor: docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.6, test/text_composition_update_promise_*.cpp, and test/text_composition_updates_manager_*.cpp.

Assessed and not adapted in this pass:

1. 3678c2d42 (Improve removeTextCompositionStyle documentation.)

• Decision: not valuable.
• Reason: documentation-only; no executable boundary change.

2. 49b3bcbb6 (Fix compilation error.)

• Decision: not valuable for current repository state.
• Reason: touches only AiComposeToneExample.hpp, while AiComposeToneExample.* owners are absent locally.

3. Remaining owner/schema expansion rows (d72be7609, 176915344, a05aeeb9c, b77099227, fc903aab3, 3ba1e630b, 23971a844, 327531a54, ee93de50b, 8a7d707ee, 27b1ee8cd, f5b5a6e11, 64972181c, 86d375553, 3e10a17e6, 6113d3822, 36e726f93)

• Decision: defer.
• Reason: product/schema bundle remains gated by the approved Wave 5 preflight sequence.

This section records pass-B outcomes for the managed-bot access slice while preserving pass-A row classes above.

Valuable and adapted in this pass (bounded managed-bot hardening slice):

1. 3819fded5 (Rename td_api::getBotToken to getManagedBotToken.)

• Decision: valuable with local compatibility-preserving adaptation.
• Local adaptation summary: add getManagedBotToken endpoint and request handler while retaining legacy getBotToken; both routes delegate to one guarded BotInfoManager::get_bot_token(...) path.
• Local hardening update (2026-05-20): both Requests handlers now route through one dispatch_get_managed_bot_token(...) helper so legacy and managed endpoints cannot drift apart.
• Additional hardening update (2026-05-20, pass-C): explicit bot-session fail-closed guards now exist in both dispatch_get_managed_bot_token(...) and BotInfoManager::get_bot_token(...) (Only bots can use the method) to prevent future helper reuse from non-bot call paths.
• Hardening summary: token export now fail-closes for non-owned bots (Bot must be owned) before any export RPC; non-bot invocations fail closed at both request and manager boundaries; CLI exposes gmbt/gmbtr without removing gbt/gbtr; request-path equivalence is pinned by contract/adversarial/integration/light-fuzz/stress tests.
• Evidence anchor: docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.9 and test/managed_bot_token_access_*.cpp.

2. 19292458f (Add td_api::botAccessSettings.)

• Decision: valuable with bounded local-equivalent adaptation.
• Local adaptation summary: repository-resident BotAccessSettings conversion and validation seams are present and wired through managed-bot request/manager boundaries.
• Evidence anchor: docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.9 and test/managed_bot_access_settings_*.cpp.

3. b6aa479a9 (Add td_api::getManagedBotAccessSettings.)

• Decision: valuable with bounded local-equivalent adaptation.
• Local adaptation summary: Requests::on_request(getManagedBotAccessSettings) routes through BotInfoManager::get_bot_access_settings(...) guarded by dispatch_managed_bot_access_settings_read(...) fail-closed checks.
• Evidence anchor: docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.9.

4. 83506493e (Add td_api::setManagedBotAccessSettings.)

• Decision: valuable with bounded local-equivalent adaptation.
• Local adaptation summary: Requests::on_request(setManagedBotAccessSettings) routes through BotInfoManager::set_bot_access_settings(...) guarded by dispatch_managed_bot_access_settings_write(...) fail-closed checks.
• Evidence anchor: docs/Plans/UPSTREAM_BACKPORT_GATING_PLAN_2026-05-08.md Section 0.3.9 and focused runtime harness passes recorded in Section 0.3.13.