Support resuming from squash merge commits with multiple checkpoints by pfleidi · Pull Request #534 · entireio/cli

pfleidi · 2026-02-26T23:11:13Z

Summary

Support entire resume on squash merge commits that contain multiple Entire-Checkpoint trailers
Fix checkpoint ordering bug where git CLI squash merges list trailers newest-first, causing the oldest transcript to overwrite the newest on disk
Deduplicate sessions by SessionID across checkpoints, keeping the most recent transcript

Problem

When a feature branch with multiple commits (each with its own Entire-Checkpoint trailer) is squash-merged, all trailers end up in a single commit message. entire resume previously only parsed the first trailer, losing all other sessions.

Additionally, GitHub squash merges list trailers chronologically (oldest first), but git CLI squash merges list them in reverse order (newest first). Since RestoreLogsOnly writes session files eagerly, the last checkpoint processed wins on disk — meaning reverse-ordered trailers caused the oldest transcript to overwrite the newest.

Changes

cmd/entire/cli/trailers/trailers.go — Add ParseAllCheckpoints() to extract all Entire-Checkpoint trailers from a commit message (not just the first).

cmd/entire/cli/resume.go —

Switch from ParseCheckpoint (single) to ParseAllCheckpoints (multi) throughout findBranchCheckpoint and findCheckpointInHistory
Change branchCheckpointResult.checkpointID → checkpointIDs []CheckpointID
Add resumeMultipleCheckpoints: reads metadata for all checkpoint IDs, sorts by CreatedAt ascending, then restores in order so the newest checkpoint always writes last
Add deduplicateSessions: merges sessions across checkpoints, keeping the one with the latest CreatedAt when a SessionID appears in multiple checkpoints
Extract displayRestoredSessions to share session display logic between single and multi-checkpoint paths

cmd/entire/cli/resume_test.go — Add unit tests for deduplicateSessions (including three-occurrence staleness edge case), findCheckpointInHistory with multiple trailers, findBranchCheckpoint with squash merge, and checkpoint timestamp sorting.

cmd/entire/cli/integration_test/resume_test.go — Add integration test simulating a full squash merge workflow: two sessions on a feature branch, squash merge to main, then entire resume restoring both sessions.

cmd/entire/cli/trailers/trailers_test.go — Add tests for ParseAllCheckpoints.

Caveat: Optimization

I thought about optimizing this process by only restoring the very latest checkpoint, but realized that this wouldn't work as expected:

A committed checkpoint only contains the sessions that were condensed at that specific commit. When a feature branch is squash merged, Git/GitHub preserves all Entire-Checkpoint trailers from the original commits in the squash commit body. Each trailer points to a different checkpoint on entire/checkpoints/v1, and different checkpoints may contain different sessions.

Since there is no single checkpoint that aggregates all sessions from the branch, the resume command must iterate over every checkpoint ID found in the squash commit and restore each one. Sessions are de-duplicated by ID, keeping the entry with the latest CreatedAt.

Optimizing by only restoring the latest checkpoint would silently drop any session whose last activity was on an earlier commit.

Test plan

mise run test:ci passes (unit + integration)
Integration test TestResume_SquashMergeMultipleCheckpoints covers the end-to-end squash merge flow
Unit test TestResumeMultipleCheckpoints_SortsByCreatedAt verifies reverse-ordered checkpoints are sorted correctly
Unit tests for deduplicateSessions cover no-duplicates, newer-wins, older-loses, three-occurrence, and mixed scenarios

Change checkpointID field to checkpointIDs slice, update findBranchCheckpoint and findCheckpointInHistory to use ParseAllCheckpoints, and add test for squash merge commits with multiple Entire-Checkpoint trailers. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: e49c84c2d596

Add ParseAllCheckpoints() to trailers package for extracting all Entire-Checkpoint trailers from squash merge commits. Add resumeMultipleCheckpoints() to resume.go that iterates over all checkpoint IDs, restores sessions for each, and displays aggregated resume commands. Refactor test helper to support custom checkpoint IDs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: 43abb5b45ab5

Entire-Checkpoint: c585b5e466a1

cursor · 2026-02-26T23:11:18Z

PR Summary

Medium Risk
Changes entire resume restoration logic to process multiple checkpoints and overwrite transcripts based on checkpoint timestamps, which could affect which session logs end up on disk. The behavior is well-covered by new unit and integration tests but touches a core workflow and remote metadata fallback paths.

Overview
entire resume now supports squash-merge commits that include multiple Entire-Checkpoint trailers, restoring sessions from every referenced checkpoint instead of only the first.

The new multi-checkpoint path sorts checkpoints by metadata CreatedAt (so the newest transcript wins on disk even when trailer order is reversed) and deduplicates sessions by SessionID (keeping the latest). Output formatting is refactored into a shared displayRestoredSessions helper.

