fix: upstream reused draft reconciliation

[constbogdan]

What changed

fix: upstream reused draft reconciliation

Scope: 10 files · tooling-only · high risk

Application paths changed: no.
UI paths changed: no.

Review-sensitive areas

• .github/workflows/upstream-sync.yml
• docs/CODEX_HANDOFF.md
• docs/UPSTREAM_SYNC.md
• scripts/prepare-pr.ps1

Confirmed paths (10)

• .github/workflows/upstream-sync.yml
• docs/CODEX_HANDOFF.md
• docs/PREPARE_PR.md
• docs/UPSTREAM_SYNC.md
• scripts/hosted_upstream.py
• scripts/prepare-pr.ps1
• scripts/resolve_upstream.py
• scripts/test_hosted_upstream.py
• scripts/test_prepare_pr.py
• scripts/test_resolve_upstream.py

Validation and release

• Local checks: Fast feedback passed for the committed snapshot.
• Expected hosted path: Android Full authoritative validation.
• Required CI / Full validation: pending.
• Development APK: not required for the currently classified scope; protected main rechecks independently.
• Android TV/manual runtime validation: not recorded by prepare-pr; update if applicable.

Related issues

Not recorded by prepare-pr. Add references or state that none apply.

Screenshots

Not applicable; no UI path was detected.

AI or LLM usage

Not recorded automatically. Disclose applicable assistance and human verification before merge.