e5d507876d
Both sides carried duplicated commits from a cherry-pick/rebase split (animation cadence cap, key-to-paint metrics, desktop2 scroll work), so most conflicts resolved to the remote copies. Kept local desktop2 and iOS polish where it was the newer pass, took origin's ReasoningDisclosure and collapsed tool-call input summaries for iOS, and restored the soft interrupt image persistence that a local desktop-crate removal commit had stripped by accident.