Repository navigation
Upstream integration cycle: worktree setup progress and cancellation #605
Description
Activity
Implemented and merged in #608 after combined-diff review, focused verification, and green CI on
01c1f5005f0e12487cdec17abf548d1588c9bf69.The complete ten-source worktree setup series is adopted: staged progress, required/background scripts, durable prompt/history, cancellation cleanup, and web/mobile draft recovery. Pylon-specific fixes preserve admission receipts, source epochs, compaction and inline context; native cancellation and edited-draft recovery were verified on iOS. Original upstream author commits and cherry-pick provenance are retained.
Validation: 1,389 focused tests across 27 files, scoped package typechecks/lint, and the full CI checks. Web evidence and final iOS evidence are uploaded. The implementation agent completed review; the automated review request did not return a separate approval.
Frozen range reconciliation: 209 source commits = 23 earlier adoptions + 22 confirmed existing ports (#604) + 10 sources in #608 + 154 remaining. Upstream head stays
6d1d549441be84f19696ab59ed7e2fbf305280d4; the review cursor staysbbedad0278bbf753503184c00e0c09a0eab6679c. No upstream fetch, whole-upstream merge, release or physical-device update was performed.
Continue the approved catch-up with the complete worktree setup progress/cancellation dependency group. Merge is authorized after review and green verification.
Frozen upstream head:
6d1d549441be84f19696ab59ed7e2fbf305280d4; cursor remainsbbedad0278bbf753503184c00e0c09a0eab6679c. Base:2ed2480add730d899430b7b73f583f643ba30fbe. Prior reconciliation: #604 (164 unclassified sources).Scope: persisted setup prompt/progress, cancellable setup stages, async script controls, web stability and mobile handoff. Preserve Pylon provider ownership, cancellation fences, authentication, migration lineage and version compatibility.
dd6ba84dc96f83000388e14b90f6533d5f63315d— fix(server): fall back when new worktrees are unavailable (#6208)73b206f4bf99e7e98ae144a9d9edbf7cb2700fc1— feat(web): show each worktree setup step and let users cancel it (#11372)5ea6439816470288d3f2b6b43635fea41fbbb101— feat(web): inline worktree setup rows and async setup scripts (#11832)5623089aea68ca62811f51321686c259fa4c810f— fix(server): disable color probes in worktree setup (#11843)0310cbf9f46ca94e9df0231a3440bca08ac44709— fix: keep worktree setup visible after leaving and reopening the thread (#11836)2c19283afed1e3b69a9af33360980527aeb37494— feat(server): persist the worktree setup send and progress on the thread (#11852)ae53072af0560c0606202b87b5fdb7e52d48ac5c— fix(web): keep the composer ready during background worktree setup (#11883)0f5a1513e09fb41e0d0f86157aff64cc3657975d— fix(web): stop the worktree setup card from flashing and shifting (#12015)3bee4c286e586c2eb7f8d196a65b4b5ea6a95241— fix(server): settle cancelled worktree setup before rollback (#12176)4abb07eac3d47543b5804e8039633ac8ad7f67d2— feat(mobile): port worktree setup progress and agent handoff (#12177)Verification: focused regression coverage for state transitions, restart and cancellation/rollback; affected package checks; integrated UI evidence. No release/install scope.