Skip to content

fix(server): preserve Claude rewind across fork history changes #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rynfar merged 4 commits into from
Sep 18, 2026
Merged

fix(server): preserve Claude rewind across fork history changes #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec9f2e1
fix(server): keep Claude rewind when fork history length changes (#11…
maria-rcks Sep 16, 2026
d354295
test(server): adversarial coverage for Claude rewind fork remapping a…
rynfar Sep 18, 2026
07ee2cd
test(server): align mock fork message content with retained turns in …
rynfar Sep 18, 2026
67171d0
docs: record Claude rewind upstream disposition
rynfar Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .agents/upstream-review.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The maintainer authorized compatible catch-up and routine adaptations that prese

## Active cycle

[Upstream integration cycle #605](https://github.com/pylon-code/pylon/issues/605) owns worktree setup progress, cancellation and mobile handoff within frozen head `6d1d549441be84f19696ab59ed7e2fbf305280d4`. The [existing-port audit #604](https://github.com/pylon-code/pylon/issues/604) reconciles 22 sources already present and records the remaining range after cycle #598. Merge is authorized after review and green verification; the review cursor remains unchanged.
[Upstream integration cycle #611](https://github.com/pylon-code/pylon/issues/611) owns provider account usage, discovery, executable diagnostics, WSL discovery coverage and Claude rewind within frozen head `6d1d549441be84f19696ab59ed7e2fbf305280d4`. The [existing-port audit #604](https://github.com/pylon-code/pylon/issues/604) reconciles 22 sources already present and records the remaining range after cycle #598. Merge is authorized after review and green verification; the review cursor remains unchanged.

## Latest cycle

Expand Down Expand Up @@ -193,3 +193,5 @@ The review cursor stays unchanged; unrelated sources in this range remain unclas
| Preview identity and focus recovery / `6d1d549441be84f19696ab59ed7e2fbf305280d4` | `c542b781c6c4c766e66dcb764b2142d95600e890` (#7110), `cfeaca41ae27bdf2c203158d378c87c7308fea2a` (#11444) | Adopted: preview sessions retain native Electron/Pylon User-Agent and window-return refocus leaves iframe/webview focus alone. Permission policy and session ownership unchanged. Sites can identify the native embedded browser; no claim of bypassing third-party authentication policies. | Cycle #598; implementation PR records effective-UA regression, focus tests, types/lint and interaction evidence. |

| Worktree setup progress and cancellation / `6d1d549441be84f19696ab59ed7e2fbf305280d4` | Ten full source SHAs enumerated in [PR #608](https://github.com/pylon-code/pylon/pull/608), from #6208 and #11372 through #12177 | Adopted with Pylon admission, source epochs, compaction, inline context and mobile outbox retained. Live stages, required/background scripts, prompt persistence, cancellation and draft recovery span web and mobile. Capability-gated subscriptions support older hosts; setup history is bounded, and server restart ends live tracking. iOS uses the existing React Native modal layout so setup actions receive touches. | Cycle #605; PR #608 records combined review, regression coverage, scoped checks and uploaded web/iOS evidence. |

| Claude fork rewind alignment / `6d1d549441be84f19696ab59ed7e2fbf305280d4` | `eed974c122e192de45b54b7dac7ca1a51448c08f` (#11954) | Adopted: align retained user/assistant messages and remap fork UUIDs despite changed system metadata. Reject missing, reordered or changed retained conversation. Preserve Pylon session ownership, stopped-session fences and exact checkpoint behavior. No excluded source behavior; cursor unchanged. | Cycle [#611](https://github.com/pylon-code/pylon/issues/611), Claude rewind implementation PR; independent Antigravity adversarial review, 173 adapter tests and scoped server checks. |
Loading
Loading