Adds trailers.ParseAllCheckpoints, a new integration test that simulates a full squash-merge workflow, and unit tests covering trailer parsing, checkpoint ordering, history scanning, and session deduplication; integration test helpers gain GitCommitWithMultipleCheckpoints to build squash-style commit messages.

^{Written by Cursor Bugbot for commit b0d0093. Configure here.}

Copilot

Pull request overview

Adds support for resuming sessions from squash-merge commits that contain multiple Entire-Checkpoint trailers, enabling entire resume <branch> to restore more than one session when multiple checkpoints are embedded in a single commit message.

Changes:

Add trailers.ParseAllCheckpoints() to extract and deduplicate multiple checkpoint trailers from a commit message.
Update resume branch-checkpoint discovery to return multiple checkpoint IDs and add a multi-checkpoint resume flow.
Add unit + integration tests (including a squash-merge simulation) and a new integration test helper to create commits with multiple checkpoint trailers.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
cmd/entire/cli/trailers/trailers.go	Adds `ParseAllCheckpoints()` to return all checkpoint trailers (deduped, ordered).
cmd/entire/cli/trailers/trailers_test.go	Adds unit tests covering single/multiple/dedup/invalid/mixed checkpoint trailers.
cmd/entire/cli/resume.go	Switches checkpoint discovery to multiple IDs and introduces `resumeMultipleCheckpoints()`.
cmd/entire/cli/resume_test.go	Adds unit tests for multiple-checkpoint history/branch discovery and a helper to create distinct checkpoint metadata.
cmd/entire/cli/integration_test/testenv.go	Adds `GitCommitWithMultipleCheckpoints()` helper for squash-merge style commit messages.
cmd/entire/cli/integration_test/resume_test.go	Adds integration test validating restore from squash-merge commit containing two checkpoints.

cmd/entire/cli/resume.go

The sorting, header formatting, and resume command printing was duplicated between resumeSession and resumeMultipleCheckpoints. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: 0ff68845c557

RestoreLogsOnly already resolves agents per-session from session-level metadata, so an unknown checkpoint-level agent shouldn't block the restore attempt. The session dir creation was also redundant since RestoreLogsOnly handles it internally. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: 831e4afa5e83

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

cmd/entire/cli/resume.go

Split the error and empty-sessions cases into separate log entries so the actual failure reason is visible in debug logs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: 932c2642d8ac

When a single session spans multiple commits, different checkpoint IDs can contain the same session. In a squash merge this would produce duplicate resume commands. Keep the entry with the latest CreatedAt. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: e92b8f8525e9

toothbrush · 2026-02-26T23:42:06Z

As someone who prefers¹ squash-merge to messy merge-tennis with careless commit messages, this effort really pleases me.

Out of an abundance of caution i want to add that doesn't mean it's my favouritest merge.

The inline dedup logic in resumeMultipleCheckpoints did not update the seen map's CreatedAt after replacing a session, so a third occurrence could incorrectly overwrite the newest entry. Extract to a standalone function with a correct update and add targeted unit tests. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: 7132c7b6328a

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

cmd/entire/cli/trailers/trailers_test.go

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Entire-Checkpoint: 27bbbac46736

…uash-merge-resume

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

cmd/entire/cli/resume_test.go

Entire-Checkpoint: 9c67547d59c3

cmd/entire/cli/resume.go

Entire-Checkpoint: 8664f2d41cb3

cmd/entire/cli/resume.go

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.

cmd/entire/cli/resume.go

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…uash-merge-resume Entire-Checkpoint: 4ff8bd5bc20c

Entire-Checkpoint: dc311b24d1d0

Entire-Checkpoint: f0894592c6ef

Entire-Checkpoint: dc723823f0b4

Entire-Checkpoint: af287eac4686

pfleidi · 2026-03-03T23:45:47Z

@cursor review

Add end2end tests for `entire resume` for squash merged commits

cursor

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

pfleidi and others added 4 commits February 26, 2026 13:57

Merge branch 'main' of github.com:entireio/cli into squash-merge-resume

0b33ed4

Add integration test for multi-checkpoint resume

c9405b9

Entire-Checkpoint: c585b5e466a1

pfleidi requested a review from a team as a code owner February 26, 2026 23:11

Copilot AI review requested due to automatic review settings February 26, 2026 23:11

Copilot started reviewing on behalf of pfleidi February 26, 2026 23:11 View session

Copilot AI reviewed Feb 26, 2026

View reviewed changes

cmd/entire/cli/resume.go Outdated Show resolved Hide resolved

cmd/entire/cli/resume.go Outdated Show resolved Hide resolved

cmd/entire/cli/resume.go Show resolved Hide resolved

cmd/entire/cli/resume.go Outdated Show resolved Hide resolved

cursor bot reviewed Feb 26, 2026

View reviewed changes

cmd/entire/cli/resume.go Show resolved Hide resolved

pfleidi requested a review from Copilot February 26, 2026 23:19

Copilot started reviewing on behalf of pfleidi February 26, 2026 23:19 View session

pfleidi and others added 2 commits February 26, 2026 15:22

Extract displayRestoredSessions to deduplicate session display logic

5ddc24e

The sorting, header formatting, and resume command printing was duplicated between resumeSession and resumeMultipleCheckpoints. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: 0ff68845c557

Copilot AI reviewed Feb 26, 2026

View reviewed changes

cmd/entire/cli/resume.go Outdated Show resolved Hide resolved

pfleidi and others added 2 commits February 26, 2026 15:26

Include error details in debug log when RestoreLogsOnly fails

c1e7316

Split the error and empty-sessions cases into separate log entries so the actual failure reason is visible in debug logs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: 932c2642d8ac

pfleidi requested a review from Copilot February 26, 2026 23:58

Copilot started reviewing on behalf of pfleidi February 26, 2026 23:59 View session

Copilot AI reviewed Feb 27, 2026

View reviewed changes

cmd/entire/cli/trailers/trailers_test.go Show resolved Hide resolved

Update cmd/entire/cli/trailers/trailers_test.go

f5d7ee5

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

pfleidi marked this pull request as draft February 27, 2026 02:16

pfleidi added 4 commits March 2, 2026 13:05

Merge branch 'main' of github.com:entireio/cli into squash-merge-resume

d10022c

Sort checkpoints based on timestamp before trying to restore them.

4271b62

Entire-Checkpoint: 27bbbac46736

Merge branch 'squash-merge-resume' of github.com:entireio/cli into sq…

1938f48

…uash-merge-resume

Merge branch 'main' of github.com:entireio/cli into squash-merge-resume

658b869

pfleidi requested a review from Copilot March 3, 2026 02:07

Copilot started reviewing on behalf of pfleidi March 3, 2026 02:07 View session

Copilot AI reviewed Mar 3, 2026

View reviewed changes

cmd/entire/cli/resume_test.go Show resolved Hide resolved

Remove collectCheckpointsByAge duplication

652f3f0

Entire-Checkpoint: 9c67547d59c3

pfleidi commented Mar 3, 2026

View reviewed changes

cmd/entire/cli/resume.go Show resolved Hide resolved

Rename branchCheckpointResult since its functionality changed slightly

c0b9c95

Entire-Checkpoint: 8664f2d41cb3

pfleidi commented Mar 3, 2026

View reviewed changes

cmd/entire/cli/resume.go Show resolved Hide resolved

pfleidi requested a review from Copilot March 3, 2026 19:33

Copilot started reviewing on behalf of pfleidi March 3, 2026 19:34 View session

Copilot AI reviewed Mar 3, 2026

View reviewed changes

cmd/entire/cli/resume.go Outdated Show resolved Hide resolved

cmd/entire/cli/resume.go Outdated Show resolved Hide resolved

pfleidi and others added 4 commits March 3, 2026 11:43

Update cmd/entire/cli/resume.go

a342bef

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update cmd/entire/cli/resume.go

1764063

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Merge branch 'squash-merge-resume' of github.com:entireio/cli into sq…

07eddb8

…uash-merge-resume Entire-Checkpoint: 4ff8bd5bc20c

Remove tie breaker

8e9b25b

Entire-Checkpoint: dc311b24d1d0

pfleidi marked this pull request as ready for review March 3, 2026 19:50

pfleidi added 4 commits March 3, 2026 11:50

Merge branch 'main' into squash-merge-resume

b0d0093

Add e2e tests for entire resume

8df9e50

Entire-Checkpoint: f0894592c6ef

Ensure resume tests operate on feature branches.

daae0fe

Entire-Checkpoint: dc723823f0b4

Ensure main branch is clean and doesn't contain uncommitted files

a946b3b

Entire-Checkpoint: af287eac4686

Merge pull request #593 from entireio/squash-merge-resume-e2e-tests

5d332c1

Add end2end tests for `entire resume` for squash merged commits

cursor bot reviewed Mar 3, 2026

View reviewed changes

gtrrz-victor approved these changes Mar 4, 2026

View reviewed changes

gtrrz-victor merged commit 256ba8b into main Mar 4, 2026
7 of 8 checks passed

gtrrz-victor deleted the squash-merge-resume branch March 4, 2026 00:17

Conversation

pfleidi commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Problem

Changes

Caveat: Optimization

Test plan

Uh oh!

cursor bot commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

toothbrush commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

pfleidi commented Mar 3, 2026

Uh oh!

cursor bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

pfleidi commented Feb 26, 2026 •

edited

Loading

cursor bot commented Feb 26, 2026 •

edited

Loading

toothbrush commented Feb 26, 2026 •

edited

Loading